Skip to content

Commit fbafee4

Browse files
authored
Merge branch 'release_candidate' into ESPNowPair
2 parents 5c50fa7 + 45a7872 commit fbafee4

File tree

4 files changed

+7
-1
lines changed

4 files changed

+7
-1
lines changed

Firmware/RTK_Surveyor/Begin.ino

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -705,6 +705,7 @@ bool beginExternalTriggers()
705705

706706
void beginIdleTasks()
707707
{
708+
#ifdef COMPILE_IDLE_TASKS
708709
if (settings.enablePrintIdleTime == true)
709710
{
710711
char taskName[32];
@@ -723,6 +724,7 @@ void beginIdleTasks()
723724
index); //Core where task should run, 0=core, 1=Arduino
724725
}
725726
}
727+
#endif //COMPILE_IDLE_TASKS
726728
}
727729

728730
void beginI2C()

Firmware/RTK_Surveyor/NtripServer.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -581,7 +581,7 @@ void ntripServerUpdate()
581581
Serial.println("NTRIP Server connection dropped");
582582
ntripServerStop(false); //Allocate new wifiClient
583583
}
584-
else if ((millis() - ntripServerTimer) > 3000)
584+
else if ((millis() - ntripServerTimer) > (3 * 1000))
585585
{
586586
//GNSS stopped sending RTCM correction data
587587
Serial.println("NTRIP Server breaking caster connection due to lack of RTCM data!");

Firmware/RTK_Surveyor/RTK_Surveyor.ino

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ const int FIRMWARE_VERSION_MINOR = 4;
3030
#define COMPILE_ESPNOW //Requires WiFi. Comment out to remove ESP-Now functionality.
3131
#define COMPILE_BT //Comment out to remove Bluetooth functionality
3232
#define COMPILE_L_BAND //Comment out to remove L-Band functionality
33+
#define COMPILE_IDLE_TASKS //Comment out to remove idle tasks
3334
#define ENABLE_DEVELOPER //Uncomment this line to enable special developer modes (don't check power button at startup)
3435

3536
//Define the RTK board identifier:

Firmware/RTK_Surveyor/Tasks.ino

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -620,6 +620,7 @@ void ButtonCheckTask(void *e)
620620
}
621621
}
622622

623+
#ifdef COMPILE_IDLE_TASKS
623624
void idleTask(void *e)
624625
{
625626
int cpu = xPortGetCoreID();
@@ -669,3 +670,5 @@ void idleTask(void *e)
669670
taskYIELD();
670671
}
671672
}
673+
#endif //COMPILE_IDLE_TASKS
674+

0 commit comments

Comments
 (0)