Skip to content

Fix #144 #150 #151 #275 #403

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nseidle merged 11 commits into from
Jul 8, 2024
Merged

Fix #144 #150 #151 #275 #403

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
b75f937
Revamp MQTT_Client. Add localised distribution
PaulZC Jul 3, 2024
b2af920
Merge branch 'release_candidate' into Fix_#144_#150
PaulZC Jul 4, 2024
55daec6
Add support for AssistNow
PaulZC Jul 4, 2024
157b9d5
Add web config support for localised distribution and AssistNow
PaulZC Jul 4, 2024
b4aca7c
Fix duplicate form field
PaulZC Jul 4, 2024
92ed632
Change localised to localized
PaulZC Jul 4, 2024
b7c0d96
Disable ENABLE_DEVELOPER 15min key attempt
PaulZC Jul 4, 2024
01e3005
forceKeyAttempt becomes settings.requestKeyUpdate. Add to web config
PaulZC Jul 4, 2024
d93d2b0
Increase provisioningTimeout to 2 mins. Maybe it should be even longer?
PaulZC Jul 6, 2024
988ca7c
Update mqttClientLastDataReceived when the connection is made
PaulZC Jul 6, 2024
e2cec32
Better corrections debugging
PaulZC Jul 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
78 changes: 57 additions & 21 deletions Firmware/RTK_Everywhere/AP-Config/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1168,6 +1168,54 @@
<p id="pointPerfectDeviceProfileTokenError" class="inlineError"></p>
</div>
</div>

<div class="form-check mt-3">
<label class="form-check-label" for="requestKeyUpdate">Request Key Update </label>
<input class="form-check-input" type="checkbox" value="" id="requestKeyUpdate">
<span class="tt" data-bs-placement="right"
title="When checked, the PointPerfect keys will be requested and updated at the next opportunity. Default: Disabled">
<span class="icon-info-circle text-primary ms-2"></span>
</span>
</div>

<div id="useAssistNowCheckbox">
<div class="form-check mt-3">
<label class="form-check-label" for="useAssistNow">AssistNow </label>
<input class="form-check-input" type="checkbox" value="" id="useAssistNow">
<span class="tt" data-bs-placement="right"
title="When enabled, AssistNow MGA data will be requested to improve GNSS acquisition performance. Default: Disabled">
<span class="icon-info-circle text-primary ms-2"></span>
</span>
</div>
</div>

<div class="form-check mt-3">
<label class="form-check-label" for="useLocalizedDistribution">Localized Distribution </label>
<input class="form-check-input" type="checkbox" value="" id="useLocalizedDistribution">
<span class="tt" data-bs-placement="right"
title="When enabled, localized corrections for your location will be used instead of the continental corrections. Default: Disabled">
<span class="icon-info-circle text-primary ms-2"></span>
</span>
</div>

<div id="localizedDistributionTileLevelDropdown">
<label for="localizedDistributionTileLevel">Localized Distribution Tile Level:</label>
<select name="localizedDistributionTileLevel" id="localizedDistributionTileLevel" class="form-dropdown mb-2">
<option value="0">1000 x 1000km Sparse</option>
<option value="1">500 x 500km Sparse</option>
<option value="2">250 x 250km Sparse</option>
<option value="3">1000 x 1000km High Density</option>
<option value="4">500 x 500km High Density</option>
<option value="5">250 x 250km High Density</option>
</select>
<span class="tt" data-bs-placement="right"
title="Select the localized distribution tile level. High Density is recommended. Sparse may be deprecated. Default: 250 x 250km High Density">
<span class="icon-info-circle text-primary ms-2"></span>
</span>
<br>
</div>


</div>
</div>
</div>
Expand Down Expand Up @@ -1309,29 +1357,17 @@
<span class="icon-info-circle text-primary ms-2"></span>
</span>
</div>

<div class="form-check mt-3">
<label class="form-check-label" for="enableGnssToUsbSerial">Enable GNSS output over
USB</label>
<input class="form-check-input" type="checkbox" value="" id="enableGnssToUsbSerial">
<span class="tt" data-bs-placement="right"
title="Output GNSS serial data (ie, NMEA and RTCM) over the USB port instead of status messages. Default: False">
<span class="icon-info-circle text-primary ms-2"></span>
</span>
</div>
</div>

