Skip to content

Commit 1d24afd

Browse files
LeeLeahy2nseidle
LeeLeahy2
authored and
nseidle
committed
WiFi Config: Display button down arrows after save
There was a display bug when a section (e.g GNSS Config) was opened up and the save button is pressed. Prior to pressing the save button, the arrow on the section button (e.g. GNSS Config) is point up to indicate that the section may be collapsed. After pressing the save button, the section is collapsed but the arrow on the section button remains pointing up. This change fixes this display error by changing all of the section buttons to have a down arrow. Each of the caret icons is given a name (id) and any icon direction is removed and the icon down direction is added.
1 parent 9dd6e79 commit 1d24afd

File tree

3 files changed

+54
-41
lines changed

3 files changed

+54
-41
lines changed

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ <h2>
9797
<div class="d-grid gap-2">
9898
<button class="btn btn-primary toggle-btn" type="button" data-toggle="collapse"
9999
data-target="#collapseGNSSConfig" aria-expanded="false" aria-controls="collapseGNSSConfig">
100-
GNSS Configuration <i class="caret-icon bi icon-caret-up"></i>
100+
GNSS Configuration <i id="gnssCaret" class="caret-icon bi icon-caret-up"></i>
101101
</button>
102102
</div>
103103
<div class="collapse show" id="collapseGNSSConfig">
@@ -265,8 +265,8 @@ <h2>
265265
<input type="text" class="form-control" id="ntripClient_MountPointPW">
266266
<p id="ntripClient_MountPointPWError" class="inlineError"></p>
267267
</div>
268-
</div>
269-
268+
</div>
269+
270270
<div class="form-check mt-1 box-margin20">
271271
<label class="form-check-label" for="ntripClient_TransmitGGA">Transmit GGA to Caster</label>
272272
<input class="form-check-input" type="checkbox" value="" id="ntripClient_TransmitGGA" unchecked>
@@ -276,12 +276,12 @@ <h2>
276276
</span>
277277
</div>
278278
</div>
279-
279+
280280
<div id="messageRateButton">
281281
<button class="btn btn-md btn-outline-primary mt-3 toggle-btn" type="button"
282282
data-toggle="collapse" data-target="#collapseGNSSConfigMsg" aria-expanded="false"
283283
aria-controls="collapseGNSSConfigMsg">
284-
Message Rates <i class="caret-icon bi icon-caret-down"></i>
284+
Message Rates <i id="gnssMsgCaret" class="caret-icon bi icon-caret-down"></i>
285285
</button>
286286
<span class="tt" data-bs-placement="right"
287287
title="NMEA and RAWX are the two most commonly reported types of message but the receiver supports more than 70 different messages. Each message rate input controls which messages are disabled (0) and how often the message is reported (1 = one message reported per 1 fix, 5 = one report every 5 fixes). Default: NMEA GGA, GSA, GST, GSV, and RMC. Limits: 0 to 20.">
@@ -846,7 +846,7 @@ <h2>
846846
<div class="d-grid gap-2">
847847
<button class="btn btn-primary mt-3 toggle-btn" id="baseConfig" type="button" data-toggle="collapse"
848848
data-target="#collapseBaseConfig" aria-expanded="false" aria-controls="collapseBaseConfig">
849-
Base Configuration <i class="caret-icon bi icon-caret-down"></i>
849+
Base Configuration <i id="baseCaret" class="caret-icon bi icon-caret-down"></i>
850850
</button>
851851
</div>
852852
<div class="collapse" id="collapseBaseConfig">
@@ -1055,7 +1055,7 @@ <h2>
10551055
<div class="d-grid gap-2">
10561056
<button class="btn btn-primary mt-3 toggle-btn" id="sensorConfig" type="button" data-toggle="collapse"
10571057
data-target="#collapseSensorConfig" aria-expanded="false" aria-controls="collapseSensorConfig">
1058-
Sensor Configuration <i class="caret-icon bi icon-caret-down"></i>
1058+
Sensor Configuration <i id="sensorCaret" class="caret-icon bi icon-caret-down"></i>
10591059
</button>
10601060
</div>
10611061
<div class="collapse" id="collapseSensorConfig">
@@ -1083,7 +1083,7 @@ <h2>
10831083
<div class="d-grid gap-2">
10841084
<button class="btn btn-primary mt-3 toggle-btn" id="ppConfig" type="button" data-toggle="collapse"
10851085
data-target="#collapsePPConfig" aria-expanded="false" aria-controls="collapsePPConfig">
1086-
PointPerfect Configuration <i class="caret-icon bi icon-caret-down"></i>
1086+
PointPerfect Configuration <i id="pointPerfectCaret" class="caret-icon bi icon-caret-down"></i>
10871087
</button>
10881088
</div>
10891089
<div class="collapse" id="collapsePPConfig">
@@ -1149,12 +1149,12 @@ <h2>
11491149
</div>
11501150
</div>
11511151
</div>
1152-
1152+
11531153
<!-- --------- Ports Config --------- -->
11541154
<div class="d-grid gap-2">
11551155
<button class="btn btn-primary mt-3 toggle-btn" type="button" data-toggle="collapse"
11561156
data-target="#collapsePortsConfig" aria-expanded="false" aria-controls="collapsePortsConfig">
1157-
Ports Configuration <i class="caret-icon bi icon-caret-down"></i>
1157+
Ports Configuration <i id="portsCaret" class="caret-icon bi icon-caret-down"></i>
11581158
</button>
11591159
</div>
11601160
<div class="collapse" id="collapsePortsConfig">
@@ -1270,7 +1270,7 @@ <h2>
12701270
<div class="d-grid gap-2">
12711271
<button class="btn btn-primary mt-3 toggle-btn" type="button" data-toggle="collapse"
12721272
data-target="#collapseSystemConfig" aria-expanded="false" aria-controls="collapseSystemConfig">
1273-
System Configuration <i class="caret-icon bi icon-caret-down"></i>
1273+
System Configuration <i id="systemCaret" class="caret-icon bi icon-caret-down"></i>
12741274
</button>
12751275
</div>
12761276
<div class="collapse" id="collapseSystemConfig">
@@ -1397,4 +1397,4 @@ <h2>
13971397
</script>
13981398
</body>
13991399

