diff --git a/variants/esp32/diy/hydra_868m/platformio.ini b/variants/esp32/diy/hydra_e22p_868m/platformio.ini similarity index 84% rename from variants/esp32/diy/hydra_868m/platformio.ini rename to variants/esp32/diy/hydra_e22p_868m/platformio.ini index ee37ee084..446bd0972 100644 --- a/variants/esp32/diy/hydra_868m/platformio.ini +++ b/variants/esp32/diy/hydra_e22p_868m/platformio.ini @@ -1,5 +1,5 @@ ; Hydra - Meshtastic DIY v1 hardware with some specific changes -[env:hydra_868m] +[env:hydra_e22p_868m] custom_meshtastic_hw_model = 39 custom_meshtastic_hw_model_slug = HYDRA custom_meshtastic_architecture = esp32 @@ -13,5 +13,4 @@ board = esp32doit-devkit-v1 build_flags = ${esp32_base.build_flags} -D DIY_V1 - -I variants/esp32/diy/hydra_868m - -D EBYTE_E22P_868M30S + -I variants/esp32/diy/hydra_e22p_868m \ No newline at end of file diff --git a/variants/esp32/diy/hydra_868m/variant.h b/variants/esp32/diy/hydra_e22p_868m/variant.h similarity index 73% rename from variants/esp32/diy/hydra_868m/variant.h rename to variants/esp32/diy/hydra_e22p_868m/variant.h index 27a93752d..5923cc766 100644 --- a/variants/esp32/diy/hydra_868m/variant.h +++ b/variants/esp32/diy/hydra_e22p_868m/variant.h @@ -20,8 +20,7 @@ // Radio #define USE_SX1262 // E22-900M30S uses SX1262 #define USE_SX1268 // E22-400M30S uses SX1268 -#define SX126X_MAX_POWER \ - 22 // Outputting 22dBm from SX1262 results in ~30dBm E22-900M30S output (module only uses last stage of the YP2233W PA) +#define SX126X_MAX_POWER 12 // Для модуля E22P 868M30S выходная мощность не более 12дбм! на выходе будет 30дбм! #define SX126X_DIO3_TCXO_VOLTAGE 1.8 // E22 series TCXO reference voltage is 1.8V #define SX126X_CS 18 // EBYTE module's NSS pin @@ -32,16 +31,10 @@ #define SX126X_BUSY 32 // EBYTE module's BUSY pin #define SX126X_DIO1 33 // EBYTE module's DIO1 pin -//#define SX126X_TXEN 13 // Schematic connects EBYTE module's TXEN pin to MCU - -//#if defined(EBYTE_E22P_868M30S) // For Ebyte E22P-868M30S and E22P-915M30S modules - pin 14 always HIGH - #define SX126X_TXEN RADIOLIB_NC - #define SX126X_RXEN RADIOLIB_NC - #define SX126X_POWER_EN 14 - #define SX126X_DIO2_AS_RF_SWITCH -//#else -// #define SX126X_RXEN 14 // Schematic connects EBYTE module's RXEN pin to MCU -//#endif +#define SX126X_TXEN RADIOLIB_NC // Schematic connects EBYTE module's TXEN pin to MCU +#define SX126X_RXEN RADIOLIB_NC +#define SX126X_POWER_EN 14 +#define SX126X_DIO2_AS_RF_SWITCH #define LORA_CS SX126X_CS // Compatibility with variant file configuration structure #define LORA_SCK SX126X_SCK // Compatibility with variant file configuration structure @@ -51,5 +44,4 @@ #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 -#define LORA_POWER_EN SX126X_POWER_EN \ No newline at end of file +//#define LORA_DIO2 SX126X_BUSY // Compatibility with variant file configuration structure \ No newline at end of file