Skip to content

Commit b57a12c

Browse files
nseidlenseidle
authored
Merge pull request #799 from sparkfun/release_candidate
Add TCP/UDP support for ethernet
2 parents ef2d44b + b2bb297 commit b57a12c

20 files changed

+1202
-638
lines changed

‎.github/workflows/compile-rtk-firmware.yml‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,10 @@ on:
66
env:
77
FILENAME_PREFIX: RTK_Surveyor_Firmware
88
FIRMWARE_VERSION_MAJOR: 4
9-
FIRMWARE_VERSION_MINOR: 2
9+
FIRMWARE_VERSION_MINOR: 3
1010
POINTPERFECT_TOKEN: ${{ secrets.POINTPERFECT_TOKEN }}
11+
#We limit the ESP32 core to v2.0.2
12+
CORE_VERSION: 2.0.2
1113

1214
jobs:
1315
build:
@@ -17,7 +19,7 @@ jobs:
1719

1820
steps:
1921
- name: Checkout
20-
uses: actions/checkout@master
22+
uses: actions/checkout@main
2123

2224
- name: Get current date
2325
id: date
@@ -59,9 +61,8 @@ jobs:
5961
- name: Update index
6062
run: arduino-cli core update-index
6163

62-
#We limit the ESP32 core to v2.0.2
6364
- name: Install platform
64-
run: arduino-cli core install esp32:esp32@2.0.2
65+
run: arduino-cli core install esp32:esp32@${{ env.CORE_VERSION }}
6566

6667
- name: Get Known Libraries
6768
run: arduino-cli lib install
@@ -92,14 +93,14 @@ jobs:
9293
#- name: Patch ESP32 Core
9394
# run: |
9495
# cd Firmware/RTK_Surveyor/Patch/
95-
# cp WiFiGeneric.cpp /home/runner/.arduino15/packages/esp32/hardware/esp32/2.0.2/libraries/WiFi/src/WiFiGeneric.cpp
96+
# cp WiFiGeneric.cpp /home/runner/.arduino15/packages/esp32/hardware/esp32/${{ env.CORE_VERSION }}/libraries/WiFi/src/WiFiGeneric.cpp
9697

9798
#Patch Server.h to avoid https://github.com/arduino-libraries/Ethernet/issues/88#issuecomment-455498941
9899
#Note: this patch can be removed if/when we upgrade to ESP32 core >= v2.0.6
99100
- name: Patch ESP32 Server.h for Ethernet
100101
run: |
101102
cd Firmware/RTK_Surveyor/Patch/
102-
cp Server.h /home/runner/.arduino15/packages/esp32/hardware/esp32/2.0.2/cores/esp32/Server.h
103+
cp Server.h /home/runner/.arduino15/packages/esp32/hardware/esp32/${{ env.CORE_VERSION }}/cores/esp32/Server.h
103104
104105
- name: Setup Python
105106
uses: actions/setup-python@v4
@@ -131,7 +132,7 @@ jobs:
131132

132133
- name: Copy custom app3M_fat9M_16MB.csv
133134
run:
134-
cp Firmware/app3M_fat9M_16MB.csv /home/runner/.arduino15/packages/esp32/hardware/esp32/2.0.2/tools/partitions/app3M_fat9M_16MB.csv
135+
cp Firmware/app3M_fat9M_16MB.csv /home/runner/.arduino15/packages/esp32/hardware/esp32/${{ env.CORE_VERSION }}/tools/partitions/app3M_fat9M_16MB.csv
135136

136137
- name: Compile Sketch
137138
run: arduino-cli compile --fqbn "esp32:esp32:esp32":DebugLevel=${{ env.DEBUG_LEVEL }} ./Firmware/RTK_Surveyor/RTK_Surveyor.ino

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

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ env:
88
FIRMWARE_VERSION_MAJOR: 99
99
FIRMWARE_VERSION_MINOR: 99
1010
POINTPERFECT_TOKEN: ${{ secrets.POINTPERFECT_TOKEN }}
11+
#We limit the ESP32 core to v2.0.2
12+
CORE_VERSION: 2.0.2
1113

1214
jobs:
1315
build:
@@ -17,7 +19,7 @@ jobs:
1719

1820
steps:
1921
- name: Checkout
20-
uses: actions/checkout@master
22+
uses: actions/checkout@main
2123

2224
- name: Get current date
2325
id: date
@@ -50,9 +52,11 @@ jobs:
5052
- name: Update index
5153
run: arduino-cli core update-index
5254

53-
#We limit the ESP32 core to v2.0.2
55+
- name: Update library index
56+
run: arduino-cli lib update-index
57+
5458
- name: Install platform
55-
run: arduino-cli core install esp32:esp32@2.0.2
59+
run: arduino-cli core install esp32:esp32@${{ env.CORE_VERSION }}
5660

