rcvractivity: check each group TWICE for activity

Author: mlyle

flight/Modules/ManualControl/transmitter_control.c

@@ -83,7 +83,7 @@
 struct rcvr_activity_fsm {
 	ManualControlSettingsChannelGroupsOptions group;
 	uint16_t prev[RCVR_ACTIVITY_MONITOR_CHANNELS_PER_GROUP];
-	uint8_t sample_count;
+	uint8_t check_count;
 };
 
 extern uintptr_t pios_rcvr_group_map[];
@@ -853,7 +853,7 @@ static void resetRcvrActivity(struct rcvr_activity_fsm * fsm)
 
 	/* Reset the FSM state */
 	fsm->group        = 0;
-	fsm->sample_count = 0;
+	fsm->check_count = 0;
 }
 
 static void updateRcvrActivitySample(uintptr_t rcvr_id, uint16_t samples[], uint8_t max_channels) {
@@ -927,26 +927,21 @@ static bool updateRcvrActivity(struct rcvr_activity_fsm * fsm)
 		resetRcvrActivity(fsm);
 	}
 
-	if (!pios_rcvr_group_map[fsm->group]) {
-		/* Unbound group, skip it */
-		goto group_completed;
+	if (fsm->check_count && (pios_rcvr_group_map[fsm->group])) {
+		/* Compare with previous sample */
+		activity_updated = updateRcvrActivityCompare(pios_rcvr_group_map[fsm->group], fsm);
 	}
 
-	if (fsm->sample_count == 0) {
-		/* Take a sample of each channel in this group */
-		updateRcvrActivitySample(pios_rcvr_group_map[fsm->group],
-					fsm->prev,
-					NELEMENTS(fsm->prev));
-		fsm->sample_count++;
-		return (false);
-	}
+	if (!activity_updated && fsm->check_count < 3) {
+		// First time through this is 1, so basically be willing
+		// to check twice.
+		fsm->check_count++;
 
-	/* Compare with previous sample */
-	activity_updated = updateRcvrActivityCompare(pios_rcvr_group_map[fsm->group], fsm);
+		return false;
+	}
 
-group_completed:
 	/* Reset the sample counter */
-	fsm->sample_count = 0;
+	fsm->check_count = 0;
 
 	/* Find the next active group, but limit search so we can't loop forever here */
 	for (uint8_t i = 0; i <= MANUALCONTROLSETTINGS_CHANNELGROUPS_NONE; i++) {
@@ -965,7 +960,9 @@ static bool updateRcvrActivity(struct rcvr_activity_fsm * fsm)
 			updateRcvrActivitySample(pios_rcvr_group_map[fsm->group],
 						fsm->prev,
 						NELEMENTS(fsm->prev));
-			fsm->sample_count++;
+
+			fsm->check_count = 1;
+
 			break;
 		}
 	}