From 01e98caea74f46a24caa53e072f58f63d6d8775e Mon Sep 17 00:00:00 2001 From: taco Date: Sun, 30 Mar 2025 15:52:25 +1100 Subject: [PATCH 1/2] Refactor: FaketecBoard to PromicroBoard --- .../{FaketecBoard.cpp => PromicroBoard.cpp} | 8 ++-- .../nrf52/{FaketecBoard.h => PromicroBoard.h} | 4 +- variants/promicro/platformio.ini | 46 +++++++++---------- variants/promicro/target.cpp | 2 +- variants/promicro/target.h | 4 +- 5 files changed, 32 insertions(+), 32 deletions(-) rename src/helpers/nrf52/{FaketecBoard.cpp => PromicroBoard.cpp} (93%) rename src/helpers/nrf52/{FaketecBoard.h => PromicroBoard.h} (95%) diff --git a/src/helpers/nrf52/FaketecBoard.cpp b/src/helpers/nrf52/PromicroBoard.cpp similarity index 93% rename from src/helpers/nrf52/FaketecBoard.cpp rename to src/helpers/nrf52/PromicroBoard.cpp index 4b9ff023..58710509 100644 --- a/src/helpers/nrf52/FaketecBoard.cpp +++ b/src/helpers/nrf52/PromicroBoard.cpp @@ -1,12 +1,12 @@ #include -#include "FaketecBoard.h" +#include "PromicroBoard.h" #include #include static BLEDfu bledfu; -void FaketecBoard::begin() { +void PromicroBoard::begin() { // for future use, sub-classes SHOULD call this from their begin() startup_reason = BD_STARTUP_NORMAL; btn_prev_state = HIGH; @@ -39,7 +39,7 @@ static void disconnect_callback(uint16_t conn_handle, uint8_t reason) { MESH_DEBUG_PRINTLN("BLE client disconnected"); } -bool FaketecBoard::startOTAUpdate(const char* id, char reply[]) { +bool PromicroBoard::startOTAUpdate(const char* id, char reply[]) { // Config the peripheral connection with maximum bandwidth // more SRAM required by SoftDevice // Note: All config***() function must be called before begin() @@ -50,7 +50,7 @@ bool FaketecBoard::startOTAUpdate(const char* id, char reply[]) { // Set max power. Accepted values are: -40, -30, -20, -16, -12, -8, -4, 0, 4 Bluefruit.setTxPower(4); // Set the BLE device name - Bluefruit.setName("Faketec_OTA"); + Bluefruit.setName("ProMicro_OTA"); Bluefruit.Periph.setConnectCallback(connect_callback); Bluefruit.Periph.setDisconnectCallback(disconnect_callback); diff --git a/src/helpers/nrf52/FaketecBoard.h b/src/helpers/nrf52/PromicroBoard.h similarity index 95% rename from src/helpers/nrf52/FaketecBoard.h rename to src/helpers/nrf52/PromicroBoard.h index f407958b..89e71755 100644 --- a/src/helpers/nrf52/FaketecBoard.h +++ b/src/helpers/nrf52/PromicroBoard.h @@ -19,7 +19,7 @@ #define PIN_VBAT_READ 17 #define ADC_MULTIPLIER (1.815f) // dependent on voltage divider resistors. TODO: more accurate battery tracking -class FaketecBoard : public mesh::MainBoard { +class PromicroBoard : public mesh::MainBoard { protected: uint8_t startup_reason; uint8_t btn_prev_state; @@ -43,7 +43,7 @@ public: } const char* getManufacturerName() const override { - return "Faketec DIY"; + return "ProMicro DIY"; } int buttonStateChanged() { diff --git a/variants/promicro/platformio.ini b/variants/promicro/platformio.ini index f99a427d..ce1b7b99 100644 --- a/variants/promicro/platformio.ini +++ b/variants/promicro/platformio.ini @@ -1,4 +1,4 @@ -[faketec] +[Faketec] extends = nrf52840_base board = promicro_nrf52840 build_flags = ${nrf52840_base.build_flags} @@ -15,17 +15,17 @@ build_flags = ${nrf52840_base.build_flags} -D PIN_OLED_RESET=-1 -D PIN_USER_BTN=6 build_src_filter = ${nrf52840_base.build_src_filter} - + + + +<../variants/promicro> lib_deps= ${nrf52840_base.lib_deps} adafruit/Adafruit SSD1306 @ ^2.5.13 [env:Faketec_Repeater] -extends = faketec -build_src_filter = ${faketec.build_src_filter} +<../examples/simple_repeater> + +extends = Faketec +build_src_filter = ${Faketec.build_src_filter} +<../examples/simple_repeater> + build_flags = - ${faketec.build_flags} + ${Faketec.build_flags} -D ADVERT_NAME="\"Faketec Repeater\"" -D ADVERT_LAT=-37.0 -D ADVERT_LON=145.0 @@ -33,14 +33,14 @@ build_flags = ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 lib_deps = - ${faketec.lib_deps} + ${Faketec.lib_deps} adafruit/RTClib @ ^2.1.3 [env:Faketec_room_server] -extends = faketec -build_src_filter = ${faketec.build_src_filter} +<../examples/simple_room_server> + +extends = Faketec +build_src_filter = ${Faketec.build_src_filter} +<../examples/simple_room_server> + build_flags = - ${faketec.build_flags} + ${Faketec.build_flags} -D ADVERT_NAME="\"Test Room\"" -D ADVERT_LAT=-37.0 -D ADVERT_LON=145.0 @@ -49,41 +49,41 @@ build_flags = ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 lib_deps = - ${faketec.lib_deps} + ${Faketec.lib_deps} adafruit/RTClib @ ^2.1.3 [env:Faketec_terminal_chat] -extends = faketec +extends = Faketec build_flags = - ${faketec.build_flags} + ${Faketec.build_flags} -D MAX_CONTACTS=100 -D MAX_GROUP_CHANNELS=1 ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 -build_src_filter = ${faketec.build_src_filter} +<../examples/simple_secure_chat/main.cpp> +build_src_filter = ${Faketec.build_src_filter} +<../examples/simple_secure_chat/main.cpp> lib_deps = - ${faketec.lib_deps} + ${Faketec.lib_deps} densaugeo/base64 @ ~1.4.0 adafruit/RTClib @ ^2.1.3 [env:Faketec_companion_radio_usb] -extends = faketec +extends = Faketec build_flags = - ${faketec.build_flags} + ${Faketec.build_flags} -D MAX_CONTACTS=100 -D MAX_GROUP_CHANNELS=8 ; NOTE: DO NOT ENABLE --> -D MESH_PACKET_LOGGING=1 ; NOTE: DO NOT ENABLE --> -D MESH_DEBUG=1 -build_src_filter = ${faketec.build_src_filter} +<../examples/companion_radio> +<../examples/companion_radio> + +build_src_filter = ${Faketec.build_src_filter} +<../examples/companion_radio> +<../examples/companion_radio> + lib_deps = - ${faketec.lib_deps} + ${Faketec.lib_deps} adafruit/RTClib @ ^2.1.3 densaugeo/base64 @ ~1.4.0 [env:Faketec_companion_radio_ble] -extends = faketec +extends = Faketec build_flags = - ${faketec.build_flags} + ${Faketec.build_flags} -D MAX_CONTACTS=100 -D MAX_GROUP_CHANNELS=8 -D BLE_PIN_CODE=123456 @@ -92,9 +92,9 @@ build_flags = -D ENABLE_PRIVATE_KEY_IMPORT=1 ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 -build_src_filter = ${faketec.build_src_filter} + +<../examples/companion_radio> + +build_src_filter = ${Faketec.build_src_filter} + +<../examples/companion_radio> + lib_deps = - ${faketec.lib_deps} + ${Faketec.lib_deps} adafruit/RTClib @ ^2.1.3 densaugeo/base64 @ ~1.4.0 @@ -110,7 +110,7 @@ build_flags = ${nrf52840_base.build_flags} -D SX126X_CURRENT_LIMIT=130 -D SX126X_RX_BOOSTED_GAIN=1 build_src_filter = ${nrf52840_base.build_src_filter} - + + + +<../variants/promicro> [env:ProMicroLLCC68_Repeater] diff --git a/variants/promicro/target.cpp b/variants/promicro/target.cpp index 9958c9eb..059bd552 100644 --- a/variants/promicro/target.cpp +++ b/variants/promicro/target.cpp @@ -2,7 +2,7 @@ #include "target.h" #include -FaketecBoard board; +PromicroBoard board; RADIO_CLASS radio = new Module(P_LORA_NSS, P_LORA_DIO_1, P_LORA_RESET, P_LORA_BUSY, SPI); diff --git a/variants/promicro/target.h b/variants/promicro/target.h index b66020d4..79d0862f 100644 --- a/variants/promicro/target.h +++ b/variants/promicro/target.h @@ -3,12 +3,12 @@ #define RADIOLIB_STATIC_ONLY 1 #include #include -#include +#include #include #include #include -extern FaketecBoard board; +extern PromicroBoard board; extern WRAPPER_CLASS radio_driver; extern AutoDiscoverRTCClock rtc_clock; From b8f09531c4d2e39a87f98fcfd3b8f29ec81c8fbd Mon Sep 17 00:00:00 2001 From: taco Date: Sun, 30 Mar 2025 15:57:20 +1100 Subject: [PATCH 2/2] fix: give ProMicroLLCC68 a different definition --- variants/promicro/platformio.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/variants/promicro/platformio.ini b/variants/promicro/platformio.ini index ce1b7b99..f2cecad1 100644 --- a/variants/promicro/platformio.ini +++ b/variants/promicro/platformio.ini @@ -103,7 +103,7 @@ extends = nrf52840_base board = promicro_nrf52840 build_flags = ${nrf52840_base.build_flags} -I variants/promicro - -D FAKETEC + -D PROMICROLLCC68 -D RADIO_CLASS=CustomLLCC68 -D WRAPPER_CLASS=CustomLLCC68Wrapper -D LORA_TX_POWER=22