MX 9 месяцев назад
Родитель
Сommit
32cc222439
3 измененных файлов с 11 добавлено и 10 удалено
  1. 2 2
      upython.h
  2. 2 2
      upython_cli.c
  3. 7 6
      upython_repl.c

+ 2 - 2
upython.h

@@ -28,8 +28,8 @@ bool upython_select_python_file(FuriString* file_path);
 void upython_cli_register(void* args);
 void upython_cli_unregister(void* args);
 
-void upython_cli(Cli* cli, FuriString* args, void* ctx);
+void upython_cli(PipeSide* pipe, FuriString* args, void* ctx);
 
-void upython_repl_execute(Cli* cli);
+void upython_repl_execute(PipeSide* pipe);
 
 void upython_file_execute(FuriString* file);

+ 2 - 2
upython_cli.c

@@ -11,7 +11,7 @@ static void write_to_stdout_buffer(const char* data, size_t size, void* context)
     furi_stream_buffer_send(stdout_buffer, data, size, 0);
 }
 
-void upython_cli(Cli* cli, FuriString* args, void* ctx) {
+void upython_cli(PipeSide* pipe, FuriString* args, void* ctx) {
     UNUSED(ctx);
 
     if(action != ActionNone) {
@@ -23,7 +23,7 @@ void upython_cli(Cli* cli, FuriString* args, void* ctx) {
     if(furi_string_empty(args)) {
         action = ActionRepl;
 
-        upython_repl_execute(cli);
+        upython_repl_execute(pipe);
 
         action = ActionNone;
     } else {

+ 7 - 6
upython_repl.c

@@ -246,7 +246,8 @@ inline static bool continue_with_input(mp_flipper_repl_context_t* context) {
     return true;
 }
 
-void upython_repl_execute(Cli* cli) {
+void upython_repl_execute(PipeSide* pipe) {
+    UNUSED(pipe);
     size_t stack;
 
     const size_t heap_size = memmgr_get_free_heap() * 0.1;
@@ -285,7 +286,7 @@ void upython_repl_execute(Cli* cli) {
 
             // scan character loop
             do {
-                character = cli_getc(cli);
+                character = getchar();
 
                 // Ctrl + C
                 if(character == CliKeyETX) {
@@ -317,15 +318,15 @@ void upython_repl_execute(Cli* cli) {
                     furi_string_cat(context->code, context->line);
                     furi_string_trim(context->code);
 
-                    cli_nl(cli);
+                    printf("\r\n");
 
                     break;
                 }
 
                 // handle arrow keys
                 if(character >= 0x18 && character <= 0x1B) {
-                    character = cli_getc(cli);
-                    character = cli_getc(cli);
+                    character = getchar();
+                    character = getchar();
 
                     handle_arrow_keys(character, context);
 
@@ -349,7 +350,7 @@ void upython_repl_execute(Cli* cli) {
                 // append at end
                 if(context->cursor == furi_string_size(context->line)) {
                     buffer[0] = character;
-                    cli_write(cli, (const uint8_t*)buffer, 1);
+                    putchar(character);
 
                     furi_string_push_back(context->line, character);