Skip to content

Commit 755f3e8

Browse files
author
dberschauer
committed
Merge remote-tracking branch 'origin/release_candidate' into nmea-over-udp
2 parents f1bdc5a + 577cadc commit 755f3e8

31 files changed

+1817
-1292
lines changed

‎.github/workflows/compile-rtk-firmware.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
env:
77
FILENAME_PREFIX: RTK_Surveyor_Firmware
88
FIRMWARE_VERSION_MAJOR: 3
9-
FIRMWARE_VERSION_MINOR: 7
9+
FIRMWARE_VERSION_MINOR: 10
1010
POINTPERFECT_TOKEN: ${{ secrets.POINTPERFECT_TOKEN }}
1111

1212
jobs:

‎Firmware/RTK_Surveyor/AP-Config/index.html

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -466,21 +466,6 @@
466466

467467

468468
<div id="messageList">
469-
<div class="form-group row" id="msgUBX_NMEA_DTM">
470-
<label for="UBX_NMEA_DTM" class="col-sm-3 col-5 col-form-label">NMEA_DTM:</label>
471-
<div class="col-sm-8 col-7"><input type="number" class="form-control"
472-
id="UBX_NMEA_DTM" value="0">
473-
<p id="UBX_NMEA_DTMError" class="inlineError"></p>
474-
</div>
475-
</div>
476-
<hr>
477-
<div class="form-group row" id="msgUBX_NAV_ATT">
478-
<label for="UBX_NAV_ATT" class="col-sm-3 col-5 col-form-label">NAV_ATT:</label>
479-
<div class="col-sm-8 col-7"><input type="number" class="form-control"
480-
id="UBX_NAV_ATT" value="0">
481-
<p id="UBX_NAV_ATTError" class="inlineError"></p>
482-
</div>
483-
</div>
484469
</div>
485470
</div>
486471
</div>
@@ -926,21 +911,6 @@
926911
</div>
927912

928913
<div id="messageListBase">
929-
<div class="form-group row" id="msgUBX_NMEA_DTM">
930-
<label for="UBX_NMEA_DTM" class="col-sm-3 col-5 col-form-label">RTCM_1005:</label>
931-
<div class="col-sm-8 col-7"><input type="number" class="form-control"
932-
id="UBX_NMEA_DTM" value="0">
933-
<p id="UBX_NMEA_DTMError" class="inlineError"></p>
934-
</div>
935-
</div>
936-
<hr>
937-
<div class="form-group row" id="msgUBX_NAV_ATT">
938-
<label for="UBX_NAV_ATT" class="col-sm-3 col-5 col-form-label">RTCM_1074:</label>
939-
<div class="col-sm-8 col-7"><input type="number" class="form-control"
940-
id="UBX_NAV_ATT" value="0">
941-
<p id="UBX_NAV_ATTError" class="inlineError"></p>
942-
</div>
943-
</div>
944914
</div>
945915

946916
</div>

‎Firmware/RTK_Surveyor/Begin.ino

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -153,10 +153,6 @@ void beginBoard()
153153
}
154154
}
155155

