Fix merge.

HiFiPhile · Apr 16, 2024 · ae9e202 · ae9e202
1 parent 1b52630
commit ae9e202
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/tty.c b/src/tty.c
@@ -570,7 +570,7 @@ void handle_command_sequence(char input_char, char *output_char, bool *forward)
                         {
                             tio_printf("Sending file '%s'  ", line);
                             tio_printf("Press any key to abort transfer");
-                            tio_printf("%s", xymodem_send(hPort, line, input_char) < 0 ? "Aborted" : "Done");
+                            tio_printf("%s", xymodem_send(hPort, line, XMODEM_1K) < 0 ? "Aborted" : "Done");
                         }
                         break;
 
@@ -581,7 +581,7 @@ void handle_command_sequence(char input_char, char *output_char, bool *forward)
                         {
                             tio_printf("Sending file '%s'  ", line);
                             tio_printf("Press any key to abort transfer");
-                            tio_printf("%s", xymodem_send(hPort, line, input_char) < 0 ? "Aborted" : "Done");
+                            tio_printf("%s", xymodem_send(hPort, line, XMODEM_CRC) < 0 ? "Aborted" : "Done");
                         }
                         break;
                 }
@@ -692,6 +692,7 @@ void handle_command_sequence(char input_char, char *output_char, bool *forward)
                 tio_printf(" DTR        (0)");
                 tio_printf(" RTS        (1)");
                 tio_printf(" DTR+RTS    (2)");
+                line_mode = LINE_TOGGLE;
                 // Process next input character as part of the line toggle step
                 sub_command = SUBCOMMAND_LINE_TOGGLE;
                 break;
@@ -701,6 +702,7 @@ void handle_command_sequence(char input_char, char *output_char, bool *forward)
                 tio_printf(" DTR        (0)");
                 tio_printf(" RTS        (1)");
                 tio_printf(" DTR+RTS    (2)");
+                line_mode = LINE_PULSE;
                 // Process next input character as part of the line pulse step
                 sub_command = SUBCOMMAND_LINE_PULSE;
                 break;