Gcc warning onscreen (#1701)

* Fix GCC version detection for old CMAKE

* Yellow tint version number / hash on gcc mismatch

.github/workflows/create_stable_release.yml

@@ -74,11 +74,12 @@ jobs:
             **Full Changelog**: https://github.com/eried/portapack-mayhem/compare/${{ steps.past_version.outputs.past_version }}...${{ steps.version.outputs.version }}
 
             ## Installation
-            Check the [wiki](https://github.com/eried/portapack-havoc/wiki/Update-firmware) for details how to upgrade. 
+            Check the [wiki](https://github.com/eried/portapack-havoc/wiki/Update-firmware) for details how to upgrade.
+            __Warning:__ Since release 1.8.0, some applications has been moved to the SD card as we ran out of flash space.
 
             ### MicroSD card files
 
-            For certain functionality, like the world map, GPS simulator, and others you need to uncompress (using [7-zip](https://www.7-zip.org/download.html)) the files from `mayhem_vX.Y.Z_COPY_TO_SDCARD.zip` to a FAT32 formatted MicroSD card.
+            For certain functionality, like external apps, the world map, GPS simulator, and others you need to uncompress (using [7-zip](https://www.7-zip.org/download.html)) the files from `mayhem_vX.Y.Z_COPY_TO_SDCARD.zip` to a FAT32 formatted MicroSD card.
           draft: true
           prerelease: false
       - name: Upload Firmware Asset

CMakeLists.txt

@@ -25,6 +25,8 @@ set(CMAKE_TOOLCHAIN_FILE ${CMAKE_CURRENT_LIST_DIR}/firmware/toolchain-arm-cortex
 
 project(portapack-h1)
 
+set(EXPECTED_GCC_VERSION "9.2.1")
+
 set(VERSION "$ENV{VERSION_STRING}")
 if ("$ENV{VERSION_STRING}" STREQUAL "")
 	execute_process(

firmware/CMakeLists.txt

@@ -34,6 +34,17 @@ set(LZ4 lz4)
 set(FIRMWARE_NAME portapack-h1_h2-mayhem)
 set(FIRMWARE_FILENAME ${FIRMWARE_NAME}.bin)
 
+# In our current build container cmake need a little help to get the version :)
+if(NOT DEFINED ${CMAKE_CXX_COMPILER_VERSION})
+	execute_process(COMMAND bash "-c" "arm-none-eabi-g++ -v 2>&1 | grep 'gcc version' | awk '{print $3}'" OUTPUT_VARIABLE CMAKE_CXX_COMPILER_VERSION)
+	string(STRIP ${CMAKE_CXX_COMPILER_VERSION} CMAKE_CXX_COMPILER_VERSION)
+endif()
+
+set(GCC_VERSION_MISMATCH 0)
+if(NOT ${CMAKE_CXX_COMPILER_VERSION} VERSION_EQUAL ${EXPECTED_GCC_VERSION})
+	set(GCC_VERSION_MISMATCH 1)
+endif()
+
 add_subdirectory(application)
 add_subdirectory(baseband)
 add_subdirectory(test)
@@ -52,6 +63,15 @@ add_custom_target(
 	DEPENDS ${FIRMWARE_FILENAME} ${HACKRF_FIRMWARE_DFU_FILENAME}
 )
 
+if(${GCC_VERSION_MISMATCH})
+	set(COMPILER_MISMATCH_MESSAGE "WARNING: Compiler version mismatch, please use the official compiler version ${EXPECTED_GCC_VERSION} when sharing builds! Current compiler version: ${CMAKE_CXX_COMPILER_VERSION}")
+	message(${COMPILER_MISMATCH_MESSAGE})
+	add_custom_command(
+		TARGET firmware POST_BUILD
+		COMMAND echo ${COMPILER_MISMATCH_MESSAGE}
+		VERBATIM)
+endif()
+
 add_custom_target(
 	program
 	COMMAND ${PROJECT_SOURCE_DIR}/tools/enter_mode.sh hackrf

firmware/application/CMakeLists.txt

@@ -424,7 +424,7 @@ set(CPPWARN "-Wall -Wextra -Wno-psabi")
 # List all default C defines here, like -D_DEBUG=1
 # TODO: Switch -DCRT0_INIT_DATA depending on load from RAM or SPIFI?
 # NOTE: _RANDOM_TCC to kill a GCC 4.9.3 error with std::max argument types
-set(DDEFS "-DLPC43XX -DLPC43XX_M0 -D__NEWLIB__ -DHACKRF_ONE -DTOOLCHAIN_GCC -DTOOLCHAIN_GCC_ARM -D_RANDOM_TCC=0 -D'VERSION_STRING=\"${VERSION}\"' -DVERSION_MD5=${VERSION_MD5}")
+set(DDEFS "-DLPC43XX -DLPC43XX_M0 -D__NEWLIB__ -DHACKRF_ONE -DTOOLCHAIN_GCC -DTOOLCHAIN_GCC_ARM -D_RANDOM_TCC=0 -D'VERSION_STRING=\"${VERSION}\"' -DVERSION_MD5=${VERSION_MD5} -D'GCC_VERSION_MISMATCH=${GCC_VERSION_MISMATCH}'")
 
 # List all default ASM defines here, like -D_DEBUG=1
 set(DADEFS)

firmware/application/apps/ui_recon.cpp

@@ -102,7 +102,7 @@ void ReconView::set_loop_config(bool v) {
     persistent_memory::set_recon_continuous(continuous);
 }
 
-void ReconView::recon_stop_recording() {
+void ReconView::recon_stop_recording(bool exiting) {
     if (is_recording) {
         if (field_mode.selected_index_value() == SPEC_MODULATION)
             button_audio_app.set_text("RAW");
@@ -113,14 +113,14 @@ void ReconView::recon_stop_recording() {
         button_config.set_style(&Styles::white);
         is_recording = false;
         // repeater mode
-        if (persistent_memory::recon_repeat_recorded()) {
+        if (!exiting && persistent_memory::recon_repeat_recorded()) {
             start_repeat();
         }
     }
 }
 
 void ReconView::clear_freqlist_for_ui_action() {
-    recon_stop_recording();
+    recon_stop_recording(false);
     if (field_mode.selected_index_value() != SPEC_MODULATION)
         audio::output::stop();
     // flag to detect and reload frequency_list
@@ -308,9 +308,16 @@ void ReconView::focus() {
 }
 
 ReconView::~ReconView() {
-    recon_stop_recording();
+    if (recon_tx) {
+        replay_thread.reset();
+    }
+
+    recon_stop_recording(true);
+
     if (field_mode.selected_index_value() != SPEC_MODULATION)
         audio::output::stop();
+
+    transmitter_model.disable();
     receiver_model.disable();
     baseband::shutdown();
 }
@@ -542,7 +549,7 @@ ReconView::ReconView(NavigationView& nav)
     };
 
     button_manual_recon.on_select = [this](Button&) {
-        button_remove.set_text("DELETE");
+        button_remove.set_text("<DELETE>");
         button_add.hidden(false);
         scanner_mode = false;
         manual_mode = true;
@@ -636,12 +643,12 @@ ReconView::ReconView(NavigationView& nav)
             scanner_mode = false;
             button_scanner_mode.set_style(&Styles::blue);
             button_scanner_mode.set_text("RECON");
-            button_remove.set_text("REMOVE");
+            button_remove.set_text("<REMOVE>");
         } else {
             scanner_mode = true;
             button_scanner_mode.set_style(&Styles::red);
             button_scanner_mode.set_text("SCAN");
-            button_remove.set_text("DELETE");
+            button_remove.set_text("<DELETE>");
         }
         frequency_file_load();
         if (autostart) {
@@ -844,7 +851,7 @@ void ReconView::on_statistics_update(const ChannelStatistics& statistics) {
             if (status != 1) {
                 status = 1;
                 if (wait != 0) {
-                    recon_stop_recording();
+                    recon_stop_recording(false);
                     if (field_mode.selected_index_value() != SPEC_MODULATION)
                         audio::output::stop();
                 }
@@ -1145,7 +1152,7 @@ size_t ReconView::change_mode(freqman_index_t new_mod) {
         return 0;
     field_mode.on_change = [this](size_t, OptionsField::value_t) {};
     field_bw.on_change = [this](size_t, OptionsField::value_t) {};
-    recon_stop_recording();
+    recon_stop_recording(false);
     if (record_view != nullptr) {
         remove_child(record_view.get());
         record_view.reset();
@@ -1377,10 +1384,31 @@ void ReconView::start_repeat() {
         repeat_file_error(rawfile, "Can't open file to send to thread");
         return;
     }
-    repeat_ready_signal = true;
-    repeat_cur_rep++;
+    // wait for TX if needed (hackish, direct screen update since the UI will be blocked)
+    if (persistent_memory::recon_repeat_delay() > 0) {
+        uint8_t delay = persistent_memory::recon_repeat_delay();
+        Painter p;
+        while (delay > 0) {
+            std::string delay_message = "TX DELAY: " + to_string_dec_uint(delay) + "s";
+
+            // update display information
+            p.fill_rectangle({0, (SCREEN_H / 2) - 16, SCREEN_W, 64}, Color::light_grey());
+            p.draw_string({(SCREEN_W / 2) - 7 * 8, SCREEN_H / 2}, Styles::red, delay_message);
+
+            // sleep 1 second
+            chThdSleepMilliseconds(1000);
+
+            // decre delay
+            if (delay > 0)
+                delay = delay - 1;
+            else
+                break;
+        }
+    }
 
     // ReplayThread starts immediately on construction; must be set before creating.
+    repeat_ready_signal = true;
+    repeat_cur_rep++;
     replay_thread = std::make_unique<ReplayThread>(
         std::move(reader),
         /* read_size */ repeat_read_size,

firmware/application/apps/ui_recon.hpp

@@ -110,7 +110,7 @@ class ReconView : public View {
     void load_persisted_settings();
     bool recon_save_freq(const std::filesystem::path& path, size_t index, bool warn_if_exists);
     // placeholder for possible void recon_start_recording();
-    void recon_stop_recording();
+    void recon_stop_recording(bool exiting);
 
     // Returns true if 'current_index' is in bounds of frequency_list.
     bool current_is_valid();

firmware/application/apps/ui_recon_settings.cpp

@@ -106,6 +106,7 @@ void ReconSetupViewMore::save() {
     persistent_memory::set_recon_repeat_nb(field_repeat_nb.value());
     persistent_memory::set_recon_repeat_amp(checkbox_repeat_amp.value());
     persistent_memory::set_recon_repeat_gain(field_repeat_gain.value());
+    persistent_memory::set_recon_repeat_delay(field_repeat_delay.value());
 };
 
 void ReconSetupViewMain::focus() {
@@ -128,7 +129,9 @@ ReconSetupViewMore::ReconSetupViewMore(NavigationView& nav, Rect parent_rect)
                   &field_repeat_nb,
                   &checkbox_repeat_amp,
                   &text_repeat_gain,
-                  &field_repeat_gain});
+                  &field_repeat_gain,
+                  &text_repeat_delay,
+                  &field_repeat_delay});
 
     // tx options have to be in yellow to inform the users that activating them will make the device transmit
     checkbox_repeat_recorded.set_style(&Styles::yellow);
@@ -137,6 +140,8 @@ ReconSetupViewMore::ReconSetupViewMore(NavigationView& nav, Rect parent_rect)
     checkbox_repeat_amp.set_style(&Styles::yellow);
     text_repeat_gain.set_style(&Styles::yellow);
     field_repeat_gain.set_style(&Styles::yellow);
+    text_repeat_delay.set_style(&Styles::yellow);
+    field_repeat_delay.set_style(&Styles::yellow);
 
     checkbox_load_freqs.set_value(persistent_memory::recon_load_freqs());
     checkbox_load_repeaters.set_value(persistent_memory::recon_load_repeaters());
@@ -148,6 +153,7 @@ ReconSetupViewMore::ReconSetupViewMore(NavigationView& nav, Rect parent_rect)
     checkbox_repeat_amp.set_value(persistent_memory::recon_repeat_amp());
     field_repeat_nb.set_value(persistent_memory::recon_repeat_nb());
     field_repeat_gain.set_value(persistent_memory::recon_repeat_gain());
+    field_repeat_delay.set_value(persistent_memory::recon_repeat_delay());
 
     // tx warning modal
     checkbox_repeat_recorded.on_select = [this, &nav](Checkbox&, bool v) {

firmware/application/apps/ui_recon_settings.hpp

@@ -158,7 +158,7 @@ class ReconSetupViewMore : public View {
         "nb:"};
 
     NumberField field_repeat_nb{
-        {18 * 8, 165},
+        {17 * 8, 165},
         2,
         {1, 99},
         1,
@@ -171,16 +171,28 @@ class ReconSetupViewMore : public View {
         "AMP,"};
 
     Text text_repeat_gain{
-        {10 * 8, 196, 5 * 8, 22},
+        {9 * 8, 196, 5 * 8, 22},
         "GAIN:"};
 
     NumberField field_repeat_gain{
-        {16 * 8, 196},
+        {14 * 8, 196},
         2,
         {0, 47},
         1,
         ' ',
     };
+
+    Text text_repeat_delay{
+        {16 * 8, 196, 8 * 8, 22},
+        ", delay:"};
+
+    NumberField field_repeat_delay{
+        {24 * 8, 196},
+        3,
+        {0, 254},
+        1,
+        ' ',
+    };
 };
 
 class ReconSetupView : public View {

firmware/application/ui_navigation.cpp

@@ -441,7 +441,17 @@ InformationView::InformationView(
                   &version,
                   &ltime});
 
+#if GCC_VERSION_MISMATCH
+    static constexpr Style style_gcc_warning{
+        .font = font::fixed_8x16,
+        .background = {33, 33, 33},
+        .foreground = Color::yellow(),
+    };
+    version.set_style(&style_gcc_warning);
+#else
     version.set_style(&style_infobar);
+#endif
+
     ltime.set_style(&style_infobar);
     refresh();
     set_dirty();

firmware/common/portapack_persistent_memory.cpp

@@ -197,6 +197,7 @@ struct data_t {
     uint64_t recon_config;
     int8_t recon_repeat_nb;
     int8_t recon_repeat_gain;
+    uint8_t recon_repeat_delay;
 
     // enable or disable converter
     bool converter;
@@ -263,6 +264,7 @@ struct data_t {
           recon_config(0),
           recon_repeat_nb(0),
           recon_repeat_gain(0),
+          recon_repeat_delay(0),
 
           converter(false),
           updown_converter(false),
@@ -405,6 +407,7 @@ void defaults() {
     set_recon_repeat_amp(false);
     set_recon_repeat_gain(35);
     set_recon_repeat_nb(3);
+    set_recon_repeat_delay(1);
 
     set_config_sdcard_high_speed_io(false, true);
 }
@@ -766,6 +769,9 @@ int8_t recon_repeat_nb() {
 int8_t recon_repeat_gain() {
     return data->recon_repeat_gain;
 }
+uint8_t recon_repeat_delay() {
+    return data->recon_repeat_delay;
+}
 bool recon_repeat_amp() {
     return (data->recon_config & 0x00100000UL) ? true : false;
 }
@@ -812,6 +818,9 @@ void set_recon_repeat_nb(const int8_t v) {
 void set_recon_repeat_gain(const int8_t v) {
     data->recon_repeat_gain = v;
 }
+void set_recon_repeat_delay(const uint8_t v) {
+    data->recon_repeat_delay = v;
+}
 void set_recon_repeat_amp(const bool v) {
     data->recon_config = (data->recon_config & ~0x00100000UL) | (v << 20);
 }
@@ -1028,6 +1037,9 @@ bool debug_dump() {
     pmem_dump_file.write_line("tone_mix: " + to_string_dec_uint(data->tone_mix));
     pmem_dump_file.write_line("hardware_config: " + to_string_dec_uint(data->hardware_config));
     pmem_dump_file.write_line("recon_config: 0x" + to_string_hex(data->recon_config, 16));
+    pmem_dump_file.write_line("recon_repeat_nb: " + to_string_dec_int(data->recon_repeat_nb, 16));
+    pmem_dump_file.write_line("recon_repeat_gain:" + to_string_hex(data->recon_config, 16));
+    pmem_dump_file.write_line("recon_repeat_delay:" + to_string_hex(data->recon_config, 16));
     pmem_dump_file.write_line("converter: " + to_string_dec_int(data->converter));
     pmem_dump_file.write_line("updown_converter: " + to_string_dec_int(data->updown_converter));
     pmem_dump_file.write_line("updown_frequency_rx_correction: " + to_string_dec_int(data->updown_frequency_rx_correction));

firmware/common/portapack_persistent_memory.hpp

@@ -255,6 +255,7 @@ int8_t recon_repeat_gain();
 bool recon_repeat_amp();
 bool recon_load_hamradios();
 bool recon_match_mode();
+uint8_t recon_repeat_delay();
 void set_recon_autosave_freqs(const bool v);
 void set_recon_autostart_recon(const bool v);
 void set_recon_continuous(const bool v);
@@ -270,6 +271,7 @@ void set_recon_repeat_amp(const bool v);
 void set_recon_load_hamradios(const bool v);
 void set_recon_load_repeaters(const bool v);
 void set_recon_match_mode(const bool v);
+void set_recon_repeat_delay(const uint8_t v);
 
 /* UI Config 2 */
 bool ui_hide_speaker();