5761
- name: Get Known Libraries
5862
run: arduino-cli lib install
@@ -83,14 +87,14 @@ jobs:
8387
#- name: Patch ESP32 Core
8488
# run: |
8589
# cd Firmware/RTK_Surveyor/Patch/
86-
# cp WiFiGeneric.cpp /home/runner/.arduino15/packages/esp32/hardware/esp32/2.0.2/libraries/WiFi/src/WiFiGeneric.cpp
90+
# cp WiFiGeneric.cpp /home/runner/.arduino15/packages/esp32/hardware/esp32/${{ env.CORE_VERSION }}/libraries/WiFi/src/WiFiGeneric.cpp
8791

8892
#Patch Server.h to avoid https://github.com/arduino-libraries/Ethernet/issues/88#issuecomment-455498941
8993
#Note: this patch can be removed if/when we upgrade to ESP32 core >= v2.0.6
9094
- name: Patch ESP32 Server.h for Ethernet
9195
run: |
9296
cd Firmware/RTK_Surveyor/Patch/
93-
cp Server.h /home/runner/.arduino15/packages/esp32/hardware/esp32/2.0.2/cores/esp32/Server.h
97+
cp Server.h /home/runner/.arduino15/packages/esp32/hardware/esp32/${{ env.CORE_VERSION }}/cores/esp32/Server.h
9498
9599
- name: Setup Python
96100
uses: actions/setup-python@v4
@@ -122,7 +126,7 @@ jobs:
122126

123127
- name: Copy custom app3M_fat9M_16MB.csv
124128
run:
125-
cp Firmware/app3M_fat9M_16MB.csv /home/runner/.arduino15/packages/esp32/hardware/esp32/2.0.2/tools/partitions/app3M_fat9M_16MB.csv
129+
cp Firmware/app3M_fat9M_16MB.csv /home/runner/.arduino15/packages/esp32/hardware/esp32/${{ env.CORE_VERSION }}/tools/partitions/app3M_fat9M_16MB.csv
126130

127131
- name: Compile Sketch
128132
run: arduino-cli compile --fqbn "esp32:esp32:esp32":DebugLevel=${{ env.DEBUG_LEVEL }} ./Firmware/RTK_Surveyor/RTK_Surveyor.ino
@@ -143,7 +147,7 @@ jobs:
143147
mv RTK_Surveyor.ino.elf ${{ env.ARTIFACT }}
144148
145149
- name: Upload artifact directory to action - avoid double-zip
146-
uses: actions/upload-artifact@v3
150+
uses: actions/upload-artifact@v4
147151
with:
148152
name: ${{ env.ARTIFACT }}
149153
path: Firmware/RTK_Surveyor/build/esp32.esp32.esp32/${{ env.ARTIFACT }}

‎Firmware/RTK_Surveyor/Developer.ino‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,17 @@ void pvtUdpServerUpdate() {}
9292
void pvtUdpServerZeroTail() {}
9393
void discardPvtUdpServerBytes(RING_BUFFER_OFFSET previousTail, RING_BUFFER_OFFSET newTail) {}
9494

95+
//----------------------------------------
96+
// PVT server
97+
//----------------------------------------
98+
99+
int32_t pvtServerSendData(uint16_t dataHead) {return 0;}
100+
void pvtServerStop() {}
101+
void pvtServerUpdate() {}
102+
void pvtServerZeroTail() {}
103+
void pvtServerValidateTables() {}
104+
void discardPvtServerBytes(RING_BUFFER_OFFSET previousTail, RING_BUFFER_OFFSET newTail) {}
105+
95106
#endif // COMPILE_NETWORK
96107

97108
//----------------------------------------
@@ -109,23 +120,12 @@ void stopWebServer() {}
109120
bool parseIncomingSettings() {return false;}
110121

111122
#endif // COMPILE_AP
112-
#ifndef COMPILE_WIFI
113-
114-
//----------------------------------------
115-
// PVT server
116-
//----------------------------------------
117-
118-
int32_t pvtServerSendData(uint16_t dataHead) {return 0;}
119-
void pvtServerStop() {}
120-
void pvtServerUpdate() {}
121-
void pvtServerZeroTail() {}
122-
void pvtServerValidateTables() {}
123-
void discardPvtServerBytes(RING_BUFFER_OFFSET previousTail, RING_BUFFER_OFFSET newTail) {}
124123

125124
//----------------------------------------
126125
// WiFi
127126
//----------------------------------------
128127

128+
#ifndef COMPILE_WIFI
129129
void menuWiFi() {systemPrintln("WiFi not compiled");};
130130
bool wifiConnect(unsigned long timeout) {return false;}
131131
IPAddress wifiGetGatewayIpAddress() {return IPAddress((uint32_t)0);}

0 commit comments

Comments
 (0)