Skip to content

Commit a3721de

Browse files
nseidlenseidle
authored
Merge pull request #697 from sparkfun/release_candidate
Merge v2.2 release candidate changes to main
2 parents c02c639 + 03520d9 commit a3721de

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+11135
-8415
lines changed

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,11 @@ on:
66
env:
77
FILENAME_PREFIX: RTK_Everywhere_Firmware
88
FIRMWARE_VERSION_MAJOR: 2
9-
FIRMWARE_VERSION_MINOR: 1
9+
FIRMWARE_VERSION_MINOR: 2
1010
POINTPERFECT_LBAND_TOKEN: ${{ secrets.POINTPERFECT_LBAND_TOKEN }}
1111
POINTPERFECT_IP_TOKEN: ${{ secrets.POINTPERFECT_IP_TOKEN }}
1212
POINTPERFECT_LBAND_IP_TOKEN: ${{ secrets.POINTPERFECT_LBAND_IP_TOKEN }}
13+
POINTPERFECT_RTCM_TOKEN: ${{ secrets.POINTPERFECT_RTCM_TOKEN }}
1314
CORE_VERSION: 3.0.7
1415

1516
jobs:
@@ -94,7 +95,7 @@ jobs:
9495
"SparkFun u-blox PointPerfect Library"@1.11.4
9596
"SparkFun IM19 IMU Arduino Library"@1.0.1
9697
"SparkFun UM980 Triband RTK GNSS Arduino Library"@1.0.4
97-
"SparkFun LG290P Quadband RTK GNSS Arduino Library"@1.0.2
98+
"SparkFun LG290P Quadband RTK GNSS Arduino Library"@1.0.8
9899
"SparkFun I2C Expander Arduino Library"@1.0.1
99100

100101
- name: Patch libmbedtls
@@ -150,7 +151,7 @@ jobs:
150151
run: arduino-cli compile --fqbn "esp32:esp32:esp32":DebugLevel=${{ env.DEBUG_LEVEL }},PSRAM=enabled ./Firmware/RTK_Everywhere/RTK_Everywhere.ino
151152
--build-property build.partitions=RTKEverywhere
152153
--build-property upload.maximum_size=4055040
153-
--build-property "compiler.cpp.extra_flags=-MMD -c \"-DPOINTPERFECT_LBAND_TOKEN=$POINTPERFECT_LBAND_TOKEN\" \"-DPOINTPERFECT_IP_TOKEN=$POINTPERFECT_IP_TOKEN\" \"-DPOINTPERFECT_LBAND_IP_TOKEN=$POINTPERFECT_LBAND_IP_TOKEN\" \"-DFIRMWARE_VERSION_MAJOR=$FIRMWARE_VERSION_MAJOR\" \"-DFIRMWARE_VERSION_MINOR=$FIRMWARE_VERSION_MINOR\" \"-DENABLE_DEVELOPER=${{ env.ENABLE_DEVELOPER }}\""
154+
--build-property "compiler.cpp.extra_flags=-MMD -c \"-DPOINTPERFECT_LBAND_TOKEN=$POINTPERFECT_LBAND_TOKEN\" \"-DPOINTPERFECT_IP_TOKEN=$POINTPERFECT_IP_TOKEN\" \"-DPOINTPERFECT_LBAND_IP_TOKEN=$POINTPERFECT_LBAND_IP_TOKEN\" \"-DPOINTPERFECT_RTCM_TOKEN=$POINTPERFECT_RTCM_TOKEN\" \"-DFIRMWARE_VERSION_MAJOR=$FIRMWARE_VERSION_MAJOR\" \"-DFIRMWARE_VERSION_MINOR=$FIRMWARE_VERSION_MINOR\" \"-DENABLE_DEVELOPER=${{ env.ENABLE_DEVELOPER }}\""
154155
--export-binaries
155156

156157
- name: Rename binary

‎.github/workflows/non-release-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ jobs:
9494
"SparkFun u-blox PointPerfect Library"@1.11.4
9595
"SparkFun IM19 IMU Arduino Library"@1.0.1
9696
"SparkFun UM980 Triband RTK GNSS Arduino Library"@1.0.4
97-
"SparkFun LG290P Quadband RTK GNSS Arduino Library"@1.0.0
97+
"SparkFun LG290P Quadband RTK GNSS Arduino Library"@1.0.7
9898
"SparkFun I2C Expander Arduino Library"@1.0.1
9999

100100
- name: Patch libmbedtls

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

Lines changed: 67 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1190,36 +1190,50 @@
11901190

11911191
<div>
11921192
Device ID: <p id="hardwareID" style="display:inline;">N/A</p><br>
1193-
Days until keys expire: <p id="daysRemaining" style="display:inline;">No Keys</p>
11941193
</div>
11951194

