Skip to content

Commit 89ac550

Browse files
authored
Merge pull request #365 from sparkfun/release_candidate
Release candidate
2 parents 780dfce + 5e31e37 commit 89ac550

31 files changed

+3198
-2024
lines changed

.github/workflows/compile-rc.yml

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,15 @@ jobs:
2222
- name: Setup Arduino CLI
2323
uses: arduino/setup-arduino-cli@v1
2424

25-
#We limit the ESP32 core to v2.0.2. See: https://github.com/sparkfun/SparkFun_RTK_Firmware/issues/334
25+
- name: Start config file
26+
run: arduino-cli config init --additional-urls "https://raw.githubusercontent.com/espressif/arduino-esp32/gh-pages/package_esp32_index.json"
27+
28+
- name: Update index
29+
run: arduino-cli core update-index
30+
31+
#We limit the ESP32 core to v2.0.2
2632
- name: Install platform
2733
run: arduino-cli core install esp32:[email protected]
28-
--additional-urls 'https://raw.githubusercontent.com/espressif/arduino-esp32/gh-pages/package_esp32_index.json'
29-
30-
- name: Start config file
31-
run: arduino-cli config init
3234

3335
- name: Enable external libs
3436
run: arduino-cli config set library.enable_unsafe_install true
@@ -48,11 +50,11 @@ jobs:
4850
https://github.com/knolleary/pubsubclient.git
4951
https://github.com/avinabmalla/ESP32_BleSerial.git
5052

51-
#Incorporate ESP-Now patch into core: https://github.com/espressif/arduino-esp32/pull/7044/files
52-
- name: Patch ESP32 Core
53-
run: |
54-
cd Firmware/RTK_Surveyor/Patch/
55-
cp WiFiGeneric.cpp /home/runner/.arduino15/packages/esp32/hardware/esp32/2.0.4/libraries/WiFi/src/WiFiGeneric.cpp
53+
#Incorporate ESP-Now patch into v2.0.4 core: https://github.com/espressif/arduino-esp32/pull/7044/files
54+
# - name: Patch ESP32 Core
55+
# run: |
56+
# cd Firmware/RTK_Surveyor/Patch/
57+
# cp WiFiGeneric.cpp /home/runner/.arduino15/packages/esp32/hardware/esp32/2.0.4/libraries/WiFi/src/WiFiGeneric.cpp
5658

5759
- name: Compile Sketch
5860
run: arduino-cli compile --fqbn "esp32:esp32:esp32":DebugLevel=debug ./Firmware/RTK_Surveyor/RTK_Surveyor.ino
@@ -63,7 +65,7 @@ jobs:
6365

6466
- name: Get current date
6567
id: date
66-
run: echo "::set-output name=date::$(date +'%b_%d_%Y')"
68+
run: echo "date=$(date +'%b_%d_%Y')" >> $GITHUB_OUTPUT
6769

6870
- name: Rename binary
6971
run: |

.github/workflows/compile-release.yml

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,15 @@ jobs:
2121
- name: Setup Arduino CLI
2222
uses: arduino/setup-arduino-cli@v1
2323

24-
#We limit the ESP32 core to v2.0.2. See: https://github.com/sparkfun/SparkFun_RTK_Firmware/issues/334
24+
- name: Start config file
25+
run: arduino-cli config init --additional-urls "https://raw.githubusercontent.com/espressif/arduino-esp32/gh-pages/package_esp32_index.json"
26+
27+
- name: Update index
28+
run: arduino-cli core update-index
29+
30+
#We limit the ESP32 core to v2.0.2
2531
- name: Install platform
2632
run: arduino-cli core install esp32:[email protected]
27-
--additional-urls 'https://raw.githubusercontent.com/espressif/arduino-esp32/gh-pages/package_esp32_index.json'
28-
29-
- name: Start config file
30-
run: arduino-cli config init
3133

3234
- name: Enable external libs
3335
run: arduino-cli config set library.enable_unsafe_install true
@@ -48,10 +50,10 @@ jobs:
4850
https://github.com/avinabmalla/ESP32_BleSerial.git
4951

5052
#Incorporate ESP-Now patch into core: https://github.com/espressif/arduino-esp32/pull/7044/files
51-
- name: Patch ESP32 Core
52-
run: |
53-
cd Firmware/RTK_Surveyor/Patch/
54-
cp WiFiGeneric.cpp /home/runner/.arduino15/packages/esp32/hardware/esp32/2.0.4/libraries/WiFi/src/WiFiGeneric.cpp
53+
#- name: Patch ESP32 Core
54+
# run: |
55+
# cd Firmware/RTK_Surveyor/Patch/
56+
# cp WiFiGeneric.cpp /home/runner/.arduino15/packages/esp32/hardware/esp32/2.0.2/libraries/WiFi/src/WiFiGeneric.cpp
5557

5658
- name: Compile Sketch
5759
run: arduino-cli compile --fqbn esp32:esp32:esp32 ./Firmware/RTK_Surveyor/RTK_Surveyor.ino
@@ -62,7 +64,7 @@ jobs:
6264

6365
- name: Get current date
6466
id: date
65-
run: echo "::set-output name=date::$(date +'%b_%d_%Y')"
67+
run: echo "date=$(date +'%b_%d_%Y')" >> $GITHUB_OUTPUT
6668

6769
- name: Rename binary
6870
run: |

Firmware/RTK_Surveyor/AP-Config/index.html

Lines changed: 224 additions & 74 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)