Git-Mirrors/portapack-mayhem
1
0
Fork 0
mirror of https://github.com/eried/portapack-mayhem.git synced 2025-02-26 09:31:13 -05:00
Code Issues Packages Projects Releases Wiki Activity

naming fix

Browse Source
This commit is contained in:
zxkmm 2024-09-29 15:32:46 +08:00
parent 8f67ae85ac
commit 3e3f8a43cb
2 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
firmware/application/external/random/ui_random.cpp vendored
View File

@ -1,6 +1,7 @@
/* /*
* Copyright (C) 2014 Jared Boone, ShareBrained Technology, Inc. * Copyright (C) 2014 Jared Boone, ShareBrained Technology, Inc.
* Copyright (C) 2017 Furrtek * Copyright (C) 2017 Furrtek
* copyleft zxkmm
* *
* This file is part of PortaPack. * This file is part of PortaPack.
* *
@ -73,8 +74,7 @@ RandomView::RandomView(NavigationView& nav)
&check_allow_confusable_chars, &check_allow_confusable_chars,
&text_seed}); &text_seed});
// Auto-configure modem for LCR RX (TODO remove) // no idea what's these, i copied from afsk rx app and they seems needed'
// field_frequency.set_value(467225500);
auto def_bell202 = &modem_defs[0]; auto def_bell202 = &modem_defs[0];
persistent_memory::set_modem_baudrate(def_bell202->baudrate); persistent_memory::set_modem_baudrate(def_bell202->baudrate);
serial_format_t serial_format; serial_format_t serial_format;
@ -84,8 +84,6 @@ RandomView::RandomView(NavigationView& nav)
serial_format.bit_order = LSB_FIRST; serial_format.bit_order = LSB_FIRST;
persistent_memory::set_serial_format(serial_format); persistent_memory::set_serial_format(serial_format);
field_frequency.set_step(100);
check_log.set_value(logging); check_log.set_value(logging);
check_log.on_select = [this](Checkbox&, bool v) { check_log.on_select = [this](Checkbox&, bool v) {
if (v) { if (v) {
@ -113,7 +111,7 @@ RandomView::RandomView(NavigationView& nav)
} }
}; };
button_modem_setup.on_select = [&nav](Button&) { button_modem_setup.on_select = [&nav](Button&) { //copied from afsk rx app
nav.push<ModemSetupView>(); nav.push<ModemSetupView>();
}; };
@ -143,7 +141,6 @@ RandomView::RandomView(NavigationView& nav)
}; };
button_show_qr.on_select = [this, &nav](Button&) { button_show_qr.on_select = [this, &nav](Button&) {
// std::string qr = text_generated_passwd.
nav.push<QRCodeView>(password.data()); nav.push<QRCodeView>(password.data());
}; };
@ -179,7 +176,7 @@ RandomView::RandomView(NavigationView& nav)
if (logger) if (logger)
logger->append(logs_dir / u"random.TXT"); logger->append(logs_dir / u"random.TXT");
// Auto-configure modem for LCR RX (will be removed later) // Auto-configure modem for LCR RX (will be removed later), copied from afsk rx app
baseband::set_afsk(persistent_memory::modem_baudrate(), 8, 0, false); baseband::set_afsk(persistent_memory::modem_baudrate(), 8, 0, false);
receiver_model.enable(); receiver_model.enable();
@ -281,7 +278,15 @@ void RandomView::new_password() {
} }
} }
void RandomView::paint_password_hints() { // TODO: why flash and disappeared // TODO: why flash and disappeared
// tried:
// 1. paint inline in new_password func
// 2. paint in a seperate func and call from new_password
// 3. override nav's paint func (i think it can tried to capture same obj) and paint, hoping set_dirty handle it correctly
// 4. override nav's paint func (i think it can tried to capture same obj) and paint in a seperate func, hoping set_dirty handle it correctly
// all these methods failed, and all of them only flash and disappeared. only when set_dirty in on_data (which seems incorrect), and it keep flashing never stop. but see painted content (flashing too)
// btw this is not caused by the seed text set thing, cuz commented it out not helping.
void RandomView::paint_password_hints() {
Painter painter; Painter painter;
const int char_width = 8; const int char_width = 8;
const int char_height = 16; const int char_height = 16;

7
firmware/application/external/random/ui_random.hpp vendored
View File

@ -1,6 +1,7 @@
/* /*
* Copyright (C) 2014 Jared Boone, ShareBrained Technology, Inc. * Copyright (C) 2014 Jared Boone, ShareBrained Technology, Inc.
* Copyright (C) 2017 Furrtek * Copyright (C) 2017 Furrtek
* copyleft zxkmm
* *
* This file is part of PortaPack. * This file is part of PortaPack.
* *
@ -20,8 +21,8 @@
* Boston, MA 02110-1301, USA. * Boston, MA 02110-1301, USA.
*/ */
#ifndef __UI_AFSK_RX_H__ #ifndef __UI_RANDOM_H__
#define __UI_AFSK_RX_H__ #define __UI_RANDOM_H__
#include "ui.hpp" #include "ui.hpp"
#include "ui_language.hpp" #include "ui_language.hpp"
@ -205,4 +206,4 @@ class RandomView : public View {
} // namespace ui::external_app::random } // namespace ui::external_app::random
#endif /*__UI_AFSK_RX_H__*/ #endif /*__UI_RANDOM_H__*/