RogueMaster
diff --git a/‎.github/workflows/build.yml
-34 b/‎.github/workflows/build.yml
-34
diff --git a/‎.gitignore
-57 b/‎.gitignore
-57
diff --git a/‎.gitmodules
-3 b/‎.gitmodules
-3
diff --git a/‎README.md
+14-45 b/‎README.md
+14-45
diff --git a/‎application.fam
+3-7 b/‎application.fam
+3-7
diff --git a/‎gps.c
+19-5 b/‎gps.c
+19-5
diff --git a/‎gps_uart.c
+1-1 b/‎gps_uart.c
+1-1
diff --git a/‎img/1.png
2.21 KB b/‎img/1.png
2.21 KB
diff --git a/‎img/2.png
2.2 KB b/‎img/2.png
2.2 KB
diff --git a/‎img/3.png
2.2 KB b/‎img/3.png
2.2 KB
diff --git a/‎lib/minmea
-1 b/‎lib/minmea
-1
@@ -1,29 +1,17 @@
 # GPS for Flipper Zero
 
-[![FAP Build](https://github.com/ezod/flipperzero-gps/actions/workflows/build.yml/badge.svg)](https://github.com/ezod/flipperzero-gps/actions/workflows/build.yml)
+A simple Flipper Zero application for NMEA 0183 serial GPS modules, such as the
+- Adafruit Ultimate GPS Breakout.
 
-A simple Flipper Zero application for NMEA 0183 serial GPS modules.
-
-![ui](ui.png)
-
-Heavy lifting (NMEA parsing) provided by [minmea].
-
-## Installation
-
-1. Navigate to the [FAP Build](https://github.com/ezod/flipperzero-gps/actions/workflows/build.yml)
-   GitHub action workflow, and select the most recent run.
-2. The FAP is built for both the `dev` and `release` channels of the official
-   firmware. Download the artifact corresponding to your firmware version.
-3. Extract `gps_nmea.fap` from the ZIP file to `apps/GPIO` on your Flipper
-   Zero SD card.
+Heavy lifting (NMEA parsing) provided by minmea.
 
 ## Usage
 
 This is a single-screen app, and a few interactions are provided via the
 hardware buttons:
 
 - Long press the up button to change the **baud rate**. The default baud rate
-  is 9600, but 4800, 19200, 38400, 57600, and 115200 baud are also supported.
+  is 9600, but 19200, 38400, 57600, and 115200 baud are also supported.
 - Long press the right button to change **speed units** from knots to
   kilometers per hour.
 - Press the OK button to set the **backlight** to always on mode. Press it
@@ -35,43 +23,24 @@ hardware buttons:
 Connect the GPS module to power and the USART using GPIO pins 9 (3.3V), 11
 (GND), 13 (TX), and 14 (RX), as appropriate.
 
-![wiring](wiring.png)
 
-See the [tutorial video](https://www.youtube.com/watch?v=5vSGFzEBp-k) from
-Lab401 by [RocketGod](https://github.com/RocketGod-git) for a visual guide to
+See the tutorial video - https://www.youtube.com/watch?v=5vSGFzEBp-k from
+Lab401 by RocketGod - https://github.com/RocketGod-git for a visual guide to
 the hardware setup.
 
-### Confirmed Compatible Modules
+## Confirmed Compatible Modules
 
-* [Adafruit Ultimate GPS Breakout]
-* ATGM336H
+* Adafruit Ultimate GPS Breakout
 * Beitian BN-180
-* Beitian BN-220
-* Beitian BN-280
-* Beitian BN-880
-* Beitian BK-250
-* Beitian BK-357
-* Beitian BK-880Q
-* Beitian BE-280
-* Beitian BN-280ZF
-* Beitian BN-357ZF
 * Royaltek RBT-2100LP
-* [u-blox NEO-6M]
-* [u-blox NEO-7M]
-* [Uputronics u-blox MAX-M8C Pico]
+* u-blox NEO-6M
 
 If you have verified this application working with a module not listed here,
 please submit a PR adding it to the list.
 
-## Building
-
-This application can be compiled using [uFBT]. Run `ufbt` in the root directory
-of the repository.
+## Links
 
-[Adafruit Ultimate GPS Breakout]: https://www.adafruit.com/product/746
-[minmea]: https://github.com/kosma/minmea
-[qFlipper]: https://flipperzero.one/update
-[u-blox NEO-6M]: https://www.u-blox.com/en/product/neo-6-series
-[u-blox NEO-7M]: https://www.u-blox.com/en/product/neo-7-series
-[uFBT]: https://github.com/flipperdevices/flipperzero-ufbt
-[Uputronics u-blox MAX-M8C Pico]: https://store.uputronics.com/index.php?route=product/product&product_id=72
+Original repo link - https://github.com/ezod/flipperzero-gps
+Adafruit Ultimate GPS Breakout: https://www.adafruit.com/product/746
+minmea: https://github.com/kosma/minmea
+u-blox NEO-6M: https://www.u-blox.com/en/product/neo-6-series
@@ -8,11 +8,7 @@ App(
     order=35,
     fap_icon="gps_10px.png",
     fap_category="GPIO",
-    fap_private_libs=[
-        Lib(
-            name="minmea",
-            sources=["minmea.c"],
-            cdefines=["timegm=mktime"],
-        ),
-    ],
+    fap_author="@ezod & @xMasterX",
+    fap_version="1.2",
+    fap_description="Works with GPS modules via UART, using NMEA protocol.",
 )
@@ -2,6 +2,7 @@
 #include "constants.h"
 
 #include <furi.h>
+#include <furi_hal_power.h>
 #include <gui/gui.h>
 #include <string.h>
 
@@ -94,6 +95,14 @@ int32_t gps_app(void* p) {
 
     FuriMessageQueue* event_queue = furi_message_queue_alloc(8, sizeof(PluginEvent));
 
+    uint8_t attempts = 0;
+    bool otg_was_enabled = furi_hal_power_is_otg_enabled();
+    while(!furi_hal_power_is_otg_enabled() && attempts++ < 5) {
+        furi_hal_power_enable_otg();
+        furi_delay_ms(10);
+    }
+    furi_delay_ms(200);
+
     GpsUart* gps_uart = gps_uart_enable();
 
     gps_uart->mutex = furi_mutex_alloc(FuriMutexTypeNormal);
@@ -159,6 +168,8 @@ int32_t gps_app(void* p) {
 
                         gps_uart_init_thread(gps_uart);
                         gps_uart->changing_baudrate = true;
+                        furi_mutex_release(gps_uart->mutex);
+                        view_port_update(view_port);
                         break;
                     case InputKeyRight:
                         gps_uart->speed_units++;
@@ -175,11 +186,10 @@ int32_t gps_app(void* p) {
                 }
             }
         }
-
-        view_port_update(view_port);
-        furi_mutex_release(gps_uart->mutex);
-
-        if(gps_uart->changing_baudrate) {
+        if(!gps_uart->changing_baudrate) {
+            furi_mutex_release(gps_uart->mutex);
+            view_port_update(view_port);
+        } else {
             furi_delay_ms(1000);
             gps_uart->changing_baudrate = false;
         }
@@ -194,5 +204,9 @@ int32_t gps_app(void* p) {
     furi_mutex_free(gps_uart->mutex);
     gps_uart_disable(gps_uart);
 
+    if(furi_hal_power_is_otg_enabled() && !otg_was_enabled) {
+        furi_hal_power_disable_otg();
+    }
+
     return 0;
 }
@@ -1,6 +1,6 @@
 #include <string.h>
 
-#include <minmea.h>
+#include "minmea.h"
 #include "gps_uart.h"
 
 typedef enum {