deuxyeux/RNode_Firmware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: deuxyeux:af8647d2394b9a2842cd52867af4c60ed984b18d
Branches Tags
deuxyeux:master
..
compare: deuxyeux:master
Branches Tags
deuxyeux:master

2 Commits
af8647d239 ... master

Author SHA1 Message Date
Nickie Deuxyeux
2a6eacb151 TX power clamping for MODEL_FD 2026-04-26 18:17:37 +03:00
Nickie Deuxyeux
e6983eaf07 Added model for 33dBm E22 boards 2026-04-26 18:17:08 +03:00
2 changed files with 14 additions and 8 deletions
Expand all files Collapse all files

5
Boards.h
View File

@@ -121,6 +121,7 @@
#define BOARD_HUZZAH32 0x34 #define BOARD_HUZZAH32 0x34
#define BOARD_GENERIC_ESP32 0x35 #define BOARD_GENERIC_ESP32 0x35
#define BOARD_GENERIC_NRF52 0x50 #define BOARD_GENERIC_NRF52 0x50
#define MODEL_FD 0xFD // Homebrew board with E22-xxxM33S, max 33dBm output power (clamped max txpower to 8)
#define MODEL_FE 0xFE // Homebrew board, max 17dBm output power #define MODEL_FE 0xFE // Homebrew board, max 17dBm output power
#define MODEL_FF 0xFF // Homebrew board, max 14dBm output power #define MODEL_FF 0xFF // Homebrew board, max 14dBm output power
@@ -416,8 +417,8 @@
#define HAS_INPUT true #define HAS_INPUT true
#define HAS_TCXO true #define HAS_TCXO true
#define MODEM SX1262 #define MODEM SX1262
#define DIO2_AS_RF_SWITCH false #define DIO2_AS_RF_SWITCH true
#define HAS_RF_SWITCH_RX_TX true #define HAS_RF_SWITCH_RX_TX false
const int pin_cs = 5; const int pin_cs = 5;
const int pin_sclk = 18; const int pin_sclk = 18;
const int pin_miso = 19; const int pin_miso = 19;

17
Utilities.h
View File

@@ -1407,6 +1407,10 @@ void setTXPower() {
lora_txp = real_lora_txp; lora_txp = real_lora_txp;
#endif #endif
if (model == MODEL_FD && mapped_lora_txp > 8) {
mapped_lora_txp = 8;
}
if (model == MODEL_11) LoRa->setTxPower(mapped_lora_txp, PA_OUTPUT_RFO_PIN); if (model == MODEL_11) LoRa->setTxPower(mapped_lora_txp, PA_OUTPUT_RFO_PIN);
if (model == MODEL_12) LoRa->setTxPower(mapped_lora_txp, PA_OUTPUT_RFO_PIN); if (model == MODEL_12) LoRa->setTxPower(mapped_lora_txp, PA_OUTPUT_RFO_PIN);
@@ -1452,6 +1456,7 @@ void setTXPower() {
if (model == MODEL_E3) LoRa->setTxPower(mapped_lora_txp, PA_OUTPUT_PA_BOOST_PIN); if (model == MODEL_E3) LoRa->setTxPower(mapped_lora_txp, PA_OUTPUT_PA_BOOST_PIN);
if (model == MODEL_E8) LoRa->setTxPower(mapped_lora_txp, PA_OUTPUT_PA_BOOST_PIN); if (model == MODEL_E8) LoRa->setTxPower(mapped_lora_txp, PA_OUTPUT_PA_BOOST_PIN);
if (model == MODEL_FD) LoRa->setTxPower(mapped_lora_txp, PA_OUTPUT_PA_BOOST_PIN);
if (model == MODEL_FE) LoRa->setTxPower(mapped_lora_txp, PA_OUTPUT_PA_BOOST_PIN); if (model == MODEL_FE) LoRa->setTxPower(mapped_lora_txp, PA_OUTPUT_PA_BOOST_PIN);
if (model == MODEL_FF) LoRa->setTxPower(mapped_lora_txp, PA_OUTPUT_RFO_PIN); if (model == MODEL_FF) LoRa->setTxPower(mapped_lora_txp, PA_OUTPUT_RFO_PIN);
} }
@@ -1693,7 +1698,7 @@ bool eeprom_model_valid() {
#elif BOARD_MODEL == BOARD_T3S3 #elif BOARD_MODEL == BOARD_T3S3
if (model == MODEL_A1 || model == MODEL_A6 || model == MODEL_A5 || model == MODEL_AA || model == MODEL_AC) { if (model == MODEL_A1 || model == MODEL_A6 || model == MODEL_A5 || model == MODEL_AA || model == MODEL_AC) {
#elif BOARD_MODEL == BOARD_HMBRW #elif BOARD_MODEL == BOARD_HMBRW
if (model == MODEL_FF || model == MODEL_FE) { if (model == MODEL_FF || model == MODEL_FE || model = MODEL_FD) {
#elif BOARD_MODEL == BOARD_TBEAM #elif BOARD_MODEL == BOARD_TBEAM
if (model == MODEL_E4 || model == MODEL_E9 || model == MODEL_E3 || model == MODEL_E8) { if (model == MODEL_E4 || model == MODEL_E9 || model == MODEL_E3 || model == MODEL_E8) {
#elif BOARD_MODEL == BOARD_TDECK #elif BOARD_MODEL == BOARD_TDECK
@@ -1725,15 +1730,15 @@ bool eeprom_model_valid() {
#elif BOARD_MODEL == BOARD_GENERIC_ESP32 #elif BOARD_MODEL == BOARD_GENERIC_ESP32
if (model == MODEL_FF || model == MODEL_FE) { if (model == MODEL_FF || model == MODEL_FE) {
#elif BOARD_MODEL == BOARD_MESHPOE_S3 #elif BOARD_MODEL == BOARD_MESHPOE_S3
if (model == MODEL_FF || model == MODEL_FE) { if (model == MODEL_FF || model == MODEL_FE || model == MODEL_FD) {
#elif BOARD_MODEL == BOARD_MESHADVENTURER_S3 #elif BOARD_MODEL == BOARD_MESHADVENTURER_S3
if (model == MODEL_FF || model == MODEL_FE) { if (model == MODEL_FF || model == MODEL_FE || model == MODEL_FD) {
#elif BOARD_MODEL == BOARD_MESHADVENTURER #elif BOARD_MODEL == BOARD_MESHADVENTURER
if (model == MODEL_FF || model == MODEL_FE) { if (model == MODEL_FF || model == MODEL_FE || model == MODEL_FD) {
#elif BOARD_MODEL == BOARD_DIY_V1 #elif BOARD_MODEL == BOARD_DIY_V1
if (model == MODEL_FF || model == MODEL_FE) { if (model == MODEL_FF || model == MODEL_FE || model == MODEL_FD) {
#elif BOARD_MODEL == BOARD_AETHERNODE #elif BOARD_MODEL == BOARD_AETHERNODE
if (model == MODEL_FF || model == MODEL_FE) { if (model == MODEL_FF || model == MODEL_FE || model == MODEL_FD) {
#elif BOARD_MODEL == BOARD_PROMICRO #elif BOARD_MODEL == BOARD_PROMICRO
if (model == MODEL_FF || model == MODEL_FE) { if (model == MODEL_FF || model == MODEL_FE) {
#else #else