MNTM SubGHz UPDs

applications/drivers/subghz/cc1101_ext/cc1101_ext.c

@@ -237,10 +237,7 @@ bool subghz_device_cc1101_ext_alloc(SubGhzDeviceConf* conf) {
                                                         &furi_hal_spi_bus_handle_external_extra);
 
     // this is needed if multiple SPI devices are connected to the same bus but with different CS pins
-    if(cfw_settings.spi_cc1101_handle == SpiDefault && !furi_hal_subghz_get_ext_power_amp()) {
-        furi_hal_gpio_init_simple(&gpio_ext_pc3, GpioModeOutputPushPull);
-        furi_hal_gpio_write(&gpio_ext_pc3, true);
-    } else if(cfw_settings.spi_cc1101_handle == SpiExtra) {
+    if(cfw_settings.spi_cc1101_handle == SpiExtra) {
         furi_hal_gpio_init_simple(&gpio_ext_pa4, GpioModeOutputPushPull);
         furi_hal_gpio_write(&gpio_ext_pa4, true);
     }

applications/main/subghz/application.fam

@@ -10,6 +10,8 @@ App(
     # Sources separation breaks linking with subghz on internal, commented for now
     # sources=[
     #     "*.c",
+    #     "!helpers/subghz_gps.c",
+    #     "!helpers/minmea.c",
     #     "!subghz_cli.c",
     #     "!helpers/subghz_chat.c",
     #     "!subghz_extended_freq.c",
@@ -23,7 +25,7 @@ App(
 
 App(
     appid="subghz_fap",
-    name="SubGHz",
+    name="Sub-GHz",
     apptype=FlipperAppType.EXTERNAL,
     entry_point="subghz_fap",
     stack_size=3 * 1024,
@@ -32,6 +34,15 @@ App(
     fap_category="Sub-GHz",
 )
 
+App(
+    appid="subghz_gps",
+    targets=["f7"],
+    apptype=FlipperAppType.PLUGIN,
+    entry_point="subghz_gps_plugin_ep",
+    requires=["subghz"],
+    sources=["helpers/subghz_gps.c", "helpers/minmea.c"],
+)
+
 App(
     appid="subghz_cli",
     targets=["f7"],

applications/main/subghz/helpers/subghz_frequency_analyzer_worker.c

@@ -364,4 +364,4 @@ void subghz_frequency_analyzer_worker_set_trigger_level(
 
 float subghz_frequency_analyzer_worker_get_trigger_level(SubGhzFrequencyAnalyzerWorker* instance) {
     return instance->trigger_level;
-}
+}

applications/main/subghz/helpers/subghz_gps.c

@@ -1,6 +1,17 @@
 #include "subghz_gps.h"
 #include "minmea.h"
 
+#include <cfw/cfw.h>
+
+#define UART_CH (cfw_settings.uart_nmea_channel)
+
+typedef enum {
+    WorkerEvtStop = (1 << 0),
+    WorkerEvtRxDone = (1 << 1),
+} WorkerEvtFlags;
+
+#define WORKER_ALL_RX_EVENTS (WorkerEvtStop | WorkerEvtRxDone)
+
 static void subghz_gps_uart_parse_nmea(SubGhzGPS* subghz_gps, char* line) {
     switch(minmea_sentence_id(line, false)) {
     case MINMEA_SENTENCE_RMC: {
@@ -113,9 +124,86 @@ static int32_t subghz_gps_uart_worker(void* context) {
     return 0;
 }
 
-SubGhzGPS* subghz_gps_init() {
-    SubGhzGPS* subghz_gps = malloc(sizeof(SubGhzGPS));
+static void subghz_gps_deinit(SubGhzGPS* subghz_gps) {
+    furi_assert(subghz_gps);
+
+    furi_thread_flags_set(furi_thread_get_id(subghz_gps->thread), WorkerEvtStop);
+    furi_thread_join(subghz_gps->thread);
+
+    furi_hal_serial_async_rx_stop(subghz_gps->serial_handle);
+    furi_hal_serial_deinit(subghz_gps->serial_handle);
+    furi_hal_serial_control_release(subghz_gps->serial_handle);
+
+    furi_thread_free(subghz_gps->thread);
+
+    furi_stream_buffer_free(subghz_gps->rx_stream);
+}
 
+static float subghz_gps_deg2rad(float deg) {
+    return (deg * M_PI / 180);
+}
+
+static float subghz_gps_calc_distance(float lat1d, float lon1d, float lat2d, float lon2d) {
+    float lat1r, lon1r, lat2r, lon2r;
+    double u, v;
+    lat1r = subghz_gps_deg2rad(lat1d);
+    lon1r = subghz_gps_deg2rad(lon1d);
+    lat2r = subghz_gps_deg2rad(lat2d);
+    lon2r = subghz_gps_deg2rad(lon2d);
+    u = sin((lat2r - lat1r) / 2);
+    v = sin((lon2r - lon1r) / 2);
+    return 2 * 6371 * asin(sqrt(u * u + cos(lat1r) * cos(lat2r) * v * v));
+}
+
+static float subghz_gps_calc_angle(float lat1, float lon1, float lat2, float lon2) {
+    return atan2(lat1 - lat2, lon1 - lon2) * 180 / (double)M_PI;
+}
+
+static void subghz_gps_cat_realtime(
+    SubGhzGPS* subghz_gps,
+    FuriString* descr,
+    float latitude,
+    float longitude) {
+    float distance =
+        subghz_gps_calc_distance(latitude, longitude, subghz_gps->latitude, subghz_gps->longitude);
+
+    float angle =
+        subghz_gps_calc_angle(latitude, longitude, subghz_gps->latitude, subghz_gps->longitude);
+
+    char* angle_str = "?";
+    if(angle > -22.5 && angle <= 22.5) {
+        angle_str = "E";
+    } else if(angle > 22.5 && angle <= 67.5) {
+        angle_str = "NE";
+    } else if(angle > 67.5 && angle <= 112.5) {
+        angle_str = "N";
+    } else if(angle > 112.5 && angle <= 157.5) {
+        angle_str = "NW";
+    } else if(angle < -22.5 && angle >= -67.5) {
+        angle_str = "SE";
+    } else if(angle < -67.5 && angle >= -112.5) {
+        angle_str = "S";
+    } else if(angle < -112.5 && angle >= -157.5) {
+        angle_str = "SW";
+    } else if(angle < -157.5 || angle >= 157.5) {
+        angle_str = "W";
+    }
+
+    furi_string_cat_printf(
+        descr,
+        "Realtime:  Sats: %d\r\n"
+        "Distance: %.2f%s Dir: %s\r\n"
+        "GPS time: %02d:%02d:%02d UTC",
+        subghz_gps->satellites,
+        (double)(subghz_gps->satellites > 0 ? distance > 1 ? distance : distance * 1000 : 0),
+        distance > 1 ? "km" : "m",
+        angle_str,
+        subghz_gps->fix_hour,
+        subghz_gps->fix_minute,
+        subghz_gps->fix_second);
+}
+
+static void subghz_gps_init(SubGhzGPS* subghz_gps, uint32_t baudrate) {
     subghz_gps->latitude = NAN;
     subghz_gps->longitude = NAN;
     subghz_gps->satellites = 0;
@@ -125,69 +213,29 @@ SubGhzGPS* subghz_gps_init() {
 
     subghz_gps->rx_stream = furi_stream_buffer_alloc(RX_BUF_SIZE, 1);
 
-    subghz_gps->thread = furi_thread_alloc();
-    furi_thread_set_name(subghz_gps->thread, "SubGhzGPSWorker");
-    furi_thread_set_stack_size(subghz_gps->thread, 1024);
-    furi_thread_set_context(subghz_gps->thread, subghz_gps);
-    furi_thread_set_callback(subghz_gps->thread, subghz_gps_uart_worker);
-
-    subghz_gps->expansion = furi_record_open(RECORD_EXPANSION);
-    expansion_disable(subghz_gps->expansion);
+    subghz_gps->thread =
+        furi_thread_alloc_ex("SubGhzGPSWorker", 1024, subghz_gps_uart_worker, subghz_gps);
+    furi_thread_start(subghz_gps->thread);
 
     subghz_gps->serial_handle = furi_hal_serial_control_acquire(UART_CH);
     furi_check(subghz_gps->serial_handle);
-    furi_hal_serial_init(subghz_gps->serial_handle, 9600);
+    furi_hal_serial_init(subghz_gps->serial_handle, baudrate);
 
     furi_hal_serial_async_rx_start(
         subghz_gps->serial_handle, subghz_gps_uart_on_irq_cb, subghz_gps, false);
 
-    return subghz_gps;
-}
-
-void subghz_gps_deinit(SubGhzGPS* subghz_gps) {
-    furi_assert(subghz_gps);
-
-    furi_hal_serial_async_rx_stop(subghz_gps->serial_handle);
-    furi_hal_serial_deinit(subghz_gps->serial_handle);
-    furi_hal_serial_control_release(subghz_gps->serial_handle);
-
-    expansion_enable(subghz_gps->expansion);
-    furi_record_close(RECORD_EXPANSION);
-
-    furi_thread_free(subghz_gps->thread);
-    furi_stream_buffer_free(subghz_gps->rx_stream);
-
-    free(subghz_gps);
-}
-
-void subghz_gps_start(SubGhzGPS* subghz_gps) {
-    furi_thread_start(subghz_gps->thread);
-}
-
-void subghz_gps_stop(SubGhzGPS* subghz_gps) {
-    furi_thread_flags_set(furi_thread_get_id(subghz_gps->thread), WorkerEvtStop);
-    furi_thread_join(subghz_gps->thread);
+    subghz_gps->deinit = &subghz_gps_deinit;
+    subghz_gps->cat_realtime = &subghz_gps_cat_realtime;
 }
 
-void subghz_gps_set_baudrate(SubGhzGPS* subghz_gps, uint32_t baudrate) {
-    furi_hal_serial_set_br(subghz_gps->serial_handle, baudrate);
-}
+#include <flipper_application/flipper_application.h>
 
-double subghz_gps_deg2rad(double deg) {
-    return (deg * (double)M_PI / 180);
-}
+static const FlipperAppPluginDescriptor plugin_descriptor = {
+    .appid = "subghz_gps",
+    .ep_api_version = 1,
+    .entry_point = &subghz_gps_init,
+};
 
-double subghz_gps_calc_distance(double lat1d, double lon1d, double lat2d, double lon2d) {
-    double lat1r, lon1r, lat2r, lon2r, u, v;
-    lat1r = subghz_gps_deg2rad(lat1d);
-    lon1r = subghz_gps_deg2rad(lon1d);
-    lat2r = subghz_gps_deg2rad(lat2d);
-    lon2r = subghz_gps_deg2rad(lon2d);
-    u = sin((lat2r - lat1r) / 2);
-    v = sin((lon2r - lon1r) / 2);
-    return 2 * 6371 * asin(sqrt(u * u + cos((double)lat1r) * cos((double)lat2r) * v * v));
+const FlipperAppPluginDescriptor* subghz_gps_plugin_ep(void) {
+    return &plugin_descriptor;
 }
-
-double subghz_gps_calc_angle(double lat1, double lon1, double lat2, double lon2) {
-    return atan2(lat1 - lat2, lon1 - lon2) * 180 / (double)M_PI;
-}

applications/main/subghz/helpers/subghz_gps.h

@@ -1,25 +1,18 @@
-#include <furi_hal.h>
-#include <cfw/cfw.h>
-#include <expansion/expansion.h>
+#pragma once
 
-#define UART_CH (cfw_settings.uart_nmea_channel)
+#include <furi_hal.h>
+#include <flipper_application/flipper_application.h>
 
 #define RX_BUF_SIZE 1024
 
-typedef enum {
-    WorkerEvtStop = (1 << 0),
-    WorkerEvtRxDone = (1 << 1),
-} WorkerEvtFlags;
-
-#define WORKER_ALL_RX_EVENTS (WorkerEvtStop | WorkerEvtRxDone)
+typedef struct SubGhzGPS SubGhzGPS;
 
-typedef struct {
-    Expansion* expansion;
+struct SubGhzGPS {
+    FlipperApplication* plugin_app;
     FuriThread* thread;
     FuriStreamBuffer* rx_stream;
     uint8_t rx_buf[RX_BUF_SIZE];
     FuriHalSerialHandle* serial_handle;
-
     FuriTimer* timer;
 
     float latitude;
@@ -28,73 +21,40 @@ typedef struct {
     uint8_t fix_second;
     uint8_t fix_minute;
     uint8_t fix_hour;
-} SubGhzGPS;
 
-/**
- * Initialize SubGhzGPS object
- * 
+    /**
+     * Deinitialize SubGhzGPS object
+     * To be used by plugin handler
+     * 
+     * @param subghz_gps SubGhzGPS object
+     * @return void
+    */
+    void (*deinit)(SubGhzGPS* subghz_gps);
+
+    /**
+     * Concatenate realtime GPS info to string
+     * 
+     * @param subghz_gps SubGhzGPS object
+     * @param descr Output string
+     * @param latitude Latitude
+     * @param longitude Longitude
+     * @return void
+    */
+    void (*cat_realtime)(SubGhzGPS* subghz_gps, FuriString* descr, float latitude, float longitude);
+};
+
+/**
+ * Initialize SubGhzGPS plugin
+ * Fails and returns NULL if Expansion is connected
+ *
  * @return SubGhzGPS* SubGhzGPS object
 */
-SubGhzGPS* subghz_gps_init(void);
-
-/**
- * Deinitialize SubGhzGPS object
- * 
- * @param subghz_gps SubGhzGPS object
- * @return void
-*/
-void subghz_gps_deinit(SubGhzGPS* subghz_gps);
-
-/**
- * Start GPS thread
- * 
- * @param subghz_gps SubGhzGPS object
- * @return void
-*/
-void subghz_gps_start(SubGhzGPS* subghz_gps);
+SubGhzGPS* subghz_gps_plugin_init(uint32_t baudrate);
 
 /**
- * Stop GPS thread
+ * Deinitialize SubGhzGPS plugin
  * 
  * @param subghz_gps SubGhzGPS object
  * @return void
 */
-void subghz_gps_stop(SubGhzGPS* subghz_gps);
-
-/**
- * Set baudrate for GPS
- * 
- * @param baudrate Baudrate
- * @return void
-*/
-void subghz_gps_set_baudrate(SubGhzGPS* subghz_gps, uint32_t baudrate);
-
-/**
- * Convert degree to radian
- * 
- * @param deg Degree
- * @return double Radian
- */
-double subghz_gps_deg2rad(double deg);
-
-/**
- * Calculate distance between two coordinates
- * 
- * @param lat1d Latitude 1
- * @param lon1d Longitude 1
- * @param lat2d Latitude 2
- * @param lon2d Longitude 2
- * @return double Distance in km
-*/
-double subghz_gps_calc_distance(double lat1d, double lon1d, double lat2d, double lon2d);
-
-/**
- * Calculate angle between two coordinates
- * 
- * @param lat1 Latitude 1
- * @param lon1 Longitude 1
- * @param lat2 Latitude 2
- * @param lon2 Longitude 2
- * @return double Angle in degree
-*/
-double subghz_gps_calc_angle(double lat1, double lon1, double lat2, double lon2);
+void subghz_gps_plugin_deinit(SubGhzGPS* subghz_gps);