Fix #424: return to app mode on port 224 join command

Author: terrillmoore

src/lmic/lmic_compliance.c

@@ -307,6 +307,9 @@ Name:   evDeactivate()
 
 Description:
         We report a deactivation event, and re-evaluate the FSM.
+        We also set a flag so that we're return the appropriate
+        status from the compliance entry point to the real
+        application.
 
 Returns:
         No explicit result.
@@ -344,8 +347,10 @@ Name:   evJoinCommand()
         void evJoinCommand(void);
 
 Description:
-        We report a join-command event, and the kick the FSM. This
-        will cause the FSM to coordinate sending and the other activities.
+        We unjoin from the network, and then report a deactivation
+        of test mode. That will get us out of test mode and back
+        to the compliance app. The next message send will trigger
+        a join.
 
 Returns:
         No explicit result.
@@ -355,8 +360,8 @@ Name:   evJoinCommand()
 static void evJoinCommand(
     void
 ) {
-    LMIC_Compliance.eventflags |= LMIC_COMPLIANCE_EVENT_JOIN_CMD;
-    fsmEvalDeferred();
+    LMIC_unjoin();
+    evDeactivate();
 }
 
 /*
@@ -582,8 +587,6 @@ fsmDispatch(
             }
             if (eventflags_TestAndClear(LMIC_COMPLIANCE_EVENT_DEACTIVATE)) {
                 newState = LMIC_COMPLIANCE_FSMSTATE_INACTIVE;
-            } else if (eventflags_TestAndClear(LMIC_COMPLIANCE_EVENT_JOIN_CMD)) {
-                newState = LMIC_COMPLIANCE_FSMSTATE_JOINING;
             } else if (eventflags_TestAndClear(LMIC_COMPLIANCE_EVENT_ECHO_REQUEST)) {
                 newState = LMIC_COMPLIANCE_FSMSTATE_ECHOING;
             } else {
@@ -592,16 +595,6 @@ fsmDispatch(
             break;
         }
 
-        case LMIC_COMPLIANCE_FSMSTATE_JOINING: {
-            if (fEntry)
-                acDoJoin();
-
-            if (eventflags_TestAndClear(LMIC_COMPLIANCE_EVENT_JOINED)) {
-                newState = LMIC_COMPLIANCE_FSMSTATE_RECOVERY;
-            }
-            break;
-        }
-
         case LMIC_COMPLIANCE_FSMSTATE_ECHOING: {
             if (fEntry)
                 acSendUplinkBuffer();
@@ -625,8 +618,7 @@ fsmDispatch(
         case LMIC_COMPLIANCE_FSMSTATE_RECOVERY: {
             if (fEntry) {
                 if (LMIC_Compliance.eventflags & (LMIC_COMPLIANCE_EVENT_DEACTIVATE |
-                                                  LMIC_COMPLIANCE_EVENT_ECHO_REQUEST |
-                                                  LMIC_COMPLIANCE_EVENT_JOIN_CMD)) {
+                                                  LMIC_COMPLIANCE_EVENT_ECHO_REQUEST)) {
                     acSetTimer(sec2osticks(1));
                 } else {
                     acSetTimer(sec2osticks(5));
@@ -677,10 +669,7 @@ static void lmicEventCb(
     }
 
     // if it's a EV_JOINED, or a TXCMOMPLETE, we should tell the FSM.
-    if (ev == EV_JOINED) {
-        LMIC_Compliance.eventflags |= LMIC_COMPLIANCE_EVENT_JOINED;
-        fsmEvalDeferred();
-    } else if (ev == EV_TXCOMPLETE) {
+    if ((UINT32_C(1) << ev) & (EV_JOINED | EV_TXCOMPLETE)) {
         fsmEvalDeferred();
     }
 }
@@ -764,13 +753,3 @@ static void acSendUplinkBuffer(void) {
 static const char *txSuccessToString(int fSuccess) {
     return fSuccess ? "ok" : "failed";
 }
-
-static void acDoJoin(void) {
-    LMIC_COMPLIANCE_PRINTF("acDoJoin\n");
-
-    LMIC_Compliance.eventflags &= ~LMIC_COMPLIANCE_EVENT_JOINED;
-
-    LMIC_unjoin();
-    LMIC_Compliance.downlinkCount = 0;
-    LMIC_startJoining();
-}

src/lmic/lmic_compliance.h

@@ -57,9 +57,7 @@ enum lmic_compliance_eventflags_e {
     LMIC_COMPLIANCE_EVENT_DEACTIVATE    = 1u << 1,
     LMIC_COMPLIANCE_EVENT_TIMER_EXPIRED = 1u << 2,
     LMIC_COMPLIANCE_EVENT_UPLINK_COMPLETE = 1u << 3,
-    LMIC_COMPLIANCE_EVENT_JOIN_CMD      = 1u << 4,
-    LMIC_COMPLIANCE_EVENT_JOINED        = 1u << 5,
-    LMIC_COMPLIANCE_EVENT_ECHO_REQUEST  = 1u << 6,
+    LMIC_COMPLIANCE_EVENT_ECHO_REQUEST  = 1u << 4,
 };
 
 typedef uint8_t lmic_compliance_fsmflags_t;
@@ -76,14 +74,13 @@ enum lmic_compliance_fsmstate_e {
     LMIC_COMPLIANCE_FSMSTATE_ACTIVE = 2,
     LMIC_COMPLIANCE_FSMSTATE_INACTIVE = 3,
     LMIC_COMPLIANCE_FSMSTATE_TESTMODE = 4,   // sending test uplinks
-    LMIC_COMPLIANCE_FSMSTATE_JOINING = 5,    // joining (under command)
-    LMIC_COMPLIANCE_FSMSTATE_ECHOING = 6,
-    LMIC_COMPLIANCE_FSMSTATE_REPORTING = 7,
-    LMIC_COMPLIANCE_FSMSTATE_RECOVERY = 8,
+    LMIC_COMPLIANCE_FSMSTATE_ECHOING = 5,
+    LMIC_COMPLIANCE_FSMSTATE_REPORTING = 6,
+    LMIC_COMPLIANCE_FSMSTATE_RECOVERY = 7,
 };
 
 #define LMIC_COMPLIANCE_FSMSTATE__NAMES   \
-    "INITIAL", "NOCHANGE", "ACTIVE", "INACTIVE", "TESTMODE", "JOINING",  \
+    "INITIAL", "NOCHANGE", "ACTIVE", "INACTIVE", "TESTMODE",   \
     "ECHOING", "REPORTING", "RECOVERY"
 
 typedef struct lmic_compliance_eventcb_s lmic_compliance_eventcb_t;