Bläddra i källkod

Merge uart_terminal from https://github.com/xMasterX/all-the-plugins

# Conflicts:
#	uart_terminal/scenes/uart_terminal_scene_setup.c
#	uart_terminal/uart_terminal_app.c
Willy-JL 1 år sedan
förälder
incheckning
1176130bb7

+ 1 - 1
uart_terminal/application.fam

@@ -10,6 +10,6 @@ App(
     fap_category="GPIO",
     fap_icon_assets="assets",
     fap_author="@cool4uma & @rnadyrshin & (some fixes by @xMasterX)",
-    fap_version="1.3",
+    fap_version="1.4",
     fap_description="Control various devices via the Flipper Zero UART interface.",
 )

+ 9 - 0
uart_terminal/uart_terminal_app.c

@@ -2,6 +2,7 @@
 
 #include <furi.h>
 #include <furi_hal.h>
+#include <expansion/expansion.h>
 
 static bool uart_terminal_app_custom_event_callback(void* context, uint32_t event) {
     furi_assert(context);
@@ -112,6 +113,10 @@ void uart_terminal_app_free(UART_TerminalApp* app) {
 
 int32_t uart_terminal_app(void* p) {
     UNUSED(p);
+    // Disable expansion protocol to avoid interference with UART Handle
+    Expansion* expansion = furi_record_open(RECORD_EXPANSION);
+    expansion_disable(expansion);
+
     UART_TerminalApp* uart_terminal_app = uart_terminal_app_alloc();
 
     uart_terminal_app->uart = uart_terminal_uart_init(uart_terminal_app);
@@ -120,5 +125,9 @@ int32_t uart_terminal_app(void* p) {
 
     uart_terminal_app_free(uart_terminal_app);
 
+    // Return previous state of expansion
+    expansion_enable(expansion);
+    furi_record_close(RECORD_EXPANSION);
+
     return 0;
 }

+ 1 - 1
uart_terminal/uart_terminal_uart.c

@@ -99,4 +99,4 @@ void uart_terminal_uart_free(UART_TerminalUart* uart) {
     furi_hal_serial_control_release(uart->serial_handle);
 
     free(uart);
-}
+}