Fix Recon Modulation/Bandwidth presets (#1913)

* fix_shift_back

* clean up

* gitignore

* remove the workaround in notpad cuz it's been fixed in this PR

* format

* add credit for mark

* 2024

.gitignore

@@ -68,9 +68,11 @@ CMakeFiles/
 .DS_Store
 /firmware/CMakeCache.txt
 
-# Python env/ venv
+# Python env/ venv and cache
 env/
 venv/
+**/__pycache__/
+*.pyc
 
 # Other
 *.bak

firmware/application/apps/ui_text_editor.cpp

@@ -27,8 +27,6 @@
 #include "log_file.hpp"
 #include "string_format.hpp"
 
-#include "portapack_persistent_memory.hpp"
-
 using namespace portapack;
 namespace fs = std::filesystem;
 
@@ -556,8 +554,6 @@ void TextEditorView::open_file(const fs::path& path) {
         viewer.set_file(*file_);
     }
 
-    portapack::persistent_memory::set_apply_fake_brightness(false);  // work around to resolve the display issue in notepad app. not elegant i know, so TODO.
-
     refresh_ui();
 }
 

firmware/application/usb_serial_shell_filesystem.cpp

@@ -26,6 +26,8 @@
 #include "string_format.hpp"
 #include <cstring>
 
