Skip to content

Commit 6bd8ec8

Browse files
nseidlenseidle
authored
Merge pull request #403 from sparkfun/Fix_#144_#150
Fix #144 #150 #151 #275
2 parents d95eefe + e2cec32 commit 6bd8ec8

File tree

9 files changed

+434
-121
lines changed

9 files changed

+434
-121
lines changed

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

Lines changed: 57 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1168,6 +1168,54 @@
11681168
<p id="pointPerfectDeviceProfileTokenError" class="inlineError"></p>
11691169
</div>
11701170
</div>
1171+
1172+
<div class="form-check mt-3">
1173+
<label class="form-check-label" for="requestKeyUpdate">Request Key Update </label>
1174+
<input class="form-check-input" type="checkbox" value="" id="requestKeyUpdate">
1175+
<span class="tt" data-bs-placement="right"
1176+
title="When checked, the PointPerfect keys will be requested and updated at the next opportunity. Default: Disabled">
1177+
<span class="icon-info-circle text-primary ms-2"></span>
1178+
</span>
1179+
</div>
1180+
1181+
<div id="useAssistNowCheckbox">
1182+
<div class="form-check mt-3">
1183+
<label class="form-check-label" for="useAssistNow">AssistNow </label>
1184+
<input class="form-check-input" type="checkbox" value="" id="useAssistNow">
1185+
<span class="tt" data-bs-placement="right"
1186+
title="When enabled, AssistNow MGA data will be requested to improve GNSS acquisition performance. Default: Disabled">
1187+
<span class="icon-info-circle text-primary ms-2"></span>
1188+
</span>
1189+
</div>
1190+
</div>
1191+
1192+
<div class="form-check mt-3">
1193+
<label class="form-check-label" for="useLocalizedDistribution">Localized Distribution </label>
1194+
<input class="form-check-input" type="checkbox" value="" id="useLocalizedDistribution">
1195+
<span class="tt" data-bs-placement="right"
1196+
title="When enabled, localized corrections for your location will be used instead of the continental corrections. Default: Disabled">
1197+
<span class="icon-info-circle text-primary ms-2"></span>
1198+
</span>
1199+
</div>
1200+
1201+
<div id="localizedDistributionTileLevelDropdown">
1202+
<label for="localizedDistributionTileLevel">Localized Distribution Tile Level:</label>
1203+
<select name="localizedDistributionTileLevel" id="localizedDistributionTileLevel" class="form-dropdown mb-2">
1204+
<option value="0">1000 x 1000km Sparse</option>
1205+
<option value="1">500 x 500km Sparse</option>
1206+
<option value="2">250 x 250km Sparse</option>
1207+
<option value="3">1000 x 1000km High Density</option>
1208+
<option value="4">500 x 500km High Density</option>
1209+
<option value="5">250 x 250km High Density</option>
1210+
</select>
1211+
<span class="tt" data-bs-placement="right"
1212+
title="Select the localized distribution tile level. High Density is recommended. Sparse may be deprecated. Default: 250 x 250km High Density">
1213+
<span class="icon-info-circle text-primary ms-2"></span>
1214+
</span>
1215+
<br>
1216+
</div>
1217+
1218+
11711219
</div>
11721220
</div>
11731221
</div>
@@ -1309,29 +1357,17 @@
13091357
<span class="icon-info-circle text-primary ms-2"></span>
13101358
</span>
13111359
</div>
1312-
1313-
<div class="form-check mt-3">
1314-
<label class="form-check-label" for="enableGnssToUsbSerial">Enable GNSS output over
1315-
USB</label>
1316-
<input class="form-check-input" type="checkbox" value="" id="enableGnssToUsbSerial">
1317-
<span class="tt" data-bs-placement="right"
1318-
title="Output GNSS serial data (ie, NMEA and RTCM) over the USB port instead of status messages. Default: False">
1319-
<span class="icon-info-circle text-primary ms-2"></span>
1320-
</span>
1321-
</div>
13221360
</div>
13231361

