Selaa lähdekoodia

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

# Conflicts:
#	cli_bridge/.gitignore
#	cli_bridge/assets/KeyBackspaceSelected_16x9.png
#	cli_bridge/assets/KeyBackspace_16x9.png
#	cli_bridge/assets/KeyKeyboardSelected_10x11.png
#	cli_bridge/assets/KeyKeyboard_10x11.png
#	cli_bridge/assets/KeySaveSelected_24x11.png
#	cli_bridge/assets/KeySave_24x11.png
#	cli_bridge/assets/WarningDolphin_45x42.png
#	cli_bridge/cli_control.c
#	cli_bridge/cli_control.h
#	cli_bridge/cligui_main_i.h
#	cli_bridge/custom_text_input.c
#	cli_bridge/custom_validators.c
#	cli_bridge/custom_validators.h
Willy-JL 10 kuukautta sitten
vanhempi
commit
546cb3ebaa
3 muutettua tiedostoa jossa 13 lisäystä ja 10 poistoa
  1. 1 1
      cli_bridge/.gitsubtree
  2. 1 0
      cli_bridge/application.fam
  3. 11 9
      cli_bridge/cli_control.c

+ 1 - 1
cli_bridge/.gitsubtree

@@ -1,2 +1,2 @@
 https://github.com/ranchordo/flipperzero-cli-bridge main /
-https://github.com/xMasterX/all-the-plugins dev non_catalog_apps/cli_bridge 4558d74c9da36abc851edd96a95d18f7d5511a75
+https://github.com/xMasterX/all-the-plugins dev non_catalog_apps/cli_bridge 8bc18d5d99262484548b6bbc92690a1472c329a0

+ 1 - 0
cli_bridge/application.fam

@@ -7,4 +7,5 @@ App(
     stack_size=8 * 1024,
     fap_icon="cligui.png",
     fap_category="Tools",
+    fap_icon_assets="assets",
 )

+ 11 - 9
cli_bridge/cli_control.c

@@ -2,6 +2,7 @@
 
 #include <FreeRTOS.h>
 #include <cli/cli.h>
+
 #include <cli/cli_i.h>
 #include <cli/cli_vcp.h>
 #include <loader/loader.h>
@@ -84,13 +85,13 @@ void clicontrol_hijack(size_t tx_size, size_t rx_size) {
     }
 
     // Session switcharooney
-    FuriThreadStdoutWriteCallback prev_stdout;
-    void* prev_stdout_ctx;
-    furi_thread_get_stdout_callback(&prev_stdout, &prev_stdout_ctx);
+    FuriThreadStdoutWriteCallback original_out_cb;
+    void* original_out_ctx;
+    furi_thread_get_stdout_callback(&original_out_cb, &original_out_ctx);
     cli_session_close(global_cli);
     restore_tx_stdout = false;
     cli_session_open(global_cli, session);
-    furi_thread_set_stdout_callback(prev_stdout, prev_stdout_ctx);
+    furi_thread_set_stdout_callback(original_out_cb, original_out_ctx);
 
     furi_record_close(RECORD_CLI);
 }
@@ -112,7 +113,7 @@ void clicontrol_unhijack(bool persist) {
 
     if(persist) {
         // Don't trigger a terminal reset as the session switches
-        // cli_vcp.is_connected = &furi_hal_version_do_i_belong_here;
+        //cli_vcp.is_connected = &furi_hal_version_do_i_belong_here;
     } else {
         // Send CTRL-C a few times
         char eot = 0x03;
@@ -134,12 +135,13 @@ void clicontrol_unhijack(bool persist) {
     restore_tx_stdout = true; // Ready for next rx call
 
     // Session switcharooney again
-    FuriThreadStdoutWriteCallback prev_stdout;
-    void* prev_stdout_ctx;
-    furi_thread_get_stdout_callback(&prev_stdout, &prev_stdout_ctx);
+    //FuriThreadStdoutWriteCallback prev_stdout = furi_thread_get_stdout_callback();
+    FuriThreadStdoutWriteCallback original_out_cb;
+    void* original_out_ctx;
+    furi_thread_get_stdout_callback(&original_out_cb, &original_out_ctx);
     cli_session_close(global_cli);
     cli_session_open(global_cli, &cli_vcp);
-    furi_thread_set_stdout_callback(prev_stdout, prev_stdout_ctx);
+    furi_thread_set_stdout_callback(original_out_cb, original_out_ctx);
     furi_record_close(RECORD_CLI);
 
     // Unblock waiting rx handler, restore old cli_vcp.tx_stdout