diff --git a/platformio.ini b/platformio.ini index 929edf77844..f296f838213 100644 --- a/platformio.ini +++ b/platformio.ini @@ -96,7 +96,7 @@ build_flags = ${arduino_base.build_flags} lib_deps = ${arduino_base.lib_deps} https://github.com/oltaco/CustomLFS#0.2.3 -; ------------- RP2040 / RP2350 ----------------- +; ----------------- RP2040 --------------------- [rp2040_base] extends = arduino_base diff --git a/variants/rpi_pico2/RpiPico2Board.cpp b/variants/rpi_pico2/RpiPico2Board.cpp deleted file mode 100644 index f5e33971a8b..00000000000 --- a/variants/rpi_pico2/RpiPico2Board.cpp +++ /dev/null @@ -1,30 +0,0 @@ -#include "RpiPico2Board.h" - -#include -#include - -void RpiPico2Board::begin() { - // for future use, sub-classes SHOULD call this from their begin() - startup_reason = BD_STARTUP_NORMAL; - -#ifdef P_LORA_TX_LED - pinMode(P_LORA_TX_LED, OUTPUT); -#endif - -#ifdef PIN_VBAT_READ - pinMode(PIN_VBAT_READ, INPUT); -#endif - -#if defined(PIN_BOARD_SDA) && defined(PIN_BOARD_SCL) - Wire.setSDA(PIN_BOARD_SDA); - Wire.setSCL(PIN_BOARD_SCL); -#endif - - Wire.begin(); - - delay(10); // give sx1262 some time to power up -} - -bool RpiPico2Board::startOTAUpdate(const char *id, char reply[]) { - return false; -} diff --git a/variants/rpi_pico2/RpiPico2Board.h b/variants/rpi_pico2/RpiPico2Board.h deleted file mode 100644 index 398c38c6778..00000000000 --- a/variants/rpi_pico2/RpiPico2Board.h +++ /dev/null @@ -1,63 +0,0 @@ -#pragma once - -#include -#include -#include - -/* - * This board has no built-in way to read battery voltage. - * Nevertheless it's very easy to make it work, you only require two 1% resistors. - * If your using the WIO SX1262 Addon for xaio, make sure you dont connect D0! - * - * BAT+ -----+ - * | - * VSYS --+ -/\/\/\/\- --+ - * 200k | - * +-- D0 - * | - * GND --+ -/\/\/\/\- --+ - * | 100k - * BAT- -----+ - */ -#define PIN_VBAT_READ 26 // D0 -#define BATTERY_SAMPLES 8 -#define ADC_MULTIPLIER (3.0f * 3.3f * 1000) - -class RpiPico2Board : public mesh::MainBoard { -protected: - uint8_t startup_reason; - -public: - void begin(); - uint8_t getStartupReason() const override { return startup_reason; } - - void attachDynamicPrefs(KeyValueStore* prefs) { } // no-op - -#ifdef P_LORA_TX_LED - void onBeforeTransmit() override { digitalWrite(P_LORA_TX_LED, HIGH); } - void onAfterTransmit() override { digitalWrite(P_LORA_TX_LED, LOW); } -#endif - - - uint16_t getBattMilliVolts() override { -#if defined(PIN_VBAT_READ) && defined(ADC_MULTIPLIER) - analogReadResolution(12); - - uint32_t raw = 0; - for (int i = 0; i < BATTERY_SAMPLES; i++) { - raw += analogRead(PIN_VBAT_READ); - } - raw = raw / BATTERY_SAMPLES; - - return (ADC_MULTIPLIER * raw) / 4096; -#else - return 0; -#endif - } - - const char *getManufacturerName() const override { return "RpiPico2"; } - - void reboot() override { rp2040.reboot(); } - - bool startOTAUpdate(const char *id, char reply[]) override; -}; diff --git a/variants/rpi_pico2/platformio.ini b/variants/rpi_pico2/platformio.ini deleted file mode 100644 index fbf47e169ce..00000000000 --- a/variants/rpi_pico2/platformio.ini +++ /dev/null @@ -1,120 +0,0 @@ -[rpi_pico2] -extends = rp2040_base -board = rpipico2 -board_build.filesystem_size = 0.5m -build_flags = ${rp2040_base.build_flags} - -I variants/rpi_pico2 - -D SX126X_CURRENT_LIMIT=140 - -D USE_SX1262 - -D RADIO_CLASS=CustomSX1262 - -D WRAPPER_CLASS=CustomSX1262Wrapper - -D P_LORA_DIO_1=20 - -D P_LORA_NSS=3 - -D P_LORA_RESET=15 - -D P_LORA_BUSY=2 - -D P_LORA_SCLK=10 - -D P_LORA_MOSI=11 - -D P_LORA_MISO=12 - -D P_LORA_TX_LED=25 - -D SX126X_RXEN=RADIOLIB_NC - -D SX126X_TXEN=RADIOLIB_NC - -D SX126X_DIO2_AS_RF_SWITCH=true - -D SX126X_DIO3_TCXO_VOLTAGE=1.8 - -D SX126X_RX_BOOSTED_GAIN=1 - -D LORA_TX_POWER=22 -; Debug options - ; -D DEBUG_RP2040_WIRE=1 - ; -D DEBUG_RP2040_SPI=1 - ; -D DEBUG_RP2040_CORE=1 - ; -D RADIOLIB_DEBUG_SPI=1 - ; -D DEBUG_RP2040_PORT=Serial -build_src_filter = ${rp2040_base.build_src_filter} - + - +<../variants/rpi_pico2> -lib_deps = ${rp2040_base.lib_deps} - -[env:rpi_pico2_repeater] -extends = rpi_pico2 -build_flags = ${rpi_pico2.build_flags} - -D ADVERT_NAME='"Pico2 Repeater"' - -D ADVERT_LAT=0.0 - -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' - -D MAX_NEIGHBOURS=50 -; -D MESH_PACKET_LOGGING=1 -; -D MESH_DEBUG=1 -build_src_filter = ${rpi_pico2.build_src_filter} - +<../examples/simple_repeater> - -[env:rpi_pico2_room_server] -extends = rpi_pico2 -build_flags = ${rpi_pico2.build_flags} - -D ADVERT_NAME='"Pico2 Room"' - -D ADVERT_LAT=0.0 - -D ADVERT_LON=0.0 - -D ADMIN_PASSWORD='"password"' - -D ROOM_PASSWORD='"hello"' -; -D MESH_PACKET_LOGGING=1 -; -D MESH_DEBUG=1 -build_src_filter = ${rpi_pico2.build_src_filter} - +<../examples/simple_room_server> - -[env:rpi_pico2_companion_radio_usb] -extends = rpi_pico2 -build_flags = ${rpi_pico2.build_flags} - -D MAX_CONTACTS=350 - -D MAX_GROUP_CHANNELS=40 - -D ENABLE_USB_INTERFACE -; NOTE: DO NOT ENABLE --> -D MESH_PACKET_LOGGING=1 -; NOTE: DO NOT ENABLE --> -D MESH_DEBUG=1 -build_src_filter = ${rpi_pico2.build_src_filter} - +<../examples/companion_radio/*.cpp> -lib_deps = ${rpi_pico2.lib_deps} - densaugeo/base64 @ ~1.4.0 -lib_ignore = BLE - -; [env:rpi_pico2_companion_radio_ble] -; extends = rpi_pico2 -; build_flags = ${rpi_pico2.build_flags} -; -D MAX_CONTACTS=100 -; -D MAX_GROUP_CHANNELS=8 -; -D BLE_PIN_CODE=123456 -; -D BLE_DEBUG_LOGGING=1 -; ; -D MESH_PACKET_LOGGING=1 -; ; -D MESH_DEBUG=1 -; build_src_filter = ${rpi_pico2.build_src_filter} -; +<../examples/companion_radio/*.cpp> -; lib_deps = ${rpi_pico2.lib_deps} -; densaugeo/base64 @ ~1.4.0 - -; [env:rpi_pico2_companion_radio_wifi] -; extends = rpi_pico2 -; build_flags = ${rpi_pico2.build_flags} -; -D MAX_CONTACTS=100 -; -D MAX_GROUP_CHANNELS=8 -; -D WIFI_DEBUG_LOGGING=1 -; -D WIFI_SSID='"myssid"' -; -D WIFI_PWD='"mypwd"' -; ; -D MESH_PACKET_LOGGING=1 -; ; -D MESH_DEBUG=1 -; build_src_filter = ${rpi_pico2.build_src_filter} -; +<../examples/companion_radio/*.cpp> -; lib_deps = ${rpi_pico2.lib_deps} -; densaugeo/base64 @ ~1.4.0 - -[env:rpi_pico2_terminal_chat] -extends = rpi_pico2 -build_flags = ${rpi_pico2.build_flags} - -D MAX_CONTACTS=350 - -D MAX_GROUP_CHANNELS=1 -; -D MESH_PACKET_LOGGING=1 -; -D MESH_DEBUG=1 -build_src_filter = ${rpi_pico2.build_src_filter} - +<../examples/simple_secure_chat/main.cpp> -lib_deps = ${rpi_pico2.lib_deps} - densaugeo/base64 @ ~1.4.0 - -[env:rpi_pico2_kiss_modem] -extends = rpi_pico2 -build_src_filter = ${rpi_pico2.build_src_filter} - +<../examples/kiss_modem/> diff --git a/variants/rpi_pico2/target.cpp b/variants/rpi_pico2/target.cpp deleted file mode 100644 index 9cd72d7234d..00000000000 --- a/variants/rpi_pico2/target.cpp +++ /dev/null @@ -1,30 +0,0 @@ -#include "target.h" - -#include -#include - -RpiPico2Board board; - -RADIO_CLASS radio = new Module(P_LORA_NSS, P_LORA_DIO_1, P_LORA_RESET, P_LORA_BUSY, SPI1); - -WRAPPER_CLASS radio_driver(radio, board); - -VolatileRTCClock fallback_clock; -AutoDiscoverRTCClock rtc_clock(fallback_clock); -SensorManager sensors; - -#ifndef LORA_CR -#define LORA_CR 5 -#endif - -bool radio_init() { - rtc_clock.begin(Wire); - - return radio.std_init(&SPI1); -} - -mesh::LocalIdentity radio_new_identity() { - RadioNoiseListener rng(radio); - return mesh::LocalIdentity(&rng); // create new random identity -} - diff --git a/variants/rpi_pico2/target.h b/variants/rpi_pico2/target.h deleted file mode 100644 index 7ff28707583..00000000000 --- a/variants/rpi_pico2/target.h +++ /dev/null @@ -1,19 +0,0 @@ -#pragma once - -#define RADIOLIB_STATIC_ONLY 1 - -#include -#include -#include -#include -#include -#include - -extern RpiPico2Board board; -extern WRAPPER_CLASS radio_driver; -extern AutoDiscoverRTCClock rtc_clock; -extern SensorManager sensors; - -bool radio_init(); -mesh::LocalIdentity radio_new_identity(); -