Skip to content

Commit 9cb2996

Browse files
PaulZCPaulZC
committed
Merge branch 'release_candidate' into Changes_from_RTK_Firmware
2 parents c7dc480 + 7c8549c commit 9cb2996

File tree

3 files changed

+56
-70
lines changed

3 files changed

+56
-70
lines changed

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

Lines changed: 53 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -284,22 +284,22 @@ function parseIncoming(msg) {
284284
else if (id.includes("fmNext")) {
285285
sendFile();
286286
}
287-
else if (id.includes("ubxMessageRate")) { // ubxMessageRate_UBX_NMEA_DTM ubxMessageRateBase_UBX_RTCM_1005
287+
else if (id.includes("ubxMessageRate")) { // ubxMessageRate_NMEA_DTM ubxMessageRateBase_RTCM_1005
288288
var messageName = id;
289289
var messageRate = val;
290290
var messageNameLabel = "";
291291

292292
var messageData = messageName.split('_');
293-
if (messageData.length >= 4) {
294-
var messageType = messageData[2]; // ubxMessageRate_UBX_NMEA_DTM = NMEA
293+
if (messageData.length >= 3) {
294+
var messageType = messageData[1]; // ubxMessageRate_NMEA_DTM = NMEA
295295
if (lastMessageType != messageType) {
296296
lastMessageType = messageType;
297297
messageText += "<hr>";
298298
}
299299

300-
messageNameLabel = messageData[2] + "_" + messageData[3]; // ubxMessageRate_UBX_RTCM_4072_0 = RTCM_4072
301-
if (messageData.length == 5) {
302-
messageNameLabel = messageData[2] + "_" + messageData[3] + "_" + messageData[4]; // ubxMessageRate_UBX_RTCM_4072_0 = RTCM_4072_0
300+
messageNameLabel = messageData[1] + "_" + messageData[2]; // ubxMessageRateBase_RTCM_1005 = RTCM_1005
301+
if (messageData.length == 4) {
302+
messageNameLabel = messageData[1] + "_" + messageData[2] + "_" + messageData[3]; // ubxMessageRate_RTCM_4072_0 = RTCM_4072_0
303303
}
304304
}
305305

@@ -862,30 +862,16 @@ function saveConfig() {
862862
}
863863

864864
function checkConstellations() {
865-
if ((platformPrefix == "EVK") || (platformPrefix == "Facet v2")) {
866-
if ((ge("ubxConstellation_GPS").checked == false)
867-
&& (ge("ubxConstellation_Galileo").checked == false)
868-
&& (ge("ubxConstellation_BeiDou").checked == false)
869-
&& (ge("ubxConstellation_GLONASS").checked == false)) {
870-
ge("collapseGNSSConfig").classList.add('show');
871-
showError('gnssConstellations', "Please choose one constellation");
872-
errorCount++;
873-
}
874-
else
875-
clearError("gnssConstellations");
876-
}
877-
if (platformPrefix == "Torch") {
878-
if ((ge("constellation_GPS").checked == false)
879-
&& (ge("constellation_Galileo").checked == false)
880-
&& (ge("constellation_BeiDou").checked == false)
881-
&& (ge("constellation_GLONASS").checked == false)) {
882-
ge("collapseGNSSConfig").classList.add('show');
883-
showError('gnssConstellations', "Please choose one constellation");
884-
errorCount++;
885-
}
886-
else
887-
clearError("gnssConstellations");
865+
if ((ge("constellation_GPS").checked == false)
866+
&& (ge("constellation_Galileo").checked == false)
867+
&& (ge("constellation_BeiDou").checked == false)
868+
&& (ge("constellation_GLONASS").checked == false)) {
869+
ge("collapseGNSSConfig").classList.add('show');
870+
showError('gnssConstellations', "Please choose one constellation");
871+
errorCount++;
888872
}
873+
else
874+
clearError("gnssConstellations");
889875
}
890876

891877
function checkBitMapValue(id, min, max, bitMap, errorText, collapseID) {
@@ -1086,11 +1072,11 @@ function zeroBaseMessages() {
10861072
function resetToSurveyingDefaults() {
10871073
zeroMessages();
10881074
if ((platformPrefix == "EVK") || (platformPrefix == "Facet v2")) {
1089-
ge("ubxMessageRate_UBX_NMEA_GGA").value = 1;
1090-
ge("ubxMessageRate_UBX_NMEA_GSA").value = 1;
1091-
ge("ubxMessageRate_UBX_NMEA_GST").value = 1;
1092-
ge("ubxMessageRate_UBX_NMEA_GSV").value = 4;
1093-
ge("ubxMessageRate_UBX_NMEA_RMC").value = 1;
1075+
ge("ubxMessageRate_NMEA_GGA").value = 1;
1076+
ge("ubxMessageRate_NMEA_GSA").value = 1;
1077+
ge("ubxMessageRate_NMEA_GST").value = 1;
1078+
ge("ubxMessageRate_NMEA_GSV").value = 4;
1079+
ge("ubxMessageRate_NMEA_RMC").value = 1;
10941080
}
10951081
else if (platformPrefix == "Torch") {
10961082
ge("messageRateNMEA_GPGGA").value = 0.5;
@@ -1103,14 +1089,14 @@ function resetToSurveyingDefaults() {
11031089
function resetToLoggingDefaults() {
11041090
zeroMessages();
11051091
if ((platformPrefix == "EVK") || (platformPrefix == "Facet v2")) {
1106-
ge("ubxMessageRate_UBX_NMEA_GGA").value = 1;
1107-
ge("ubxMessageRate_UBX_NMEA_GSA").value = 1;
1108-
ge("ubxMessageRate_UBX_NMEA_GST").value = 1;
1109-
ge("ubxMessageRate_UBX_NMEA_GSV").value = 4;
1110-
ge("ubxMessageRate_UBX_NMEA_RMC").value = 1;
1092+
ge("ubxMessageRate_NMEA_GGA").value = 1;
1093+
ge("ubxMessageRate_NMEA_GSA").value = 1;
1094+
ge("ubxMessageRate_NMEA_GST").value = 1;
1095+
ge("ubxMessageRate_NMEA_GSV").value = 4;
1096+
ge("ubxMessageRate_NMEA_RMC").value = 1;
11111097

1112-
ge("ubxMessageRate_UBX_RXM_RAWX").value = 1;
1113-
ge("ubxMessageRate_UBX_RXM_SFRBX").value = 1;
1098+
ge("ubxMessageRate_RXM_RAWX").value = 1;
1099+
ge("ubxMessageRate_RXM_SFRBX").value = 1;
11141100
}
11151101
else if (platformPrefix == "Torch") {
11161102
ge("messageRateNMEA_GPGGA").value = 0.5;
@@ -1129,20 +1115,20 @@ function resetToLoggingDefaults() {
11291115
function resetToRTCMDefaults() {
11301116
zeroBaseMessages();
11311117
if ((platformPrefix == "EVK") || (platformPrefix == "Facet v2")) {
1132-
ge("ubxMessageRateBase_UBX_RTCM_1005").value = 1;
1133-
ge("ubxMessageRateBase_UBX_RTCM_1074").value = 1;
1134-
ge("ubxMessageRateBase_UBX_RTCM_1077").value = 0;
1135-
ge("ubxMessageRateBase_UBX_RTCM_1084").value = 1;
1136-
ge("ubxMessageRateBase_UBX_RTCM_1087").value = 0;
1118+
ge("ubxMessageRateBase_RTCM_1005").value = 1;
1119+
ge("ubxMessageRateBase_RTCM_1074").value = 1;
1120+
ge("ubxMessageRateBase_RTCM_1077").value = 0;
1121+
ge("ubxMessageRateBase_RTCM_1084").value = 1;
1122+
ge("ubxMessageRateBase_RTCM_1087").value = 0;
11371123

1138-
ge("ubxMessageRateBase_UBX_RTCM_1094").value = 1;
1139-
ge("ubxMessageRateBase_UBX_RTCM_1097").value = 0;
1140-
ge("ubxMessageRateBase_UBX_RTCM_1124").value = 1;
1141-
ge("ubxMessageRateBase_UBX_RTCM_1127").value = 0;
1142-
ge("ubxMessageRateBase_UBX_RTCM_1230").value = 10;
1124+
ge("ubxMessageRateBase_RTCM_1094").value = 1;
1125+
ge("ubxMessageRateBase_RTCM_1097").value = 0;
1126+
ge("ubxMessageRateBase_RTCM_1124").value = 1;
1127+
ge("ubxMessageRateBase_RTCM_1127").value = 0;
1128+
ge("ubxMessageRateBase_RTCM_1230").value = 10;
11431129

1144-
ge("ubxMessageRateBase_UBX_RTCM_4072_0").value = 0;
1145-
ge("ubxMessageRateBase_UBX_RTCM_4072_1").value = 0;
1130+
ge("ubxMessageRateBase_RTCM_4072_0").value = 0;
1131+
ge("ubxMessageRateBase_RTCM_4072_1").value = 0;
11461132
}
11471133
else if (platformPrefix == "Torch") {
11481134
ge("messageRateRTCMBase_RTCM1005").value = 1.0;
@@ -1157,20 +1143,20 @@ function resetToRTCMDefaults() {
11571143
function resetToRTCMLowBandwidth() {
11581144
zeroBaseMessages();
11591145
if ((platformPrefix == "EVK") || (platformPrefix == "Facet v2")) {
1160-
ge("ubxMessageRateBase_UBX_RTCM_1005").value = 10;
1161-
ge("ubxMessageRateBase_UBX_RTCM_1074").value = 2;
1162-
ge("ubxMessageRateBase_UBX_RTCM_1077").value = 0;
1163-
ge("ubxMessageRateBase_UBX_RTCM_1084").value = 2;
1164-
ge("ubxMessageRateBase_UBX_RTCM_1087").value = 0;
1165-
1166-
ge("ubxMessageRateBase_UBX_RTCM_1094").value = 2;
1167-
ge("ubxMessageRateBase_UBX_RTCM_1097").value = 0;
1168-
ge("ubxMessageRateBase_UBX_RTCM_1124").value = 2;
1169-
ge("ubxMessageRateBase_UBX_RTCM_1127").value = 0;
1170-
ge("ubxMessageRateBase_UBX_RTCM_1230").value = 10;
1171-
1172-
ge("ubxMessageRateBase_UBX_RTCM_4072_0").value = 0;
1173-
ge("ubxMessageRateBase_UBX_RTCM_4072_1").value = 0;
1146+
ge("ubxMessageRateBase_RTCM_1005").value = 10;
1147+
ge("ubxMessageRateBase_RTCM_1074").value = 2;
1148+
ge("ubxMessageRateBase_RTCM_1077").value = 0;
1149+
ge("ubxMessageRateBase_RTCM_1084").value = 2;
1150+
ge("ubxMessageRateBase_RTCM_1087").value = 0;
1151+
1152+
ge("ubxMessageRateBase_RTCM_1094").value = 2;
1153+
ge("ubxMessageRateBase_RTCM_1097").value = 0;
1154+
ge("ubxMessageRateBase_RTCM_1124").value = 2;
1155+
ge("ubxMessageRateBase_RTCM_1127").value = 0;
1156+
ge("ubxMessageRateBase_RTCM_1230").value = 10;
1157+
1158+
ge("ubxMessageRateBase_RTCM_4072_0").value = 0;
1159+
ge("ubxMessageRateBase_RTCM_4072_1").value = 0;
11741160
}
11751161
else if (platformPrefix == "Torch") {
11761162
ge("messageRateRTCMBase_RTCM1005").value = 2.0;

‎Firmware/RTK_Everywhere/Form.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1091,7 +1091,7 @@ void createMessageListBase(String &returnText)
10911091
for (int messageNumber = 0; messageNumber < MAX_UBX_MSG_RTCM; messageNumber++)
10921092
{
10931093
if (messageSupported(firstRTCMRecord + messageNumber) == true)
1094-
returnText += "messageRateBase_" + String(ubxMessages[messageNumber + firstRTCMRecord].msgTextName) +
1094+
returnText += "ubxMessageRateBase_" + String(ubxMessages[messageNumber + firstRTCMRecord].msgTextName) +
10951095
"," + String(settings.ubxMessageRatesBase[messageNumber]) + ","; // UBX_RTCM_1074Base,4,
10961096
}
10971097
}

‎Firmware/RTK_Everywhere/settings.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1803,8 +1803,8 @@ const RTK_Settings_Entry rtkSettingsEntries[] =
18031803
// ublox GNSS Receiver
18041804
{ 0, 1, 1, 0, 1, 1, 0, 0, _bool, 0, & settings.enableUART2UBXIn, "enableUART2UBXIn", },
18051805
{ 1, 1, 1, 1, 1, 1, 0, 0, tUbxConst, MAX_CONSTELLATIONS, & settings.ubxConstellations[0], "constellation_", },
1806-
{ 1, 0, 1, 1, 1, 1, 0, 0, tUbxMsgRt, MAX_UBX_MSG, & settings.ubxMessageRates[0], "messageRate_", },
1807-
{ 1, 0, 1, 1, 1, 1, 0, 0, tUbMsgRtb, MAX_UBX_MSG_RTCM, & settings.ubxMessageRatesBase[0], "messageRateBase_", },
1806+
{ 1, 0, 1, 1, 1, 1, 0, 0, tUbxMsgRt, MAX_UBX_MSG, & settings.ubxMessageRates[0], "ubxMessageRate_", },
1807+
{ 1, 0, 1, 1, 1, 1, 0, 0, tUbMsgRtb, MAX_UBX_MSG_RTCM, & settings.ubxMessageRatesBase[0], "ubxMessageRateBase_", },
18081808

18091809
// UDP Server
18101810
{ 0, 0, 0, 0, 1, 1, 1, 1, _bool, 0, & settings.debugUdpServer, "debugUdpServer", },

0 commit comments

Comments
 (0)