1324-
<!-- For devices that don't have an external port, present the USB output option only-->
1325-
<div id="noExternalPortOptions">
1326-
<div class="form-check mt-3">
1327-
<label class="form-check-label" for="enableGnssToUsbSerial">Enable GNSS output over
1328-
USB</label>
1329-
<input class="form-check-input" type="checkbox" value="" id="enableGnssToUsbSerial">
1330-
<span class="tt" data-bs-placement="right"
1331-
title="Output GNSS serial data (ie, NMEA and RTCM) over the USB port instead of status messages. Default: False">
1332-
<span class="icon-info-circle text-primary ms-2"></span>
1333-
</span>
1334-
</div>
1362+
<!-- Always show Enable GNSS output over USB -->
1363+
<div class="form-check mt-3">
1364+
<label class="form-check-label" for="enableGnssToUsbSerial">Enable GNSS output over
1365+
USB</label>
1366+
<input class="form-check-input" type="checkbox" value="" id="enableGnssToUsbSerial">
1367+
<span class="tt" data-bs-placement="right"
1368+
title="Output GNSS serial data (ie, NMEA and RTCM) over the USB port instead of status messages. Default: False">
1369+
<span class="icon-info-circle text-primary ms-2"></span>
1370+
</span>
13351371
</div>
13361372
</div>
13371373
</div>

‎Firmware/RTK_Everywhere/AP-Config/src/main.js

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -103,49 +103,53 @@ function parseIncoming(msg) {
103103
show("ppConfig");
104104
show("ethernetConfig");
105105
show("ntpConfig");
106-
hide("portsConfig");
106+
show("portsConfig");
107+
hide("externalPortOptions");
107108
show("logToSDCard");
108109
hide("galileoHasSetting");
109110
hide("tiltConfig");
110111
hide("beeperControl");
112+
show("useAssistNowCheckbox");
111113
}
112114
else if (platformPrefix == "Facet v2") {
113115
show("baseConfig");
114116
show("ppConfig");
115117
hide("ethernetConfig");
116118
hide("ntpConfig");
117119
show("portsConfig");
118-
hide("noExternalPortOptions");
120+
show("externalPortOptions");
119121
show("logToSDCard");
120122
hide("galileoHasSetting");
121123
hide("tiltConfig");
122124
hide("beeperControl");
125+
show("useAssistNowCheckbox");
123126
}
124127
else if (platformPrefix == "Facet mosaic") {
125128
show("baseConfig");
126129
show("ppConfig");
127130
hide("ethernetConfig");
128131
hide("ntpConfig");
129132
show("portsConfig");
130-
hide("noExternalPortOptions");
133+
show("externalPortOptions");
131134
show("logToSDCard");
132135
hide("tiltConfig");
133136
hide("beeperControl");
137+
hide("useAssistNowCheckbox");
134138
}
135139
else if (platformPrefix == "Torch") {
136140
show("baseConfig");
137141
show("ppConfig");
138142
hide("ethernetConfig");
139143
hide("ntpConfig");
140144
show("portsConfig");
141-
142145
hide("externalPortOptions");
143-
show("noExternalPortOptions");
144146

145147
hide("logToSDCard");
146148

147149
hide("constellationSbas"); //Not supported on UM980
148150

151+
show("useAssistNowCheckbox"); //Does the PPL use MGA? Not sure...
152+
149153
select = ge("dynamicModel");
150154
let newOption = new Option('Survey', '0');
151155
select.add(newOption, undefined);
@@ -435,6 +439,7 @@ function parseIncoming(msg) {
435439
ge("enableARPLogging").dispatchEvent(new CustomEvent('change'));
436440
ge("enableAutoFirmwareUpdate").dispatchEvent(new CustomEvent('change'));
437441
ge("enableAutoReset").dispatchEvent(new CustomEvent('change'));
442+
ge("useLocalizedDistribution").dispatchEvent(new CustomEvent('change'));
438443

439444
updateECEFList();
440445
updateGeodeticList();
@@ -1384,6 +1389,15 @@ document.addEventListener("DOMContentLoaded", (event) => {
13841389
}
13851390
});
13861391

1392+
ge("useLocalizedDistribution").addEventListener("change", function () {
1393+
if (ge("useLocalizedDistribution").checked) {
1394+
show("localizedDistributionTileLevelDropdown");
1395+
}
1396+
else {
1397+
hide("localizedDistributionTileLevelDropdown");
1398+
}
1399+
});
1400+
13871401
ge("enableExternalPulse").addEventListener("change", function () {
13881402
if (ge("enableExternalPulse").checked == true) {
13891403
show("externalPulseConfigDetails");

0 commit comments

Comments
 (0)