1196-
<div class="form-check mt-3">
1197-
<label class="form-check-label" for="enablePointPerfectCorrections">Enable PointPerfect
1198-
Corrections </label>
1199-
<input class="form-check-input" type="checkbox" value="" id="enablePointPerfectCorrections">
1200-
<span class="tt" data-bs-placement="right"
1201-
title="Use L-Band / IP PointPerfect corrections when available. Default: Disabled">
1202-
<span class="icon-info-circle text-primary ms-2"></span>
1203-
</span>
1204-
</div>
1205-
1206-
<div id="geographicRegionDropdown">
1207-
<label for="geographicRegion">Geographic Region:</label>
1208-
<select name="geographicRegion" id="geographicRegion" class="form-dropdown mb-2">
1209-
<option value="0">US</option>
1210-
<option value="1">EU</option>
1211-
<option value="2">AU</option>
1212-
<option value="3">KR</option>
1213-
<option value="4">Japan</option>
1195+
<div id="pointPerfectServiceDropdown">
1196+
<label for="pointPerfectService">PointPerfect Service:</label>
1197+
<select name="pointPerfectService" id="pointPerfectService" class="form-dropdown mb-2">
12141198
</select>
12151199
<span class="tt" data-bs-placement="right"
1216-
title="Select your geographic region. This defines the L-Band frequency and Regional Correction topic. Default: US">
1200+
title="The device will attempt to use PointPerfect for corrections. The device must be registered through SparkFun. NTRIP/RTCM service requires WiFi. Default: Disabled">
12171201
<span class="icon-info-circle text-primary ms-2"></span>
12181202
</span>
1219-
<br>
1203+
<p id="pointPerfectServiceError" class="inlineError"></p>
12201204
</div>
12211205

1222-
<div id="ppSettingsConfig">
1206+
<div id="ppSettingsLBandNAConfig">
1207+
<div>
1208+
Days until keys expire: <p id="daysRemaining" style="display:inline;">No Keys</p>
1209+
</div>
1210+
1211+
<div class="form-check mt-3">
1212+
<label class="form-check-label" for="requestKeyUpdate"
1213+
id="pointPerfectKeyUpdateLabel">Request Key Update</label>
1214+
<input class="form-check-input" type="checkbox" value="" id="requestKeyUpdate">
1215+
<span class="tt" data-bs-placement="right"
1216+
title="When checked, the PointPerfect keys will be requested and updated at the next opportunity. Default: Disabled">
1217+
<span class="icon-info-circle text-primary ms-2"></span>
1218+
</span>
1219+
</div>
1220+
1221+
<div id="geographicRegionDropdown">
1222+
<label for="geographicRegion">Geographic Region:</label>
1223+
<select name="geographicRegion" id="geographicRegion" class="form-dropdown mb-2">
1224+
<option value="0">US</option>
1225+
<option value="1">EU</option>
1226+
<option value="2">AU</option>
1227+
<option value="3">KR</option>
1228+
<option value="4">Japan</option>
1229+
</select>
1230+
<span class="tt" data-bs-placement="right"
1231+
title="Select your geographic region. This defines the L-Band frequency and Regional Correction topic. Default: US">
1232+
<span class="icon-info-circle text-primary ms-2"></span>
1233+
</span>
1234+
<br>
1235+
</div>
1236+
12231237
<div class="form-check mt-3">
12241238
<label class="form-check-label" for="autoKeyRenewal">Auto Key Renewal </label>
12251239
<input class="form-check-input" type="checkbox" value="" id="autoKeyRenewal">
@@ -1243,15 +1257,6 @@
12431257
</div>
12441258
</div>
12451259

