diff --git a/firmware/application/apps/ui_about_simple.cpp b/firmware/application/apps/ui_about_simple.cpp index ab3b30513..e6cce9e20 100644 --- a/firmware/application/apps/ui_about_simple.cpp +++ b/firmware/application/apps/ui_about_simple.cpp @@ -43,7 +43,7 @@ namespace ui case 2: // https://github.com/eried/portapack-mayhem/graphs/contributors?to=2020-04-12&from=2015-07-31&type=c console.writeln("\x1B\x06Havoc:\x1B\x10"); - console.writeln("furrtek,mrmookie,notpike"); + console.writeln("furrtek,mrmookie,NotPike"); console.writeln("mjwaxios,ImDroided,Giorgiofox"); console.writeln("F4GEV,z4ziggy,xmycroftx"); console.writeln("troussos,silascutler"); diff --git a/firmware/application/apps/ui_touchtunes.cpp b/firmware/application/apps/ui_touchtunes.cpp index 63e5e6f05..d9f9f3ee4 100644 --- a/firmware/application/apps/ui_touchtunes.cpp +++ b/firmware/application/apps/ui_touchtunes.cpp @@ -1,7 +1,7 @@ /* * Copyright (C) 2015 Jared Boone, ShareBrained Technology, Inc. * Copyright (C) 2017 Furrtek - * Copyright (C) 2017 NotPike + * Copyright (C) 2022 NotPike * * This file is part of PortaPack. * @@ -27,6 +27,7 @@ #include "baseband_api.hpp" #include "string_format.hpp" + using namespace portapack; using namespace encoders; @@ -72,6 +73,14 @@ void TouchTunesView::on_tx_progress(const uint32_t progress, const bool done) { } } +void TouchTunesView::start_ew() { + text_status.set("Jamming..."); +} + +void TouchTunesView::stop_ew() { + text_status.set("Ready"); +} + void TouchTunesView::start_tx(const uint32_t button_index) { std::string fragments = { "" }; size_t bit; @@ -136,6 +145,7 @@ TouchTunesView::TouchTunesView( &labels, &field_pin, &check_scan, + &check_ew, &text_status, &progressbar }); @@ -145,6 +155,15 @@ TouchTunesView::TouchTunesView( field_pin.on_change = [this](int32_t v) { pin = v; }; + + // EW Mode + check_ew.on_select = [this](Checkbox&, bool v) { + if(v){ + start_ew(); + } else { + stop_ew(); + } + }; const auto button_fn = [this](Button& button) { start_tx(button.id); diff --git a/firmware/application/apps/ui_touchtunes.hpp b/firmware/application/apps/ui_touchtunes.hpp index f4b986c6e..b7fb5a752 100644 --- a/firmware/application/apps/ui_touchtunes.hpp +++ b/firmware/application/apps/ui_touchtunes.hpp @@ -1,7 +1,7 @@ /* * Copyright (C) 2015 Jared Boone, ShareBrained Technology, Inc. * Copyright (C) 2017 Furrtek - * Copyright (C) 2018 NotPike + * Copyright (C) 2022 NotPike * * This file is part of PortaPack. * @@ -127,6 +127,8 @@ private: void start_tx(const uint32_t button_index); void stop_tx(); void on_tx_progress(const uint32_t progress, const bool done); + void start_ew(); + void stop_ew(); struct remote_layout_t { Point position; @@ -191,11 +193,17 @@ private: }; Checkbox check_scan { - { 2 * 8, 27 * 8 }, + { 2 * 8, 25 * 8 }, 4, "Scan" }; + Checkbox check_ew { + { 2 * 8, 29 * 8 }, + 4, + "EW Mode" + }; + Text text_status { { 2 * 8, 33 * 8, 128, 16 }, "Ready"