Skip to content

Commit 114e1c0

Browse files
committed
Move the confirmation of data up to avoid main.js from resending large blob of config data
1 parent 41b9812 commit 114e1c0

File tree

1 file changed

+16
-12
lines changed

1 file changed

+16
-12
lines changed

Firmware/RTK_Everywhere/States.ino

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -440,12 +440,15 @@ void stateUpdate()
440440
if (incomingSettingsSpot > 0)
441441
{
442442
// Allow for 750ms before we parse buffer for all data to arrive
443-
if ((millis() - timeSinceLastIncomingSetting) > 750)
443+
if ((millis() - timeSinceLastIncomingSetting) > 250)
444444
{
445-
bool changed;
445+
// Confirm receipt so the web interface stops sending the config blob
446+
if (settings.debugWebServer == true)
447+
systemPrintln("Sending receipt confirmation of settings");
448+
sendStringToWebsocket("confirmDataReceipt,1,");
446449

447-
currentlyParsingData =
448-
true; // Disallow new data to flow from websocket while we are parsing the current data
450+
// Disallow new data to flow from websocket while we are parsing the current data
451+
currentlyParsingData = true;
449452

450453
systemPrint("Parsing: ");
451454
for (int x = 0; x < incomingSettingsSpot; x++)
@@ -771,14 +774,15 @@ typedef struct _RTK_MODE_ENTRY
771774
SystemState last;
772775
} RTK_MODE_ENTRY;
773776

774-
const RTK_MODE_ENTRY stateModeTable[] = {{"Rover", STATE_ROVER_NOT_STARTED, STATE_ROVER_RTK_FIX},
775-
{"Base Caster", STATE_BASE_CASTER_NOT_STARTED, STATE_BASE_CASTER_NOT_STARTED},
776-
{"Base", STATE_BASE_NOT_STARTED, STATE_BASE_FIXED_TRANSMITTING},
777-
{"Setup", STATE_DISPLAY_SETUP, STATE_PROFILE}, // Covers SETUP, WEB_CONFIG, TEST
778-
{"Provisioning", STATE_KEYS_REQUESTED, STATE_KEYS_REQUESTED},
779-
{"ESPNOW Pairing", STATE_ESPNOW_PAIRING_NOT_STARTED, STATE_ESPNOW_PAIRING},
780-
{"NTP", STATE_NTPSERVER_NOT_STARTED, STATE_NTPSERVER_SYNC},
781-
{"Shutdown", STATE_SHUTDOWN, STATE_SHUTDOWN}};
777+
const RTK_MODE_ENTRY stateModeTable[] = {
778+
{"Rover", STATE_ROVER_NOT_STARTED, STATE_ROVER_RTK_FIX},
779+
{"Base Caster", STATE_BASE_CASTER_NOT_STARTED, STATE_BASE_CASTER_NOT_STARTED},
780+
{"Base", STATE_BASE_NOT_STARTED, STATE_BASE_FIXED_TRANSMITTING},
781+
{"Setup", STATE_DISPLAY_SETUP, STATE_PROFILE}, // Covers SETUP, WEB_CONFIG, TEST
782+
{"Provisioning", STATE_KEYS_REQUESTED, STATE_KEYS_REQUESTED},
783+
{"ESPNOW Pairing", STATE_ESPNOW_PAIRING_NOT_STARTED, STATE_ESPNOW_PAIRING},
784+
{"NTP", STATE_NTPSERVER_NOT_STARTED, STATE_NTPSERVER_SYNC},
785+
{"Shutdown", STATE_SHUTDOWN, STATE_SHUTDOWN}};
782786
const int stateModeTableEntries = sizeof(stateModeTable) / sizeof(stateModeTable[0]);
783787

784788
const char *stateToRtkMode(SystemState state)

0 commit comments

Comments
 (0)