first cut at turnon scripts for EasyTimer v2

[fw/altos] / ao-tools / ao-test-igniter / ao-test-igniter.c

diff --git a/ao-tools/ao-test-igniter/ao-test-igniter.c b/ao-tools/ao-test-igniter/ao-test-igniter.c
index 17d5aad6451dd22d1ff874db4e2a525fc0f1d045..16ff27f45359755450b0f01e439cdc556ae6188f 100644 (file)
--- a/ao-tools/ao-test-igniter/ao-test-igniter.c
+++ b/ao-tools/ao-test-igniter/ao-test-igniter.c
@@ -82,6 +82,16 @@ map_igniter_name(char *adc_name, char *igniter_name)
        return true;
 }
 
+static const char *
+other_igniter_name(const char *name)
+{
+       if (!strcmp(name, "drogue"))
+               return "apogee";
+       if (!strcmp(name, "apogee"))
+               return "drogue";
+       return name;
+}
+
 static struct igniter *
 igniters(struct cc_usb *usb)
 {
@@ -115,7 +125,9 @@ igniters(struct cc_usb *usb)
                                if (found_igniter) {
                                        struct igniter *i;
                                        for (i = head; i; i = i->next)
-                                               if (!strcmp(i->name, igniter_name)) {
+                                               if (!strcmp(i->name, igniter_name) ||
+                                                   !strcmp(i->name, other_igniter_name(igniter_name)))
+                                               {
                                                        i->adc = atoi(tok);
                                                        break;
                                                }
@@ -183,7 +195,7 @@ do_igniter(struct cc_usb *usb, char *name, double rplus, double rminus, int adc_
                        return 0;
                }
        }
-       if (strcmp(this->status, "ready") != 0) {
+       if (strcmp(this->status, "open") == 0) {
                printf("igniter %s status is %s\n", this->name, this->status);
                free_igniters(all);
                return 0;