From 74cae6dadc93db59c066b632f4254ae252e5e6e3 Mon Sep 17 00:00:00 2001 From: Linar Yusupov Date: Fri, 8 Sep 2023 12:16:59 +0300 Subject: [PATCH] ESP32-Sx/C3: GitHub Actions CI transition onto Arduino Core 2.0.12 --- .github/ISSUE_TEMPLATE/softrf-issue-template.md | 2 ++ .github/workflows/main.yml | 6 +++--- software/firmware/source/SoftRF/src/protocol/radio/APRS.cpp | 3 ++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/softrf-issue-template.md b/.github/ISSUE_TEMPLATE/softrf-issue-template.md index 009822286..50cbd37f3 100644 --- a/.github/ISSUE_TEMPLATE/softrf-issue-template.md +++ b/.github/ISSUE_TEMPLATE/softrf-issue-template.md @@ -24,9 +24,11 @@ Recommended: - [ ] Standalone - [ ] Badge +- [ ] Prime Mark III - [ ] Prime Mark II - [ ] Dongle - [ ] SkyView EZ +- [ ] SkyView Pico - [ ] Uni - [ ] Mini diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 1e8d53693..67c7e3ffc 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -132,7 +132,7 @@ jobs: fi if [[ "$BOARD" =~ "esp32:esp32:esp32s2" ]]; then arduino --pref "boardsmanager.additional.urls=https://raw.githubusercontent.com/espressif/arduino-esp32/gh-pages/package_esp32_index.json" --save-prefs ; - arduino --install-boards esp32:esp32:2.0.11 ; + arduino --install-boards esp32:esp32:2.0.12 ; arduino --board $BOARD --save-prefs ; arduino --pref "custom_CPUFreq=esp32s2_80" --save-prefs ; arduino --pref "custom_DebugLevel=esp32s2_none" --save-prefs ; @@ -146,7 +146,7 @@ jobs: fi if [[ "$BOARD" =~ "esp32:esp32:esp32s3" ]]; then arduino --pref "boardsmanager.additional.urls=https://raw.githubusercontent.com/espressif/arduino-esp32/gh-pages/package_esp32_index.json" --save-prefs ; - arduino --install-boards esp32:esp32:2.0.11 ; + arduino --install-boards esp32:esp32:2.0.12 ; arduino --board $BOARD --save-prefs ; arduino --pref "custom_CPUFreq=esp32s3_80" --save-prefs ; arduino --pref "custom_DebugLevel=esp32s3_none" --save-prefs ; @@ -162,7 +162,7 @@ jobs: fi if [[ "$BOARD" =~ "esp32:esp32:esp32c3" ]]; then arduino --pref "boardsmanager.additional.urls=https://raw.githubusercontent.com/espressif/arduino-esp32/gh-pages/package_esp32_index.json" --save-prefs ; - arduino --install-boards esp32:esp32:2.0.11 ; + arduino --install-boards esp32:esp32:2.0.12 ; arduino --board $BOARD --save-prefs ; arduino --pref "custom_CPUFreq=esp32c3_80" --save-prefs ; arduino --pref "custom_DebugLevel=esp32c3_none" --save-prefs ; diff --git a/software/firmware/source/SoftRF/src/protocol/radio/APRS.cpp b/software/firmware/source/SoftRF/src/protocol/radio/APRS.cpp index 6d6e43934..72eca052c 100644 --- a/software/firmware/source/SoftRF/src/protocol/radio/APRS.cpp +++ b/software/firmware/source/SoftRF/src/protocol/radio/APRS.cpp @@ -233,6 +233,7 @@ size_t aprs_encode(void *pkt, ufo_t *this_aircraft) { char buf[APRS_PAYLOAD_SIZE]; uint32_t id = this_aircraft->addr & 0x00FFFFFF; + const char *ToCall = "OGFLR"; // TODO: make use of assigned APSRFx value #if !defined(SOFTRF_ADDRESS) uint8_t addr_type = ADDR_TYPE_ANONYMOUS; @@ -267,7 +268,7 @@ size_t aprs_encode(void *pkt, ufo_t *this_aircraft) { "%03d%05.2f%c" "'" "%03d/%03d/A=%06d !W00! id%08X +000fpm +0.0rot" /* " 7.8dB -1.6kHz gps8x3" */, - id, "OGFLR", + id, ToCall, gnss.time.hour(), gnss.time.minute(), gnss.time.second(), abs(lat_int), fabsf(lat_dec * 60), lat < 0 ? 'S' : 'N', abs(lon_int), fabsf(lon_dec * 60), lon < 0 ? 'W' : 'E',