manual-merge tbeam conflicts

variants/lilygo_tbeam/platformio.ini

@@ -1,63 +0,0 @@
-[LilyGo_TBeam]
-extends = esp32_base
-board = ttgo-t-beam
-build_flags =
-  ${esp32_base.build_flags}
-  -I variants/lilygo_tbeam
-  -D LILYGO_TBEAM
-  -D RADIO_CLASS=CustomSX1276
-  -D WRAPPER_CLASS=CustomSX1276Wrapper
-  -D SX127X_CURRENT_LIMIT=120
-  -D LORA_TX_POWER=20
-  -D P_LORA_TX_LED=4
-  -D PIN_BOARD_SDA=21
-  -D PIN_BOARD_SCL=22
-  -D PIN_USER_BTN=38
-build_src_filter = ${esp32_base.build_src_filter}
-  +<../variants/lilygo_tbeam>
-board_build.partitions = min_spiffs.csv ; get around 4mb flash limit
-lib_deps =
-  ${esp32_base.lib_deps}
-  lewisxhe/XPowersLib@^0.2.7
-  adafruit/Adafruit SSD1306 @ ^2.5.13
-
-[env:Tbeam_companion_radio_ble]
-extends = LilyGo_TBeam
-board_build.upload.maximum_ram_size=2000000
-build_flags =
-  ${LilyGo_TBeam.build_flags}
-  -D DISPLAY_CLASS=SSD1306Display
-  -D MAX_CONTACTS=100
-  -D MAX_GROUP_CHANNELS=8
-  -D BLE_PIN_CODE=123456
-  -D BLE_DEBUG_LOGGING=1
-  -D OFFLINE_QUEUE_SIZE=256
-;  -D RADIOLIB_DEBUG_BASIC=1
-;  -D MESH_PACKET_LOGGING=1
-;  -D MESH_DEBUG=1
-build_src_filter = ${LilyGo_TBeam.build_src_filter}
-  +<helpers/esp32/*.cpp>
-  +<helpers/ui/SSD1306Display.cpp>
-  +<../examples/companion_radio>
-lib_deps =
-  ${LilyGo_TBeam.lib_deps}
-  densaugeo/base64 @ ~1.4.0
-
-[env:Tbeam_repeater]
-extends = LilyGo_TBeam
-build_flags =
-  ${LilyGo_TBeam.build_flags}
-  -D DISPLAY_CLASS=SSD1306Display
-  -D ADVERT_NAME='"Tbeam Repeater"'
-  -D ADVERT_LAT=0.0
-  -D ADVERT_LON=0.0
-  -D ADMIN_PASSWORD='"password"'
-  -D MAX_NEIGHBOURS=8
-;  -D MESH_PACKET_LOGGING=1
-;  -D MESH_DEBUG=1
-build_src_filter = ${LilyGo_TBeam.build_src_filter}
-  +<helpers/ui/SSD1306Display.cpp>
-  +<../examples/simple_repeater>
-lib_deps =
-  ${LilyGo_TBeam.lib_deps}
-  ${esp32_ota.lib_deps}

variants/lilygo_tbeam/target.h

@@ -1,27 +0,0 @@
-#pragma once
-
-#define RADIOLIB_STATIC_ONLY 1
-#include <RadioLib.h>
-#include <helpers/RadioLibWrappers.h>
-#include <helpers/TBeamBoard.h>
-#include <helpers/CustomSX1276Wrapper.h>
-#include <helpers/AutoDiscoverRTCClock.h>
-#include <helpers/SensorManager.h>
-#ifdef DISPLAY_CLASS
-  #include <helpers/ui/SSD1306Display.h>
-#endif
-
-extern TBeamBoard board;
-extern WRAPPER_CLASS radio_driver;
-extern AutoDiscoverRTCClock rtc_clock;
-extern SensorManager sensors;
-
-#ifdef DISPLAY_CLASS
-  extern DISPLAY_CLASS display;
-#endif
-
-bool radio_init();
-uint32_t radio_get_rng_seed();
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr);
-void radio_set_tx_power(uint8_t dbm);
-mesh::LocalIdentity radio_new_identity();