1246-
<div class="form-check mt-3">
1247-
<label class="form-check-label" for="requestKeyUpdate">Request Key Update </label>
1248-
<input class="form-check-input" type="checkbox" value="" id="requestKeyUpdate">
1249-
<span class="tt" data-bs-placement="right"
1250-
title="When checked, the PointPerfect keys will be requested and updated at the next opportunity. Default: Disabled">
1251-
<span class="icon-info-circle text-primary ms-2"></span>
1252-
</span>
1253-
</div>
1254-
12551260
<div id="useAssistNowCheckbox">
12561261
<div class="form-check mt-3">
12571262
<label class="form-check-label" for="useAssistNow">AssistNow </label>
@@ -1315,6 +1320,7 @@
13151320
<div id="radioPortChannelDropdown" class="mb-2">
13161321
<label for="radioPortBaud">Radio Port Baud Rate: </label>
13171322
<select name="radioPortBaud" id="radioPortBaud" class="form-dropdown">
1323+
<!-- These are the compatible options for ZED-F9P and mosaic -->
13181324
<option value="4800">4800</option>
13191325
<option value="9600">9600</option>
13201326
<option value="19200">19200</option>
@@ -1326,7 +1332,7 @@
13261332
<option value="921600">921600</option>
13271333
</select>
13281334
<span class="tt" data-bs-placement="right"
1329-
title="The baud rate for the RADIO port can be changed to match a user's choice of radio. Default: 57600bps">
1335+
title="The baud rate for the RADIO port can be changed to match a user's choice of radio. Default: 57600bps or 115200bps">
13301336
<span class="icon-info-circle text-primary ms-2"></span>
13311337
</span>
13321338
<br>
@@ -1466,6 +1472,16 @@
14661472
<span class="icon-info-circle text-primary ms-2"></span>
14671473
</span>
14681474
</div>
1475+
1476+
<div class="form-check mt-3">
1477+
<label class="form-check-label" for="enableNmeaOnRadio">Enable NMEA output on
1478+
Radio</label>
1479+
<input class="form-check-input" type="checkbox" value="" id="enableNmeaOnRadio">
1480+
<span class="tt" data-bs-placement="right" id="enableNmeaOnRadioInfoText"
1481+
title="Enable NMEA output on external radio. Default: True">
1482+
<span class="icon-info-circle text-primary ms-2"></span>
1483+
</span>
1484+
</div>
14691485
</div>
14701486
</div>
14711487

@@ -1694,6 +1710,18 @@
16941710
<p id="enableUdpServerError" class="inlineError"></p>
16951711
</div>
16961712

1713+
<div id="tcpUdpWiFiTypeDropdown" class="mt-3">
1714+
<label for="tcpUdpOverWiFiStation">TCP/UDP Server Connection: </label>
1715+
<select name="tcpUdpWiFiType" id="tcpUdpOverWiFiStation" class="form-dropdown">
1716+
<option value="1">WiFi</option>
1717+
<option value="0">AP</option>
1718+
</select>
1719+
<span class="tt" data-bs-placement="right"
1720+
title="In WiFi mode, the device will attempt to connect to local WiFi to broadcast TCP/UDP packets. In AP mode, the device will become an Access Point that devices can connect to over WiFi.">
1721+
<span class="icon-info-circle text-primary ms-2"></span>
1722+
</span>
1723+
</div>
1724+
16971725
</div>
16981726
</div>
16991727

@@ -2166,7 +2194,7 @@
21662194
</div>
21672195

21682196
<div id="measurementScaleDropdown" class="mb-2 mt-3">
2169-
<label for="measurementScale">Measurement Scale: </label>
2197+
<label for="measurementScale">Units: </label>
21702198
<select name="measurementScale" id="measurementScale" class="form-dropdown">
21712199
<option value="0">Meters</option>
21722200
<option value="1">Feet/Inches</option>
@@ -2202,8 +2230,10 @@
22022230

22032231
<div id="shutdownNoChargeTimeoutMinutesCheckboxDetail">
22042232
<div class="form-check mt-3">
2205-
<label class="form-check-label" for="shutdownNoChargeTimeoutMinutes">Shutdown if not charging:</label>
2206-
<input class="form-check-input" type="checkbox" value="" id="shutdownNoChargeTimeoutMinutesCheckbox">
2233+
<label class="form-check-label" for="shutdownNoChargeTimeoutMinutes">Shutdown If Not
2234+
Charging</label>
2235+
<input class="form-check-input" type="checkbox" value=""
2236+
id="shutdownNoChargeTimeoutMinutesCheckbox">
22072237
<span class="tt" data-bs-placement="right"
22082238
title="If enabled, device will turn off if no external charger is present. This is helpful when deploying in machinery or where a user may forget to turn the device off. Default: Disabled">
22092239
<span class="icon-info-circle text-primary ms-2"></span>
@@ -2213,7 +2243,8 @@
22132243

22142244
<div id="shutdownNoChargeTimeoutMinutesDetails" class="collapse mb-2">
22152245
<div class="form-group row">
2216-
<label for="shutdownNoChargeTimeoutMinutes" class="box-margin40 col-sm-3 col-7 col-form-label">Minutes before
2246+
<label for="shutdownNoChargeTimeoutMinutes"
2247+
class="box-margin40 col-sm-3 col-7 col-form-label">Minutes before
22172248
shutdown:
22182249
<span class="tt" data-bs-placement="right"
22192250
title="If shutdown is enabled, the device will turn off after this many minutes if no external charger is detected. Limits: 0 (disabled) to 10,080.">

0 commit comments

Comments
 (0)