From 7c1c49b8abefd91c328ff772a9458e5d627a215d Mon Sep 17 00:00:00 2001 From: Mark Trevor Birss Date: Sat, 7 Jan 2023 13:00:50 +0200 Subject: [PATCH 1/7] Create platformio.ini --- variants/betafpv_2400_tx_micro/platformio.ini | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 variants/betafpv_2400_tx_micro/platformio.ini diff --git a/variants/betafpv_2400_tx_micro/platformio.ini b/variants/betafpv_2400_tx_micro/platformio.ini new file mode 100644 index 000000000..1968413c1 --- /dev/null +++ b/variants/betafpv_2400_tx_micro/platformio.ini @@ -0,0 +1,19 @@ +[env:betafpv_2400_tx_micro] +extends = esp32_base +board = esp32doit-devkit-v1 +build_flags = + ${esp32_base.build_flags} + -D DIY_V1 + ;-D EBYTE_E22 + ;-D OLED_RU + -D VTABLES_IN_FLASH=1 + -D CONFIG_DISABLE_HAL_LOCKS=1 + -O2 + -I variants/betafpv_2400_tx_micro +board_build.f_cpu = 240000000L +upload_protocol = esptool +upload_port = /dev/ttyUSB0 +upload_speed = 460800 +lib_deps = + ${esp32_base.lib_deps} + makuna/NeoPixelBus@^2.7.1 From 9f1c77da763c4872831cbc9e79dad309aeed975b Mon Sep 17 00:00:00 2001 From: Mark Trevor Birss Date: Sat, 7 Jan 2023 13:01:14 +0200 Subject: [PATCH 2/7] Create variant.h --- variants/betafpv_2400_tx_micro/variant.h | 37 ++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 variants/betafpv_2400_tx_micro/variant.h diff --git a/variants/betafpv_2400_tx_micro/variant.h b/variants/betafpv_2400_tx_micro/variant.h new file mode 100644 index 000000000..6a124b68e --- /dev/null +++ b/variants/betafpv_2400_tx_micro/variant.h @@ -0,0 +1,37 @@ +#include + +// For OLED LCD +#define I2C_SDA 22 +#define I2C_SCL 32 + +//#undef I2C_SDA +//#undef I2C_SCL +//#define HAS_SCREEN 0 + +// NO GPS +#undef GPS_RX_PIN +#undef GPS_TX_PIN + +#define RF95_SCK 18 +#define RF95_MISO 19 +#define RF95_MOSI 23 +#define RF95_NSS 5 +#define RF95_FAN_EN 17 + +#define LED_PIN 16 // This is a LED_WS2812 not a standard LED + +#define BUTTON_PIN 25 +#define BUTTON_NEED_PULLUP + +#undef EXT_NOTIFY_OUT + +// SX128X 2.4 Ghz LoRa module +#define USE_SX1280 +#define LORA_RESET 14 +#define SX128X_CS 5 +#define SX128X_DIO1 4 +#define SX128X_BUSY 21 +#define SX128X_TXEN 26 +#define SX128X_RXEN 27 +#define SX128X_RESET LORA_RESET +#define SX128X_MAX_POWER 13 From 0e0ccad4896987001ec0217d7dd2f61ef0efe02a Mon Sep 17 00:00:00 2001 From: Mark Trevor Birss Date: Sat, 7 Jan 2023 13:22:32 +0200 Subject: [PATCH 3/7] Update variant.h --- variants/betafpv_2400_tx_micro/variant.h | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/variants/betafpv_2400_tx_micro/variant.h b/variants/betafpv_2400_tx_micro/variant.h index 6a124b68e..777c91ec7 100644 --- a/variants/betafpv_2400_tx_micro/variant.h +++ b/variants/betafpv_2400_tx_micro/variant.h @@ -1,13 +1,9 @@ #include -// For OLED LCD +// 0.96" OLED #define I2C_SDA 22 #define I2C_SCL 32 -//#undef I2C_SDA -//#undef I2C_SCL -//#define HAS_SCREEN 0 - // NO GPS #undef GPS_RX_PIN #undef GPS_TX_PIN From f21212dd3e3bdc2c8a17b4242811a588fae9a3b2 Mon Sep 17 00:00:00 2001 From: Mark Trevor Birss Date: Sat, 7 Jan 2023 13:23:33 +0200 Subject: [PATCH 4/7] Update platformio.ini --- variants/betafpv_2400_tx_micro/platformio.ini | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/variants/betafpv_2400_tx_micro/platformio.ini b/variants/betafpv_2400_tx_micro/platformio.ini index 1968413c1..88fcfda98 100644 --- a/variants/betafpv_2400_tx_micro/platformio.ini +++ b/variants/betafpv_2400_tx_micro/platformio.ini @@ -4,11 +4,9 @@ board = esp32doit-devkit-v1 build_flags = ${esp32_base.build_flags} -D DIY_V1 - ;-D EBYTE_E22 - ;-D OLED_RU - -D VTABLES_IN_FLASH=1 - -D CONFIG_DISABLE_HAL_LOCKS=1 - -O2 + -D VTABLES_IN_FLASH=1 + -D CONFIG_DISABLE_HAL_LOCKS=1 + -O2 -I variants/betafpv_2400_tx_micro board_build.f_cpu = 240000000L upload_protocol = esptool From c98dc4cae09c977e98fb126f77c71470ac8e59a7 Mon Sep 17 00:00:00 2001 From: Mark Trevor Birss Date: Sat, 7 Jan 2023 13:48:35 +0200 Subject: [PATCH 5/7] Update variant.h --- variants/betafpv_2400_tx_micro/variant.h | 1 + 1 file changed, 1 insertion(+) diff --git a/variants/betafpv_2400_tx_micro/variant.h b/variants/betafpv_2400_tx_micro/variant.h index 777c91ec7..d4af5dac4 100644 --- a/variants/betafpv_2400_tx_micro/variant.h +++ b/variants/betafpv_2400_tx_micro/variant.h @@ -1,3 +1,4 @@ +//https://betafpv.com/products/elrs-micro-tx-module #include // 0.96" OLED From 52cfd620311f1ef8f9c467d7c01aa0753715148c Mon Sep 17 00:00:00 2001 From: Mark Trevor Birss Date: Sat, 7 Jan 2023 14:05:16 +0200 Subject: [PATCH 6/7] Update SX128xInterface.cpp --- src/mesh/SX128xInterface.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/mesh/SX128xInterface.cpp b/src/mesh/SX128xInterface.cpp index cc6d299c8..0fa77575f 100644 --- a/src/mesh/SX128xInterface.cpp +++ b/src/mesh/SX128xInterface.cpp @@ -25,7 +25,12 @@ bool SX128xInterface::init() digitalWrite(SX128X_POWER_EN, HIGH); pinMode(SX128X_POWER_EN, OUTPUT); #endif - + +#ifdef RF95_FAN_EN + pinMode(RF95_FAN_EN, OUTPUT); + digitalWrite(RF95_FAN_EN, 1); +#endif + #if defined(SX128X_RXEN) && (SX128X_RXEN != RADIOLIB_NC) // set not rx or tx mode digitalWrite(SX128X_RXEN, LOW); // Set low before becoming an output pinMode(SX128X_RXEN, OUTPUT); From 4d7402839e6e6dab048ce5e858a54b52c60553b4 Mon Sep 17 00:00:00 2001 From: Mark Trevor Birss Date: Sat, 7 Jan 2023 16:00:27 +0200 Subject: [PATCH 7/7] Update platformio.ini --- variants/betafpv_2400_tx_micro/platformio.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/variants/betafpv_2400_tx_micro/platformio.ini b/variants/betafpv_2400_tx_micro/platformio.ini index 88fcfda98..e04f4efc2 100644 --- a/variants/betafpv_2400_tx_micro/platformio.ini +++ b/variants/betafpv_2400_tx_micro/platformio.ini @@ -3,7 +3,7 @@ extends = esp32_base board = esp32doit-devkit-v1 build_flags = ${esp32_base.build_flags} - -D DIY_V1 + -D BETAFPV_2400_TX -D VTABLES_IN_FLASH=1 -D CONFIG_DISABLE_HAL_LOCKS=1 -O2