diff --git a/src/helpers/ESP32Board.h b/src/helpers/ESP32Board.h index 3fb7ff5d..d7eb5fee 100644 --- a/src/helpers/ESP32Board.h +++ b/src/helpers/ESP32Board.h @@ -41,11 +41,6 @@ public: pinMode(P_LORA_TX_LED, OUTPUT); digitalWrite(P_LORA_TX_LED, LOW); #endif -// -// #ifdef P_LORA_EN -// pinMode(P_LORA_EN, OUTPUT); -// digitalWrite(P_LORA_EN, HIGH); -// #endif #if defined(PIN_BOARD_SDA) && defined(PIN_BOARD_SCL) #if PIN_BOARD_SDA >= 0 && PIN_BOARD_SCL >= 0 diff --git a/variants/generic-e22/platformio.ini b/variants/generic-e22/platformio.ini index dfa2ff64..b18f751e 100644 --- a/variants/generic-e22/platformio.ini +++ b/variants/generic-e22/platformio.ini @@ -166,4 +166,4 @@ build_flags = ; -D MESH_DEBUG=1 lib_deps = ${Generic_E22.lib_deps} - ${esp32_ota.lib_deps} + ${esp32_ota.lib_deps} \ No newline at end of file diff --git a/variants/generic-e22/target.cpp b/variants/generic-e22/target.cpp index 26bba1c0..0d5a42fa 100644 --- a/variants/generic-e22/target.cpp +++ b/variants/generic-e22/target.cpp @@ -31,4 +31,3 @@ mesh::LocalIdentity radio_new_identity() { RadioNoiseListener rng(radio); return mesh::LocalIdentity(&rng); // create new random identity } - diff --git a/variants/meshadventurer/platformio.ini b/variants/meshadventurer/platformio.ini index 5bdc1cb7..0b33196c 100644 --- a/variants/meshadventurer/platformio.ini +++ b/variants/meshadventurer/platformio.ini @@ -24,6 +24,7 @@ build_flags = -D PIN_BOARD_SCL=22 -D SX126X_DIO2_AS_RF_SWITCH=false -D SX126X_DIO3_TCXO_VOLTAGE=1.8 + -D SX126X_CURRENT_LIMIT=140 -D SX126X_RX_BOOSTED_GAIN=1 -D PIN_GPS_RX=12 -D PIN_GPS_TX=15 @@ -120,7 +121,7 @@ build_flags = -D ADMIN_PASSWORD='"password"' -D MAX_NEIGHBOURS=50 ; -D MESH_PACKET_LOGGING=1 -; -D MESH_DEBUG=1 + -D MESH_DEBUG=1 lib_deps = ${Meshadventurer.lib_deps} ${esp32_ota.lib_deps} @@ -354,7 +355,7 @@ build_flags = ${Meshadventurer.build_flags} -D WRAPPER_CLASS=CustomSX1268Wrapper -D LORA_TX_POWER=22 -[env:Meshadventurer_sx1262_e22p_companion_radio_ble] +[env:Meshadventurer_sx1262_e22p_868m30s_companion_radio_ble] extends = Meshadventurer build_src_filter = ${Meshadventurer.build_src_filter} + @@ -370,7 +371,6 @@ build_flags = -D P_LORA_EN=14 -D SX126X_DIO2_AS_RF_SWITCH=1 -D LORA_TX_POWER=12 - ;-D MAX_LORA_TX_POWER=30 -D MAX_CONTACTS=160 -D MAX_GROUP_CHANNELS=40 -D BLE_PIN_CODE=123456 @@ -384,7 +384,7 @@ lib_deps = ${Meshadventurer.lib_deps} densaugeo/base64 @ ~1.4.0 -[env:Meshadventurer_sx1262_e22p_repeater] +[env:Meshadventurer_sx1262_e22p_868m30s_repeater] extends = Meshadventurer build_src_filter = ${Meshadventurer.build_src_filter} +<../examples/simple_repeater> diff --git a/variants/meshadventurer/variant.h b/variants/meshadventurer/variant.h index 3d50cbfe..fc5a1963 100644 --- a/variants/meshadventurer/variant.h +++ b/variants/meshadventurer/variant.h @@ -42,7 +42,7 @@ #define LORA_MOSI SX126X_MOSI // Compatibility with variant file configuration structure #define LORA_MISO SX126X_MISO // Compatibility with variant file configuration structure #define LORA_DIO1 SX126X_DIO1 // Compatibility with variant file configuration structure -//#define LORA_TXEN SX126X_TXEN // Compatibility with variant file configuration structure -//#define LORA_RXEN SX126X_RXEN // Compatibility with variant file configuration structure -//#define LORA_RESET SX126X_RESET // Compatibility with variant file configuration structure -//#define LORA_DIO2 SX126X_BUSY // Compatibility with variant file configuration structure \ No newline at end of file +#define LORA_TXEN SX126X_TXEN // Compatibility with variant file configuration structure +#define LORA_RXEN SX126X_RXEN // Compatibility with variant file configuration structure +#define LORA_RESET SX126X_RESET // Compatibility with variant file configuration structure +#define LORA_DIO2 SX126X_BUSY // Compatibility with variant file configuration structure \ No newline at end of file