Skip to content

Commit 42e84f2

Browse files
authored
Merge pull request #272 from sparkfun/release_candidate
Release v1.0
2 parents e45ae0b + fbd45a6 commit 42e84f2

Some content is hidden

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

54 files changed

+10319
-8489
lines changed

.github/workflows/non-release-build.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,8 @@ env:
77
FILENAME_PREFIX: RTK_Everywhere_Firmware
88
FIRMWARE_VERSION_MAJOR: 0
99
FIRMWARE_VERSION_MINOR: 9
10-
POINTPERFECT_LBAND_PAID_TOKEN: ${{ secrets.POINTPERFECT_LBAND_PAID_TOKEN }}
11-
POINTPERFECT_LBAND_FREE_TOKEN: ${{ secrets.POINTPERFECT_LBAND_FREE_TOKEN }}
12-
POINTPERFECT_IP_FREE_TOKEN: ${{ secrets.POINTPERFECT_IP_FREE_TOKEN }}
13-
POINTPERFECT_IP_PAID_TOKEN: ${{ secrets.POINTPERFECT_IP_PAID_TOKEN }}
10+
POINTPERFECT_LBAND_TOKEN: ${{ secrets.POINTPERFECT_LBAND_TOKEN }}
11+
POINTPERFECT_IP_TOKEN: ${{ secrets.POINTPERFECT_IP_TOKEN }}
1412

1513
jobs:
1614
build:
@@ -142,7 +140,7 @@ jobs:
142140
run: arduino-cli compile --fqbn "esp32:esp32:esp32":DebugLevel=${{ env.DEBUG_LEVEL }},PSRAM=enabled ./Firmware/RTK_Everywhere/RTK_Everywhere.ino
143141
--build-property build.partitions=RTKEverywhere
144142
--build-property upload.maximum_size=3145728
145-
--build-property "compiler.cpp.extra_flags=\"-DPOINTPERFECT_LBAND_PAID_TOKEN=$POINTPERFECT_LBAND_PAID_TOKEN\" \"-DPOINTPERFECT_LBAND_FREE_TOKEN=$POINTPERFECT_LBAND_FREE_TOKEN\" \"-DPOINTPERFECT_IP_PAID_TOKEN=$POINTPERFECT_IP_PAID_TOKEN\" \"-DPOINTPERFECT_IP_FREE_TOKEN=$POINTPERFECT_IP_FREE_TOKEN\" \"-DFIRMWARE_VERSION_MAJOR=$FIRMWARE_VERSION_MAJOR\" \"-DFIRMWARE_VERSION_MINOR=$FIRMWARE_VERSION_MINOR\" \"-DENABLE_DEVELOPER=${{ env.ENABLE_DEVELOPER }}\""
143+
--build-property "compiler.cpp.extra_flags=\"-DPOINTPERFECT_LBAND_TOKEN=$POINTPERFECT_LBAND_TOKEN\" \"-DPOINTPERFECT_IP_TOKEN=$POINTPERFECT_IP_TOKEN\" \"-DFIRMWARE_VERSION_MAJOR=$FIRMWARE_VERSION_MAJOR\" \"-DFIRMWARE_VERSION_MINOR=$FIRMWARE_VERSION_MINOR\" \"-DENABLE_DEVELOPER=${{ env.ENABLE_DEVELOPER }}\""
146144
--export-binaries
147145

148146
- name: Create artifact name

Firmware/RTK_Everywhere/AP-Config/index.html

Lines changed: 575 additions & 350 deletions
Large diffs are not rendered by default.

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

Lines changed: 543 additions & 254 deletions
Large diffs are not rendered by default.

Firmware/RTK_Everywhere/Base.ino

Lines changed: 16 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,20 @@
1+
// This function gets called when an RTCM packet passes parser check in processUart1Message() task
2+
// Pass data along to NTRIP Server, or ESP-NOW radio
3+
void processRTCM(uint8_t *rtcmData, uint16_t dataLength)
4+
{
5+
// Give this byte to the various possible transmission methods
6+
for (int x = 0; x < dataLength; x++)
7+
{
8+
for (int serverIndex = 0; serverIndex < NTRIP_SERVER_MAX; serverIndex++)
9+
ntripServerProcessRTCM(serverIndex, rtcmData[x]);
10+
}
111

12+
for (int x = 0; x < dataLength; x++)
13+
espnowProcessRTCM(rtcmData[x]);
14+
15+
rtcmLastPacketSent = millis();
16+
rtcmPacketsSent++;
217

3-
// This function gets called from the SparkFun u-blox Arduino Library.
4-
// As each RTCM byte comes in you can specify what to do with it
5-
// Useful for passing the RTCM correction data to a radio, Ntrip broadcaster, etc.
6-
void DevUBLOXGNSS::processRTCM(uint8_t incoming)
7-
{
818
// Check for too many digits
919
if (settings.enableResetDisplay == true)
1020
{
@@ -16,22 +26,4 @@ void DevUBLOXGNSS::processRTCM(uint8_t incoming)
1626
if (rtcmPacketsSent > 999)
1727
rtcmPacketsSent = 1; // Trim to three digits to avoid log icon and increasing bar
1828
}
19-
20-
// Determine if we should check this byte with the RTCM checker or simply pass it along
21-
bool passAlongIncomingByte = true;
22-
23-
if (settings.enableRtcmMessageChecking == true)
24-
passAlongIncomingByte &= checkRtcmMessage(incoming);
25-
26-
// Give this byte to the various possible transmission methods
27-
if (passAlongIncomingByte)
28-
{
29-
rtcmLastReceived = millis();
30-
rtcmBytesSent++;
31-
32-
for (int serverIndex = 0; serverIndex < NTRIP_SERVER_MAX; serverIndex++)
33-
ntripServerProcessRTCM(serverIndex, incoming);
34-
35-
espnowProcessRTCM(incoming);
36-
}
37-
}
29+
}

0 commit comments

Comments
 (0)