<!-- For devices that don't have an external port, present the USB output option only-->
<div id="noExternalPortOptions">
<div class="form-check mt-3">
<label class="form-check-label" for="enableGnssToUsbSerial">Enable GNSS output over
USB</label>
<input class="form-check-input" type="checkbox" value="" id="enableGnssToUsbSerial">
<span class="tt" data-bs-placement="right"
title="Output GNSS serial data (ie, NMEA and RTCM) over the USB port instead of status messages. Default: False">
<span class="icon-info-circle text-primary ms-2"></span>
</span>
</div>
<!-- Always show Enable GNSS output over USB -->
<div class="form-check mt-3">
<label class="form-check-label" for="enableGnssToUsbSerial">Enable GNSS output over
USB</label>
<input class="form-check-input" type="checkbox" value="" id="enableGnssToUsbSerial">
<span class="tt" data-bs-placement="right"
title="Output GNSS serial data (ie, NMEA and RTCM) over the USB port instead of status messages. Default: False">
<span class="icon-info-circle text-primary ms-2"></span>
</span>
</div>
</div>
</div>
Expand Down
24 changes: 19 additions & 5 deletions Firmware/RTK_Everywhere/AP-Config/src/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,49 +103,53 @@ function parseIncoming(msg) {
show("ppConfig");
show("ethernetConfig");
show("ntpConfig");
hide("portsConfig");
show("portsConfig");
hide("externalPortOptions");
show("logToSDCard");
hide("galileoHasSetting");
hide("tiltConfig");
hide("beeperControl");
show("useAssistNowCheckbox");
}
else if (platformPrefix == "Facet v2") {
show("baseConfig");
show("ppConfig");
hide("ethernetConfig");
hide("ntpConfig");
show("portsConfig");
hide("noExternalPortOptions");
show("externalPortOptions");
show("logToSDCard");
hide("galileoHasSetting");
hide("tiltConfig");
hide("beeperControl");
show("useAssistNowCheckbox");
}
else if (platformPrefix == "Facet mosaic") {
show("baseConfig");
show("ppConfig");
hide("ethernetConfig");
hide("ntpConfig");
show("portsConfig");
hide("noExternalPortOptions");
show("externalPortOptions");
show("logToSDCard");
hide("tiltConfig");
hide("beeperControl");
hide("useAssistNowCheckbox");
}
else if (platformPrefix == "Torch") {
show("baseConfig");
show("ppConfig");
hide("ethernetConfig");
hide("ntpConfig");
show("portsConfig");

hide("externalPortOptions");
show("noExternalPortOptions");

hide("logToSDCard");

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

show("useAssistNowCheckbox"); //Does the PPL use MGA? Not sure...

select = ge("dynamicModel");
let newOption = new Option('Survey', '0');
select.add(newOption, undefined);
Expand Down Expand Up @@ -435,6 +439,7 @@ function parseIncoming(msg) {
ge("enableARPLogging").dispatchEvent(new CustomEvent('change'));
ge("enableAutoFirmwareUpdate").dispatchEvent(new CustomEvent('change'));
ge("enableAutoReset").dispatchEvent(new CustomEvent('change'));
ge("useLocalizedDistribution").dispatchEvent(new CustomEvent('change'));

updateECEFList();
updateGeodeticList();
Expand Down Expand Up @@ -1384,6 +1389,15 @@ document.addEventListener("DOMContentLoaded", (event) => {
}
});

ge("useLocalizedDistribution").addEventListener("change", function () {
if (ge("useLocalizedDistribution").checked) {
show("localizedDistributionTileLevelDropdown");
}
else {
hide("localizedDistributionTileLevelDropdown");
}
});

ge("enableExternalPulse").addEventListener("change", function () {
if (ge("enableExternalPulse").checked == true) {
show("externalPulseConfigDetails");
Expand Down
Loading