+#include "crc.hpp"
+
 static File* shell_file = nullptr;
 
 static bool report_on_error(BaseSequentialStream* chp, File::Error& error) {
@@ -371,3 +373,34 @@ void cmd_sd_write_binary(BaseSequentialStream* chp, int argc, char* argv[]) {
 
     chprintf(chp, "ok\r\n");
 }
+
+void cmd_sd_crc32(BaseSequentialStream* chp, int argc, char* argv[]) {
+    if (argc != 1) {
+        chprintf(chp, "usage: crc32 <path>\r\n");
+        return;
+    }
+
+    auto path = path_from_string8(argv[0]);
+    File* crc_file = new File();
+    auto error = crc_file->open(path, true, false);
+    if (report_on_error(chp, error)) return;
+
+    uint8_t buffer[64];
+    CRC<32> crc{0x04c11db7, 0xffffffff, 0xffffffff};
+
+    while (true) {
+        auto bytes_read = crc_file->read(buffer, 64);
+        if (report_on_error(chp, bytes_read)) return;
+
+        if (bytes_read.value() > 0) {
+            crc.process_bytes((void*)buffer, bytes_read.value());
+        }
+
+        if (64 != bytes_read.value()) {
+            chprintf(chp, "CRC32: 0x%08X\r\n", crc.checksum());
+            return;
+        }
+    }
+
+    delete crc_file;
+}

firmware/application/usb_serial_shell_filesystem.hpp

@@ -42,6 +42,7 @@ void cmd_sd_read(BaseSequentialStream* chp, int argc, char* argv[]);
 void cmd_sd_read_binary(BaseSequentialStream* chp, int argc, char* argv[]);
 void cmd_sd_write(BaseSequentialStream* chp, int argc, char* argv[]);
 void cmd_sd_write_binary(BaseSequentialStream* chp, int argc, char* argv[]);
+void cmd_sd_crc32(BaseSequentialStream* chp, int argc, char* argv[]);
 
 static std::filesystem::path path_from_string8(char* path) {
     std::wstring_convert<std::codecvt_utf8_utf16<char16_t>, char16_t> conv;
@@ -62,6 +63,7 @@ static std::filesystem::path path_from_string8(char* path) {
     {"ftell", cmd_sd_tell},            \
     {"fread", cmd_sd_read},            \
     {"frb", cmd_sd_read_binary},       \
-    {"fwrite", cmd_sd_write},           \
-    {"fwb", cmd_sd_write_binary}
+    {"fwrite", cmd_sd_write},          \
+    {"fwb", cmd_sd_write_binary},      \
+    {"crc32", cmd_sd_crc32}
 // clang-format on

firmware/common/portapack_io.hpp

@@ -2,6 +2,7 @@
  * Copyright (C) 2014 Jared Boone, ShareBrained Technology, Inc.
  * Copyleft (ɔ) 2024 zxkmm under GPL license
  * Copyright (C) 2024 u-foka
+ * Copyright (C) 2024 Mark Thompson
  *
  * This file is part of PortaPack.
  *
@@ -147,7 +148,7 @@ class IO {
 
     void lcd_write_pixel(ui::Color pixel) {
         if (get_dark_cover()) {
-            darken_color(pixel, get_brightness());  // Darken the pixel color
+            shift_color(pixel, get_brightness(), false);  // Darken the pixel color
         }
         lcd_write_data(pixel.v);
     }
@@ -158,7 +159,7 @@ class IO {
 
     void lcd_write_pixels(ui::Color pixel, size_t n) {
         if (get_dark_cover()) {
-            darken_color(pixel, get_brightness());  // Darken the pixel color
+            shift_color(pixel, get_brightness(), false);  // Darken the pixel color
         }
         while (n--) {
             lcd_write_data(pixel.v);
@@ -167,7 +168,7 @@ class IO {
 
     void lcd_write_pixels_unrolled8(ui::Color pixel, size_t n) {
         if (get_dark_cover()) {
-            darken_color(pixel, get_brightness());  // Darken the pixel color
+            shift_color(pixel, get_brightness(), false);  // Darken the pixel color
         }
         auto v = pixel.v;
         n >>= 3;
@@ -331,7 +332,7 @@ class IO {
         addr(1); /* Set up for data phase (most likely after a command) */
     }
 
-    void darken_color(ui::Color& pixel, uint8_t darken_level_shift) {
+    void shift_color(ui::Color& pixel, uint8_t shift_level, bool shift_left) {
         // TODO: 1. do we need edge control?
         // currently didn't see and issue without edge control
         // but maybe hurts screen hardware without one?
@@ -343,9 +344,15 @@ class IO {
         uint16_t g = (pixel.v >> 5) & 0x3F;   // Extract green
         uint16_t b = pixel.v & 0x1F;          // Extract blue
 
-        r = r >> darken_level_shift;  // Darken red
-        g = g >> darken_level_shift;  // Darken green
-        b = b >> darken_level_shift;  // Darken blue
+        if (shift_left) {  // Shfting
+            r = r << shift_level;
+            g = g << shift_level;
+            b = b << shift_level;
+        } else if (!shift_left) {
+            r = r >> shift_level;
+            g = g >> shift_level;
+            b = b >> shift_level;
+        }
 
         pixel.v = (r << 11) | (g << 5) | b;  // Combine back to color, check UI::color for the color layout
     }
@@ -417,7 +424,16 @@ class IO {
         halPolledDelay(18);  // 90ns
 
         const auto value_low = data_read();
-        return (value_high << 8) | value_low;
+        uint32_t original_value = (value_high << 8) | value_low;
+
+        if (get_dark_cover()) {
+            ui::Color pixel;
+            pixel.v = original_value;
+            shift_color(pixel, get_brightness(), true);
+            original_value = pixel.v;
+        }
+
+        return original_value;
     }
 
     void io_write(const bool address, const uint_fast16_t value) {

sdcard/FREQMAN/RECON.TXT

@@ -1,22 +1,22 @@
-a=150000,b=285000,m=AM,bw=DSB,s=5kHz,d=Longwave broadcast band|BCB (EU)
-a=525000,b=1605000,m=AM,bw=DSB,s=5kHz,d=AM broadcast band|BCB (EU & J)
-a=530000,b=1710000,m=AM,bw=DSB,s=5kHz,d=AM broadcast band|BCB (US)
-a=1800000,b=29700000,m=WFM,bw=16k,d=Amateur_radio|Amateur
-a=26900000,b=27400000,m=WFM,bw=16k,d=Citizens_band_radio|Citizens band
-a=28000000,b=30000000,m=WFM,bw=16k,d=Amateur_radio|Amateur
-a=29000000,b=54000000,m=WFM,bw=16k,d=Land mobile
-a=50000000,b=54000000,m=WFM,bw=16k,d=Amateur_radio|Amateur
-a=65000000,b=85000000,m=WFM,bw=16k,d=Land mobile (EU)
-a=108000000,b=136000000,m=WFM,bw=16k,d=Aircraft
-a=120000000,b=160000000,m=WFM,bw=16k,s=50kHz,d=Land mobile (EU)
-a=132000000,b=174000000,m=WFM,bw=16k,s=50kHz,d=Land mobile
-a=142000000,b=170000000,m=WFM,bw=16k,s=50kHz,d=Land mobile (J)
-a=144000000,b=148000000,m=WFM,bw=16k,s=50kHz,d=Amateur_radio|Amateur
-a=216000000,b=222000000,m=WFM,bw=16k,s=50kHz,d=Land mobile
-a=222000000,b=225000000,m=WFM,bw=16k,s=50kHz,d=Amateur_radio|Amateur
-a=335000000,b=384000000,m=WFM,bw=16k,s=50kHz,d=Land mobile (J)
-a=406000000,b=512000000,m=WFM,bw=16k,s=50kHz,d=Land mobile
-a=450000000,b=470000000,m=WFM,bw=16k,s=50kHz,d=Land mobile (J)
-a=430000000,b=450000000,m=WFM,bw=16k,s=50kHz,d=Amateur_radio|Amateur
-a=806000000,b=947000000,m=WFM,bw=16k,s=50kHz,d=Land mobile
-a=1200000000,b=1600000000,m=WFM,bw=16k,s=50kHz,d=Amateur|Land mobile|GPS
+a=150000,b=285000,m=AM,bw=DSB 9k,s=5kHz,d=Longwave broadcast band|BCB (EU)
+a=525000,b=1605000,m=AM,bw=DSB 9k,s=5kHz,d=AM broadcast band|BCB (EU & J)
+a=530000,b=1710000,m=AM,bw=DSB 9k,s=5kHz,d=AM broadcast band|BCB (US)
+a=1800000,b=29700000,m=AM,bw=LSB-3k,d=Amateur_radio|Amateur
+a=26900000,b=27400000,m=AM,bw=DSB 9k,d=Citizens_band_radio|Citizens band
+a=28000000,b=30000000,m=AM,bw=USB+3k,d=Amateur_radio|Amateur
+a=29000000,b=54000000,m=AM,bw=DSB 9k,d=Land mobile
+a=50000000,b=54000000,m=NFM,bw=16k,d=Amateur_radio|Amateur
+a=65000000,b=85000000,m=NFM,bw=16k,d=Land mobile (EU)
+a=108000000,b=136000000,m=NFM,bw=16k,d=Aircraft
+a=120000000,b=160000000,m=NFM,bw=16k,s=50kHz,d=Land mobile (EU)
+a=132000000,b=174000000,m=NFM,bw=16k,s=50kHz,d=Land mobile
+a=142000000,b=170000000,m=NFM,bw=16k,s=50kHz,d=Land mobile (J)
+a=144000000,b=148000000,m=NFM,bw=16k,s=50kHz,d=Amateur_radio|Amateur
+a=216000000,b=222000000,m=NFM,bw=16k,s=50kHz,d=Land mobile
+a=222000000,b=225000000,m=NFM,bw=16k,s=50kHz,d=Amateur_radio|Amateur
+a=335000000,b=384000000,m=NFM,bw=16k,s=50kHz,d=Land mobile (J)
+a=406000000,b=512000000,m=NFM,bw=16k,s=50kHz,d=Land mobile
+a=450000000,b=470000000,m=NFM,bw=16k,s=50kHz,d=Land mobile (J)
+a=430000000,b=450000000,m=NFM,bw=16k,s=50kHz,d=Amateur_radio|Amateur
+a=806000000,b=947000000,m=NFM,bw=16k,s=50kHz,d=Land mobile
+a=1200000000,b=1600000000,m=NFM,bw=16k,s=50kHz,d=Amateur|Land mobile|GPS