156-
// We need some settings before we are completely powered on
157-
// ie, disablePowerFiltering, enableResetDisplay, resetCount, etc
158-
loadSettingsPartial(); // Loads settings from LFS
159-
160156
// Setup hardware pins
161157
if (productVariant == RTK_SURVEYOR)
162158
{
@@ -295,6 +291,7 @@ void beginBoard()
295291
ethernetMACAddress[5] += 3; // Convert MAC address to Ethernet MAC (add 3)
296292

297293
// For all boards, check reset reason. If reset was due to wdt or panic, append last log
294+
loadSettingsPartial(); // Loads settings from LFS
298295
if ((esp_reset_reason() == ESP_RST_POWERON) || (esp_reset_reason() == ESP_RST_SW))
299296
{
300297
reuseLastLog = false; // Start new log

‎Firmware/RTK_Surveyor/Bluetooth.ino

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,10 @@
2727
// Locals - compiled out
2828
//----------------------------------------
2929

30+
static volatile BTState bluetoothState = BT_OFF;
31+
3032
#ifdef COMPILE_BT
3133
BTSerialInterface *bluetoothSerial;
32-
static volatile BTState bluetoothState = BT_OFF;
3334

3435
//----------------------------------------
3536
// Bluetooth Routines - compiled out
@@ -154,6 +155,8 @@ void bluetoothStart()
154155
strncpy(stateName, "Rover-", sizeof(stateName) - 1);
155156
else if (systemState >= STATE_BASE_NOT_STARTED && systemState <= STATE_BASE_FIXED_TRANSMITTING)
156157
strncpy(stateName, "Base-", sizeof(stateName) - 1);
158+
else
159+
log_d("State out of range for Bluetooth Broadcast: %d", systemState);
157160

158161
snprintf(deviceName, sizeof(deviceName), "%s %s%02X%02X", platformPrefix, stateName, btMACAddress[4],
159162
btMACAddress[5]);

‎Firmware/RTK_Surveyor/Buttons.ino

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,11 @@ void powerOnCheck()
88
if (digitalRead(pin_powerSenseAndControl) == LOW)
99
delay(500);
1010

11-
if (settings.powerButtonFiltering == true)
11+
if (FIRMWARE_VERSION_MAJOR == 99)
12+
{
13+
// Do not check button if this is a locally compiled developer firmware
14+
}
15+
else
1216
{
1317
if (pin_powerSenseAndControl >= 0)
1418
if (digitalRead(pin_powerSenseAndControl) != LOW)
@@ -53,7 +57,8 @@ void powerDown(bool displayInfo)
5357
digitalWrite(pin_powerFastOff, LOW);
5458
}
5559

56-
if ((productVariant == RTK_FACET) || (productVariant == RTK_FACET_LBAND) || (productVariant == RTK_FACET_LBAND_DIRECT) || (productVariant == REFERENCE_STATION))
60+
if ((productVariant == RTK_FACET) || (productVariant == RTK_FACET_LBAND) ||
61+
(productVariant == RTK_FACET_LBAND_DIRECT) || (productVariant == REFERENCE_STATION))
5762
digitalWrite(pin_peripheralPowerControl, LOW);
5863

5964
while (1)

‎Firmware/RTK_Surveyor/Developer.ino

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ pvtServer.ino
1111
// Ethernet
1212
//----------------------------------------
1313

14-
void menuEthernet() {systemPrintln("NOT compiled");}
14+
void menuEthernet() {systemPrintln("Ethernet not compiled");}
1515
void ethernetBegin() {}
1616
IPAddress ethernetGetIpAddress() {return IPAddress((uint32_t)0);}
1717
void ethernetUpdate() {}
@@ -27,10 +27,11 @@ void ethernetWebServerStopESP32W5500() {}
2727
// NTP: Network Time Protocol
2828
//----------------------------------------
2929

30-
void menuNTP() {systemPrint("NOT compiled");}
30+
void menuNTP() {systemPrint("NTP not compiled");}
3131
void ntpServerBegin() {}
3232
void ntpServerUpdate() {}
3333
void ntpValidateTables() {}
34+
void ntpServerStop() {}
3435

3536
#endif // COMPILE_ETHERNET
3637

@@ -40,15 +41,15 @@ void ntpValidateTables() {}
4041
// Network layer
4142
//----------------------------------------
4243

43-
void menuNetwork() {systemPrint("NOT compiled");}
44+
void menuNetwork() {systemPrint("Network not compiled");}
4445
void networkUpdate() {}
4546
void networkVerifyTables() {}
4647

4748
//----------------------------------------
4849
// NTRIP client
4950
//----------------------------------------
5051

51-
void ntripClientPrintStatus() {systemPrint("NOT compiled");}
52+
void ntripClientPrintStatus() {systemPrint("NTRIP Client not compiled");}
5253
void ntripClientStart()
5354
{
5455
systemPrintln("NTRIP Client not available: Ethernet and WiFi not compiled");
@@ -62,7 +63,7 @@ void ntripClientValidateTables() {}
6263
//----------------------------------------
6364

6465
bool ntripServerIsCasting() {return false;}
65-
void ntripServerPrintStatus() {systemPrint("NOT compiled");}
66+
void ntripServerPrintStatus() {systemPrint("NTRIP Server not compiled");}
6667
void ntripServerProcessRTCM(uint8_t incoming) {}
6768
void ntripServerStart()
6869
{
@@ -80,7 +81,11 @@ void ntripServerValidateTables() {}
8081

8182
#ifndef COMPILE_AP
8283

83-
bool startWebServer(bool startWiFi = true, int httpPort = 80) {return false;}
84+
bool startWebServer(bool startWiFi = true, int httpPort = 80)
85+
{
86+
systemPrintln("AP not compiled");
87+
return false;
88+
}
8489
void stopWebServer() {}
8590
bool parseIncomingSettings() {return false;}
8691

@@ -95,6 +100,8 @@ uint16_t pvtClientSendData(uint16_t dataHead) {return 0;};
95100
void pvtClientUpdate() {}
96101
void pvtClientValidateTables() {}
97102
void pvtClientZeroTail() {}
103+
void discardPvtClientBytes(RING_BUFFER_OFFSET previousTail, RING_BUFFER_OFFSET newTail) {}
104+
98105

99106
//----------------------------------------
100107
// PVT server
@@ -103,6 +110,8 @@ void pvtClientZeroTail() {}
103110
int pvtServerSendData(uint16_t dataHead) {return 0;}
104111
void pvtServerUpdate() {}
105112
void pvtServerZeroTail() {}
113+
void pvtServerValidateTables() {}
114+
void discardPvtServerBytes(RING_BUFFER_OFFSET previousTail, RING_BUFFER_OFFSET newTail) {}
106115

107116
//----------------------------------------
108117
// PVT UDP server
@@ -116,7 +125,7 @@ void pvtUdpServerZeroTail() {}
116125
// WiFi
117126
//----------------------------------------
118127

119-
void menuWiFi() {systemPrintln("NOT compiled");};
128+
void menuWiFi() {systemPrintln("WiFi not compiled");};
120129
bool wifiConnect(unsigned long timeout) {return false;}
121130
IPAddress wifiGetGatewayIpAddress() {return IPAddress((uint32_t)0);}
122131
IPAddress wifiGetIpAddress() {return IPAddress((uint32_t)0);}
@@ -129,5 +138,7 @@ void wifiPrintNetworkInfo() {}
129138
void wifiStart() {}
130139
void wifiStop() {}
131140
void wifiUpdate() {}
141+
void wifiShutdown() {}
142+
#define WIFI_STOP() {}
132143

133144
#endif // COMPILE_WIFI

‎Firmware/RTK_Surveyor/Display.ino

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -428,9 +428,6 @@ void updateDisplay()
428428
iconsRadio = setWiFiIcon(); // Blink WiFi in center
429429
paintGettingKeys();
430430
break;
431-
case (STATE_KEYS_PROVISION_WIFI_TIMEOUT):
432-
// Do nothing. Quick, fall through state.
433-
break;
434431

435432
case (STATE_ESPNOW_PAIRING_NOT_STARTED):
436433
paintEspNowPairing();
@@ -2088,7 +2085,7 @@ void displayWiFiConfig()
20882085

20892086
#ifdef COMPILE_AP
20902087
IPAddress myIpAddress;
2091-
if (settings.wifiConfigOverAP == true)
2088+
if (WiFi.getMode() == WIFI_AP)
20922089
myIpAddress = WiFi.softAPIP();
20932090
else
20942091
myIpAddress = WiFi.localIP();

0 commit comments

Comments
 (0)