Skip to content

Commit f088c1b

Browse files
nseidlenseidle
authored
Merge pull request #327 from sparkfun/arduino-esp32_v3.0.0
Arduino esp32 v3.0.0
2 parents 825057b + 768bff9 commit f088c1b

Some content is hidden

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

47 files changed

+2179
-3422
lines changed

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

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ env:
1010
POINTPERFECT_LBAND_TOKEN: ${{ secrets.POINTPERFECT_LBAND_TOKEN }}
1111
POINTPERFECT_IP_TOKEN: ${{ secrets.POINTPERFECT_IP_TOKEN }}
1212
POINTPERFECT_LBAND_IP_TOKEN: ${{ secrets.POINTPERFECT_LBAND_IP_TOKEN }}
13+
CORE_VERSION: 3.0.1
1314

1415
jobs:
1516
build:
@@ -56,7 +57,7 @@ jobs:
5657
uses: arduino/setup-arduino-cli@v1
5758

5859
- name: Start config file
59-
run: arduino-cli config init --additional-urls "https://raw.githubusercontent.com/espressif/arduino-esp32/gh-pages/package_esp32_index.json"
60+
run: arduino-cli config init --additional-urls "https://raw.githubusercontent.com/espressif/arduino-esp32/gh-pages/package_esp32_index.json,https://espressif.github.io/arduino-esp32/package_esp32_dev_index.json"
6061

6162
- name: Update core index
6263
run: arduino-cli core update-index
@@ -65,22 +66,20 @@ jobs:
6566
run: arduino-cli lib update-index
6667

6768
- name: Install platform
68-
run: arduino-cli core install esp32:esp32@2.0.11
69+
run: arduino-cli core install esp32:esp32@${{ env.CORE_VERSION }}
6970

7071
- name: Get Known Libraries
7172
run: arduino-cli lib install
7273
[email protected]
7374
[email protected]
7475
[email protected]
7576
"ESP32-OTA-Pull"@1.0.0
76-
[email protected]
7777
[email protected]
7878
[email protected]
7979
"SdFat"@2.1.1
8080
"SparkFun LIS2DH12 Arduino Library"@1.0.3
8181
"SparkFun MAX1704x Fuel Gauge Arduino Library"@1.0.4
8282
"SparkFun u-blox GNSS v3"@3.1.5
83-
[email protected]
8483
"SparkFun Qwiic OLED Arduino Library"@1.0.13
8584
[email protected]
8685
"SparkFun Extensible Message Parser"@1.0.0
@@ -90,14 +89,12 @@ jobs:
9089
"SparkFun IM19 IMU Arduino Library"@1.0.1
9190
"SparkFun UM980 Triband RTK GNSS Arduino Library"@1.0.4
9291

93-
- name: Enable external libs
94-
run: arduino-cli config set library.enable_unsafe_install true
92+
# https://github.com/avinabmalla/ESP32_BleSerial/issues/15
93+
- name: Patch ESP32_BleSerial BLECharacteristic
94+
run: |
95+
cd Firmware/RTK_Everywhere/Patch/
96+
cp BleSerial.cpp /home/runner/Arduino/libraries/ESP32_BleSerial/src/BleSerial.cpp
9597
96-
- name: Get Libraries
97-
run: arduino-cli lib install --git-url
98-
https://github.com/me-no-dev/ESPAsyncWebServer.git
99-
https://github.com/me-no-dev/AsyncTCP.git
100-
10198
- name: Setup Python
10299
uses: actions/setup-python@v4
103100
with:
@@ -128,13 +125,13 @@ jobs:
128125

129126
- name: Copy custom RTKEverywhere.csv
130127
run:
131-
cp Firmware/RTKEverywhere.csv /home/runner/.arduino15/packages/esp32/hardware/esp32/2.0.11/tools/partitions/RTKEverywhere.csv
128+
cp Firmware/RTKEverywhere.csv /home/runner/.arduino15/packages/esp32/hardware/esp32/${{ env.CORE_VERSION }}/tools/partitions/RTKEverywhere.csv
132129

