From 14ed77cc4c933a103419311546bb482fee0264b5 Mon Sep 17 00:00:00 2001 From: faraday Date: Wed, 2 Oct 2024 13:53:43 -0500 Subject: [PATCH] Remove Cubecell Support (#448) * remove cubecell from code Signed-off-by: faradaym * remove cubecell from build Signed-off-by: faradaym * more cubecell stuff Signed-off-by: faradaym --------- Signed-off-by: faradaym --- .github/workflows/arduino_ci.yml | 15 ++----- .../Basic-Ducks/DetectorDuck/platformio.ini | 28 ------------- examples/Basic-Ducks/DuckLink/platformio.ini | 30 -------------- examples/Basic-Ducks/MamaDuck/platformio.ini | 29 ------------- examples/Basic-Ducks/PapaDuck/platformio.ini | 29 ------------- .../Custom-Mama-Detect/platformio.ini | 28 ------------- .../Custom-Mama-Example/platformio.ini | 30 +------------- .../AWS-PapaDuck/platformio.ini | 29 ------------- .../MQTT-PapaDuck/platformio.ini | 29 ------------- library.json | 2 +- platformio.ini | 41 +------------------ src/config/cubecell_base.ini | 4 -- src/include/boards/heltec_cubecell_board.h | 27 ------------ src/include/boards/heltec_cubecell_gps.h | 32 --------------- src/include/cdpcfg.h | 2 - tools/CDP_CLI.md | 4 -- 16 files changed, 7 insertions(+), 352 deletions(-) delete mode 100644 src/config/cubecell_base.ini delete mode 100644 src/include/boards/heltec_cubecell_board.h delete mode 100644 src/include/boards/heltec_cubecell_gps.h diff --git a/.github/workflows/arduino_ci.yml b/.github/workflows/arduino_ci.yml index 982f06eb..4b9b7b53 100644 --- a/.github/workflows/arduino_ci.yml +++ b/.github/workflows/arduino_ci.yml @@ -24,7 +24,7 @@ jobs: strategy: fail-fast: false matrix: - board: ["esp32:esp32:heltec_wifi_lora_32_V3", "CubeCell:CubeCell:CubeCell-Board-V2"] + board: ["esp32:esp32:heltec_wifi_lora_32_V3"] steps: - name: Checkout code @@ -50,22 +50,14 @@ jobs: set -x arduino-cli config init arduino-cli config set library.enable_unsafe_install true - # udpate the index to include the Heltec ESP32 and CubeCell boards - echo "[ARDUINO SETUP] Updating the index to include the Heltec ESP32 and CubeCell boards" + echo "[ARDUINO SETUP] Updating the index to include the Heltec ESP32 boards" arduino-cli core update-index --additional-urls https://github.com/Heltec-Aaron-Lee/WiFi_Kit_series/releases/download/3.0.0/package_heltec_esp32_index.json - arduino-cli core update-index --additional-urls https://github.com/HelTecAutomation/CubeCell-Arduino/releases/download/V1.5.0/package_CubeCell_index.json - # install the Heltec ESP32 and CubeCell boards + # install the Heltec ESP32 boards if [[ "${{ matrix.board }}" =~ "esp32:esp32:" ]]; then echo "[ARDUINO SETUP] Installing the Heltec ESP32 board" arduino-cli core install esp32:esp32@2.0.17 --additional-urls https://github.com/Heltec-Aaron-Lee/WiFi_Kit_series/releases/download/3.0.0/package_heltec_esp32_index.json fi - if [[ "${{ matrix.board }}" =~ "CubeCell:CubeCell:" ]]; then - echo "[ARDUINO SETUP] Installing the CubeCell board" - arduino-cli core install CubeCell:CubeCell --additional-urls https://github.com/HelTecAutomation/CubeCell-Arduino/releases/download/V1.5.0/package_CubeCell_index.json - echo "[ARDUINO SETUP] Patching the CubeCell Arduino.h file." - cp ./arduino_patches/CubeCell_Arduino.h /home/runner/.arduino15/packages/CubeCell/hardware/CubeCell/1.5.0/cores/asr650x/Arduino.h - fi - name: Install CDP run: | @@ -124,3 +116,4 @@ jobs: with: name: build-log path: '*.log' + diff --git a/examples/Basic-Ducks/DetectorDuck/platformio.ini b/examples/Basic-Ducks/DetectorDuck/platformio.ini index 3d0f14a1..f0003baa 100644 --- a/examples/Basic-Ducks/DetectorDuck/platformio.ini +++ b/examples/Basic-Ducks/DetectorDuck/platformio.ini @@ -100,20 +100,6 @@ description = DetectorDuck CDP examples ${env:esp32.lib_deps} ${env:release_cdp.lib_deps} -; PRODUCTION CUBECELL_BOARD_V2 -[env:prod_cubecell_board_v2] - platform = https://github.com/HelTecAutomation/heltec-cubecell.git - board = cubecell_board_v2 - framework = arduino - monitor_speed = 115200 - monitor_filters = time - build_flags = - -DCubeCell_Board - lib_ignore = - ESP Async WebServer - lib_deps = - ${env:release_cdp.lib_deps} - ; ------------------------------------------------------------------------------------------------------- ; ---- LOCAL ENVIRONMENTS ; ------------------------------------------------------------------------------------------------------- @@ -162,17 +148,3 @@ description = DetectorDuck CDP examples ${env:esp32.lib_deps} ${env:local_cdp.lib_deps} -; LOCAL CUBECELL_BOARD_V2 -[env:local_cubecell_board_v2] - platform = https://github.com/HelTecAutomation/heltec-cubecell.git - board = cubecell_board_v2 - framework = arduino - monitor_speed = 115200 - monitor_filters = time - build_flags = - -DCubeCell_Board - lib_ignore = - ESP Async WebServer - lib_deps = - ${env:local_cdp.lib_deps} - diff --git a/examples/Basic-Ducks/DuckLink/platformio.ini b/examples/Basic-Ducks/DuckLink/platformio.ini index 7c5f8937..5f3b32ba 100644 --- a/examples/Basic-Ducks/DuckLink/platformio.ini +++ b/examples/Basic-Ducks/DuckLink/platformio.ini @@ -99,21 +99,6 @@ description = DuckLink CDP examples lib_deps = ${env:esp32.lib_deps} ${env:release_cdp.lib_deps} - -; PRODUCTION CUBECELL_BOARD_V2 -[env:prod_cubecell_board_v2] - platform = https://github.com/HelTecAutomation/heltec-cubecell.git - board = cubecell_board_v2 - framework = arduino - monitor_speed = 115200 - monitor_filters = time - build_flags = - -DCubeCell_Board - lib_ignore = - ESP Async WebServer - lib_deps = - ${env:release_cdp.lib_deps} - ; ------------------------------------------------------------------------------------------------------- ; ---- LOCAL ENVIRONMENTS ; ------------------------------------------------------------------------------------------------------- @@ -161,18 +146,3 @@ description = DuckLink CDP examples lib_deps = ${env:esp32.lib_deps} ${env:local_cdp.lib_deps} - -; LOCAL CUBECELL_BOARD_V2 -[env:local_cubecell_board_v2] - platform = https://github.com/HelTecAutomation/heltec-cubecell.git - board = cubecell_board_v2 - framework = arduino - monitor_speed = 115200 - monitor_filters = time - build_flags = - -DCubeCell_Board - lib_ignore = - ESP Async WebServer - lib_deps = - ${env:local_cdp.lib_deps} - diff --git a/examples/Basic-Ducks/MamaDuck/platformio.ini b/examples/Basic-Ducks/MamaDuck/platformio.ini index 999f505f..146a3731 100644 --- a/examples/Basic-Ducks/MamaDuck/platformio.ini +++ b/examples/Basic-Ducks/MamaDuck/platformio.ini @@ -99,21 +99,6 @@ description = MamaDuck CDP examples lib_deps = ${env:esp32.lib_deps} ${env:release_cdp.lib_deps} - -; PRODUCTION CUBECELL_BOARD_V2 -[env:prod_cubecell_board_v2] - platform = https://github.com/HelTecAutomation/heltec-cubecell.git - board = cubecell_board_v2 - framework = arduino - monitor_speed = 115200 - monitor_filters = time - build_flags = - -DCubeCell_Board - lib_ignore = - ESP Async WebServer - lib_deps = - ${env:release_cdp.lib_deps} - ; ------------------------------------------------------------------------------------------------------- ; ---- LOCAL ENVIRONMENTS ; ------------------------------------------------------------------------------------------------------- @@ -162,17 +147,3 @@ description = MamaDuck CDP examples ${env:esp32.lib_deps} ${env:local_cdp.lib_deps} -; LOCAL CUBECELL_BOARD_V2 -[env:local_cubecell_board_v2] - platform = https://github.com/HelTecAutomation/heltec-cubecell.git - board = cubecell_board_v2 - framework = arduino - monitor_speed = 115200 - monitor_filters = time - build_flags = - -DCubeCell_Board - lib_ignore = - ESP Async WebServer - lib_deps = - ${env:local_cdp.lib_deps} - diff --git a/examples/Basic-Ducks/PapaDuck/platformio.ini b/examples/Basic-Ducks/PapaDuck/platformio.ini index 8f68f8a9..84b9b112 100644 --- a/examples/Basic-Ducks/PapaDuck/platformio.ini +++ b/examples/Basic-Ducks/PapaDuck/platformio.ini @@ -100,20 +100,6 @@ description = PapaDuck CDP examples ${env:esp32.lib_deps} ${env:release_cdp.lib_deps} -; PRODUCTION CUBECELL_BOARD_V2 -[env:prod_cubecell_board_v2] - platform = https://github.com/HelTecAutomation/heltec-cubecell.git - board = cubecell_board_v2 - framework = arduino - monitor_speed = 115200 - monitor_filters = time - build_flags = - -DCubeCell_Board - lib_ignore = - ESP Async WebServer - lib_deps = - ${env:release_cdp.lib_deps} - ; ------------------------------------------------------------------------------------------------------- ; ---- LOCAL ENVIRONMENTS ; ------------------------------------------------------------------------------------------------------- @@ -161,18 +147,3 @@ description = PapaDuck CDP examples lib_deps = ${env:esp32.lib_deps} ${env:local_cdp.lib_deps} - -; LOCAL CUBECELL_BOARD_V2 -[env:local_cubecell_board_v2] - platform = https://github.com/HelTecAutomation/heltec-cubecell.git - board = cubecell_board_v2 - framework = arduino - monitor_speed = 115200 - monitor_filters = time - build_flags = - -DCubeCell_Board - lib_ignore = - ESP Async WebServer - lib_deps = - ${env:local_cdp.lib_deps} - diff --git a/examples/Custom-Mama-Examples/Custom-Mama-Detect/platformio.ini b/examples/Custom-Mama-Examples/Custom-Mama-Detect/platformio.ini index 169fe1ca..9b3e093f 100644 --- a/examples/Custom-Mama-Examples/Custom-Mama-Detect/platformio.ini +++ b/examples/Custom-Mama-Examples/Custom-Mama-Detect/platformio.ini @@ -80,20 +80,6 @@ description = Custom Mama Detect examples ${env:esp32.lib_deps} ${env:release_cdp.lib_deps} -; PRODUCTION CUBECELL_BOARD_V2 -[env:prod_cubecell_board_v2] - platform = https://github.com/HelTecAutomation/heltec-cubecell.git - board = cubecell_board_v2 - framework = arduino - monitor_speed = 115200 - monitor_filters = time - build_flags = - -DCubeCell_Board - lib_ignore = - ESP Async WebServer - lib_deps = - ${env:release_cdp.lib_deps} - ; ------------------------------------------------------------------------------------------------------- ; ---- LOCAL ENVIRONMENTS ; ------------------------------------------------------------------------------------------------------- @@ -141,17 +127,3 @@ description = Custom Mama Detect examples lib_deps = ${env:esp32.lib_deps} ${env:local_cdp.lib_deps} - -; LOCAL CUBECELL_BOARD_V2 -[env:local_cubecell_board_v2] - platform = https://github.com/HelTecAutomation/heltec-cubecell.git - board = cubecell_board_v2 - framework = arduino - monitor_speed = 115200 - monitor_filters = time - build_flags = - -DCubeCell_Board - lib_ignore = - ESP Async WebServer - lib_deps = - ${env:local_cdp.lib_deps} diff --git a/examples/Custom-Mama-Examples/Custom-Mama-Example/platformio.ini b/examples/Custom-Mama-Examples/Custom-Mama-Example/platformio.ini index 42dab61d..f772be8d 100644 --- a/examples/Custom-Mama-Examples/Custom-Mama-Example/platformio.ini +++ b/examples/Custom-Mama-Examples/Custom-Mama-Example/platformio.ini @@ -80,20 +80,6 @@ description = Custom Mama examples ${env:esp32.lib_deps} ${env:release_cdp.lib_deps} -; PRODUCTION CUBECELL_BOARD_V2 -[env:prod_cubecell_board_v2] - platform = https://github.com/HelTecAutomation/heltec-cubecell.git - board = cubecell_board_v2 - framework = arduino - monitor_speed = 115200 - monitor_filters = time - build_flags = - -DCubeCell_Board - lib_ignore = - ESP Async WebServer - lib_deps = - ${env:release_cdp.lib_deps} - ; ------------------------------------------------------------------------------------------------------- ; ---- LOCAL ENVIRONMENTS ; ------------------------------------------------------------------------------------------------------- @@ -140,18 +126,4 @@ description = Custom Mama examples monitor_filters = time lib_deps = ${env:esp32.lib_deps} - ${env:local_cdp.lib_deps} - -; LOCAL CUBECELL_BOARD_V2 -[env:local_cubecell_board_v2] - platform = https://github.com/HelTecAutomation/heltec-cubecell.git - board = cubecell_board_v2 - framework = arduino - monitor_speed = 115200 - monitor_filters = time - build_flags = - -DCubeCell_Board - lib_ignore = - ESP Async WebServer - lib_deps = - ${env:local_cdp.lib_deps} + ${env:local_cdp.lib_deps} \ No newline at end of file diff --git a/examples/Custom-Papa-Examples/AWS-PapaDuck/platformio.ini b/examples/Custom-Papa-Examples/AWS-PapaDuck/platformio.ini index 90d51578..e126cb1e 100644 --- a/examples/Custom-Papa-Examples/AWS-PapaDuck/platformio.ini +++ b/examples/Custom-Papa-Examples/AWS-PapaDuck/platformio.ini @@ -100,20 +100,6 @@ description = AWS PapaDuck CDP examples ${env:esp32.lib_deps} ${env:release_cdp.lib_deps} -; PRODUCTION CUBECELL_BOARD_V2 -[env:prod_cubecell_board_v2] - platform = https://github.com/HelTecAutomation/heltec-cubecell.git - board = cubecell_board_v2 - framework = arduino - monitor_speed = 115200 - monitor_filters = time - build_flags = - -DCubeCell_Board - lib_ignore = - ESP Async WebServer - lib_deps = - ${env:release_cdp.lib_deps} - ; ------------------------------------------------------------------------------------------------------- ; ---- LOCAL ENVIRONMENTS ; ------------------------------------------------------------------------------------------------------- @@ -161,18 +147,3 @@ description = AWS PapaDuck CDP examples lib_deps = ${env:esp32.lib_deps} ${env:local_cdp.lib_deps} - -; LOCAL CUBECELL_BOARD_V2 -[env:local_cubecell_board_v2] - platform = https://github.com/HelTecAutomation/heltec-cubecell.git - board = cubecell_board_v2 - framework = arduino - monitor_speed = 115200 - monitor_filters = time - build_flags = - -DCubeCell_Board - lib_ignore = - ESP Async WebServer - lib_deps = - ${env:local_cdp.lib_deps} - diff --git a/examples/Custom-Papa-Examples/MQTT-PapaDuck/platformio.ini b/examples/Custom-Papa-Examples/MQTT-PapaDuck/platformio.ini index 844096c5..5abf8672 100644 --- a/examples/Custom-Papa-Examples/MQTT-PapaDuck/platformio.ini +++ b/examples/Custom-Papa-Examples/MQTT-PapaDuck/platformio.ini @@ -79,21 +79,6 @@ description = Papa MQTT CDP examples lib_deps = ${env:esp32.lib_deps} ${env:release_cdp.lib_deps} - -; PRODUCTION CUBECELL_BOARD_V2 -[env:prod_cubecell_board_v2] - platform = https://github.com/HelTecAutomation/heltec-cubecell.git - board = cubecell_board_v2 - framework = arduino - monitor_speed = 115200 - monitor_filters = time - build_flags = - -DCubeCell_Board - lib_ignore = - ESP Async WebServer - lib_deps = - ${env:release_cdp.lib_deps} - ; ------------------------------------------------------------------------------------------------------- ; ---- LOCAL ENVIRONMENTS ; ------------------------------------------------------------------------------------------------------- @@ -141,17 +126,3 @@ description = Papa MQTT CDP examples lib_deps = ${env:esp32.lib_deps} ${env:local_cdp.lib_deps} - -; LOCAL CUBECELL_BOARD_V2 -[env:local_cubecell_board_v2] - platform = https://github.com/HelTecAutomation/heltec-cubecell.git - board = cubecell_board_v2 - framework = arduino - monitor_speed = 115200 - monitor_filters = time - build_flags = - -DCubeCell_Board - lib_ignore = - ESP Async WebServer - lib_deps = - ${env:local_cdp.lib_deps} diff --git a/library.json b/library.json index 1d25f263..a08fb8fb 100644 --- a/library.json +++ b/library.json @@ -15,7 +15,7 @@ "url": "https://github.com/ClusterDuck-Protocol/ClusterDuck-Protocol" }, "frameworks": "arduino", - "platforms": ["espressif32","heltec-cubecell"], + "platforms": ["espressif32"], "license": "Apache-2.0", "export": { "include": [ diff --git a/platformio.ini b/platformio.ini index 5458fc84..e7eb4034 100644 --- a/platformio.ini +++ b/platformio.ini @@ -25,12 +25,9 @@ ; default_envs = heltec_wifi_lora_32_V3 ; default_envs = heltec_wifi_lora_32_V2 default_envs = lilygo_t_beam_sx1262 -; default_envs = cubecell_gps -; default_envs = cubecell_board_v2 ; default_envs = ttgo_lora32_v1 ; default_envs = test_heltec_wifi_lora_32_V3 -; default_envs = test_cubecell_board_v2 ; default_envs = test_lilygo_t_beam_sx1262 ; default_envs = test_ttgo_lora32_v1 @@ -97,12 +94,6 @@ ${env.lib_deps} https://github.com/arduino/arduinoOTA.git mathieucarbou/ESP Async WebServer@^2.7.0 - -[env:cubecell_base] - extends = env - platform = heltec-cubecell - framework = arduino -; nothing to do here [env:heltec_wifi_lora_32_V3] ; extends esp32_base environment which extends cdp_common environment @@ -132,22 +123,6 @@ lewisxhe/XPowersLib@^0.1.5 build_flags = ${env.build_flags} - -[env:cubecell_gps] - ; extends cubecell_base environment which extends cdp_common environment - extends = cubecell_base - board = cubecell_gps - build_flags = - ${cubecell_base.build_flags} - -DCubeCell_GPS - -[env:cubecell_board_v2] - extends = env:cubecell_base - board = cubecell_board_v2 - build_flags = - ${cubecell_base.build_flags} - -DCubeCell_Board - ;;-------------------------------------------------------------------------------- ;; test environments ;;-------------------------------------------------------------------------------- @@ -189,18 +164,4 @@ SPI WIRE FS - WIFI - -;; -- CUBECELL_BOARD_V2 -[env:test_cubecell_board_v2] - extends = - cubecell_base - cdp_common_test - board = ${env:cubecell_board_v2.board} - -;; -- CUBECELL_GPS -[env:test_cubecell_gps] - extends = - cubecell_base - cdp_common_test - board = ${env:cubecell_gps.board} \ No newline at end of file + WIFI \ No newline at end of file diff --git a/src/config/cubecell_base.ini b/src/config/cubecell_base.ini deleted file mode 100644 index d232f7bb..00000000 --- a/src/config/cubecell_base.ini +++ /dev/null @@ -1,4 +0,0 @@ -[cubecell_base] - extends = cdp_common - platform = heltec-cubecell - framework = arduino \ No newline at end of file diff --git a/src/include/boards/heltec_cubecell_board.h b/src/include/boards/heltec_cubecell_board.h deleted file mode 100644 index 4fd02303..00000000 --- a/src/include/boards/heltec_cubecell_board.h +++ /dev/null @@ -1,27 +0,0 @@ -#pragma once - -/* - * BOARD "Heltec Cube Cell Board ASR6501 with SX1262" - * https://heltec.org/project/htcc-ab01-v2/ - */ - -#if defined(CubeCell_Board) || defined(CubeCell_Board_V2) || defined(CubeCell_BoardPlus) - -#define CDP_BOARD_NAME "Heltec CubeCell Series" -#define CDPCFG_RADIO_SX1262 - -// Lora configurations -#define CDPCFG_PIN_LORA_CS 35 -#define CDPCFG_PIN_LORA_DIO0 39 -#define CDPCFG_PIN_LORA_BUSY 39 -#define CDPCFG_PIN_LORA_DIO1 38 -#define CDPCFG_PIN_LORA_DIO2 -1 -#define CDPCFG_PIN_LORA_RST 47 - -// Oled Display settings -#define CDPCFG_OLED_NONE - -// Wifi module -#define CDPCFG_WIFI_NONE - -#endif diff --git a/src/include/boards/heltec_cubecell_gps.h b/src/include/boards/heltec_cubecell_gps.h deleted file mode 100644 index 0fba6137..00000000 --- a/src/include/boards/heltec_cubecell_gps.h +++ /dev/null @@ -1,32 +0,0 @@ -#pragma once - -// BOARD "Heltec Cube Cell Board ASR6502+GPS+DISPLAY with SX1262" -#if defined(CubeCell_GPS) - -#define CDP_BOARD_NAME "Heltec CubeCell GPS" -#define CDPCFG_RADIO_SX1262 - -// Uncomment this to enable the OLED display -//#define ENABLE_DISPLAY - -#define CDPCFG_PIN_LORA_CS 35 -#define CDPCFG_PIN_LORA_DIO0 39 -#define CDPCFG_PIN_LORA_BUSY 39 -#define CDPCFG_PIN_LORA_DIO1 38 -#define CDPCFG_PIN_LORA_DIO2 -1 -#define CDPCFG_PIN_LORA_RST 47 - - -// Oled Display settings -#ifdef ENABLE_DISPLAY -#define CDPCFG_PIN_OLED_CLOCK 15 -#define CDPCFG_PIN_OLED_DATA 4 -#define CDPCFG_PIN_OLED_RESET 16 -#else -#define CDPCFG_OLED_NONE -#endif - -// Wifi module -#define CDPCFG_WIFI_NONE - -#endif \ No newline at end of file diff --git a/src/include/cdpcfg.h b/src/include/cdpcfg.h index 3c0e2fc0..1b3986d3 100644 --- a/src/include/cdpcfg.h +++ b/src/include/cdpcfg.h @@ -19,8 +19,6 @@ #include "boards/heltec_wifi_lora_32_V2.h" #include "boards/lilygo_t_beam_sx1262.h" #include "boards/ttgo_t_beam_v1_sx1276.h" -#include "boards/heltec_cubecell_board.h" -#include "boards/heltec_cubecell_gps.h" #endif // version definitions diff --git a/tools/CDP_CLI.md b/tools/CDP_CLI.md index 11d4949d..1458c58e 100644 --- a/tools/CDP_CLI.md +++ b/tools/CDP_CLI.md @@ -49,13 +49,9 @@ Available target environments: - lilygo_t_beam_sx1262 - heltec_wifi_lora_32_V2 - ttgo_lora32_v1 - - cubecell_gps - - cubecell_board_v2 - test_heltec_wifi_lora_32_V2 - test_heltec_wifi_lora_32_V3 - test_lilygo_t_beam_sx1262 - - test_cubecell_board_v2 - - test_cubecell_gps ``` ### Build the CDP library for a specific target