sp9unb
/
meshtastic-firmware
sforkowany z mirror/meshtastic-firmware
1
0
Forkuj 0
Kod Zgłoszenia Oczekujące zmiany Packages Projekty Wydania Wiki Aktywność

use common param name `SX126X_ANT_SW` instead of the `SX1262_ANT_SW`

1.2-legacy
Vladislav Osmanov 2021-09-14 12:25:25 +03:00
rodzic cb42440963
commit 56dd3eab23
5 zmienionych plików z 8 dodań i 14 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

14
src/main.cpp
Wyświetl plik

@ -492,16 +492,10 @@ void setup()
} }
} }
#ifdef SX1262_ANT_SW #ifdef SX126X_ANT_SW
// make analog PA vs not PA switch on SX1262 eval board work properly // make analog PA vs not PA switch on SX126x eval board work properly
pinMode(SX1262_ANT_SW, OUTPUT); pinMode(SX126X_ANT_SW, OUTPUT);
digitalWrite(SX1262_ANT_SW, 1); digitalWrite(SX126X_ANT_SW, 1);
#endif
#ifdef SX1268_ANT_SW
// make analog PA vs not PA switch on SX1268 eval board work properly
pinMode(SX1268_ANT_SW, OUTPUT);
digitalWrite(SX1268_ANT_SW, 1);
#endif #endif
// radio init MUST BE AFTER service.init, so we have our radio config settings (from nodedb init) // radio init MUST BE AFTER service.init, so we have our radio config settings (from nodedb init)

2
variants/lora_relay_v1/variant.h
Wyświetl plik

@ -126,7 +126,7 @@ static const uint8_t SCK = PIN_SPI_SCK;
#define SX1262_DIO2 (30) #define SX1262_DIO2 (30)
#define SX126X_BUSY (33) // Supposed to be P0.18 but because of reworks, now on P0.31 (18) #define SX126X_BUSY (33) // Supposed to be P0.18 but because of reworks, now on P0.31 (18)
#define SX126X_RESET (34) #define SX126X_RESET (34)
// #define SX1262_ANT_SW (32 + 10) // #define SX126X_ANT_SW (32 + 10)
#define SX126X_RXEN (14) #define SX126X_RXEN (14)
#define SX126X_TXEN (31) #define SX126X_TXEN (31)
#define SX126X_POWER_EN \ #define SX126X_POWER_EN \

2
variants/lora_relay_v2/variant.h
Wyświetl plik

@ -146,7 +146,7 @@ static const uint8_t SCK = PIN_SPI_SCK;
#define SX1262_DIO2 (30) #define SX1262_DIO2 (30)
#define SX126X_BUSY (33) // Supposed to be P0.18 but because of reworks, now on P0.31 (18) #define SX126X_BUSY (33) // Supposed to be P0.18 but because of reworks, now on P0.31 (18)
#define SX126X_RESET (34) #define SX126X_RESET (34)
// #define SX1262_ANT_SW (32 + 10) // #define SX126X_ANT_SW (32 + 10)
#define SX126X_RXEN (14) #define SX126X_RXEN (14)
#define SX126X_TXEN (31) #define SX126X_TXEN (31)
#define SX126X_POWER_EN \ #define SX126X_POWER_EN \

2
variants/pca10056-rc-clock/variant.h
Wyświetl plik

@ -144,7 +144,7 @@ static const uint8_t SCK = PIN_SPI_SCK;
#define SX126X_DIO1 (32 + 6) // P1.06 #define SX126X_DIO1 (32 + 6) // P1.06
#define SX126X_BUSY (32 + 4) // P1.04 #define SX126X_BUSY (32 + 4) // P1.04
#define SX126X_RESET (0 + 3) // P0.03 #define SX126X_RESET (0 + 3) // P0.03
#define SX1262_ANT_SW (32 + 10) // P1.10 #define SX126X_ANT_SW (32 + 10) // P1.10
// To debug via the segger JLINK console rather than the CDC-ACM serial device // To debug via the segger JLINK console rather than the CDC-ACM serial device
// #define USE_SEGGER // #define USE_SEGGER

2
variants/ppr/variant.h
Wyświetl plik

@ -134,7 +134,7 @@ static const uint8_t SCK = PIN_SPI_SCK;
#define SX1262_DIO2 (26) #define SX1262_DIO2 (26)
#define SX126X_BUSY (31) // Supposed to be P0.18 but because of reworks, now on P0.31 (18) #define SX126X_BUSY (31) // Supposed to be P0.18 but because of reworks, now on P0.31 (18)
#define SX126X_RESET (17) #define SX126X_RESET (17)
// #define SX1262_ANT_SW (32 + 10) // #define SX126X_ANT_SW (32 + 10)
#define SX126X_RXEN (22) #define SX126X_RXEN (22)
#define SX126X_TXEN (24) #define SX126X_TXEN (24)
#define SX126X_E22 // Indicates this SX1262 is inside of an ebyte E22 module and special config should be done for that #define SX126X_E22 // Indicates this SX1262 is inside of an ebyte E22 module and special config should be done for that