133130
- name: Compile Sketch
134131
run: arduino-cli compile --fqbn "esp32:esp32:esp32":DebugLevel=${{ env.DEBUG_LEVEL }},PSRAM=enabled ./Firmware/RTK_Everywhere/RTK_Everywhere.ino
135132
--build-property build.partitions=RTKEverywhere
136133
--build-property upload.maximum_size=3145728
137-
--build-property "compiler.cpp.extra_flags=\"-DPOINTPERFECT_LBAND_TOKEN=$POINTPERFECT_LBAND_TOKEN\" \"-DPOINTPERFECT_IP_TOKEN=$POINTPERFECT_IP_TOKEN\" \"-DPOINTPERFECT_LBAND_IP_TOKEN=$POINTPERFECT_LBAND_IP_TOKEN\" \"-DFIRMWARE_VERSION_MAJOR=$FIRMWARE_VERSION_MAJOR\" \"-DFIRMWARE_VERSION_MINOR=$FIRMWARE_VERSION_MINOR\" \"-DENABLE_DEVELOPER=${{ env.ENABLE_DEVELOPER }}\""
134+
--build-property "compiler.cpp.extra_flags=-MMD -c \"-DPOINTPERFECT_LBAND_TOKEN=$POINTPERFECT_LBAND_TOKEN\" \"-DPOINTPERFECT_IP_TOKEN=$POINTPERFECT_IP_TOKEN\" \"-DPOINTPERFECT_LBAND_IP_TOKEN=$POINTPERFECT_LBAND_IP_TOKEN\" \"-DFIRMWARE_VERSION_MAJOR=$FIRMWARE_VERSION_MAJOR\" \"-DFIRMWARE_VERSION_MINOR=$FIRMWARE_VERSION_MINOR\" \"-DENABLE_DEVELOPER=${{ env.ENABLE_DEVELOPER }}\""
138135
--export-binaries
139136

140137
- name: Rename binary

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

Lines changed: 17 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,12 @@ on:
55

66
env:
77
FILENAME_PREFIX: RTK_Everywhere_Firmware
8-
FIRMWARE_VERSION_MAJOR: 0
9-
FIRMWARE_VERSION_MINOR: 9
8+
FIRMWARE_VERSION_MAJOR: 99
9+
FIRMWARE_VERSION_MINOR: 99
1010
POINTPERFECT_LBAND_TOKEN: ${{ secrets.POINTPERFECT_LBAND_TOKEN }}
1111
POINTPERFECT_IP_TOKEN: ${{ secrets.POINTPERFECT_IP_TOKEN }}
12+
POINTPERFECT_LBAND_IP_TOKEN: ${{ secrets.POINTPERFECT_LBAND_IP_TOKEN }}
13+
CORE_VERSION: 3.0.1
1214

1315
jobs:
1416
build:
@@ -55,7 +57,7 @@ jobs:
5557
uses: arduino/setup-arduino-cli@v1
5658

5759
- name: Start config file
58-
run: arduino-cli config init --additional-urls "https://raw.githubusercontent.com/espressif/arduino-esp32/gh-pages/package_esp32_index.json"
60+
run: arduino-cli config init --additional-urls "https://raw.githubusercontent.com/espressif/arduino-esp32/gh-pages/package_esp32_index.json,https://espressif.github.io/arduino-esp32/package_esp32_dev_index.json"
5961

6062
- name: Update core index
6163
run: arduino-cli core update-index
@@ -64,45 +66,34 @@ jobs:
6466
run: arduino-cli lib update-index
6567

6668
- name: Install platform
67-
run: arduino-cli core install esp32:esp32@2.0.11
69+
run: arduino-cli core install esp32:esp32@${{ env.CORE_VERSION }}
6870

6971
- name: Get Known Libraries
7072
run: arduino-cli lib install
7173
[email protected]
7274
[email protected]
7375
[email protected]
7476
"ESP32-OTA-Pull"@1.0.0
75-
[email protected]
7677
[email protected]
7778
[email protected]
7879
"SdFat"@2.1.1
7980
"SparkFun LIS2DH12 Arduino Library"@1.0.3
8081
"SparkFun MAX1704x Fuel Gauge Arduino Library"@1.0.4
81-
"SparkFun u-blox GNSS v3"@3.1.4
82-
[email protected]
82+
"SparkFun u-blox GNSS v3"@3.1.5
8383
"SparkFun Qwiic OLED Arduino Library"@1.0.13
8484
[email protected]
85-
[email protected]
8685
"SparkFun Extensible Message Parser"@1.0.0
8786
"SparkFun BQ40Z50 Battery Manager Arduino Library"@1.0.0
8887
"ArduinoMqttClient"@0.1.8
88+
"SparkFun u-blox PointPerfect Library"@1.11.4
89+
"SparkFun IM19 IMU Arduino Library"@1.0.1
90+
"SparkFun UM980 Triband RTK GNSS Arduino Library"@1.0.4
8991

