Skip to content

Commit 36feded

Browse files
nseidlenseidle
authored
Merge pull request #419 from sparkfun/release_candidate
Merge v3.2
2 parents d9bfc7e + db5336a commit 36feded

Some content is hidden

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

44 files changed

+3977
-1818
lines changed

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

Lines changed: 78 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,11 @@
5858
font-weight: bold;
5959
}
6060

61+
.box-small {
62+
margin-left: 0px;
63+
width: 30%;
64+
}
65+
6166
.box-margin20 {
6267
margin-left: 20px;
6368
}
@@ -87,9 +92,10 @@ <h2>
8792
<div align="center"><img src="src/rtk-setup.png" alt="SparkFun RTK WiFi Setup">
8893
</div>
8994
</h2>
90-
<div class="col-sm-12 mt-3">
91-
<div align="center" class="small">
92-
RTK Firmware: <span id="rtkFirmwareVersion" style="display:inline;">v0.0</span> <br>
95+
<!-- <div class="col-sm-12 mt-3"> -->
96+
<div class="row">
97+
<div align="center" class="small coulm left">
98+
RTK Firmware: <span id="rtkFirmwareVersion" style="display:inline;">v0.0</span><br>
9399
<span id="zedFirmwareVersion" style="display:inline;">ZED-F9P Firmware: v0.0</span> <br>
94100
<span id="deviceBTID" style="display:inline;">Device Bluetooth ID: 0000</span> <br>
95101
<span id="coordinatesLLH" style="display:inline;">LLh:
@@ -103,6 +109,10 @@ <h2>
103109
<span id="ecefZ" style="display:inline;">4086665.484</span>
104110
</span><br>
105111
</div>
112+
<div class="column right">
113+
<img id="batteryIconFileName" src="src/BatteryBlank.png" alt="Battery level">
114+
<span id="batteryPercent" style="display:inline;"></span>
115+
</div>
106116
</div>
107117

108118
<hr class="mt-0">
@@ -942,8 +952,8 @@ <h2>
942952
<!-- --------- Base Config --------- -->
943953
<div class="d-grid gap-2">
944954
<button class="btn btn-primary mt-3 toggle-btn" id="baseConfig" type="button" data-toggle="collapse"
945-
data-target="#collapseBaseConfig" aria-expanded="false" aria-controls="collapseBaseConfig"
946-
style="display:none">
955+
data-target="#collapseBaseConfig" aria-expanded="false" aria-controls="collapseBaseConfig">
956+
<!-- style="display:none"> -->
947957
Base Configuration <i id="baseCaret" class="caret-icon bi icon-caret-down"></i>
948958
</button>
949959
</div>
@@ -1003,7 +1013,7 @@ <h2>
10031013
<div class="form-group row">
10041014
<div class="box-margin40 col-sm-8 col-8 col-form-label">
10051015
<button type="button" id="useECEFCoordinates" class="btn btn-primary box-margin20"
1006-
onClick="useECEFCoordinates()">Paste Current XYZ</button>
1016+
onClick="useECEFCoordinates()">Load ECEF From ZED</button>
10071017
<span class="tt" data-bs-placement="right"
10081018
title="Puts the current ECEF coordinates into the fixed X/Y/Z boxes.">
10091019
<span class="icon-info-circle text-primary ms-2"></span>
@@ -1100,8 +1110,8 @@ <h2>
11001110
<div class="form-group row">
11011111
<div class="box-margin40 col-sm-8 col-8 col-form-label">
11021112
<button type="button" id="useGeodeticCoordinates"
1103-
class="btn btn-primary box-margin20" onClick="useGeodeticCoordinates()">Paste
1104-
Current LLh</button>
1113+
class="btn btn-primary box-margin20" onClick="useGeodeticCoordinates()">Load LLh
1114+
From ZED</button>
11051115
<span class="tt" data-bs-placement="right"
11061116
title="Puts the current LLh into the fixed LLh boxes.">
11071117
<span class="icon-info-circle text-primary ms-2"></span>
@@ -1128,18 +1138,42 @@ <h2>
11281138
</div>
11291139