1400-
</html>
1400+
</html>

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

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -186,15 +186,22 @@ function checkMessageValue(id) {
186186
checkElementValue(id, 0, 20, "Must be between 0 and 20", "collapseGNSSConfigMsg");
187187
}
188188

189+
function collapseSection(section, caret) {
190+
ge(section).classList.remove('show');
191+
ge(caret).classList.remove('icon-caret-down');
192+
ge(caret).classList.remove('icon-caret-up');
193+
ge(caret).classList.add('icon-caret-down');
194+
}
195+
189196
function validateFields() {
190197
//Collapse all sections
191-
ge("collapseGNSSConfig").classList.remove('show');
192-
ge("collapseGNSSConfigMsg").classList.remove('show');
193-
ge("collapseBaseConfig").classList.remove('show');
194-
ge("collapseSensorConfig").classList.remove('show');
195-
ge("collapsePPConfig").classList.remove('show');
196-
ge("collapsePortsConfig").classList.remove('show');
197-
ge("collapseSystemConfig").classList.remove('show');
198+
collapseSection("collapseGNSSConfig", "gnssCaret");
199+
collapseSection("collapseGNSSConfigMsg", "gnssMsgCaret");
200+
collapseSection("collapseBaseConfig", "baseCaret");
201+
collapseSection("collapseSensorConfig", "sensorCaret");
202+
collapseSection("collapsePPConfig", "pointPerfectCaret");
203+
collapseSection("collapsePortsConfig", "portsCaret");
204+
collapseSection("collapseSystemConfig", "systemCaret");
198205

199206
errorCount = 0;
200207

@@ -378,7 +385,7 @@ function validateFields() {
378385
if(ge("enablePointPerfectCorrections").checked == true) {
379386
checkElementString("home_wifiSSID", 1, 30, "Must be 1 to 30 characters", "collapsePPConfig");
380387
checkElementString("home_wifiPW", 0, 30, "Must be 0 to 30 characters", "collapsePPConfig");
381-
388+
382389
value = ge("pointPerfectDeviceProfileToken").value;
383390
console.log(value);
384391
if (value.length > 0)
@@ -736,4 +743,4 @@ document.addEventListener("DOMContentLoaded", (event) => {
736743
}
737744
});
738745

739-
})
746+
})

