Merge pull request #554 from LeeLeahy2/mp-no-state-change

nseidle · web-flow · commit fbd297df1164 · 2023-03-24T15:13:18.000-06:00
MP: Don't change state when not necessary
diff --git a/Firmware/LoRaSerial/States.ino b/Firmware/LoRaSerial/States.ino
@@ -1411,10 +1411,6 @@ void updateRadioState()
                 changeState(RADIO_MP_WAIT_TX_DONE);
               }
             }
-            else
-            {
-              changeState(RADIO_MP_STANDBY);
-            }
             break;
 
           case DATAGRAM_HEARTBEAT:
@@ -1432,7 +1428,6 @@ void updateRadioState()
               lastPacketReceived = millis(); //Update timestamp for Link LED
 
               blinkHeartbeatLed(true);
-              changeState(RADIO_MP_STANDBY);
             }
             break;
 
@@ -1446,8 +1441,6 @@ void updateRadioState()
             frequencyCorrection += radio.getFrequencyError() / 1000000.0;
 
             lastPacketReceived = millis(); //Update timestamp for Link LED
-
-            changeState(RADIO_MP_STANDBY);
             break;
         }
       }

Original file line number	Diff line number	Diff line change
`@@ -1411,10 +1411,6 @@ void updateRadioState()`
`1411`	`1411`	`changeState(RADIO_MP_WAIT_TX_DONE);`
`1412`	`1412`	`}`
`1413`	`1413`	`}`
`1414`		`- else`
`1415`		`- {`
`1416`		`- changeState(RADIO_MP_STANDBY);`
`1417`		`- }`
`1418`	`1414`	`break;`
`1419`	`1415`
`1420`	`1416`	`case DATAGRAM_HEARTBEAT:`
`@@ -1432,7 +1428,6 @@ void updateRadioState()`
`1432`	`1428`	`lastPacketReceived = millis(); //Update timestamp for Link LED`
`1433`	`1429`
`1434`	`1430`	`blinkHeartbeatLed(true);`
`1435`		`- changeState(RADIO_MP_STANDBY);`
`1436`	`1431`	`}`
`1437`	`1432`	`break;`
`1438`	`1433`
`@@ -1446,8 +1441,6 @@ void updateRadioState()`
`1446`	`1441`	`frequencyCorrection += radio.getFrequencyError() / 1000000.0;`
`1447`	`1442`
`1448`	`1443`	`lastPacketReceived = millis(); //Update timestamp for Link LED`
`1449`		`-`
`1450`		`- changeState(RADIO_MP_STANDBY);`
`1451`	`1444`	`break;`
`1452`	`1445`	`}`
`1453`	`1446`	`}`