11301140
<div class="form-group row">
1131-
<label for="fixedAltitude" class="box-margin40 col-sm-3 col-5 col-form-label">HAE
1132-
Mark/Alt(m):
1141+
<div class="form-group row">
1142+
<label for="fixedAltitude" class="box-margin40 col-sm-3 col-6 col-form-label">HAE
1143+
Mark/Alt(m):
1144+
<span class="tt" data-bs-placement="right"
1145+
title="Height Above Ellipsoid of the mark. This is the coordinate or altitude of the mark or monument on the ground.">
1146+
<span class="icon-info-circle text-primary ms-2"></span>
1147+
</span>
1148+
</label>
1149+
<div class="col-sm-4 col-4">
1150+
<input type="number" class="form-control" id="fixedAltitude">
1151+
</div>
1152+
</div>
1153+
<p id="fixedAltitudeError" class="inlineError"></p>
1154+
</div>
1155+
1156+
<div class="form-group row">
1157+
<span style="display:inline; margin-left:40px;">
1158+
<input type="radio" name="markRadio" value="1" onClick="adjustHAE()">
1159+
<label id="calcHAEMark">Calculate HAE Mark</label>
11331160
<span class="tt" data-bs-placement="right"
1134-
title="Height Above Ellipsoid of the mark. This is the coordinate or altitude of the mark or monument on the ground.">
1161+
title="If enabled, HAE Mark is calculated by *subtracting* the entered Antenna Height and ARP from the altitude reported by the GNSS receiver. This is handy when measuring a mark with a known pole height and ARP, but unknown mark elevation. Note: The HAE Mark value is always recorded to the Commonly Used Coordinates table.">
11351162
<span class="icon-info-circle text-primary ms-2"></span>
11361163
</span>
1137-
</label>
1138-
<div class="col-sm-4 col-5">
1139-
<input type="number" class="form-control" id="fixedAltitude">
1140-
<p id="fixedAltitudeError" class="inlineError"></p>
1141-
</div>
1142-
</div><br>
1164+
</span>
1165+
</div>
1166+
<div class="form-group row">
1167+
<span style="display:inline; margin-left:40px;">
1168+
<input type="radio" name="markRadio" value="2" onClick="adjustHAE()" checked>
1169+
<label id="callHAEAPC">Calculate HAE APC</label>
1170+
<span class="tt" data-bs-placement="right"
1171+
title="If enabled, HAE APC is calculated by *adding* the entered Antenna Height and ARP to the altitude reported by the GNSS receiver. Note: The HAE Mark value is always recorded to the Commonly Used Coordinates table.">
1172+
<span class="icon-info-circle text-primary ms-2"></span>
1173+
</span>
1174+
</span>
1175+
</div>
1176+
11431177

11441178
<div class="form-group row">
11451179
<label for="antennaHeight" class="box-margin40 col-sm-3 col-5 col-form-label">Antenna
@@ -1160,7 +1194,7 @@ <h2>
11601194
<label for="antennaReferencePoint" class="box-margin40 col-5 col-form-label">Antenna
11611195
Reference Point(mm):
11621196
<span class="tt" data-bs-placement="right"
1163-
title="ARP is the distance from the base of the antenna to the antenna phase center. This is usually printed on the side of the antenna and is calculated during antenna calibration. Amount is added to HAE before starting fixed base.">
1197+
title="ARP is the distance from the base of the antenna to the antenna phase center. This is usually printed on the side of the antenna and is calculated during antenna calibration. Amount is added to HAE before starting fixed base. Common ARPs: Facet(61.4mm) Facet L-Band (69mm) TOP106(52.9)">
11641198
<span class="icon-info-circle text-primary ms-2"></span>
11651199
</span>
11661200
</label>
@@ -1809,35 +1843,36 @@ <h2>
18091843
</div>
18101844

18111845
<div id="enableLoggingDetails" class="collapse mb-2">
1812-
<div id="maxLogTime Input" class="row">
1813-
<div class="col-sm-4 col-9 form-group">
1814-
<label for="maxLogTime_minutes" class="form-group box-margin20">Max Log
1815-
Time (min):<span class="tt" data-bs-placement="right"
1816-
title="Once the max log time is achieved, logging will cease. This is useful for limiting long term, overnight, static surveys to a certain length of time. Default: 1440 minutes. Limit: 1 to 2880 minutes.">
1817-
<span class="icon-info-circle text-primary ms-2"></span>
1818-
</span>
1819-
</label>
1820-
</div>
18211846

