X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fao_packet_master.c;h=b0fdf5a8804288386651c070ba6f5be8f7f703fc;hp=0808bc80af419c68efbfa4f8869eb8526bef634a;hb=fa7dd04741bf3fd9cedc59ed3b45b69ef9312609;hpb=484b44e81b655f1ecb48256095382a56d2839bae

diff --git a/src/ao_packet_master.c b/src/ao_packet_master.c
index 0808bc80..b0fdf5a8 100644
--- a/src/ao_packet_master.c
+++ b/src/ao_packet_master.c
@@ -26,7 +26,7 @@ ao_packet_getchar(void) __critical
 			break;
 		if (ao_packet_master_sleeping)
 			ao_wakeup(&ao_packet_master_sleeping);
-		ao_usb_flush();
+		flush();
 		ao_sleep(&ao_stdin_ready);
 	}
 	return c;
@@ -35,11 +35,11 @@ ao_packet_getchar(void) __critical
 static void
 ao_packet_echo(void) __reentrant
 {
-	uint8_t	c;
+	char	c;
 	while (ao_packet_enable) {
 		c = ao_packet_getchar();
 		if (c != AO_READ_AGAIN)
-			ao_usb_putchar(c);
+			putchar(c);
 	}
 	ao_exit();
 }
@@ -75,7 +75,6 @@ void
 ao_packet_master(void)
 {
 	ao_config_get();
-	ao_radio_set_packet();
 	ao_tx_packet.addr = ao_serial_number;
 	ao_tx_packet.len = AO_PACKET_SYN;
 	ao_packet_master_time = ao_time();
@@ -99,7 +98,6 @@ ao_packet_master(void)
 			ao_packet_master_sleeping = 0;
 		}
 	}
-	ao_radio_set_telemetry();
 	ao_exit();
 }
 
@@ -111,10 +109,12 @@ ao_packet_forward(void) __reentrant
 	ao_cmd_white();
 
 	flush();
+#if HAS_MONITOR
 	ao_set_monitor(0);
+#endif
 	ao_add_task(&ao_packet_task, ao_packet_master, "master");
 	ao_add_task(&ao_packet_echo_task, ao_packet_echo, "echo");
-	while ((c = ao_usb_getchar()) != '~') {
+	while ((c = getchar()) != '~') {
 		if (c == '\r') c = '\n';
 		ao_packet_putchar(c);
 	}
@@ -133,8 +133,8 @@ ao_packet_forward(void) __reentrant
 
 
 __code struct ao_cmds ao_packet_master_cmds[] = {
-	{ 'p',	ao_packet_forward,	"p                                  Remote packet link." },
-	{ 0,	ao_packet_forward,	NULL },
+	{ ao_packet_forward,	"p\0Remote packet link." },
+	{ 0,	NULL },
 };
 
 void