Skip to content

Commit abab775

Browse files
nseidlenseidle
committed
Increase menu timeout for complex entries (base coords, etc). Remove hardcoded menu timeouts.
1 parent eb789bf commit abab775

File tree

6 files changed

+28
-26
lines changed

6 files changed

+28
-26
lines changed

‎Firmware/RTK_Surveyor/menuBase.ino‎

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
//Set the ECEF coordinates for a known location
33
void menuBase()
44
{
5+
int menuTimeoutExtended = 30; //Increase time needed for complex data entry (mount point ID, ECEF coords, etc).
6+
57
while (1)
68
{
79
Serial.println();
@@ -76,7 +78,7 @@ void menuBase()
7678

7779
Serial.println(F("x) Exit"));
7880

79-
int incoming = getNumber(30); //Timeout after x seconds
81+
int incoming = getNumber(menuTimeoutExtended); //Timeout after x seconds
8082

8183
if (incoming == 1)
8284
{
@@ -93,21 +95,21 @@ void menuBase()
9395
Serial.println(F("Enter the fixed ECEF coordinates that will be used in Base mode:"));
9496

9597
Serial.print(F("ECEF X in meters (ex: -1280182.920): "));
96-
double fixedEcefX = getDouble(menuTimeout); //Timeout after x seconds
98+
double fixedEcefX = getDouble(menuTimeoutExtended); //Timeout after x seconds
9799

98100
//Progress with additional prompts only if the user enters valid data
99101
if (fixedEcefX != STATUS_GETNUMBER_TIMEOUT && fixedEcefX != STATUS_PRESSED_X)
100102
{
101103
settings.fixedEcefX = fixedEcefX;
102104

103105
Serial.print(F("\nECEF Y in meters (ex: -4716808.5807): "));
104-
double fixedEcefY = getDouble(menuTimeout);
106+
double fixedEcefY = getDouble(menuTimeoutExtended);
105107
if (fixedEcefY != STATUS_GETNUMBER_TIMEOUT && fixedEcefY != STATUS_PRESSED_X)
106108
{
107109
settings.fixedEcefY = fixedEcefY;
108110

109111
Serial.print(F("\nECEF Z in meters (ex: 4086669.6393): "));
110-
double fixedEcefZ = getDouble(menuTimeout);
112+
double fixedEcefZ = getDouble(menuTimeoutExtended);
111113
if (fixedEcefZ != STATUS_GETNUMBER_TIMEOUT && fixedEcefZ != STATUS_PRESSED_X)
112114
settings.fixedEcefZ = fixedEcefZ;
113115
}
@@ -118,21 +120,21 @@ void menuBase()
118120
Serial.println(F("Enter the fixed Lat/Long/Altitude coordinates that will be used in Base mode:"));
119121

120122
Serial.print(F("Lat in degrees (ex: 40.090335429): "));
121-
double fixedLat = getDouble(menuTimeout); //Timeout after x seconds
123+
double fixedLat = getDouble(menuTimeoutExtended); //Timeout after x seconds
122124

123125
//Progress with additional prompts only if the user enters valid data
124126
if (fixedLat != STATUS_GETNUMBER_TIMEOUT && fixedLat != STATUS_PRESSED_X)
125127
{
126128
settings.fixedLat = fixedLat;
127129

128130
Serial.print(F("\nLong in degrees (ex: -105.184774720): "));
129-
double fixedLong = getDouble(menuTimeout);
131+
double fixedLong = getDouble(menuTimeoutExtended);
130132
if (fixedLong != STATUS_GETNUMBER_TIMEOUT && fixedLong != STATUS_PRESSED_X)
131133
{
132134
settings.fixedLong = fixedLong;
133135

134136
Serial.print(F("\nAltitude in meters (ex: 1560.2284): "));
135-
double fixedAltitude = getDouble(menuTimeout);
137+
double fixedAltitude = getDouble(menuTimeoutExtended);
136138
if (fixedAltitude != STATUS_GETNUMBER_TIMEOUT && fixedAltitude != STATUS_PRESSED_X)
137139
settings.fixedAltitude = fixedAltitude;
138140
}
@@ -172,23 +174,23 @@ void menuBase()
172174
else if (incoming == 5 && settings.enableNtripServer == true)
173175
{
174176
Serial.print(F("Enter local WiFi SSID: "));
175-
readLine(settings.wifiSSID, sizeof(settings.wifiSSID), menuTimeout);
177+
readLine(settings.wifiSSID, sizeof(settings.wifiSSID), menuTimeoutExtended);
176178
}
177179
else if (incoming == 6 && settings.enableNtripServer == true)
178180
{
179181
Serial.printf("Enter password for WiFi network %s: ", settings.wifiSSID);
180-
readLine(settings.wifiPW, sizeof(settings.wifiPW), menuTimeout);
182+
readLine(settings.wifiPW, sizeof(settings.wifiPW), menuTimeoutExtended);
181183
}
182184
else if (incoming == 7 && settings.enableNtripServer == true)
183185
{
184186
Serial.print(F("Enter new Caster Address: "));
185-
readLine(settings.casterHost, sizeof(settings.casterHost), menuTimeout);
187+
readLine(settings.casterHost, sizeof(settings.casterHost), menuTimeoutExtended);
186188
}
187189
else if (incoming == 8 && settings.enableNtripServer == true)
188190
{
189191
Serial.print(F("Enter new Caster Port: "));
190192

191-
int casterPort = getNumber(menuTimeout); //Timeout after x seconds
193+
int casterPort = getNumber(menuTimeoutExtended); //Timeout after x seconds
192194
if (casterPort < 1 || casterPort > 99999) //Arbitrary 99k max port #
193195
Serial.println(F("Error: Caster Port out of range"));
194196
else
@@ -197,12 +199,12 @@ void menuBase()
197199
else if (incoming == 9 && settings.enableNtripServer == true)
198200
{
199201
Serial.print(F("Enter new Mount Point: "));
200-
readLine(settings.mountPoint, sizeof(settings.mountPoint), menuTimeout);
202+
readLine(settings.mountPoint, sizeof(settings.mountPoint), menuTimeoutExtended);
201203
}
202204
else if (incoming == 10 && settings.enableNtripServer == true)
203205
{
204206
Serial.printf("Enter password for Mount Point %s: ", settings.mountPoint);
205-
readLine(settings.mountPointPW, sizeof(settings.mountPointPW), menuTimeout);
207+
readLine(settings.mountPointPW, sizeof(settings.mountPointPW), menuTimeoutExtended);
206208
}
207209
else if (incoming == STATUS_PRESSED_X)
208210
break;

‎Firmware/RTK_Surveyor/menuDebug.ino‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ void menuDebug()
2929

3030
Serial.println(F("x) Exit"));
3131

32-
byte incoming = getByteChoice(30); //Timeout after x seconds
32+
byte incoming = getByteChoice(menuTimeout); //Timeout after x seconds
3333

3434
if (incoming == '1')
3535
{

‎Firmware/RTK_Surveyor/menuGNSS.ino‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ void menuGNSS()
2222

2323
Serial.println(F("x) Exit"));
2424

25-
int incoming = getNumber(30); //Timeout after x seconds
25+
int incoming = getNumber(menuTimeout); //Timeout after x seconds
2626

2727
if (incoming == 1)
2828
{

‎Firmware/RTK_Surveyor/menuMessages.ino‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ void menuLog()
3232

3333
Serial.println(F("x) Exit"));
3434

35-
byte incoming = getByteChoice(30); //Timeout after x seconds
35+
byte incoming = getByteChoice(menuTimeout); //Timeout after x seconds
3636

3737
if (incoming == '1')
3838
{
@@ -81,7 +81,7 @@ void menuMessages()
8181

8282
Serial.println(F("x) Exit"));
8383

84-
byte incoming = getByteChoice(30); //Timeout after x seconds
84+
byte incoming = getByteChoice(menuTimeout); //Timeout after x seconds
8585

8686
if (incoming == '1')
8787
menuMessagesNMEA();
@@ -173,7 +173,7 @@ void menuMessagesNMEA()
173173

174174
Serial.println(F("x) Exit"));
175175

176-
int incoming = getNumber(30); //Timeout after x seconds
176+
int incoming = getNumber(menuTimeout); //Timeout after x seconds
177177

178178
if (incoming == 1)
179179
inputMessageRate(settings.message.nmea_dtm);
@@ -300,7 +300,7 @@ void menuMessagesNAV()
300300

301301
Serial.println(F("x) Exit"));
302302

303-
int incoming = getNumber(30); //Timeout after x seconds
303+
int incoming = getNumber(menuTimeout); //Timeout after x seconds
304304

305305
if (incoming == 1)
306306
inputMessageRate(settings.message.nav_clock);
@@ -392,7 +392,7 @@ void menuMessagesRXM()
392392

393393
Serial.println(F("x) Exit"));
394394

395-
int incoming = getNumber(30); //Timeout after x seconds
395+
int incoming = getNumber(menuTimeout); //Timeout after x seconds
396396

397397
if (incoming == 1)
398398
inputMessageRate(settings.message.rxm_measx);
@@ -459,7 +459,7 @@ void menuMessagesMON()
459459

460460
Serial.println(F("x) Exit"));
461461

462-
int incoming = getNumber(30); //Timeout after x seconds
462+
int incoming = getNumber(menuTimeout); //Timeout after x seconds
463463

464464
if (incoming == 1)
465465
inputMessageRate(settings.message.mon_comms);
@@ -513,7 +513,7 @@ void menuMessagesTIM()
513513

514514
Serial.println(F("x) Exit"));
515515

516-
int incoming = getNumber(30); //Timeout after x seconds
516+
int incoming = getNumber(menuTimeout); //Timeout after x seconds
517517

518518
if (incoming == 1)
519519
inputMessageRate(settings.message.tim_tm2);
@@ -581,7 +581,7 @@ void menuMessagesRTCM()
581581

582582
Serial.println(F("x) Exit"));
583583

584-
int incoming = getNumber(30); //Timeout after x seconds
584+
int incoming = getNumber(menuTimeout); //Timeout after x seconds
585585

586586
if (incoming == 1)
587587
inputMessageRate(settings.message.rtcm_1005);

‎Firmware/RTK_Surveyor/menuPorts.ino‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ void menuPortsSurveyor()
2424

2525
Serial.println(F("x) Exit"));
2626

27-
byte incoming = getByteChoice(30); //Timeout after x seconds
27+
byte incoming = getByteChoice(menuTimeout); //Timeout after x seconds
2828

2929
if (incoming == '1')
3030
{
@@ -98,7 +98,7 @@ void menuPortsExpress()
9898

9999
Serial.println(F("x) Exit"));
100100

101-
byte incoming = getByteChoice(30); //Timeout after x seconds
101+
byte incoming = getByteChoice(menuTimeout); //Timeout after x seconds
102102

103103
if (incoming == '1')
104104
{

‎Firmware/RTK_Surveyor/menuTest.ino‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ void menuTest()
4343

4444
Serial.println(F("x) Exit"));
4545

46-
byte incoming = getByteChoice(30); //Timeout after x seconds
46+
byte incoming = getByteChoice(menuTimeout); //Timeout after x seconds
4747

4848
if (incoming == '1')
4949
{

0 commit comments

Comments
 (0)