1822-
<div class="col-sm-4 col-5 ms-3 form-group">
1823-
<input type="number" class="form-control" id="maxLogTime_minutes">
1824-
<p id="maxLogTime_minutesError" class="inlineError"></p>
1825-
</div>
1847+
<div class="form-group row">
1848+
<label for="maxLogTime_minutes" class="box-margin40 col-sm-3 col-7 col-form-label">Max Log
1849+
Time (min):
1850+
<span class="tt" data-bs-placement="right"
1851+
title="Once the max log time is achieved, logging will cease. This is useful for limiting long term, overnight, static surveys to a certain length of time. Default: 1440 minutes. Limit: 1 to 2880 minutes.">
1852+
<span class="icon-info-circle text-primary ms-2"></span>
1853+
</span>
1854+
</label>
1855+
<input type="number" class="form-control box-small" id="maxLogTime_minutes">
1856+
<p id="maxLogTime_minutesError" class="inlineError"></p>
18261857
</div>
18271858

1828-
<div id="maxLogLength Input" class="row">
1829-
<div class="col-sm-4 col-9 form-group">
1830-
<label for="maxLogLength_minutes" class="form-group box-margin20">Max Log
1831-
Length (min):<span class="tt" data-bs-placement="right"
1832-
title="Once this length of time is achieved, a new log will be created. This is useful for creating multiple logs over a long survey. Default: 1440 minutes. Limit: 1 to 2880 minutes.">
1833-
<span class="icon-info-circle text-primary ms-2"></span>
1834-
</span>
1835-
</label>
1836-
</div>
1859+
<div class="form-group row">
1860+
<label for="maxLogLength_minutes" class="box-margin40 col-sm-3 col-7 col-form-label">Max Log
1861+
Length (min):<span class="tt" data-bs-placement="right"
1862+
title="Once this length of time is achieved, a new log will be created. This is useful for creating multiple logs over a long survey. Default: 1440 minutes. Limit: 1 to 2880 minutes.">
1863+
<span class="icon-info-circle text-primary ms-2"></span>
1864+
</span>
1865+
</label>
18371866

1838-
<div class="col-sm-4 col-5 ms-3 form-group">
1839-
<input type="number" class="form-control" id="maxLogLength_minutes">
1840-
<p id="maxLogLength_minutesError" class="inlineError"></p>
1867+
<input type="number" class="form-control box-small" id="maxLogLength_minutes">
1868+
<p id="maxLogLength_minutesError" class="inlineError"></p>
1869+
</div>
1870+
1871+
<div id="logFile" class="row">
1872+
<div class="mb-2">
1873+
<label for="logFile" class="form-group box-margin20">Log file name: <span
1874+
id="logFileName" style="display:inline;">SFE_Log.ubx</span>
1875+
</label>
18411876
</div>
18421877
</div>
18431878

‎Firmware/RTK_Surveyor/AP-Config/src/Battery0.png‎

440 Bytes
Loading

‎Firmware/RTK_Surveyor/AP-Config/src/Battery0_Charging.png‎

452 Bytes
Loading

‎Firmware/RTK_Surveyor/AP-Config/src/Battery1.png‎

552 Bytes
Loading

‎Firmware/RTK_Surveyor/AP-Config/src/Battery1_Charging.png‎

526 Bytes
Loading

‎Firmware/RTK_Surveyor/AP-Config/src/Battery2.png‎

697 Bytes
Loading

‎Firmware/RTK_Surveyor/AP-Config/src/Battery2_Charging.png‎

590 Bytes
Loading

‎Firmware/RTK_Surveyor/AP-Config/src/Battery3.png‎

716 Bytes
Loading

‎Firmware/RTK_Surveyor/AP-Config/src/Battery3_Charging.png‎

636 Bytes
Loading

‎Firmware/RTK_Surveyor/AP-Config/src/BatteryBlank.png‎

175 Bytes
Loading

0 commit comments

Comments
 (0)