Добавлен Hydra E22P 433M30S отдельно,чтобы не путаться

.vscode/extensions.json

@@ -1,7 +1,10 @@
 {
+    // See http://go.microsoft.com/fwlink/?LinkId=827846
+    // for the documentation about the extensions.json format
     "recommendations": [
         "Jason2866.esp-decoder",
-        "pioarduino.pioarduino-ide"
+        "pioarduino.pioarduino-ide",
+        "platformio.platformio-ide"
     ],
     "unwantedRecommendations": [
         "ms-vscode.cpptools-extension-pack",

variants/esp32/diy/hydra/platformio.ini

@@ -12,5 +12,6 @@ extends = esp32_base
 board = esp32doit-devkit-v1
 build_flags =
   ${esp32_base.build_flags}
+  -D EBYTE_E22
   -D DIY_V1
   -I variants/esp32/diy/hydra

variants/esp32/diy/hydra/variant.h

@@ -22,6 +22,14 @@
 #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)
+// Вся актуальная информация по замерам мощности тут: https://meshinfo.ru/hardware
+// E22 400M30S - 22dbm max power
+// E22 400M33S - 22dbm max power
+// E22P 868M30S - 12dbm max power
+// E22 900M30S - 22dbm max power
+// E22 900M33S - 12dbm max power
+// 
+
 #define SX126X_DIO3_TCXO_VOLTAGE 1.8 // E22 series TCXO reference voltage is 1.8V
 
 #define SX126X_CS 18    // EBYTE module's NSS pin
@@ -44,3 +52,11 @@
 #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
+
+
+#ifdef EBYTE_E22
+// Internally the TTGO module hooks the SX126x-DIO2 in to control the TX/RX switch
+// (which is the default for the sx1262interface code)
+#define SX126X_DIO3_TCXO_VOLTAGE 1.8
+#define TCXO_OPTIONAL // make it so that the firmware can try both TCXO and XTAL
+#endif

variants/esp32/diy/hydra_e22p_433m/platformio.ini

@@ -0,0 +1,16 @@
+; Hydra - Meshtastic DIY v1 hardware with some specific changes
+[env:hydra_e22p_433m]
+custom_meshtastic_hw_model = 39
+custom_meshtastic_hw_model_slug = HYDRA
+custom_meshtastic_architecture = esp32
+custom_meshtastic_actively_supported = true
+custom_meshtastic_support_level = 3
+custom_meshtastic_display_name = Hydra
+custom_meshtastic_tags = DIY
+
+extends = esp32_base
+board = esp32doit-devkit-v1
+build_flags =
+  ${esp32_base.build_flags}
+  -D DIY_V1
+  -I variants/esp32/diy/hydra_e22p_433m

variants/esp32/diy/hydra_e22p_433m/variant.h

@@ -0,0 +1,48 @@
+// For OLED LCD
+#define I2C_SDA 21
+#define I2C_SCL 22
+
+// For GPS, 'undef's not needed
+#define GPS_TX_PIN 15
+#define GPS_RX_PIN 12
+#define PIN_GPS_EN 4
+
+#define BUTTON_PIN 39 // The middle button GPIO on the T-Beam
+// Note: On the ESP32 base version, gpio34-39 are input-only, and do not have internal pull-ups.
+// If 39 is not being used for a button, it is suggested to remove the #define.
+#define BATTERY_PIN 35 // A battery voltage measurement pin, voltage divider connected here to measure battery voltage
+#define ADC_CHANNEL ADC1_GPIO35_CHANNEL
+#define ADC_MULTIPLIER 1.85 // (R1 = 470k, R2 = 680k)
+#define EXT_PWR_DETECT 4    // Pin to detect connected external power source for LILYGO® TTGO T-Energy T18 and other DIY boards
+#define EXT_NOTIFY_OUT 12   // Overridden default pin to use for Ext Notify Module (#975).
+#define LED_POWER 2         // add status LED (compatible with core-pcb and DIY targets)
+
+// Radio
+#define USE_SX1262 // E22-900M30S uses SX1262
+#define USE_SX1268 // E22-400M30S uses SX1268
+#define SX126X_MAX_POWER 22 // Для модуля 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
+#define SX126X_SCK 5    // EBYTE module's SCK pin
+#define SX126X_MOSI 27  // EBYTE module's MOSI pin
+#define SX126X_MISO 19  // EBYTE module's MISO pin
+#define SX126X_RESET 23 // EBYTE module's NRST pin
+#define SX126X_BUSY 32  // EBYTE module's BUSY pin
+#define SX126X_DIO1 33  // EBYTE module's DIO1 pin
+
+#define SX126X_TXEN RADIOLIB_NC // Schematic connects EBYTE module's TXEN pin to MCU
+#define SX126X_RXEN 14 // RADIOLIB_NC
+//#define SX126X_POWER_EN 14
+#define SX126X_DIO2_AS_RF_SWITCH
+#define TCXO_OPTIONAL
+
+#define LORA_CS SX126X_CS       // Compatibility with variant file configuration structure
+#define LORA_SCK SX126X_SCK     // Compatibility with variant file configuration structure
+#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

variants/esp32/diy/hydra_e22p_868m/platformio.ini

@@ -0,0 +1,16 @@
+; Hydra - Meshtastic DIY v1 hardware with some specific changes
+[env:hydra_e22p_868m]
+custom_meshtastic_hw_model = 39
+custom_meshtastic_hw_model_slug = HYDRA
+custom_meshtastic_architecture = esp32
+custom_meshtastic_actively_supported = true
+custom_meshtastic_support_level = 3
+custom_meshtastic_display_name = Hydra
+custom_meshtastic_tags = DIY
+
+extends = esp32_base
+board = esp32doit-devkit-v1
+build_flags =
+  ${esp32_base.build_flags}
+  -D DIY_V1
+  -I variants/esp32/diy/hydra_e22p_868m

variants/esp32/diy/hydra_e22p_868m/variant.h

@@ -0,0 +1,47 @@
+// For OLED LCD
+#define I2C_SDA 21
+#define I2C_SCL 22
+
+// For GPS, 'undef's not needed
+#define GPS_TX_PIN 15
+#define GPS_RX_PIN 12
+#define PIN_GPS_EN 4
+
+#define BUTTON_PIN 39 // The middle button GPIO on the T-Beam
+// Note: On the ESP32 base version, gpio34-39 are input-only, and do not have internal pull-ups.
+// If 39 is not being used for a button, it is suggested to remove the #define.
+#define BATTERY_PIN 35 // A battery voltage measurement pin, voltage divider connected here to measure battery voltage
+#define ADC_CHANNEL ADC1_GPIO35_CHANNEL
+#define ADC_MULTIPLIER 1.85 // (R1 = 470k, R2 = 680k)
+#define EXT_PWR_DETECT 4    // Pin to detect connected external power source for LILYGO® TTGO T-Energy T18 and other DIY boards
+#define EXT_NOTIFY_OUT 12   // Overridden default pin to use for Ext Notify Module (#975).
+#define LED_POWER 2         // add status LED (compatible with core-pcb and DIY targets)
+
+// Radio
+#define USE_SX1262 // E22-900M30S uses SX1262
+#define USE_SX1268 // E22-400M30S uses SX1268
+#define SX126X_MAX_POWER 22 // Для модуля 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
+#define SX126X_SCK 5    // EBYTE module's SCK pin
+#define SX126X_MOSI 27  // EBYTE module's MOSI pin
+#define SX126X_MISO 19  // EBYTE module's MISO pin
+#define SX126X_RESET 23 // EBYTE module's NRST pin
+#define SX126X_BUSY 32  // EBYTE module's BUSY pin
+#define SX126X_DIO1 33  // EBYTE module's DIO1 pin
+
+#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
+#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

variants/nrf52840/diy/nrf52_promicro_diy_xtal/platformio.ini

@@ -0,0 +1,12 @@
+; Promicro + E22(0)-xxxMM / RA-01SH modules board variant - DIY - without TCXO
+[env:nrf52_promicro_diy_xtal]
+extends = nrf52840_base
+board = promicro-nrf52840
+board_level = extra
+build_flags = ${nrf52840_base.build_flags}
+  -I variants/nrf52840/diy/nrf52_promicro_diy_xtal
+  -D NRF52_PROMICRO_DIY
+build_src_filter = ${nrf52_base.build_src_filter} +<../variants/nrf52840/diy/nrf52_promicro_diy_xtal>
+lib_deps = 
+  ${nrf52840_base.lib_deps}
+debug_tool = jlink

variants/nrf52840/diy/nrf52_promicro_diy_xtal/variant.cpp

@@ -0,0 +1,38 @@
+/*
+  Copyright (c) 2014-2015 Arduino LLC.  All right reserved.
+  Copyright (c) 2016 Sandeep Mistry All right reserved.
+  Copyright (c) 2018, Adafruit Industries (adafruit.com)
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License, or (at your option) any later version.
+
+  This library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  See the GNU Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public
+  License along with this library; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+
+#include "variant.h"
+#include "nrf.h"
+#include "wiring_constants.h"
+#include "wiring_digital.h"
+
+const uint32_t g_ADigitalPinMap[] = {
+    // P0
+    0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+
+    // P1
+    32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47};
+
+void initVariant()
+{
+    // 3V3 Power Rail
+    pinMode(PIN_3V3_EN, OUTPUT);
+    digitalWrite(PIN_3V3_EN, HIGH);
+}

variants/nrf52840/diy/nrf52_promicro_diy_xtal/variant.h

@@ -0,0 +1,159 @@
+#ifndef _VARIANT_PROMICRO_DIY_
+#define _VARIANT_PROMICRO_DIY_
+
+/** Master clock frequency */
+#define VARIANT_MCK (64000000ul)
+
+// #define USE_LFXO // Board uses 32khz crystal for LF
+#define USE_LFRC // Board uses RC for LF
+
+#define PROMICRO_DIY_XTAL
+/*----------------------------------------------------------------------------
+ *        Headers
+ *----------------------------------------------------------------------------*/
+
+#include "WVariant.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+/*
+NRF52 PRO MICRO PIN ASSIGNMENT
+
+| Pin   | Function   |   | Pin     | Function    |
+|-------|------------|---|---------|-------------|
+| Gnd   |            |   | vbat    |             |
+| P0.06 | Serial2 RX |   | vbat    |             |
+| P0.08 | Serial2 TX |   | Gnd     |             |
+| Gnd   |            |   | reset   |             |
+| Gnd   |            |   | ext_vcc | *see 0.13   |
+| P0.17 | RXEN       |   | P0.31   | BATTERY_PIN |
+| P0.20 | GPS_RX     |   | P0.29   | BUSY        |
+| P0.22 | GPS_TX     |   | P0.02   | MISO        |
+| P0.24 | GPS_EN     |   | P1.15   | MOSI        |
+| P1.00 | BUTTON_PIN |   | P1.13   | CS          |
+| P0.11 | SCL        |   | P1.11   | SCK         |
+| P1.04 | SDA        |   | P0.10   | DIO1/IRQ    |
+| P1.06 | Free pin   |   | P0.09   | RESET       |
+|       |            |   |         |             |
+|       | Mid board  |   |         | Internal    |
+| P1.01 | Free pin   |   | 0.15    | LED         |
+| P1.02 | Free pin   |   | 0.13    | 3V3_EN      |
+| P1.07 | Free pin   |   |         |             |
+*/
+
+// Number of pins defined in PinDescription array
+#define PINS_COUNT (48)
+#define NUM_DIGITAL_PINS (48)
+#define NUM_ANALOG_INPUTS (1)
+#define NUM_ANALOG_OUTPUTS (0)
+
+// Pin 13 enables 3.3V periphery. If the Lora module is on this pin, then it should stay enabled at all times.
+#define PIN_3V3_EN (0 + 13) // P0.13
+
+// Analog pins
+#define BATTERY_PIN (0 + 31) // P0.31 Battery ADC
+#define ADC_CHANNEL ADC1_GPIO4_CHANNEL
+#define ADC_RESOLUTION 14
+#define BATTERY_SENSE_RESOLUTION_BITS 12
+#define BATTERY_SENSE_RESOLUTION 4096.0
+// Definition of milliVolt per LSB => 3.0V ADC range and 12-bit ADC resolution = 3000mV/4096
+#define VBAT_MV_PER_LSB (0.73242188F)
+// Voltage divider value => 1.5M + 1M voltage divider on VBAT = (1.5M / (1M + 1.5M))
+#define VBAT_DIVIDER (0.6F)
+// Compensation factor for the VBAT divider
+#define VBAT_DIVIDER_COMP (1.73)
+// Fixed calculation of milliVolt from compensation value
+#define REAL_VBAT_MV_PER_LSB (VBAT_DIVIDER_COMP * VBAT_MV_PER_LSB)
+#undef AREF_VOLTAGE
+#define AREF_VOLTAGE 3.0
+#define VBAT_AR_INTERNAL AR_INTERNAL_3_0
+#define ADC_MULTIPLIER VBAT_DIVIDER_COMP // REAL_VBAT_MV_PER_LSB
+#define VBAT_RAW_TO_SCALED(x) (REAL_VBAT_MV_PER_LSB * x)
+
+// WIRE IC AND IIC PINS
+#define WIRE_INTERFACES_COUNT 1
+
+#define PIN_WIRE_SDA (32 + 4) // P1.04
+#define PIN_WIRE_SCL (0 + 11) // P0.11
+
+// LED
+#define PIN_LED1 (0 + 15) // P0.15
+#define LED_BUILTIN PIN_LED1
+// Actually red
+#define LED_BLUE PIN_LED1
+#define LED_STATE_ON 1 // State when LED is lit
+
+// Button
+#define BUTTON_PIN (32 + 0) // P1.00
+
+// GPS
+#define PIN_GPS_TX (0 + 22) // P0.22
+#define PIN_GPS_RX (0 + 20) // P0.20
+
+#define PIN_GPS_EN (0 + 24) // P0.24
+#define GPS_POWER_TOGGLE
+#define GPS_UBLOX
+// define GPS_DEBUG
+
+// UART interfaces
+#define PIN_SERIAL1_RX PIN_GPS_TX
+#define PIN_SERIAL1_TX PIN_GPS_RX
+
+#define PIN_SERIAL2_RX (0 + 6) // P0.06
+#define PIN_SERIAL2_TX (0 + 8) // P0.08
+
+// Serial interfaces
+#define SPI_INTERFACES_COUNT 1
+
+#define PIN_SPI_MISO (0 + 2)   // P0.02
+#define PIN_SPI_MOSI (32 + 15) // P1.15
+#define PIN_SPI_SCK (32 + 11)  // P1.11
+
+// LORA MODULES
+#define USE_LLCC68
+#define USE_SX1262
+// #define USE_RF95
+#define USE_SX1268
+
+// LORA CONFIG
+#define SX126X_CS (32 + 13)      // P1.13 FIXME - we really should define LORA_CS instead
+#define SX126X_DIO1 (0 + 10)     // P0.10 IRQ
+#define SX126X_DIO2_AS_RF_SWITCH // Note for E22 modules: DIO2 is not attached internally to TXEN for automatic TX/RX switching,
+                                 // so it needs connecting externally if it is used in this way
+#define SX126X_BUSY (0 + 29)     // P0.29
+#define SX126X_RESET (0 + 9)     // P0.09
+#define SX126X_RXEN (0 + 17)     // P0.17
+#define SX126X_TXEN RADIOLIB_NC  // Assuming that DIO2 is connected to TXEN pin. If not, TXEN must be connected.
+
+/*
+On the SX1262, DIO3 sets the voltage for an external TCXO, if one is present. If one is not present, then this should not be used.
+
+Ebyte
+e22-900mm22s has no TCXO
+e22-900m22s has TCXO
+e220-900mm22s has no TCXO, works with/without this definition, looks like DIO3 not connected at all
+
+AI-thinker
+RA-01SH does not have TCXO
+
+Waveshare
+Core1262 has TCXO
+
+*/
+// #define SX126X_DIO3_TCXO_VOLTAGE 1.8
+
+#ifdef __cplusplus
+}
+#endif
+
+// RA-01SH-P 需要限制SX1262功率為3dbm，如果使用無PA晶片需註解
+// Datasheet: https://aithinker-static.oss-cn-shenzhen.aliyuncs.com/docs/Specification/Ra-01SH-P_V1.0.2%20%E8%A7%84%E6%A0%BC%E4%B9%A6-20250702.pdf
+#define SX126X_MAX_POWER 3
+
+/*----------------------------------------------------------------------------
+ *        Arduino objects - C++ only
+ *----------------------------------------------------------------------------*/
+
+#endif