v2.0.1 (#2090)

* Update version.txt

* Update past_version.txt

.github/workflows/past_version.txt

@@ -1 +1 @@
-v1.9.1
+v2.0.0

.github/workflows/version.txt

@@ -1 +1 @@
-v2.0.0
+v2.0.1

README.md

@@ -30,8 +30,6 @@ This repository expands upon the previous work by many people and aims to consta
 
 :heavy_check_mark: Our friends at OpenSourceSDRLab give away five units every three months in our discord (check the badge on top) of their [PortaPack H2](https://www.aliexpress.com/item/4000247041639.html?gatewayAdapt=4itemAdapt), you can support them too by ordering.
 
-:heavy_check_mark: Another popular option is the clone of the [PortaPack H1](https://s.click.aliexpress.com/e/_Dkbqs2X).
-
 :warning: Be cautious , *ask* the seller about compatibility with the latest releases. Look out for the description of the item, if they provide the firmware files for an older version or they have custom setup instructions, this means it might be **NOT compatible**, for example:
 
 ![image](https://user-images.githubusercontent.com/1091420/214579017-9ad970b9-0917-48f6-a550-588226d3f89b.png)

firmware/application/apps/ui_adsb_rx.cpp

@@ -107,7 +107,8 @@ void ADSBLogger::log(const ADSBLogEntry& log_entry) {
         log_line += " Type:" + to_string_dec_uint(log_entry.vel_type) +
                     " Hdg:" + to_string_dec_uint(log_entry.vel.heading) +
                     " Spd: " + to_string_dec_int(log_entry.vel.speed);
-
+    if (log_entry.sil != 0)
+        log_line += " Sil:" + to_string_dec_uint(log_entry.sil);
     log_file.write_entry(log_line);
 }
 
@@ -354,11 +355,12 @@ void ADSBRxDetailsView::refresh_ui() {
 
     text_callsign.set(entry_.callsign);
     text_infos.set(entry_.info_string);
+    std::string str_sil = (entry_.sil > 0) ? " Sil:" + to_string_dec_uint(entry_.sil) : "";
     if (entry_.velo.heading < 360 && entry_.velo.speed >= 0)
         text_info2.set("Hdg:" + to_string_dec_uint(entry_.velo.heading) +
-                       " Spd:" + to_string_dec_int(entry_.velo.speed));
+                       " Spd:" + to_string_dec_int(entry_.velo.speed) + str_sil);
     else
-        text_info2.set("");
+        text_info2.set(str_sil);
 
     text_frame_pos_even.set(to_string_hex_array(entry_.frame_pos_even.get_raw_data(), 14));
     text_frame_pos_odd.set(to_string_hex_array(entry_.frame_pos_odd.get_raw_data(), 14));
@@ -471,7 +473,6 @@ void ADSBRxView::on_frame(const ADSBFrameMessage* message) {
                     "Alt:" + to_string_dec_int(entry.pos.altitude) +
                     " Lat:" + to_string_decimal(entry.pos.latitude, 2) +
                     " Lon:" + to_string_decimal(entry.pos.longitude, 2);
-
                 entry.set_info_string(std::move(str_info));
             }
 
@@ -479,6 +480,8 @@ void ADSBRxView::on_frame(const ADSBFrameMessage* message) {
             entry.set_frame_velo(frame);
             log_entry.vel = entry.velo;
             log_entry.vel_type = msg_sub;
+        } else if (msg_type == AIRBORNE_OP_STATUS) {  // for ver 1
+            entry.sil = frame.get_sil_value();
         }
     }
 

firmware/application/apps/ui_adsb_rx.hpp

@@ -54,6 +54,8 @@ namespace ui {
 #define AIRBORNE_POS_GPS_L 20  // airborne position (lowest type id)
 #define AIRBORNE_POS_GPS_H 22  // airborne position (highest type id)
 
+#define AIRBORNE_OP_STATUS 31  // Aircraft operation status
+
 #define RESERVED_L 23  // reserved for other uses
 #define RESERVED_H 31  // reserved for other uses
 
@@ -102,6 +104,8 @@ struct AircraftRecentEntry {
     std::string callsign{};
     std::string info_string{};
 
+    uint8_t sil{0};  // Surveillance integrity level
+
     AircraftRecentEntry(const uint32_t ICAO_address)
         : ICAO_address{ICAO_address} {
         this->icao_str = to_string_hex(ICAO_address, 6);
@@ -173,6 +177,7 @@ struct ADSBLogEntry {
     adsb_pos pos{};
     adsb_vel vel{};
     uint8_t vel_type{};
+    uint8_t sil{};
 };
 
 // TODO: Make logging optional.

firmware/application/apps/ui_mictx.cpp

@@ -523,21 +523,6 @@ MicTXView::MicTXView(
     };
     check_mic_to_HP.set_value(mic_to_HP_enabled);
 
-    check_rxactive.on_select = [this](Checkbox&, bool v) {
-        //		vumeter.set_value(0);	//Start with a clean vumeter
-        rx_enabled = v;
-        check_mic_to_HP.hidden(rx_enabled);  // Toggle Hide / show "Hear Mic" checkbox depending if we activate or not the receiver. (if RX on => no visible "Mic Hear" option)
-        if ((rx_enabled) && (transmitting))
-            check_mic_to_HP.set_value(transmitting);  // Once we activate the "Rx audio" in reception time we disable "Hear Mic", but we allow it again in TX time.
-
-        if (rx_enabled)
-            check_va.set_value(false);  // Disallow voice activation during RX audio (for now) - Future TODO: Should allow VOX during RX audio
-
-        rxaudio(v);   // Activate-Deactivate audio RX (receiver) accordingly
-        set_dirty();  // Refresh interface
-    };
-    check_rxactive.set_value(rx_enabled);
-
     tx_button.on_select = [this](Button&) {
         if (!transmitting) {
             set_tx(true);
@@ -590,6 +575,21 @@ MicTXView::MicTXView(
     // Trigger receiver to update modulation.
     if (rx_enabled)
         receiver_model.set_squelch_level(receiver_model.squelch_level());
+
+    check_rxactive.on_select = [this](Checkbox&, bool v) {
+        //		vumeter.set_value(0);	//Start with a clean vumeter
+        rx_enabled = v;
+        check_mic_to_HP.hidden(rx_enabled);  // Toggle Hide / show "Hear Mic" checkbox depending if we activate or not the receiver. (if RX on => no visible "Mic Hear" option)
+        if ((rx_enabled) && (transmitting))
+            check_mic_to_HP.set_value(transmitting);  // Once we activate the "Rx audio" in reception time we disable "Hear Mic", but we allow it again in TX time.
+
+        if (rx_enabled)
+            check_va.set_value(false);  // Disallow voice activation during RX audio (for now) - Future TODO: Should allow VOX during RX audio
+
+        rxaudio(v);   // Activate-Deactivate audio RX (receiver) accordingly
+        set_dirty();  // Refresh interface
+    };
+    check_rxactive.set_value(rx_enabled);
 }
 
 MicTXView::MicTXView(

firmware/application/apps/ui_settings.cpp

@@ -31,6 +31,7 @@
 #include "ui_receiver.hpp"
 #include "ui_touch_calibration.hpp"
 #include "ui_text_editor.hpp"
+#include "ui_external_items_menu_loader.hpp"
 
 #include "portapack_persistent_memory.hpp"
 #include "lpc43xx_cpp.hpp"
@@ -839,6 +840,60 @@ void SetMenuColorView::focus() {
     button_save.focus();
 }
 
+/* SetAutoStartView ************************************/
+
+SetAutostartView::SetAutostartView(NavigationView& nav) {
+    add_children({&labels,
+                  &button_save,
+                  &button_cancel,
+                  &options});
+
+    button_save.on_select = [&nav, this](Button&) {
+        autostart_app = "";
+        if (selected != 0) {
+            auto it = full_app_list.find(selected);
+            if (it != full_app_list.end())
+                autostart_app = it->second;
+        }
+        nav.pop();
+    };
+
+    button_cancel.on_select = [&nav, this](Button&) {
+        nav.pop();
+    };
+
+    // options
+    i = 0;
+    OptionsField::option_t o{"-none-", i};
+    opts.emplace_back(o);
+    for (auto& app : NavigationView::appList) {
+        if (app.id == nullptr) continue;
+        i++;
+        o = {app.displayName, i};
+        opts.emplace_back(o);
+        full_app_list.emplace(i, app.id);
+        if (autostart_app == app.id) selected = i;
+    }
+    ExternalItemsMenuLoader::load_all_external_items_callback([this](ui::AppInfoConsole& app) {
+        if (app.appCallName == nullptr) return;
+        i++;
+        OptionsField::option_t o = {app.appFriendlyName, i};
+        opts.emplace_back(o);
+        full_app_list.emplace(i, app.appCallName);
+        if (autostart_app == app.appCallName) selected = i;
+    });
+
+    options.set_options(opts);
+    options.on_change = [this](size_t, OptionsField::value_t v) {
+        selected = v;
+    };
+    options.set_selected_index(selected);
+}
+
+void SetAutostartView::focus() {
+    options.focus();
+}
+
 /* SettingsMenuView **************************************/
 
 SettingsMenuView::SettingsMenuView(NavigationView& nav)
@@ -866,6 +921,7 @@ void SettingsMenuView::on_populate() {
         //{"QR Code", ui::Color::dark_cyan(), &bitmap_icon_qr_code, [this]() { nav_.push<SetQRCodeView>(); }},
         {"Brightness", ui::Color::dark_cyan(), &bitmap_icon_brightness, [this]() { nav_.push<SetFakeBrightnessView>(); }},
         {"Menu Color", ui::Color::dark_cyan(), &bitmap_icon_brightness, [this]() { nav_.push<SetMenuColorView>(); }},
+        {"Autostart", ui::Color::dark_cyan(), &bitmap_icon_setup, [this]() { nav_.push<SetAutostartView>(); }},
     });
 }
 

firmware/application/apps/ui_settings.hpp

@@ -799,6 +799,42 @@ class SetMenuColorView : public View {
     };
 };
 
+class SetAutostartView : public View {
+   public:
+    SetAutostartView(NavigationView& nav);
+
+    void focus() override;
+
+    std::string title() const override { return "Autostart"; };
+
+   private:
+    int32_t i = 0;
+    std::string autostart_app{""};
+    OptionsField::options_t opts{};
+    std::map<int32_t, std::string> full_app_list{};  // looking table
+    int32_t selected = 0;
+    SettingsStore nav_setting{
+        "nav"sv,
+        {{"autostart_app"sv, &autostart_app}}};
+    Labels labels{
+        {{1 * 8, 1 * 16}, "Select app to start on boot", Color::light_grey()},
+        {{2 * 8, 2 * 16}, "(an SD Card is required)", Color::light_grey()}};
+
+    Button button_save{
+        {2 * 8, 16 * 16, 12 * 8, 32},
+        "Save"};
+
+    OptionsField options{
+        {8 * 8, 4 * 16},
+        30,
+        {}};
+
+    Button button_cancel{
+        {16 * 8, 16 * 16, 12 * 8, 32},
+        "Cancel",
+    };
+};
+
 class SettingsMenuView : public BtnGridView {
    public:
     SettingsMenuView(NavigationView& nav);

firmware/application/main.cpp

@@ -158,6 +158,7 @@ static void event_loop() {
             event_dispatcher.set_display_sleep(true);
         }};
     portapack::setEventDispatcherToUSBSerial(&event_dispatcher);
+    system_view.get_navigation_view()->handle_autostart();
     event_dispatcher.run();
 }
 

firmware/application/ui_navigation.cpp

@@ -107,6 +107,10 @@
 #include "file_reader.hpp"
 #include "png_writer.hpp"
 #include "file_path.hpp"
+#include "ff.h"
+
+#include <locale>
+#include <codecvt>
 
 using portapack::receiver_model;
 using portapack::transmitter_model;
@@ -708,6 +712,23 @@ bool NavigationView::set_on_pop(std::function<void()> on_pop) {
     return true;
 }
 
+void NavigationView::handle_autostart() {
+    std::string autostart_app{""};
+    SettingsStore nav_setting{
+        "nav"sv,
+        {{"autostart_app"sv, &autostart_app}}};
+    if (!autostart_app.empty()) {
+        if (StartAppByName(autostart_app.c_str())) return;
+        // if returned false, check for external apps by that name, and try to start it
+        std::string appwithpath = "/" + apps_dir.string() + "/";
+        appwithpath += autostart_app;
+        appwithpath += ".ppma";
+        std::wstring_convert<std::codecvt_utf8_utf16<char16_t>, char16_t> conv;
+        std::filesystem::path pth = conv.from_bytes(appwithpath.c_str());
+        ui::ExternalItemsMenuLoader::run_external_app(*this, pth);
+    }
+}
+
 /* Helpers  **************************************************************/
 
 static void add_apps(NavigationView& nav, BtnGridView& grid, app_location_t loc) {

firmware/application/ui_navigation.hpp

@@ -136,6 +136,8 @@ class NavigationView : public View {
     static const AppList appList;
 
     bool StartAppByName(const char* name);  // Starts a View  (app) by name stored in appListFC. This is to start apps from console
+    void handle_autostart();
+
    private:
     struct ViewState {
         std::unique_ptr<View> view;

firmware/common/adsb_frame.hpp

@@ -46,6 +46,10 @@ class ADSBFrame {
         return (raw_data[4] & 7);
     }
 
+    uint8_t get_sil_value() {
+        return ((raw_data[10] >> 6) & 0b11);  // 83-84 bits
+    }
+
     uint32_t get_ICAO_address() {
         return (raw_data[1] << 16) + (raw_data[2] << 8) + raw_data[3];
     }

sdcard/FREQMAN/SSTV.TXT

@@ -1,5 +1,5 @@
 # Common SSTV frequencies
-# frequencies marked Active have more frequent transmissions. 
+# 'Active' => most used
 f=3640000,d=SSTV 80M
 f=7043000,d=SSTV 40M - Active
 f=7170000,d=SSTV 40M - Active

sdcard/LOOKINGGLASS/PRESETS.TXT

@@ -16,11 +16,14 @@
 76,95,FM BROADCAST JAPAN
 65,74,FM BROADCAST RUSSIA
 # CITIZENS BAND RADIO
-26,28,CITIZENS BAND RADIO
+26,28,CB RADIO
 # COMMON PUBLIC SERVICE BANDS
 150,160, PUBLIC SERVICE 155
 450,470,PUBLIC SERVICE 460
 769,775,PUBLIC SERVICE 770
+# CubeSats
+144,146,145 CubeSats
+435,438,436 CubeSats
 # DECT
 1879,1931,DECT
 # FRS/GMRS