Merge branch 'buttonbox' of git://git.gag.com/fw/altos into buttonbox

diff --git a/ao-tools/altosui/AltosFlash.java b/ao-tools/altosui/AltosFlash.java
index fa2465d337748a0af7ee0fd79dcdd0c80d5e8552..3af25c23457b696529ea8a2eb19fc1a8bb06278a 100644 (file)
--- a/ao-tools/altosui/AltosFlash.java
+++ b/ao-tools/altosui/AltosFlash.java
@@ -336,7 +336,9 @@ public class AltosFlash {
                debug = new AltosDebug(in_debug_dongle);
                input = new FileInputStream(file);
                image = new AltosHexfile(input);
-               if (!debug.check_connection())
+               if (!debug.check_connection()) {
+                       debug.close();
                        throw new IOException("Debug port not connected");
+               }
        }
 }
\ No newline at end of file

diff --git a/src/ao_ignite.c b/src/ao_ignite.c
index 4093b6a7480c428754bd3de99a32c3ccacac5914..58d340d9599f5c655a4a6e098696d6eb9710c107 100644 (file)
--- a/src/ao_ignite.c
+++ b/src/ao_ignite.c
@@ -113,9 +113,7 @@ ao_igniter(void)
 
                                ao_igniter_fire(igniter);
                                ao_delay(AO_IGNITER_CHARGE_TIME);
-                               status = ao_igniter_status(igniter);
-                               if (status == ao_igniter_open)
-                                       ao_ignition[igniter].fired = 1;
+                               ao_ignition[igniter].fired = 1;
                        }
                }
        }

diff --git a/src/ao_radio.c b/src/ao_radio.c
index f4a9d3b265edb1a82ea37ee95cac9568022da9c6..3fb4afd7d4831d87c556a201634655e70ba95b3c 100644 (file)
--- a/src/ao_radio.c
+++ b/src/ao_radio.c
@@ -448,19 +448,32 @@ ao_radio_rdf_abort(void)
 void
 ao_radio_test(void)
 {
-       ao_set_monitor(0);
-       ao_packet_slave_stop();
-       ao_radio_get();
-       printf ("Hit a character to stop..."); flush();
-       RFST = RFST_STX;
-       getchar();
-       ao_radio_idle();
-       ao_radio_put();
-       putchar('\n');
+       uint8_t mode = 2;
+       ao_cmd_white();
+       if (ao_cmd_lex_c != '\n') {
+               ao_cmd_decimal();
+               mode = (uint8_t) ao_cmd_lex_u32;
+       }
+       mode++;
+       if (mode & 2) {
+               ao_set_monitor(0);
+               ao_packet_slave_stop();
+               ao_radio_get();
+               RFST = RFST_STX;
+       }
+       if (mode == 3) {
+               printf ("Hit a character to stop..."); flush();
+               getchar();
+               putchar('\n');
+       }
+       if (mode & 1) {
+               ao_radio_idle();
+               ao_radio_put();
+       }
 }
 
 __code struct ao_cmds ao_radio_cmds[] = {
-       { 'C',  ao_radio_test,  "C                                  Radio carrier test" },
+       { 'C',  ao_radio_test,  "C <1 start, 0 stop, none both>     Radio carrier test" },
        { 0,    ao_radio_test,  NULL },
 };