Fix #441: handle TX busy at FSMSTATE_TESTMODE

Author: terrillmoore

src/lmic/lmic_compliance.c

@@ -575,15 +575,26 @@ fsmDispatch(
                 acEnterActiveMode();
                 acSetTimer(sec2osticks(1));
             }
-            if (eventflags_TestAndClear(LMIC_COMPLIANCE_EVENT_TIMER_EXPIRED))
+            if (eventflags_TestAndClear(LMIC_COMPLIANCE_EVENT_TIMER_EXPIRED)) {
+                newState = LMIC_COMPLIANCE_FSMSTATE_TESTMODE;
+            }
+            break;
+        }
+
+        case LMIC_COMPLIANCE_FSMSTATE_TXBUSY: {
+            if (fEntry) {
+                acSetTimer(sec2osticks(1));
+            }
+            if (eventflags_TestAndClear(LMIC_COMPLIANCE_EVENT_TIMER_EXPIRED)) {
                 newState = LMIC_COMPLIANCE_FSMSTATE_TESTMODE;
+            }
             break;
         }
 
         case LMIC_COMPLIANCE_FSMSTATE_TESTMODE: {
             if (LMIC.opmode & OP_TXDATA) {
-                // stay here until we can do something
-                break;
+                // go back and wait some more.
+                newState = LMIC_COMPLIANCE_FSMSTATE_TXBUSY;
             }
             if (eventflags_TestAndClear(LMIC_COMPLIANCE_EVENT_DEACTIVATE)) {
                 newState = LMIC_COMPLIANCE_FSMSTATE_INACTIVE;
@@ -628,6 +639,7 @@ fsmDispatch(
             if (eventflags_TestAndClear(LMIC_COMPLIANCE_EVENT_TIMER_EXPIRED)) {
                 newState = LMIC_COMPLIANCE_FSMSTATE_TESTMODE;
             }
+            break;
         }
 
         default: {

src/lmic/lmic_compliance.h

@@ -77,11 +77,12 @@ enum lmic_compliance_fsmstate_e {
     LMIC_COMPLIANCE_FSMSTATE_ECHOING = 5,
     LMIC_COMPLIANCE_FSMSTATE_REPORTING = 6,
     LMIC_COMPLIANCE_FSMSTATE_RECOVERY = 7,
+    LMIC_COMPLIANCE_FSMSTATE_TXBUSY = 8,
 };
 
 #define LMIC_COMPLIANCE_FSMSTATE__NAMES   \
     "INITIAL", "NOCHANGE", "ACTIVE", "INACTIVE", "TESTMODE",   \
-    "ECHOING", "REPORTING", "RECOVERY"
+    "ECHOING", "REPORTING", "RECOVERY", "TXBUSY"
 
 typedef struct lmic_compliance_eventcb_s lmic_compliance_eventcb_t;
 struct lmic_compliance_eventcb_s {