90-
- name: Enable external libs
91-
run: arduino-cli config set library.enable_unsafe_install true
92-
93-
- name: Get Libraries
94-
run: arduino-cli lib install --git-url
95-
https://${{ secrets.GET_PRIVATE_PPL_LIBRARY }}@github.com/sparkfun/SparkFun_u-blox_PointPerfect_Library.git
96-
https://${{ secrets.GET_PRIVATE_IM19_LIBRARY }}@github.com/sparkfun/SparkFun_IM19_IMU_Arduino_Library.git
97-
https://github.com/sparkfun/SparkFun_Unicore_GNSS_Arduino_Library.git
98-
https://github.com/me-no-dev/ESPAsyncWebServer.git
99-
https://github.com/me-no-dev/AsyncTCP.git
100-
101-
#Incorporate ESP-Now patch into core: https://github.com/espressif/arduino-esp32/pull/7044/files
102-
#- name: Patch ESP32 Core
103-
# run: |
104-
# cd Firmware/RTK_Everywhere/Patch/
105-
# cp WiFiGeneric.cpp /home/runner/.arduino15/packages/esp32/hardware/esp32/2.0.2/libraries/WiFi/src/WiFiGeneric.cpp
92+
# https://github.com/avinabmalla/ESP32_BleSerial/issues/15
93+
- name: Patch ESP32_BleSerial BLECharacteristic
94+
run: |
95+
cd Firmware/RTK_Everywhere/Patch/
96+
cp BleSerial.cpp /home/runner/Arduino/libraries/ESP32_BleSerial/src/BleSerial.cpp
10697
10798
- name: Setup Python
10899
uses: actions/setup-python@v4
@@ -134,13 +125,13 @@ jobs:
134125

135126
- name: Copy custom RTKEverywhere.csv
136127
run:
137-
cp Firmware/RTKEverywhere.csv /home/runner/.arduino15/packages/esp32/hardware/esp32/2.0.11/tools/partitions/RTKEverywhere.csv
128+
cp Firmware/RTKEverywhere.csv /home/runner/.arduino15/packages/esp32/hardware/esp32/${{ env.CORE_VERSION }}/tools/partitions/RTKEverywhere.csv
138129

139130
- name: Compile Sketch
140131
run: arduino-cli compile --fqbn "esp32:esp32:esp32":DebugLevel=${{ env.DEBUG_LEVEL }},PSRAM=enabled ./Firmware/RTK_Everywhere/RTK_Everywhere.ino
141132
--build-property build.partitions=RTKEverywhere
142133
--build-property upload.maximum_size=3145728
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 }}\""
134+
--build-property "compiler.cpp.extra_flags=-MMD -c \"-DPOINTPERFECT_LBAND_TOKEN=$POINTPERFECT_LBAND_TOKEN\" \"-DPOINTPERFECT_IP_TOKEN=$POINTPERFECT_IP_TOKEN\" \"-DPOINTPERFECT_LBAND_IP_TOKEN=$POINTPERFECT_LBAND_IP_TOKEN\" \"-DFIRMWARE_VERSION_MAJOR=$FIRMWARE_VERSION_MAJOR\" \"-DFIRMWARE_VERSION_MINOR=$FIRMWARE_VERSION_MINOR\" \"-DENABLE_DEVELOPER=${{ env.ENABLE_DEVELOPER }}\""
144135
--export-binaries
145136

146137
- name: Create artifact name

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1959,7 +1959,7 @@
19591959
<label for="rebootMinutes"
19601960
class="box-margin40 col-sm-3 col-7 col-form-label">Minutes between restarts:
19611961
<span class="tt" data-bs-placement="right"
1962-
title="If automatic restart is enabled, the device will reset after this many minutes have elapsed. Default: 1440 (1 day)">
1962+
title="If automatic restart is enabled, the device will reset after this many minutes have elapsed">
19631963
<span class="icon-info-circle text-primary ms-2"></span>
19641964
</span>
19651965
</label>

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
var gateway = `ws://${window.location.hostname}/ws`;
1+
var gateway = `ws://${window.location.hostname}:81/ws`;
22
var websocket;
33

44
window.addEventListener('load', onLoad);
@@ -764,7 +764,7 @@ function validateFields() {
764764
}
765765

766766
if (ge("enableAutoReset").checked == true) {
767-
checkElementValue("rebootMinutes", 1, 999999, "Must be 1 to 999999", "collapseSystemConfig");
767+
checkElementValue("rebootMinutes", 1, 4294967, "Must be 1 to 4294967", "collapseSystemConfig");
768768
}
769769
else {
770770
clearElement("rebootMinutes", 0); //0 = disable
@@ -1234,7 +1234,7 @@ function firmwareUploadWait() {
12341234
var formdata = new FormData();
12351235
formdata.append("submitFirmwareFile", file);
12361236
var ajax = new XMLHttpRequest();
1237-
ajax.open("POST", "/upload");
1237+
ajax.open("POST", "/uploadFirmware");
12381238
ajax.send(formdata);
12391239

12401240
ge("firmwareUploadMsg").innerHTML = "<br>Uploading, please wait...";
@@ -1833,7 +1833,7 @@ function uploadFile() {
18331833
ajax.addEventListener("load", completeHandler, false);
18341834
ajax.addEventListener("error", errorHandler, false);
18351835
ajax.addEventListener("abort", abortHandler, false);
1836-
ajax.open("POST", "/");
1836+
ajax.open("POST", "/uploadFile");
18371837
ajax.send(formdata);
18381838
}
18391839
function progressHandler(event) {

0 commit comments

Comments
 (0)