‎Firmware/RTK_Surveyor/form.h‎

Lines changed: 26 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -209,15 +209,22 @@ function checkMessageValue(id) {
209209
checkElementValue(id, 0, 20, "Must be between 0 and 20", "collapseGNSSConfigMsg");
210210
}
211211

212+
function collapseSection(section, caret) {
213+
ge(section).classList.remove('show');
214+
ge(caret).classList.remove('icon-caret-down');
215+
ge(caret).classList.remove('icon-caret-up');
216+
ge(caret).classList.add('icon-caret-down');
217+
}
218+
212219
function validateFields() {
213220
//Collapse all sections
214-
ge("collapseGNSSConfig").classList.remove('show');
215-
ge("collapseGNSSConfigMsg").classList.remove('show');
216-
ge("collapseBaseConfig").classList.remove('show');
217-
ge("collapseSensorConfig").classList.remove('show');
218-
ge("collapsePPConfig").classList.remove('show');
219-
ge("collapsePortsConfig").classList.remove('show');
220-
ge("collapseSystemConfig").classList.remove('show');
221+
collapseSection("collapseGNSSConfig", "gnssCaret");
222+
collapseSection("collapseGNSSConfigMsg", "gnssMsgCaret");
223+
collapseSection("collapseBaseConfig", "baseCaret");
224+
collapseSection("collapseSensorConfig", "sensorCaret");
225+
collapseSection("collapsePPConfig", "pointPerfectCaret");
226+
collapseSection("collapsePortsConfig", "portsCaret");
227+
collapseSection("collapseSystemConfig", "systemCaret");
221228

222229
errorCount = 0;
223230

@@ -401,7 +408,7 @@ function validateFields() {
401408
if(ge("enablePointPerfectCorrections").checked == true) {
402409
checkElementString("home_wifiSSID", 1, 30, "Must be 1 to 30 characters", "collapsePPConfig");
403410
checkElementString("home_wifiPW", 0, 30, "Must be 0 to 30 characters", "collapsePPConfig");
404-
411+
405412
value = ge("pointPerfectDeviceProfileToken").value;
406413
console.log(value);
407414
if (value.length > 0)
@@ -863,7 +870,7 @@ static const char *index_html = R"=====(
863870
<div class="d-grid gap-2">
864871
<button class="btn btn-primary toggle-btn" type="button" data-toggle="collapse"
865872
data-target="#collapseGNSSConfig" aria-expanded="false" aria-controls="collapseGNSSConfig">
866-
GNSS Configuration <i class="caret-icon bi icon-caret-up"></i>
873+
GNSS Configuration <i id="gnssCaret" class="caret-icon bi icon-caret-up"></i>
867874
</button>
868875
</div>
869876
<div class="collapse show" id="collapseGNSSConfig">
@@ -1031,8 +1038,8 @@ static const char *index_html = R"=====(
10311038
<input type="text" class="form-control" id="ntripClient_MountPointPW">
10321039
<p id="ntripClient_MountPointPWError" class="inlineError"></p>
10331040
</div>
1034-
</div>
1035-
1041+
</div>
1042+
10361043
<div class="form-check mt-1 box-margin20">
10371044
<label class="form-check-label" for="ntripClient_TransmitGGA">Transmit GGA to Caster</label>
10381045
<input class="form-check-input" type="checkbox" value="" id="ntripClient_TransmitGGA" unchecked>
@@ -1042,12 +1049,12 @@ static const char *index_html = R"=====(
10421049
</span>
10431050
</div>
10441051
</div>
1045-
1052+
10461053
<div id="messageRateButton">
10471054
<button class="btn btn-md btn-outline-primary mt-3 toggle-btn" type="button"
10481055
data-toggle="collapse" data-target="#collapseGNSSConfigMsg" aria-expanded="false"
10491056
aria-controls="collapseGNSSConfigMsg">
1050-
Message Rates <i class="caret-icon bi icon-caret-down"></i>
1057+
Message Rates <i id="gnssMsgCaret" class="caret-icon bi icon-caret-down"></i>
10511058
</button>
10521059
<span class="tt" data-bs-placement="right"
10531060
title="NMEA and RAWX are the two most commonly reported types of message but the receiver supports more than 70 different messages. Each message rate input controls which messages are disabled (0) and how often the message is reported (1 = one message reported per 1 fix, 5 = one report every 5 fixes). Default: NMEA GGA, GSA, GST, GSV, and RMC. Limits: 0 to 20.">
@@ -1612,7 +1619,7 @@ static const char *index_html = R"=====(
16121619
<div class="d-grid gap-2">
16131620
<button class="btn btn-primary mt-3 toggle-btn" id="baseConfig" type="button" data-toggle="collapse"
16141621
data-target="#collapseBaseConfig" aria-expanded="false" aria-controls="collapseBaseConfig">
1615-
Base Configuration <i class="caret-icon bi icon-caret-down"></i>
1622+
Base Configuration <i id="baseCaret" class="caret-icon bi icon-caret-down"></i>
16161623
</button>
16171624
</div>
16181625
<div class="collapse" id="collapseBaseConfig">
@@ -1821,7 +1828,7 @@ static const char *index_html = R"=====(
18211828
<div class="d-grid gap-2">
18221829
<button class="btn btn-primary mt-3 toggle-btn" id="sensorConfig" type="button" data-toggle="collapse"
18231830
data-target="#collapseSensorConfig" aria-expanded="false" aria-controls="collapseSensorConfig">
1824-
Sensor Configuration <i class="caret-icon bi icon-caret-down"></i>
1831+
Sensor Configuration <i id="sensorCaret" class="caret-icon bi icon-caret-down"></i>
18251832
</button>
18261833
</div>
18271834
<div class="collapse" id="collapseSensorConfig">
@@ -1849,7 +1856,7 @@ static const char *index_html = R"=====(
18491856
<div class="d-grid gap-2">
18501857
<button class="btn btn-primary mt-3 toggle-btn" id="ppConfig" type="button" data-toggle="collapse"
18511858
data-target="#collapsePPConfig" aria-expanded="false" aria-controls="collapsePPConfig">
1852-
PointPerfect Configuration <i class="caret-icon bi icon-caret-down"></i>
1859+
PointPerfect Configuration <i id="pointPerfectCaret" class="caret-icon bi icon-caret-down"></i>
18531860
</button>
18541861
</div>
18551862
<div class="collapse" id="collapsePPConfig">
@@ -1870,7 +1877,6 @@ static const char *index_html = R"=====(
18701877
</div>
18711878

18721879
<div id="ppSettingsConfig">
1873-
18741880
<div class="form-group row">
18751881
<label for="home_wifiSSID" class="box-margin20 col-sm-3 col-4 col-form-label">Home WiFi
18761882
SSID:</label>
@@ -1916,12 +1922,12 @@ static const char *index_html = R"=====(
19161922
</div>
19171923
</div>
19181924
</div>
1919-
1925+
19201926
<!-- --------- Ports Config --------- -->
19211927
<div class="d-grid gap-2">
19221928
<button class="btn btn-primary mt-3 toggle-btn" type="button" data-toggle="collapse"
19231929
data-target="#collapsePortsConfig" aria-expanded="false" aria-controls="collapsePortsConfig">
1924-
Ports Configuration <i class="caret-icon bi icon-caret-down"></i>
1930+
Ports Configuration <i id="portsCaret" class="caret-icon bi icon-caret-down"></i>
19251931
</button>
19261932
</div>
19271933
<div class="collapse" id="collapsePortsConfig">
@@ -2037,7 +2043,7 @@ static const char *index_html = R"=====(
20372043
<div class="d-grid gap-2">
20382044
<button class="btn btn-primary mt-3 toggle-btn" type="button" data-toggle="collapse"
20392045
data-target="#collapseSystemConfig" aria-expanded="false" aria-controls="collapseSystemConfig">
2040-
System Configuration <i class="caret-icon bi icon-caret-down"></i>
2046+
System Configuration <i id="systemCaret" class="caret-icon bi icon-caret-down"></i>
20412047
</button>
20422048
</div>
20432049
<div class="collapse" id="collapseSystemConfig">

0 commit comments

Comments
 (0)