diff --git a/examples/ArduinoLoRa/LoRaReceiver/utilities.h b/examples/ArduinoLoRa/LoRaReceiver/utilities.h index 1640f71..f5d1a74 100644 --- a/examples/ArduinoLoRa/LoRaReceiver/utilities.h +++ b/examples/ArduinoLoRa/LoRaReceiver/utilities.h @@ -255,35 +255,35 @@ #define BOARD_VARIANT_NAME "T3 V3.0 TCXO" -#elif defined(T3_S3_V1_2_SX1262) || \ - defined(T3_S3_V1_2_SX1276) || \ - defined(T3_S3_V1_2_SX1278) || \ - defined(T3_S3_V1_2_SX1280) || \ - defined(T3_S3_V1_2_SX1280_PA) || \ - defined(T3_S3_V1_2_LR1121) +#elif defined(T3_S3_V1_2_SX1262) || defined(ARDUINO_LILYGO_T3S3_SX1262) || \ + defined(T3_S3_V1_2_SX1276) || defined(ARDUINO_LILYGO_T3S3_SX1276) || \ + defined(T3_S3_V1_2_SX1278) || defined(ARDUINO_LILYGO_T3S3_SX1278) || \ + defined(T3_S3_V1_2_SX1280) || defined(ARDUINO_LILYGO_T3S3_SX1280) || \ + defined(T3_S3_V1_2_SX1280_PA) || defined(ARDUINO_LILYGO_T3S3_SX1280PA) || \ + defined(T3_S3_V1_2_LR1121) || defined(ARDUINO_LILYGO_T3S3_LR1121) -#if defined(T3_S3_V1_2_SX1262) +#if defined(T3_S3_V1_2_SX1262) || defined(ARDUINO_LILYGO_T3S3_SX1262) #ifndef USING_SX1262 #define USING_SX1262 #endif -#elif defined(T3_S3_V1_2_SX1276) +#elif defined(T3_S3_V1_2_SX1276) || defined(ARDUINO_LILYGO_T3S3_SX1276) #ifndef USING_SX1276 #define USING_SX1276 #endif -#elif defined(T3_S3_V1_2_SX1278) +#elif defined(T3_S3_V1_2_SX1278) || defined(ARDUINO_LILYGO_T3S3_SX1278) #ifndef USING_SX1278 #define USING_SX1278 #endif -#elif defined(T3_S3_V1_2_SX1280) +#elif defined(T3_S3_V1_2_SX1280) || defined(ARDUINO_LILYGO_T3S3_SX1280) #ifndef USING_SX1280 #define USING_SX1280 #endif -#elif defined(T3_S3_V1_2_SX1280_PA) -#ifndef USING_SX1280 -#define USING_SX1280 +#elif defined(T3_S3_V1_2_SX1280_PA) || defined(ARDUINO_LILYGO_T3S3_SX1280PA) +#ifndef USING_SX1280PA +#define USING_SX1280PA #endif -#elif defined(T3_S3_V1_2_LR1121) +#elif defined(T3_S3_V1_2_LR1121) || defined(ARDUINO_LILYGO_T3S3_LR1121) #ifndef USING_LR1121 #define USING_LR1121 #endif @@ -313,12 +313,12 @@ #define RADIO_RST_PIN 8 -#if defined(T3_S3_V1_2_SX1262) +#if defined(USING_SX1262) #define RADIO_DIO1_PIN 33 #define RADIO_BUSY_PIN 34 -#elif defined(T3_S3_V1_2_SX1276) || defined(T3_S3_V1_2_SX1278) +#elif defined(USING_SX1276) || defined(USING_SX1278) //!SX1276/78 module only #define RADIO_BUSY_PIN 33 //DIO1 @@ -329,12 +329,12 @@ #define RADIO_DIO4_PIN 10 #define RADIO_DIO5_PIN 36 -#elif defined(T3_S3_V1_2_SX1280) +#elif defined(USING_SX1280) #define RADIO_DIO1_PIN 9 //SX1280 DIO1 = IO9 #define RADIO_BUSY_PIN 36 //SX1280 BUSY = IO36 -#elif defined(T3_S3_V1_2_SX1280_PA) +#elif defined(USING_SX1280PA) #define RADIO_DIO1_PIN 9 //SX1280 DIO1 = IO9 #define RADIO_BUSY_PIN 36 //SX1280 BUSY = IO36 @@ -342,10 +342,10 @@ #define RADIO_TX_PIN 10 -#elif defined(T3_S3_V1_2_LR1121) +#elif defined(USING_LR1121) #define RADIO_DIO9_PIN 36 //LR1121 DIO9 = IO36 -#define RADIO_BUSY_PIN 34 //LR1121 BUSY = IO33 +#define RADIO_BUSY_PIN 34 //LR1121 BUSY = IO34 #endif diff --git a/examples/ArduinoLoRa/LoRaSender/utilities.h b/examples/ArduinoLoRa/LoRaSender/utilities.h index 1640f71..f5d1a74 100644 --- a/examples/ArduinoLoRa/LoRaSender/utilities.h +++ b/examples/ArduinoLoRa/LoRaSender/utilities.h @@ -255,35 +255,35 @@ #define BOARD_VARIANT_NAME "T3 V3.0 TCXO" -#elif defined(T3_S3_V1_2_SX1262) || \ - defined(T3_S3_V1_2_SX1276) || \ - defined(T3_S3_V1_2_SX1278) || \ - defined(T3_S3_V1_2_SX1280) || \ - defined(T3_S3_V1_2_SX1280_PA) || \ - defined(T3_S3_V1_2_LR1121) +#elif defined(T3_S3_V1_2_SX1262) || defined(ARDUINO_LILYGO_T3S3_SX1262) || \ + defined(T3_S3_V1_2_SX1276) || defined(ARDUINO_LILYGO_T3S3_SX1276) || \ + defined(T3_S3_V1_2_SX1278) || defined(ARDUINO_LILYGO_T3S3_SX1278) || \ + defined(T3_S3_V1_2_SX1280) || defined(ARDUINO_LILYGO_T3S3_SX1280) || \ + defined(T3_S3_V1_2_SX1280_PA) || defined(ARDUINO_LILYGO_T3S3_SX1280PA) || \ + defined(T3_S3_V1_2_LR1121) || defined(ARDUINO_LILYGO_T3S3_LR1121) -#if defined(T3_S3_V1_2_SX1262) +#if defined(T3_S3_V1_2_SX1262) || defined(ARDUINO_LILYGO_T3S3_SX1262) #ifndef USING_SX1262 #define USING_SX1262 #endif -#elif defined(T3_S3_V1_2_SX1276) +#elif defined(T3_S3_V1_2_SX1276) || defined(ARDUINO_LILYGO_T3S3_SX1276) #ifndef USING_SX1276 #define USING_SX1276 #endif -#elif defined(T3_S3_V1_2_SX1278) +#elif defined(T3_S3_V1_2_SX1278) || defined(ARDUINO_LILYGO_T3S3_SX1278) #ifndef USING_SX1278 #define USING_SX1278 #endif -#elif defined(T3_S3_V1_2_SX1280) +#elif defined(T3_S3_V1_2_SX1280) || defined(ARDUINO_LILYGO_T3S3_SX1280) #ifndef USING_SX1280 #define USING_SX1280 #endif -#elif defined(T3_S3_V1_2_SX1280_PA) -#ifndef USING_SX1280 -#define USING_SX1280 +#elif defined(T3_S3_V1_2_SX1280_PA) || defined(ARDUINO_LILYGO_T3S3_SX1280PA) +#ifndef USING_SX1280PA +#define USING_SX1280PA #endif -#elif defined(T3_S3_V1_2_LR1121) +#elif defined(T3_S3_V1_2_LR1121) || defined(ARDUINO_LILYGO_T3S3_LR1121) #ifndef USING_LR1121 #define USING_LR1121 #endif @@ -313,12 +313,12 @@ #define RADIO_RST_PIN 8 -#if defined(T3_S3_V1_2_SX1262) +#if defined(USING_SX1262) #define RADIO_DIO1_PIN 33 #define RADIO_BUSY_PIN 34 -#elif defined(T3_S3_V1_2_SX1276) || defined(T3_S3_V1_2_SX1278) +#elif defined(USING_SX1276) || defined(USING_SX1278) //!SX1276/78 module only #define RADIO_BUSY_PIN 33 //DIO1 @@ -329,12 +329,12 @@ #define RADIO_DIO4_PIN 10 #define RADIO_DIO5_PIN 36 -#elif defined(T3_S3_V1_2_SX1280) +#elif defined(USING_SX1280) #define RADIO_DIO1_PIN 9 //SX1280 DIO1 = IO9 #define RADIO_BUSY_PIN 36 //SX1280 BUSY = IO36 -#elif defined(T3_S3_V1_2_SX1280_PA) +#elif defined(USING_SX1280PA) #define RADIO_DIO1_PIN 9 //SX1280 DIO1 = IO9 #define RADIO_BUSY_PIN 36 //SX1280 BUSY = IO36 @@ -342,10 +342,10 @@ #define RADIO_TX_PIN 10 -#elif defined(T3_S3_V1_2_LR1121) +#elif defined(USING_LR1121) #define RADIO_DIO9_PIN 36 //LR1121 DIO9 = IO36 -#define RADIO_BUSY_PIN 34 //LR1121 BUSY = IO33 +#define RADIO_BUSY_PIN 34 //LR1121 BUSY = IO34 #endif diff --git a/examples/Display/Free_Font_Demo/utilities.h b/examples/Display/Free_Font_Demo/utilities.h index 2f03bdd..9553407 100644 --- a/examples/Display/Free_Font_Demo/utilities.h +++ b/examples/Display/Free_Font_Demo/utilities.h @@ -255,35 +255,35 @@ #define BOARD_VARIANT_NAME "T3 V3.0 TCXO" -#elif defined(T3_S3_V1_2_SX1262) || \ - defined(T3_S3_V1_2_SX1276) || \ - defined(T3_S3_V1_2_SX1278) || \ - defined(T3_S3_V1_2_SX1280) || \ - defined(T3_S3_V1_2_SX1280_PA) || \ - defined(T3_S3_V1_2_LR1121) +#elif defined(T3_S3_V1_2_SX1262) || defined(ARDUINO_LILYGO_T3S3_SX1262) || \ + defined(T3_S3_V1_2_SX1276) || defined(ARDUINO_LILYGO_T3S3_SX1276) || \ + defined(T3_S3_V1_2_SX1278) || defined(ARDUINO_LILYGO_T3S3_SX1278) || \ + defined(T3_S3_V1_2_SX1280) || defined(ARDUINO_LILYGO_T3S3_SX1280) || \ + defined(T3_S3_V1_2_SX1280_PA) || defined(ARDUINO_LILYGO_T3S3_SX1280PA) || \ + defined(T3_S3_V1_2_LR1121) || defined(ARDUINO_LILYGO_T3S3_LR1121) -#if defined(T3_S3_V1_2_SX1262) +#if defined(T3_S3_V1_2_SX1262) || defined(ARDUINO_LILYGO_T3S3_SX1262) #ifndef USING_SX1262 #define USING_SX1262 #endif -#elif defined(T3_S3_V1_2_SX1276) +#elif defined(T3_S3_V1_2_SX1276) || defined(ARDUINO_LILYGO_T3S3_SX1276) #ifndef USING_SX1276 #define USING_SX1276 #endif -#elif defined(T3_S3_V1_2_SX1278) +#elif defined(T3_S3_V1_2_SX1278) || defined(ARDUINO_LILYGO_T3S3_SX1278) #ifndef USING_SX1278 #define USING_SX1278 #endif -#elif defined(T3_S3_V1_2_SX1280) +#elif defined(T3_S3_V1_2_SX1280) || defined(ARDUINO_LILYGO_T3S3_SX1280) #ifndef USING_SX1280 #define USING_SX1280 #endif -#elif defined(T3_S3_V1_2_SX1280_PA) -#ifndef USING_SX1280 -#define USING_SX1280 +#elif defined(T3_S3_V1_2_SX1280_PA) || defined(ARDUINO_LILYGO_T3S3_SX1280PA) +#ifndef USING_SX1280PA +#define USING_SX1280PA #endif -#elif defined(T3_S3_V1_2_LR1121) +#elif defined(T3_S3_V1_2_LR1121) || defined(ARDUINO_LILYGO_T3S3_LR1121) #ifndef USING_LR1121 #define USING_LR1121 #endif @@ -313,12 +313,12 @@ #define RADIO_RST_PIN 8 -#if defined(T3_S3_V1_2_SX1262) +#if defined(USING_SX1262) #define RADIO_DIO1_PIN 33 #define RADIO_BUSY_PIN 34 -#elif defined(T3_S3_V1_2_SX1276) || defined(T3_S3_V1_2_SX1278) +#elif defined(USING_SX1276) || defined(USING_SX1278) //!SX1276/78 module only #define RADIO_BUSY_PIN 33 //DIO1 @@ -329,12 +329,12 @@ #define RADIO_DIO4_PIN 10 #define RADIO_DIO5_PIN 36 -#elif defined(T3_S3_V1_2_SX1280) +#elif defined(USING_SX1280) #define RADIO_DIO1_PIN 9 //SX1280 DIO1 = IO9 #define RADIO_BUSY_PIN 36 //SX1280 BUSY = IO36 -#elif defined(T3_S3_V1_2_SX1280_PA) +#elif defined(USING_SX1280PA) #define RADIO_DIO1_PIN 9 //SX1280 DIO1 = IO9 #define RADIO_BUSY_PIN 36 //SX1280 BUSY = IO36 @@ -342,10 +342,10 @@ #define RADIO_TX_PIN 10 -#elif defined(T3_S3_V1_2_LR1121) +#elif defined(USING_LR1121) #define RADIO_DIO9_PIN 36 //LR1121 DIO9 = IO36 -#define RADIO_BUSY_PIN 34 //LR1121 BUSY = IO33 +#define RADIO_BUSY_PIN 34 //LR1121 BUSY = IO34 #endif diff --git a/examples/Display/TBeam_TFT_Shield/utilities.h b/examples/Display/TBeam_TFT_Shield/utilities.h index 2f03bdd..9553407 100644 --- a/examples/Display/TBeam_TFT_Shield/utilities.h +++ b/examples/Display/TBeam_TFT_Shield/utilities.h @@ -255,35 +255,35 @@ #define BOARD_VARIANT_NAME "T3 V3.0 TCXO" -#elif defined(T3_S3_V1_2_SX1262) || \ - defined(T3_S3_V1_2_SX1276) || \ - defined(T3_S3_V1_2_SX1278) || \ - defined(T3_S3_V1_2_SX1280) || \ - defined(T3_S3_V1_2_SX1280_PA) || \ - defined(T3_S3_V1_2_LR1121) +#elif defined(T3_S3_V1_2_SX1262) || defined(ARDUINO_LILYGO_T3S3_SX1262) || \ + defined(T3_S3_V1_2_SX1276) || defined(ARDUINO_LILYGO_T3S3_SX1276) || \ + defined(T3_S3_V1_2_SX1278) || defined(ARDUINO_LILYGO_T3S3_SX1278) || \ + defined(T3_S3_V1_2_SX1280) || defined(ARDUINO_LILYGO_T3S3_SX1280) || \ + defined(T3_S3_V1_2_SX1280_PA) || defined(ARDUINO_LILYGO_T3S3_SX1280PA) || \ + defined(T3_S3_V1_2_LR1121) || defined(ARDUINO_LILYGO_T3S3_LR1121) -#if defined(T3_S3_V1_2_SX1262) +#if defined(T3_S3_V1_2_SX1262) || defined(ARDUINO_LILYGO_T3S3_SX1262) #ifndef USING_SX1262 #define USING_SX1262 #endif -#elif defined(T3_S3_V1_2_SX1276) +#elif defined(T3_S3_V1_2_SX1276) || defined(ARDUINO_LILYGO_T3S3_SX1276) #ifndef USING_SX1276 #define USING_SX1276 #endif -#elif defined(T3_S3_V1_2_SX1278) +#elif defined(T3_S3_V1_2_SX1278) || defined(ARDUINO_LILYGO_T3S3_SX1278) #ifndef USING_SX1278 #define USING_SX1278 #endif -#elif defined(T3_S3_V1_2_SX1280) +#elif defined(T3_S3_V1_2_SX1280) || defined(ARDUINO_LILYGO_T3S3_SX1280) #ifndef USING_SX1280 #define USING_SX1280 #endif -#elif defined(T3_S3_V1_2_SX1280_PA) -#ifndef USING_SX1280 -#define USING_SX1280 +#elif defined(T3_S3_V1_2_SX1280_PA) || defined(ARDUINO_LILYGO_T3S3_SX1280PA) +#ifndef USING_SX1280PA +#define USING_SX1280PA #endif -#elif defined(T3_S3_V1_2_LR1121) +#elif defined(T3_S3_V1_2_LR1121) || defined(ARDUINO_LILYGO_T3S3_LR1121) #ifndef USING_LR1121 #define USING_LR1121 #endif @@ -313,12 +313,12 @@ #define RADIO_RST_PIN 8 -#if defined(T3_S3_V1_2_SX1262) +#if defined(USING_SX1262) #define RADIO_DIO1_PIN 33 #define RADIO_BUSY_PIN 34 -#elif defined(T3_S3_V1_2_SX1276) || defined(T3_S3_V1_2_SX1278) +#elif defined(USING_SX1276) || defined(USING_SX1278) //!SX1276/78 module only #define RADIO_BUSY_PIN 33 //DIO1 @@ -329,12 +329,12 @@ #define RADIO_DIO4_PIN 10 #define RADIO_DIO5_PIN 36 -#elif defined(T3_S3_V1_2_SX1280) +#elif defined(USING_SX1280) #define RADIO_DIO1_PIN 9 //SX1280 DIO1 = IO9 #define RADIO_BUSY_PIN 36 //SX1280 BUSY = IO36 -#elif defined(T3_S3_V1_2_SX1280_PA) +#elif defined(USING_SX1280PA) #define RADIO_DIO1_PIN 9 //SX1280 DIO1 = IO9 #define RADIO_BUSY_PIN 36 //SX1280 BUSY = IO36 @@ -342,10 +342,10 @@ #define RADIO_TX_PIN 10 -#elif defined(T3_S3_V1_2_LR1121) +#elif defined(USING_LR1121) #define RADIO_DIO9_PIN 36 //LR1121 DIO9 = IO36 -#define RADIO_BUSY_PIN 34 //LR1121 BUSY = IO33 +#define RADIO_BUSY_PIN 34 //LR1121 BUSY = IO34 #endif diff --git a/examples/Display/TFT_Char_times/utilities.h b/examples/Display/TFT_Char_times/utilities.h index 2f03bdd..9553407 100644 --- a/examples/Display/TFT_Char_times/utilities.h +++ b/examples/Display/TFT_Char_times/utilities.h @@ -255,35 +255,35 @@ #define BOARD_VARIANT_NAME "T3 V3.0 TCXO" -#elif defined(T3_S3_V1_2_SX1262) || \ - defined(T3_S3_V1_2_SX1276) || \ - defined(T3_S3_V1_2_SX1278) || \ - defined(T3_S3_V1_2_SX1280) || \ - defined(T3_S3_V1_2_SX1280_PA) || \ - defined(T3_S3_V1_2_LR1121) +#elif defined(T3_S3_V1_2_SX1262) || defined(ARDUINO_LILYGO_T3S3_SX1262) || \ + defined(T3_S3_V1_2_SX1276) || defined(ARDUINO_LILYGO_T3S3_SX1276) || \ + defined(T3_S3_V1_2_SX1278) || defined(ARDUINO_LILYGO_T3S3_SX1278) || \ + defined(T3_S3_V1_2_SX1280) || defined(ARDUINO_LILYGO_T3S3_SX1280) || \ + defined(T3_S3_V1_2_SX1280_PA) || defined(ARDUINO_LILYGO_T3S3_SX1280PA) || \ + defined(T3_S3_V1_2_LR1121) || defined(ARDUINO_LILYGO_T3S3_LR1121) -#if defined(T3_S3_V1_2_SX1262) +#if defined(T3_S3_V1_2_SX1262) || defined(ARDUINO_LILYGO_T3S3_SX1262) #ifndef USING_SX1262 #define USING_SX1262 #endif -#elif defined(T3_S3_V1_2_SX1276) +#elif defined(T3_S3_V1_2_SX1276) || defined(ARDUINO_LILYGO_T3S3_SX1276) #ifndef USING_SX1276 #define USING_SX1276 #endif -#elif defined(T3_S3_V1_2_SX1278) +#elif defined(T3_S3_V1_2_SX1278) || defined(ARDUINO_LILYGO_T3S3_SX1278) #ifndef USING_SX1278 #define USING_SX1278 #endif -#elif defined(T3_S3_V1_2_SX1280) +#elif defined(T3_S3_V1_2_SX1280) || defined(ARDUINO_LILYGO_T3S3_SX1280) #ifndef USING_SX1280 #define USING_SX1280 #endif -#elif defined(T3_S3_V1_2_SX1280_PA) -#ifndef USING_SX1280 -#define USING_SX1280 +#elif defined(T3_S3_V1_2_SX1280_PA) || defined(ARDUINO_LILYGO_T3S3_SX1280PA) +#ifndef USING_SX1280PA +#define USING_SX1280PA #endif -#elif defined(T3_S3_V1_2_LR1121) +#elif defined(T3_S3_V1_2_LR1121) || defined(ARDUINO_LILYGO_T3S3_LR1121) #ifndef USING_LR1121 #define USING_LR1121 #endif @@ -313,12 +313,12 @@ #define RADIO_RST_PIN 8 -#if defined(T3_S3_V1_2_SX1262) +#if defined(USING_SX1262) #define RADIO_DIO1_PIN 33 #define RADIO_BUSY_PIN 34 -#elif defined(T3_S3_V1_2_SX1276) || defined(T3_S3_V1_2_SX1278) +#elif defined(USING_SX1276) || defined(USING_SX1278) //!SX1276/78 module only #define RADIO_BUSY_PIN 33 //DIO1 @@ -329,12 +329,12 @@ #define RADIO_DIO4_PIN 10 #define RADIO_DIO5_PIN 36 -#elif defined(T3_S3_V1_2_SX1280) +#elif defined(USING_SX1280) #define RADIO_DIO1_PIN 9 //SX1280 DIO1 = IO9 #define RADIO_BUSY_PIN 36 //SX1280 BUSY = IO36 -#elif defined(T3_S3_V1_2_SX1280_PA) +#elif defined(USING_SX1280PA) #define RADIO_DIO1_PIN 9 //SX1280 DIO1 = IO9 #define RADIO_BUSY_PIN 36 //SX1280 BUSY = IO36 @@ -342,10 +342,10 @@ #define RADIO_TX_PIN 10 -#elif defined(T3_S3_V1_2_LR1121) +#elif defined(USING_LR1121) #define RADIO_DIO9_PIN 36 //LR1121 DIO9 = IO36 -#define RADIO_BUSY_PIN 34 //LR1121 BUSY = IO33 +#define RADIO_BUSY_PIN 34 //LR1121 BUSY = IO34 #endif diff --git a/examples/Display/UTFT_demo/utilities.h b/examples/Display/UTFT_demo/utilities.h index 2f03bdd..9553407 100644 --- a/examples/Display/UTFT_demo/utilities.h +++ b/examples/Display/UTFT_demo/utilities.h @@ -255,35 +255,35 @@ #define BOARD_VARIANT_NAME "T3 V3.0 TCXO" -#elif defined(T3_S3_V1_2_SX1262) || \ - defined(T3_S3_V1_2_SX1276) || \ - defined(T3_S3_V1_2_SX1278) || \ - defined(T3_S3_V1_2_SX1280) || \ - defined(T3_S3_V1_2_SX1280_PA) || \ - defined(T3_S3_V1_2_LR1121) +#elif defined(T3_S3_V1_2_SX1262) || defined(ARDUINO_LILYGO_T3S3_SX1262) || \ + defined(T3_S3_V1_2_SX1276) || defined(ARDUINO_LILYGO_T3S3_SX1276) || \ + defined(T3_S3_V1_2_SX1278) || defined(ARDUINO_LILYGO_T3S3_SX1278) || \ + defined(T3_S3_V1_2_SX1280) || defined(ARDUINO_LILYGO_T3S3_SX1280) || \ + defined(T3_S3_V1_2_SX1280_PA) || defined(ARDUINO_LILYGO_T3S3_SX1280PA) || \ + defined(T3_S3_V1_2_LR1121) || defined(ARDUINO_LILYGO_T3S3_LR1121) -#if defined(T3_S3_V1_2_SX1262) +#if defined(T3_S3_V1_2_SX1262) || defined(ARDUINO_LILYGO_T3S3_SX1262) #ifndef USING_SX1262 #define USING_SX1262 #endif -#elif defined(T3_S3_V1_2_SX1276) +#elif defined(T3_S3_V1_2_SX1276) || defined(ARDUINO_LILYGO_T3S3_SX1276) #ifndef USING_SX1276 #define USING_SX1276 #endif -#elif defined(T3_S3_V1_2_SX1278) +#elif defined(T3_S3_V1_2_SX1278) || defined(ARDUINO_LILYGO_T3S3_SX1278) #ifndef USING_SX1278 #define USING_SX1278 #endif -#elif defined(T3_S3_V1_2_SX1280) +#elif defined(T3_S3_V1_2_SX1280) || defined(ARDUINO_LILYGO_T3S3_SX1280) #ifndef USING_SX1280 #define USING_SX1280 #endif -#elif defined(T3_S3_V1_2_SX1280_PA) -#ifndef USING_SX1280 -#define USING_SX1280 +#elif defined(T3_S3_V1_2_SX1280_PA) || defined(ARDUINO_LILYGO_T3S3_SX1280PA) +#ifndef USING_SX1280PA +#define USING_SX1280PA #endif -#elif defined(T3_S3_V1_2_LR1121) +#elif defined(T3_S3_V1_2_LR1121) || defined(ARDUINO_LILYGO_T3S3_LR1121) #ifndef USING_LR1121 #define USING_LR1121 #endif @@ -313,12 +313,12 @@ #define RADIO_RST_PIN 8 -#if defined(T3_S3_V1_2_SX1262) +#if defined(USING_SX1262) #define RADIO_DIO1_PIN 33 #define RADIO_BUSY_PIN 34 -#elif defined(T3_S3_V1_2_SX1276) || defined(T3_S3_V1_2_SX1278) +#elif defined(USING_SX1276) || defined(USING_SX1278) //!SX1276/78 module only #define RADIO_BUSY_PIN 33 //DIO1 @@ -329,12 +329,12 @@ #define RADIO_DIO4_PIN 10 #define RADIO_DIO5_PIN 36 -#elif defined(T3_S3_V1_2_SX1280) +#elif defined(USING_SX1280) #define RADIO_DIO1_PIN 9 //SX1280 DIO1 = IO9 #define RADIO_BUSY_PIN 36 //SX1280 BUSY = IO36 -#elif defined(T3_S3_V1_2_SX1280_PA) +#elif defined(USING_SX1280PA) #define RADIO_DIO1_PIN 9 //SX1280 DIO1 = IO9 #define RADIO_BUSY_PIN 36 //SX1280 BUSY = IO36 @@ -342,10 +342,10 @@ #define RADIO_TX_PIN 10 -#elif defined(T3_S3_V1_2_LR1121) +#elif defined(USING_LR1121) #define RADIO_DIO9_PIN 36 //LR1121 DIO9 = IO36 -#define RADIO_BUSY_PIN 34 //LR1121 BUSY = IO33 +#define RADIO_BUSY_PIN 34 //LR1121 BUSY = IO34 #endif diff --git a/examples/GPS/TinyGPS_Example/utilities.h b/examples/GPS/TinyGPS_Example/utilities.h index 1640f71..f5d1a74 100644 --- a/examples/GPS/TinyGPS_Example/utilities.h +++ b/examples/GPS/TinyGPS_Example/utilities.h @@ -255,35 +255,35 @@ #define BOARD_VARIANT_NAME "T3 V3.0 TCXO" -#elif defined(T3_S3_V1_2_SX1262) || \ - defined(T3_S3_V1_2_SX1276) || \ - defined(T3_S3_V1_2_SX1278) || \ - defined(T3_S3_V1_2_SX1280) || \ - defined(T3_S3_V1_2_SX1280_PA) || \ - defined(T3_S3_V1_2_LR1121) +#elif defined(T3_S3_V1_2_SX1262) || defined(ARDUINO_LILYGO_T3S3_SX1262) || \ + defined(T3_S3_V1_2_SX1276) || defined(ARDUINO_LILYGO_T3S3_SX1276) || \ + defined(T3_S3_V1_2_SX1278) || defined(ARDUINO_LILYGO_T3S3_SX1278) || \ + defined(T3_S3_V1_2_SX1280) || defined(ARDUINO_LILYGO_T3S3_SX1280) || \ + defined(T3_S3_V1_2_SX1280_PA) || defined(ARDUINO_LILYGO_T3S3_SX1280PA) || \ + defined(T3_S3_V1_2_LR1121) || defined(ARDUINO_LILYGO_T3S3_LR1121) -#if defined(T3_S3_V1_2_SX1262) +#if defined(T3_S3_V1_2_SX1262) || defined(ARDUINO_LILYGO_T3S3_SX1262) #ifndef USING_SX1262 #define USING_SX1262 #endif -#elif defined(T3_S3_V1_2_SX1276) +#elif defined(T3_S3_V1_2_SX1276) || defined(ARDUINO_LILYGO_T3S3_SX1276) #ifndef USING_SX1276 #define USING_SX1276 #endif -#elif defined(T3_S3_V1_2_SX1278) +#elif defined(T3_S3_V1_2_SX1278) || defined(ARDUINO_LILYGO_T3S3_SX1278) #ifndef USING_SX1278 #define USING_SX1278 #endif -#elif defined(T3_S3_V1_2_SX1280) +#elif defined(T3_S3_V1_2_SX1280) || defined(ARDUINO_LILYGO_T3S3_SX1280) #ifndef USING_SX1280 #define USING_SX1280 #endif -#elif defined(T3_S3_V1_2_SX1280_PA) -#ifndef USING_SX1280 -#define USING_SX1280 +#elif defined(T3_S3_V1_2_SX1280_PA) || defined(ARDUINO_LILYGO_T3S3_SX1280PA) +#ifndef USING_SX1280PA +#define USING_SX1280PA #endif -#elif defined(T3_S3_V1_2_LR1121) +#elif defined(T3_S3_V1_2_LR1121) || defined(ARDUINO_LILYGO_T3S3_LR1121) #ifndef USING_LR1121 #define USING_LR1121 #endif @@ -313,12 +313,12 @@ #define RADIO_RST_PIN 8 -#if defined(T3_S3_V1_2_SX1262) +#if defined(USING_SX1262) #define RADIO_DIO1_PIN 33 #define RADIO_BUSY_PIN 34 -#elif defined(T3_S3_V1_2_SX1276) || defined(T3_S3_V1_2_SX1278) +#elif defined(USING_SX1276) || defined(USING_SX1278) //!SX1276/78 module only #define RADIO_BUSY_PIN 33 //DIO1 @@ -329,12 +329,12 @@ #define RADIO_DIO4_PIN 10 #define RADIO_DIO5_PIN 36 -#elif defined(T3_S3_V1_2_SX1280) +#elif defined(USING_SX1280) #define RADIO_DIO1_PIN 9 //SX1280 DIO1 = IO9 #define RADIO_BUSY_PIN 36 //SX1280 BUSY = IO36 -#elif defined(T3_S3_V1_2_SX1280_PA) +#elif defined(USING_SX1280PA) #define RADIO_DIO1_PIN 9 //SX1280 DIO1 = IO9 #define RADIO_BUSY_PIN 36 //SX1280 BUSY = IO36 @@ -342,10 +342,10 @@ #define RADIO_TX_PIN 10 -#elif defined(T3_S3_V1_2_LR1121) +#elif defined(USING_LR1121) #define RADIO_DIO9_PIN 36 //LR1121 DIO9 = IO36 -#define RADIO_BUSY_PIN 34 //LR1121 BUSY = IO33 +#define RADIO_BUSY_PIN 34 //LR1121 BUSY = IO34 #endif diff --git a/examples/GPS/TinyGPS_FullExample/utilities.h b/examples/GPS/TinyGPS_FullExample/utilities.h index 2f03bdd..9553407 100644 --- a/examples/GPS/TinyGPS_FullExample/utilities.h +++ b/examples/GPS/TinyGPS_FullExample/utilities.h @@ -255,35 +255,35 @@ #define BOARD_VARIANT_NAME "T3 V3.0 TCXO" -#elif defined(T3_S3_V1_2_SX1262) || \ - defined(T3_S3_V1_2_SX1276) || \ - defined(T3_S3_V1_2_SX1278) || \ - defined(T3_S3_V1_2_SX1280) || \ - defined(T3_S3_V1_2_SX1280_PA) || \ - defined(T3_S3_V1_2_LR1121) +#elif defined(T3_S3_V1_2_SX1262) || defined(ARDUINO_LILYGO_T3S3_SX1262) || \ + defined(T3_S3_V1_2_SX1276) || defined(ARDUINO_LILYGO_T3S3_SX1276) || \ + defined(T3_S3_V1_2_SX1278) || defined(ARDUINO_LILYGO_T3S3_SX1278) || \ + defined(T3_S3_V1_2_SX1280) || defined(ARDUINO_LILYGO_T3S3_SX1280) || \ + defined(T3_S3_V1_2_SX1280_PA) || defined(ARDUINO_LILYGO_T3S3_SX1280PA) || \ + defined(T3_S3_V1_2_LR1121) || defined(ARDUINO_LILYGO_T3S3_LR1121) -#if defined(T3_S3_V1_2_SX1262) +#if defined(T3_S3_V1_2_SX1262) || defined(ARDUINO_LILYGO_T3S3_SX1262) #ifndef USING_SX1262 #define USING_SX1262 #endif -#elif defined(T3_S3_V1_2_SX1276) +#elif defined(T3_S3_V1_2_SX1276) || defined(ARDUINO_LILYGO_T3S3_SX1276) #ifndef USING_SX1276 #define USING_SX1276 #endif -#elif defined(T3_S3_V1_2_SX1278) +#elif defined(T3_S3_V1_2_SX1278) || defined(ARDUINO_LILYGO_T3S3_SX1278) #ifndef USING_SX1278 #define USING_SX1278 #endif -#elif defined(T3_S3_V1_2_SX1280) +#elif defined(T3_S3_V1_2_SX1280) || defined(ARDUINO_LILYGO_T3S3_SX1280) #ifndef USING_SX1280 #define USING_SX1280 #endif -#elif defined(T3_S3_V1_2_SX1280_PA) -#ifndef USING_SX1280 -#define USING_SX1280 +#elif defined(T3_S3_V1_2_SX1280_PA) || defined(ARDUINO_LILYGO_T3S3_SX1280PA) +#ifndef USING_SX1280PA +#define USING_SX1280PA #endif -#elif defined(T3_S3_V1_2_LR1121) +#elif defined(T3_S3_V1_2_LR1121) || defined(ARDUINO_LILYGO_T3S3_LR1121) #ifndef USING_LR1121 #define USING_LR1121 #endif @@ -313,12 +313,12 @@ #define RADIO_RST_PIN 8 -#if defined(T3_S3_V1_2_SX1262) +#if defined(USING_SX1262) #define RADIO_DIO1_PIN 33 #define RADIO_BUSY_PIN 34 -#elif defined(T3_S3_V1_2_SX1276) || defined(T3_S3_V1_2_SX1278) +#elif defined(USING_SX1276) || defined(USING_SX1278) //!SX1276/78 module only #define RADIO_BUSY_PIN 33 //DIO1 @@ -329,12 +329,12 @@ #define RADIO_DIO4_PIN 10 #define RADIO_DIO5_PIN 36 -#elif defined(T3_S3_V1_2_SX1280) +#elif defined(USING_SX1280) #define RADIO_DIO1_PIN 9 //SX1280 DIO1 = IO9 #define RADIO_BUSY_PIN 36 //SX1280 BUSY = IO36 -#elif defined(T3_S3_V1_2_SX1280_PA) +#elif defined(USING_SX1280PA) #define RADIO_DIO1_PIN 9 //SX1280 DIO1 = IO9 #define RADIO_BUSY_PIN 36 //SX1280 BUSY = IO36 @@ -342,10 +342,10 @@ #define RADIO_TX_PIN 10 -#elif defined(T3_S3_V1_2_LR1121) +#elif defined(USING_LR1121) #define RADIO_DIO9_PIN 36 //LR1121 DIO9 = IO36 -#define RADIO_BUSY_PIN 34 //LR1121 BUSY = IO33 +#define RADIO_BUSY_PIN 34 //LR1121 BUSY = IO34 #endif diff --git a/examples/GPS/TinyGPS_KitchenSink/utilities.h b/examples/GPS/TinyGPS_KitchenSink/utilities.h index 1640f71..f5d1a74 100644 --- a/examples/GPS/TinyGPS_KitchenSink/utilities.h +++ b/examples/GPS/TinyGPS_KitchenSink/utilities.h @@ -255,35 +255,35 @@ #define BOARD_VARIANT_NAME "T3 V3.0 TCXO" -#elif defined(T3_S3_V1_2_SX1262) || \ - defined(T3_S3_V1_2_SX1276) || \ - defined(T3_S3_V1_2_SX1278) || \ - defined(T3_S3_V1_2_SX1280) || \ - defined(T3_S3_V1_2_SX1280_PA) || \ - defined(T3_S3_V1_2_LR1121) +#elif defined(T3_S3_V1_2_SX1262) || defined(ARDUINO_LILYGO_T3S3_SX1262) || \ + defined(T3_S3_V1_2_SX1276) || defined(ARDUINO_LILYGO_T3S3_SX1276) || \ + defined(T3_S3_V1_2_SX1278) || defined(ARDUINO_LILYGO_T3S3_SX1278) || \ + defined(T3_S3_V1_2_SX1280) || defined(ARDUINO_LILYGO_T3S3_SX1280) || \ + defined(T3_S3_V1_2_SX1280_PA) || defined(ARDUINO_LILYGO_T3S3_SX1280PA) || \ + defined(T3_S3_V1_2_LR1121) || defined(ARDUINO_LILYGO_T3S3_LR1121) -#if defined(T3_S3_V1_2_SX1262) +#if defined(T3_S3_V1_2_SX1262) || defined(ARDUINO_LILYGO_T3S3_SX1262) #ifndef USING_SX1262 #define USING_SX1262 #endif -#elif defined(T3_S3_V1_2_SX1276) +#elif defined(T3_S3_V1_2_SX1276) || defined(ARDUINO_LILYGO_T3S3_SX1276) #ifndef USING_SX1276 #define USING_SX1276 #endif -#elif defined(T3_S3_V1_2_SX1278) +#elif defined(T3_S3_V1_2_SX1278) || defined(ARDUINO_LILYGO_T3S3_SX1278) #ifndef USING_SX1278 #define USING_SX1278 #endif -#elif defined(T3_S3_V1_2_SX1280) +#elif defined(T3_S3_V1_2_SX1280) || defined(ARDUINO_LILYGO_T3S3_SX1280) #ifndef USING_SX1280 #define USING_SX1280 #endif -#elif defined(T3_S3_V1_2_SX1280_PA) -#ifndef USING_SX1280 -#define USING_SX1280 +#elif defined(T3_S3_V1_2_SX1280_PA) || defined(ARDUINO_LILYGO_T3S3_SX1280PA) +#ifndef USING_SX1280PA +#define USING_SX1280PA #endif -#elif defined(T3_S3_V1_2_LR1121) +#elif defined(T3_S3_V1_2_LR1121) || defined(ARDUINO_LILYGO_T3S3_LR1121) #ifndef USING_LR1121 #define USING_LR1121 #endif @@ -313,12 +313,12 @@ #define RADIO_RST_PIN 8 -#if defined(T3_S3_V1_2_SX1262) +#if defined(USING_SX1262) #define RADIO_DIO1_PIN 33 #define RADIO_BUSY_PIN 34 -#elif defined(T3_S3_V1_2_SX1276) || defined(T3_S3_V1_2_SX1278) +#elif defined(USING_SX1276) || defined(USING_SX1278) //!SX1276/78 module only #define RADIO_BUSY_PIN 33 //DIO1 @@ -329,12 +329,12 @@ #define RADIO_DIO4_PIN 10 #define RADIO_DIO5_PIN 36 -#elif defined(T3_S3_V1_2_SX1280) +#elif defined(USING_SX1280) #define RADIO_DIO1_PIN 9 //SX1280 DIO1 = IO9 #define RADIO_BUSY_PIN 36 //SX1280 BUSY = IO36 -#elif defined(T3_S3_V1_2_SX1280_PA) +#elif defined(USING_SX1280PA) #define RADIO_DIO1_PIN 9 //SX1280 DIO1 = IO9 #define RADIO_BUSY_PIN 36 //SX1280 BUSY = IO36 @@ -342,10 +342,10 @@ #define RADIO_TX_PIN 10 -#elif defined(T3_S3_V1_2_LR1121) +#elif defined(USING_LR1121) #define RADIO_DIO9_PIN 36 //LR1121 DIO9 = IO36 -#define RADIO_BUSY_PIN 34 //LR1121 BUSY = IO33 +#define RADIO_BUSY_PIN 34 //LR1121 BUSY = IO34 #endif diff --git a/examples/GPS/UBlox_BasicNMEARead/utilities.h b/examples/GPS/UBlox_BasicNMEARead/utilities.h index 2f03bdd..9553407 100644 --- a/examples/GPS/UBlox_BasicNMEARead/utilities.h +++ b/examples/GPS/UBlox_BasicNMEARead/utilities.h @@ -255,35 +255,35 @@ #define BOARD_VARIANT_NAME "T3 V3.0 TCXO" -#elif defined(T3_S3_V1_2_SX1262) || \ - defined(T3_S3_V1_2_SX1276) || \ - defined(T3_S3_V1_2_SX1278) || \ - defined(T3_S3_V1_2_SX1280) || \ - defined(T3_S3_V1_2_SX1280_PA) || \ - defined(T3_S3_V1_2_LR1121) +#elif defined(T3_S3_V1_2_SX1262) || defined(ARDUINO_LILYGO_T3S3_SX1262) || \ + defined(T3_S3_V1_2_SX1276) || defined(ARDUINO_LILYGO_T3S3_SX1276) || \ + defined(T3_S3_V1_2_SX1278) || defined(ARDUINO_LILYGO_T3S3_SX1278) || \ + defined(T3_S3_V1_2_SX1280) || defined(ARDUINO_LILYGO_T3S3_SX1280) || \ + defined(T3_S3_V1_2_SX1280_PA) || defined(ARDUINO_LILYGO_T3S3_SX1280PA) || \ + defined(T3_S3_V1_2_LR1121) || defined(ARDUINO_LILYGO_T3S3_LR1121) -#if defined(T3_S3_V1_2_SX1262) +#if defined(T3_S3_V1_2_SX1262) || defined(ARDUINO_LILYGO_T3S3_SX1262) #ifndef USING_SX1262 #define USING_SX1262 #endif -#elif defined(T3_S3_V1_2_SX1276) +#elif defined(T3_S3_V1_2_SX1276) || defined(ARDUINO_LILYGO_T3S3_SX1276) #ifndef USING_SX1276 #define USING_SX1276 #endif -#elif defined(T3_S3_V1_2_SX1278) +#elif defined(T3_S3_V1_2_SX1278) || defined(ARDUINO_LILYGO_T3S3_SX1278) #ifndef USING_SX1278 #define USING_SX1278 #endif -#elif defined(T3_S3_V1_2_SX1280) +#elif defined(T3_S3_V1_2_SX1280) || defined(ARDUINO_LILYGO_T3S3_SX1280) #ifndef USING_SX1280 #define USING_SX1280 #endif -#elif defined(T3_S3_V1_2_SX1280_PA) -#ifndef USING_SX1280 -#define USING_SX1280 +#elif defined(T3_S3_V1_2_SX1280_PA) || defined(ARDUINO_LILYGO_T3S3_SX1280PA) +#ifndef USING_SX1280PA +#define USING_SX1280PA #endif -#elif defined(T3_S3_V1_2_LR1121) +#elif defined(T3_S3_V1_2_LR1121) || defined(ARDUINO_LILYGO_T3S3_LR1121) #ifndef USING_LR1121 #define USING_LR1121 #endif @@ -313,12 +313,12 @@ #define RADIO_RST_PIN 8 -#if defined(T3_S3_V1_2_SX1262) +#if defined(USING_SX1262) #define RADIO_DIO1_PIN 33 #define RADIO_BUSY_PIN 34 -#elif defined(T3_S3_V1_2_SX1276) || defined(T3_S3_V1_2_SX1278) +#elif defined(USING_SX1276) || defined(USING_SX1278) //!SX1276/78 module only #define RADIO_BUSY_PIN 33 //DIO1 @@ -329,12 +329,12 @@ #define RADIO_DIO4_PIN 10 #define RADIO_DIO5_PIN 36 -#elif defined(T3_S3_V1_2_SX1280) +#elif defined(USING_SX1280) #define RADIO_DIO1_PIN 9 //SX1280 DIO1 = IO9 #define RADIO_BUSY_PIN 36 //SX1280 BUSY = IO36 -#elif defined(T3_S3_V1_2_SX1280_PA) +#elif defined(USING_SX1280PA) #define RADIO_DIO1_PIN 9 //SX1280 DIO1 = IO9 #define RADIO_BUSY_PIN 36 //SX1280 BUSY = IO36 @@ -342,10 +342,10 @@ #define RADIO_TX_PIN 10 -#elif defined(T3_S3_V1_2_LR1121) +#elif defined(USING_LR1121) #define RADIO_DIO9_PIN 36 //LR1121 DIO9 = IO36 -#define RADIO_BUSY_PIN 34 //LR1121 BUSY = IO33 +#define RADIO_BUSY_PIN 34 //LR1121 BUSY = IO34 #endif diff --git a/examples/GPS/UBlox_NMEAParsing/utilities.h b/examples/GPS/UBlox_NMEAParsing/utilities.h index 2f03bdd..9553407 100644 --- a/examples/GPS/UBlox_NMEAParsing/utilities.h +++ b/examples/GPS/UBlox_NMEAParsing/utilities.h @@ -255,35 +255,35 @@ #define BOARD_VARIANT_NAME "T3 V3.0 TCXO" -#elif defined(T3_S3_V1_2_SX1262) || \ - defined(T3_S3_V1_2_SX1276) || \ - defined(T3_S3_V1_2_SX1278) || \ - defined(T3_S3_V1_2_SX1280) || \ - defined(T3_S3_V1_2_SX1280_PA) || \ - defined(T3_S3_V1_2_LR1121) +#elif defined(T3_S3_V1_2_SX1262) || defined(ARDUINO_LILYGO_T3S3_SX1262) || \ + defined(T3_S3_V1_2_SX1276) || defined(ARDUINO_LILYGO_T3S3_SX1276) || \ + defined(T3_S3_V1_2_SX1278) || defined(ARDUINO_LILYGO_T3S3_SX1278) || \ + defined(T3_S3_V1_2_SX1280) || defined(ARDUINO_LILYGO_T3S3_SX1280) || \ + defined(T3_S3_V1_2_SX1280_PA) || defined(ARDUINO_LILYGO_T3S3_SX1280PA) || \ + defined(T3_S3_V1_2_LR1121) || defined(ARDUINO_LILYGO_T3S3_LR1121) -#if defined(T3_S3_V1_2_SX1262) +#if defined(T3_S3_V1_2_SX1262) || defined(ARDUINO_LILYGO_T3S3_SX1262) #ifndef USING_SX1262 #define USING_SX1262 #endif -#elif defined(T3_S3_V1_2_SX1276) +#elif defined(T3_S3_V1_2_SX1276) || defined(ARDUINO_LILYGO_T3S3_SX1276) #ifndef USING_SX1276 #define USING_SX1276 #endif -#elif defined(T3_S3_V1_2_SX1278) +#elif defined(T3_S3_V1_2_SX1278) || defined(ARDUINO_LILYGO_T3S3_SX1278) #ifndef USING_SX1278 #define USING_SX1278 #endif -#elif defined(T3_S3_V1_2_SX1280) +#elif defined(T3_S3_V1_2_SX1280) || defined(ARDUINO_LILYGO_T3S3_SX1280) #ifndef USING_SX1280 #define USING_SX1280 #endif -#elif defined(T3_S3_V1_2_SX1280_PA) -#ifndef USING_SX1280 -#define USING_SX1280 +#elif defined(T3_S3_V1_2_SX1280_PA) || defined(ARDUINO_LILYGO_T3S3_SX1280PA) +#ifndef USING_SX1280PA +#define USING_SX1280PA #endif -#elif defined(T3_S3_V1_2_LR1121) +#elif defined(T3_S3_V1_2_LR1121) || defined(ARDUINO_LILYGO_T3S3_LR1121) #ifndef USING_LR1121 #define USING_LR1121 #endif @@ -313,12 +313,12 @@ #define RADIO_RST_PIN 8 -#if defined(T3_S3_V1_2_SX1262) +#if defined(USING_SX1262) #define RADIO_DIO1_PIN 33 #define RADIO_BUSY_PIN 34 -#elif defined(T3_S3_V1_2_SX1276) || defined(T3_S3_V1_2_SX1278) +#elif defined(USING_SX1276) || defined(USING_SX1278) //!SX1276/78 module only #define RADIO_BUSY_PIN 33 //DIO1 @@ -329,12 +329,12 @@ #define RADIO_DIO4_PIN 10 #define RADIO_DIO5_PIN 36 -#elif defined(T3_S3_V1_2_SX1280) +#elif defined(USING_SX1280) #define RADIO_DIO1_PIN 9 //SX1280 DIO1 = IO9 #define RADIO_BUSY_PIN 36 //SX1280 BUSY = IO36 -#elif defined(T3_S3_V1_2_SX1280_PA) +#elif defined(USING_SX1280PA) #define RADIO_DIO1_PIN 9 //SX1280 DIO1 = IO9 #define RADIO_BUSY_PIN 36 //SX1280 BUSY = IO36 @@ -342,10 +342,10 @@ #define RADIO_TX_PIN 10 -#elif defined(T3_S3_V1_2_LR1121) +#elif defined(USING_LR1121) #define RADIO_DIO9_PIN 36 //LR1121 DIO9 = IO36 -#define RADIO_BUSY_PIN 34 //LR1121 BUSY = IO33 +#define RADIO_BUSY_PIN 34 //LR1121 BUSY = IO34 #endif diff --git a/examples/GPS/UBlox_OutputRate/utilities.h b/examples/GPS/UBlox_OutputRate/utilities.h index 2f03bdd..9553407 100644 --- a/examples/GPS/UBlox_OutputRate/utilities.h +++ b/examples/GPS/UBlox_OutputRate/utilities.h @@ -255,35 +255,35 @@ #define BOARD_VARIANT_NAME "T3 V3.0 TCXO" -#elif defined(T3_S3_V1_2_SX1262) || \ - defined(T3_S3_V1_2_SX1276) || \ - defined(T3_S3_V1_2_SX1278) || \ - defined(T3_S3_V1_2_SX1280) || \ - defined(T3_S3_V1_2_SX1280_PA) || \ - defined(T3_S3_V1_2_LR1121) +#elif defined(T3_S3_V1_2_SX1262) || defined(ARDUINO_LILYGO_T3S3_SX1262) || \ + defined(T3_S3_V1_2_SX1276) || defined(ARDUINO_LILYGO_T3S3_SX1276) || \ + defined(T3_S3_V1_2_SX1278) || defined(ARDUINO_LILYGO_T3S3_SX1278) || \ + defined(T3_S3_V1_2_SX1280) || defined(ARDUINO_LILYGO_T3S3_SX1280) || \ + defined(T3_S3_V1_2_SX1280_PA) || defined(ARDUINO_LILYGO_T3S3_SX1280PA) || \ + defined(T3_S3_V1_2_LR1121) || defined(ARDUINO_LILYGO_T3S3_LR1121) -#if defined(T3_S3_V1_2_SX1262) +#if defined(T3_S3_V1_2_SX1262) || defined(ARDUINO_LILYGO_T3S3_SX1262) #ifndef USING_SX1262 #define USING_SX1262 #endif -#elif defined(T3_S3_V1_2_SX1276) +#elif defined(T3_S3_V1_2_SX1276) || defined(ARDUINO_LILYGO_T3S3_SX1276) #ifndef USING_SX1276 #define USING_SX1276 #endif -#elif defined(T3_S3_V1_2_SX1278) +#elif defined(T3_S3_V1_2_SX1278) || defined(ARDUINO_LILYGO_T3S3_SX1278) #ifndef USING_SX1278 #define USING_SX1278 #endif -#elif defined(T3_S3_V1_2_SX1280) +#elif defined(T3_S3_V1_2_SX1280) || defined(ARDUINO_LILYGO_T3S3_SX1280) #ifndef USING_SX1280 #define USING_SX1280 #endif -#elif defined(T3_S3_V1_2_SX1280_PA) -#ifndef USING_SX1280 -#define USING_SX1280 +#elif defined(T3_S3_V1_2_SX1280_PA) || defined(ARDUINO_LILYGO_T3S3_SX1280PA) +#ifndef USING_SX1280PA +#define USING_SX1280PA #endif -#elif defined(T3_S3_V1_2_LR1121) +#elif defined(T3_S3_V1_2_LR1121) || defined(ARDUINO_LILYGO_T3S3_LR1121) #ifndef USING_LR1121 #define USING_LR1121 #endif @@ -313,12 +313,12 @@ #define RADIO_RST_PIN 8 -#if defined(T3_S3_V1_2_SX1262) +#if defined(USING_SX1262) #define RADIO_DIO1_PIN 33 #define RADIO_BUSY_PIN 34 -#elif defined(T3_S3_V1_2_SX1276) || defined(T3_S3_V1_2_SX1278) +#elif defined(USING_SX1276) || defined(USING_SX1278) //!SX1276/78 module only #define RADIO_BUSY_PIN 33 //DIO1 @@ -329,12 +329,12 @@ #define RADIO_DIO4_PIN 10 #define RADIO_DIO5_PIN 36 -#elif defined(T3_S3_V1_2_SX1280) +#elif defined(USING_SX1280) #define RADIO_DIO1_PIN 9 //SX1280 DIO1 = IO9 #define RADIO_BUSY_PIN 36 //SX1280 BUSY = IO36 -#elif defined(T3_S3_V1_2_SX1280_PA) +#elif defined(USING_SX1280PA) #define RADIO_DIO1_PIN 9 //SX1280 DIO1 = IO9 #define RADIO_BUSY_PIN 36 //SX1280 BUSY = IO36 @@ -342,10 +342,10 @@ #define RADIO_TX_PIN 10 -#elif defined(T3_S3_V1_2_LR1121) +#elif defined(USING_LR1121) #define RADIO_DIO9_PIN 36 //LR1121 DIO9 = IO36 -#define RADIO_BUSY_PIN 34 //LR1121 BUSY = IO33 +#define RADIO_BUSY_PIN 34 //LR1121 BUSY = IO34 #endif diff --git a/examples/GPS/UBlox_Recovery/utilities.h b/examples/GPS/UBlox_Recovery/utilities.h index 2f03bdd..9553407 100644 --- a/examples/GPS/UBlox_Recovery/utilities.h +++ b/examples/GPS/UBlox_Recovery/utilities.h @@ -255,35 +255,35 @@ #define BOARD_VARIANT_NAME "T3 V3.0 TCXO" -#elif defined(T3_S3_V1_2_SX1262) || \ - defined(T3_S3_V1_2_SX1276) || \ - defined(T3_S3_V1_2_SX1278) || \ - defined(T3_S3_V1_2_SX1280) || \ - defined(T3_S3_V1_2_SX1280_PA) || \ - defined(T3_S3_V1_2_LR1121) +#elif defined(T3_S3_V1_2_SX1262) || defined(ARDUINO_LILYGO_T3S3_SX1262) || \ + defined(T3_S3_V1_2_SX1276) || defined(ARDUINO_LILYGO_T3S3_SX1276) || \ + defined(T3_S3_V1_2_SX1278) || defined(ARDUINO_LILYGO_T3S3_SX1278) || \ + defined(T3_S3_V1_2_SX1280) || defined(ARDUINO_LILYGO_T3S3_SX1280) || \ + defined(T3_S3_V1_2_SX1280_PA) || defined(ARDUINO_LILYGO_T3S3_SX1280PA) || \ + defined(T3_S3_V1_2_LR1121) || defined(ARDUINO_LILYGO_T3S3_LR1121) -#if defined(T3_S3_V1_2_SX1262) +#if defined(T3_S3_V1_2_SX1262) || defined(ARDUINO_LILYGO_T3S3_SX1262) #ifndef USING_SX1262 #define USING_SX1262 #endif -#elif defined(T3_S3_V1_2_SX1276) +#elif defined(T3_S3_V1_2_SX1276) || defined(ARDUINO_LILYGO_T3S3_SX1276) #ifndef USING_SX1276 #define USING_SX1276 #endif -#elif defined(T3_S3_V1_2_SX1278) +#elif defined(T3_S3_V1_2_SX1278) || defined(ARDUINO_LILYGO_T3S3_SX1278) #ifndef USING_SX1278 #define USING_SX1278 #endif -#elif defined(T3_S3_V1_2_SX1280) +#elif defined(T3_S3_V1_2_SX1280) || defined(ARDUINO_LILYGO_T3S3_SX1280) #ifndef USING_SX1280 #define USING_SX1280 #endif -#elif defined(T3_S3_V1_2_SX1280_PA) -#ifndef USING_SX1280 -#define USING_SX1280 +#elif defined(T3_S3_V1_2_SX1280_PA) || defined(ARDUINO_LILYGO_T3S3_SX1280PA) +#ifndef USING_SX1280PA +#define USING_SX1280PA #endif -#elif defined(T3_S3_V1_2_LR1121) +#elif defined(T3_S3_V1_2_LR1121) || defined(ARDUINO_LILYGO_T3S3_LR1121) #ifndef USING_LR1121 #define USING_LR1121 #endif @@ -313,12 +313,12 @@ #define RADIO_RST_PIN 8 -#if defined(T3_S3_V1_2_SX1262) +#if defined(USING_SX1262) #define RADIO_DIO1_PIN 33 #define RADIO_BUSY_PIN 34 -#elif defined(T3_S3_V1_2_SX1276) || defined(T3_S3_V1_2_SX1278) +#elif defined(USING_SX1276) || defined(USING_SX1278) //!SX1276/78 module only #define RADIO_BUSY_PIN 33 //DIO1 @@ -329,12 +329,12 @@ #define RADIO_DIO4_PIN 10 #define RADIO_DIO5_PIN 36 -#elif defined(T3_S3_V1_2_SX1280) +#elif defined(USING_SX1280) #define RADIO_DIO1_PIN 9 //SX1280 DIO1 = IO9 #define RADIO_BUSY_PIN 36 //SX1280 BUSY = IO36 -#elif defined(T3_S3_V1_2_SX1280_PA) +#elif defined(USING_SX1280PA) #define RADIO_DIO1_PIN 9 //SX1280 DIO1 = IO9 #define RADIO_BUSY_PIN 36 //SX1280 BUSY = IO36 @@ -342,10 +342,10 @@ #define RADIO_TX_PIN 10 -#elif defined(T3_S3_V1_2_LR1121) +#elif defined(USING_LR1121) #define RADIO_DIO9_PIN 36 //LR1121 DIO9 = IO36 -#define RADIO_BUSY_PIN 34 //LR1121 BUSY = IO33 +#define RADIO_BUSY_PIN 34 //LR1121 BUSY = IO34 #endif diff --git a/examples/LoRaWAN/LMIC_Library_OTTA/utilities.h b/examples/LoRaWAN/LMIC_Library_OTTA/utilities.h index 2f03bdd..9553407 100644 --- a/examples/LoRaWAN/LMIC_Library_OTTA/utilities.h +++ b/examples/LoRaWAN/LMIC_Library_OTTA/utilities.h @@ -255,35 +255,35 @@ #define BOARD_VARIANT_NAME "T3 V3.0 TCXO" -#elif defined(T3_S3_V1_2_SX1262) || \ - defined(T3_S3_V1_2_SX1276) || \ - defined(T3_S3_V1_2_SX1278) || \ - defined(T3_S3_V1_2_SX1280) || \ - defined(T3_S3_V1_2_SX1280_PA) || \ - defined(T3_S3_V1_2_LR1121) +#elif defined(T3_S3_V1_2_SX1262) || defined(ARDUINO_LILYGO_T3S3_SX1262) || \ + defined(T3_S3_V1_2_SX1276) || defined(ARDUINO_LILYGO_T3S3_SX1276) || \ + defined(T3_S3_V1_2_SX1278) || defined(ARDUINO_LILYGO_T3S3_SX1278) || \ + defined(T3_S3_V1_2_SX1280) || defined(ARDUINO_LILYGO_T3S3_SX1280) || \ + defined(T3_S3_V1_2_SX1280_PA) || defined(ARDUINO_LILYGO_T3S3_SX1280PA) || \ + defined(T3_S3_V1_2_LR1121) || defined(ARDUINO_LILYGO_T3S3_LR1121) -#if defined(T3_S3_V1_2_SX1262) +#if defined(T3_S3_V1_2_SX1262) || defined(ARDUINO_LILYGO_T3S3_SX1262) #ifndef USING_SX1262 #define USING_SX1262 #endif -#elif defined(T3_S3_V1_2_SX1276) +#elif defined(T3_S3_V1_2_SX1276) || defined(ARDUINO_LILYGO_T3S3_SX1276) #ifndef USING_SX1276 #define USING_SX1276 #endif -#elif defined(T3_S3_V1_2_SX1278) +#elif defined(T3_S3_V1_2_SX1278) || defined(ARDUINO_LILYGO_T3S3_SX1278) #ifndef USING_SX1278 #define USING_SX1278 #endif -#elif defined(T3_S3_V1_2_SX1280) +#elif defined(T3_S3_V1_2_SX1280) || defined(ARDUINO_LILYGO_T3S3_SX1280) #ifndef USING_SX1280 #define USING_SX1280 #endif -#elif defined(T3_S3_V1_2_SX1280_PA) -#ifndef USING_SX1280 -#define USING_SX1280 +#elif defined(T3_S3_V1_2_SX1280_PA) || defined(ARDUINO_LILYGO_T3S3_SX1280PA) +#ifndef USING_SX1280PA +#define USING_SX1280PA #endif -#elif defined(T3_S3_V1_2_LR1121) +#elif defined(T3_S3_V1_2_LR1121) || defined(ARDUINO_LILYGO_T3S3_LR1121) #ifndef USING_LR1121 #define USING_LR1121 #endif @@ -313,12 +313,12 @@ #define RADIO_RST_PIN 8 -#if defined(T3_S3_V1_2_SX1262) +#if defined(USING_SX1262) #define RADIO_DIO1_PIN 33 #define RADIO_BUSY_PIN 34 -#elif defined(T3_S3_V1_2_SX1276) || defined(T3_S3_V1_2_SX1278) +#elif defined(USING_SX1276) || defined(USING_SX1278) //!SX1276/78 module only #define RADIO_BUSY_PIN 33 //DIO1 @@ -329,12 +329,12 @@ #define RADIO_DIO4_PIN 10 #define RADIO_DIO5_PIN 36 -#elif defined(T3_S3_V1_2_SX1280) +#elif defined(USING_SX1280) #define RADIO_DIO1_PIN 9 //SX1280 DIO1 = IO9 #define RADIO_BUSY_PIN 36 //SX1280 BUSY = IO36 -#elif defined(T3_S3_V1_2_SX1280_PA) +#elif defined(USING_SX1280PA) #define RADIO_DIO1_PIN 9 //SX1280 DIO1 = IO9 #define RADIO_BUSY_PIN 36 //SX1280 BUSY = IO36 @@ -342,10 +342,10 @@ #define RADIO_TX_PIN 10 -#elif defined(T3_S3_V1_2_LR1121) +#elif defined(USING_LR1121) #define RADIO_DIO9_PIN 36 //LR1121 DIO9 = IO36 -#define RADIO_BUSY_PIN 34 //LR1121 BUSY = IO33 +#define RADIO_BUSY_PIN 34 //LR1121 BUSY = IO34 #endif diff --git a/examples/LoRaWAN/RadioLib_ABP/utilities.h b/examples/LoRaWAN/RadioLib_ABP/utilities.h index 2f03bdd..9553407 100644 --- a/examples/LoRaWAN/RadioLib_ABP/utilities.h +++ b/examples/LoRaWAN/RadioLib_ABP/utilities.h @@ -255,35 +255,35 @@ #define BOARD_VARIANT_NAME "T3 V3.0 TCXO" -#elif defined(T3_S3_V1_2_SX1262) || \ - defined(T3_S3_V1_2_SX1276) || \ - defined(T3_S3_V1_2_SX1278) || \ - defined(T3_S3_V1_2_SX1280) || \ - defined(T3_S3_V1_2_SX1280_PA) || \ - defined(T3_S3_V1_2_LR1121) +#elif defined(T3_S3_V1_2_SX1262) || defined(ARDUINO_LILYGO_T3S3_SX1262) || \ + defined(T3_S3_V1_2_SX1276) || defined(ARDUINO_LILYGO_T3S3_SX1276) || \ + defined(T3_S3_V1_2_SX1278) || defined(ARDUINO_LILYGO_T3S3_SX1278) || \ + defined(T3_S3_V1_2_SX1280) || defined(ARDUINO_LILYGO_T3S3_SX1280) || \ + defined(T3_S3_V1_2_SX1280_PA) || defined(ARDUINO_LILYGO_T3S3_SX1280PA) || \ + defined(T3_S3_V1_2_LR1121) || defined(ARDUINO_LILYGO_T3S3_LR1121) -#if defined(T3_S3_V1_2_SX1262) +#if defined(T3_S3_V1_2_SX1262) || defined(ARDUINO_LILYGO_T3S3_SX1262) #ifndef USING_SX1262 #define USING_SX1262 #endif -#elif defined(T3_S3_V1_2_SX1276) +#elif defined(T3_S3_V1_2_SX1276) || defined(ARDUINO_LILYGO_T3S3_SX1276) #ifndef USING_SX1276 #define USING_SX1276 #endif -#elif defined(T3_S3_V1_2_SX1278) +#elif defined(T3_S3_V1_2_SX1278) || defined(ARDUINO_LILYGO_T3S3_SX1278) #ifndef USING_SX1278 #define USING_SX1278 #endif -#elif defined(T3_S3_V1_2_SX1280) +#elif defined(T3_S3_V1_2_SX1280) || defined(ARDUINO_LILYGO_T3S3_SX1280) #ifndef USING_SX1280 #define USING_SX1280 #endif -#elif defined(T3_S3_V1_2_SX1280_PA) -#ifndef USING_SX1280 -#define USING_SX1280 +#elif defined(T3_S3_V1_2_SX1280_PA) || defined(ARDUINO_LILYGO_T3S3_SX1280PA) +#ifndef USING_SX1280PA +#define USING_SX1280PA #endif -#elif defined(T3_S3_V1_2_LR1121) +#elif defined(T3_S3_V1_2_LR1121) || defined(ARDUINO_LILYGO_T3S3_LR1121) #ifndef USING_LR1121 #define USING_LR1121 #endif @@ -313,12 +313,12 @@ #define RADIO_RST_PIN 8 -#if defined(T3_S3_V1_2_SX1262) +#if defined(USING_SX1262) #define RADIO_DIO1_PIN 33 #define RADIO_BUSY_PIN 34 -#elif defined(T3_S3_V1_2_SX1276) || defined(T3_S3_V1_2_SX1278) +#elif defined(USING_SX1276) || defined(USING_SX1278) //!SX1276/78 module only #define RADIO_BUSY_PIN 33 //DIO1 @@ -329,12 +329,12 @@ #define RADIO_DIO4_PIN 10 #define RADIO_DIO5_PIN 36 -#elif defined(T3_S3_V1_2_SX1280) +#elif defined(USING_SX1280) #define RADIO_DIO1_PIN 9 //SX1280 DIO1 = IO9 #define RADIO_BUSY_PIN 36 //SX1280 BUSY = IO36 -#elif defined(T3_S3_V1_2_SX1280_PA) +#elif defined(USING_SX1280PA) #define RADIO_DIO1_PIN 9 //SX1280 DIO1 = IO9 #define RADIO_BUSY_PIN 36 //SX1280 BUSY = IO36 @@ -342,10 +342,10 @@ #define RADIO_TX_PIN 10 -#elif defined(T3_S3_V1_2_LR1121) +#elif defined(USING_LR1121) #define RADIO_DIO9_PIN 36 //LR1121 DIO9 = IO36 -#define RADIO_BUSY_PIN 34 //LR1121 BUSY = IO33 +#define RADIO_BUSY_PIN 34 //LR1121 BUSY = IO34 #endif diff --git a/examples/OLED/SH1106FontUsage/utilities.h b/examples/OLED/SH1106FontUsage/utilities.h index 2f03bdd..9553407 100644 --- a/examples/OLED/SH1106FontUsage/utilities.h +++ b/examples/OLED/SH1106FontUsage/utilities.h @@ -255,35 +255,35 @@ #define BOARD_VARIANT_NAME "T3 V3.0 TCXO" -#elif defined(T3_S3_V1_2_SX1262) || \ - defined(T3_S3_V1_2_SX1276) || \ - defined(T3_S3_V1_2_SX1278) || \ - defined(T3_S3_V1_2_SX1280) || \ - defined(T3_S3_V1_2_SX1280_PA) || \ - defined(T3_S3_V1_2_LR1121) +#elif defined(T3_S3_V1_2_SX1262) || defined(ARDUINO_LILYGO_T3S3_SX1262) || \ + defined(T3_S3_V1_2_SX1276) || defined(ARDUINO_LILYGO_T3S3_SX1276) || \ + defined(T3_S3_V1_2_SX1278) || defined(ARDUINO_LILYGO_T3S3_SX1278) || \ + defined(T3_S3_V1_2_SX1280) || defined(ARDUINO_LILYGO_T3S3_SX1280) || \ + defined(T3_S3_V1_2_SX1280_PA) || defined(ARDUINO_LILYGO_T3S3_SX1280PA) || \ + defined(T3_S3_V1_2_LR1121) || defined(ARDUINO_LILYGO_T3S3_LR1121) -#if defined(T3_S3_V1_2_SX1262) +#if defined(T3_S3_V1_2_SX1262) || defined(ARDUINO_LILYGO_T3S3_SX1262) #ifndef USING_SX1262 #define USING_SX1262 #endif -#elif defined(T3_S3_V1_2_SX1276) +#elif defined(T3_S3_V1_2_SX1276) || defined(ARDUINO_LILYGO_T3S3_SX1276) #ifndef USING_SX1276 #define USING_SX1276 #endif -#elif defined(T3_S3_V1_2_SX1278) +#elif defined(T3_S3_V1_2_SX1278) || defined(ARDUINO_LILYGO_T3S3_SX1278) #ifndef USING_SX1278 #define USING_SX1278 #endif -#elif defined(T3_S3_V1_2_SX1280) +#elif defined(T3_S3_V1_2_SX1280) || defined(ARDUINO_LILYGO_T3S3_SX1280) #ifndef USING_SX1280 #define USING_SX1280 #endif -#elif defined(T3_S3_V1_2_SX1280_PA) -#ifndef USING_SX1280 -#define USING_SX1280 +#elif defined(T3_S3_V1_2_SX1280_PA) || defined(ARDUINO_LILYGO_T3S3_SX1280PA) +#ifndef USING_SX1280PA +#define USING_SX1280PA #endif -#elif defined(T3_S3_V1_2_LR1121) +#elif defined(T3_S3_V1_2_LR1121) || defined(ARDUINO_LILYGO_T3S3_LR1121) #ifndef USING_LR1121 #define USING_LR1121 #endif @@ -313,12 +313,12 @@ #define RADIO_RST_PIN 8 -#if defined(T3_S3_V1_2_SX1262) +#if defined(USING_SX1262) #define RADIO_DIO1_PIN 33 #define RADIO_BUSY_PIN 34 -#elif defined(T3_S3_V1_2_SX1276) || defined(T3_S3_V1_2_SX1278) +#elif defined(USING_SX1276) || defined(USING_SX1278) //!SX1276/78 module only #define RADIO_BUSY_PIN 33 //DIO1 @@ -329,12 +329,12 @@ #define RADIO_DIO4_PIN 10 #define RADIO_DIO5_PIN 36 -#elif defined(T3_S3_V1_2_SX1280) +#elif defined(USING_SX1280) #define RADIO_DIO1_PIN 9 //SX1280 DIO1 = IO9 #define RADIO_BUSY_PIN 36 //SX1280 BUSY = IO36 -#elif defined(T3_S3_V1_2_SX1280_PA) +#elif defined(USING_SX1280PA) #define RADIO_DIO1_PIN 9 //SX1280 DIO1 = IO9 #define RADIO_BUSY_PIN 36 //SX1280 BUSY = IO36 @@ -342,10 +342,10 @@ #define RADIO_TX_PIN 10 -#elif defined(T3_S3_V1_2_LR1121) +#elif defined(USING_LR1121) #define RADIO_DIO9_PIN 36 //LR1121 DIO9 = IO36 -#define RADIO_BUSY_PIN 34 //LR1121 BUSY = IO33 +#define RADIO_BUSY_PIN 34 //LR1121 BUSY = IO34 #endif diff --git a/examples/OLED/SH1106GraphicsTest/utilities.h b/examples/OLED/SH1106GraphicsTest/utilities.h index 2f03bdd..9553407 100644 --- a/examples/OLED/SH1106GraphicsTest/utilities.h +++ b/examples/OLED/SH1106GraphicsTest/utilities.h @@ -255,35 +255,35 @@ #define BOARD_VARIANT_NAME "T3 V3.0 TCXO" -#elif defined(T3_S3_V1_2_SX1262) || \ - defined(T3_S3_V1_2_SX1276) || \ - defined(T3_S3_V1_2_SX1278) || \ - defined(T3_S3_V1_2_SX1280) || \ - defined(T3_S3_V1_2_SX1280_PA) || \ - defined(T3_S3_V1_2_LR1121) +#elif defined(T3_S3_V1_2_SX1262) || defined(ARDUINO_LILYGO_T3S3_SX1262) || \ + defined(T3_S3_V1_2_SX1276) || defined(ARDUINO_LILYGO_T3S3_SX1276) || \ + defined(T3_S3_V1_2_SX1278) || defined(ARDUINO_LILYGO_T3S3_SX1278) || \ + defined(T3_S3_V1_2_SX1280) || defined(ARDUINO_LILYGO_T3S3_SX1280) || \ + defined(T3_S3_V1_2_SX1280_PA) || defined(ARDUINO_LILYGO_T3S3_SX1280PA) || \ + defined(T3_S3_V1_2_LR1121) || defined(ARDUINO_LILYGO_T3S3_LR1121) -#if defined(T3_S3_V1_2_SX1262) +#if defined(T3_S3_V1_2_SX1262) || defined(ARDUINO_LILYGO_T3S3_SX1262) #ifndef USING_SX1262 #define USING_SX1262 #endif -#elif defined(T3_S3_V1_2_SX1276) +#elif defined(T3_S3_V1_2_SX1276) || defined(ARDUINO_LILYGO_T3S3_SX1276) #ifndef USING_SX1276 #define USING_SX1276 #endif -#elif defined(T3_S3_V1_2_SX1278) +#elif defined(T3_S3_V1_2_SX1278) || defined(ARDUINO_LILYGO_T3S3_SX1278) #ifndef USING_SX1278 #define USING_SX1278 #endif -#elif defined(T3_S3_V1_2_SX1280) +#elif defined(T3_S3_V1_2_SX1280) || defined(ARDUINO_LILYGO_T3S3_SX1280) #ifndef USING_SX1280 #define USING_SX1280 #endif -#elif defined(T3_S3_V1_2_SX1280_PA) -#ifndef USING_SX1280 -#define USING_SX1280 +#elif defined(T3_S3_V1_2_SX1280_PA) || defined(ARDUINO_LILYGO_T3S3_SX1280PA) +#ifndef USING_SX1280PA +#define USING_SX1280PA #endif -#elif defined(T3_S3_V1_2_LR1121) +#elif defined(T3_S3_V1_2_LR1121) || defined(ARDUINO_LILYGO_T3S3_LR1121) #ifndef USING_LR1121 #define USING_LR1121 #endif @@ -313,12 +313,12 @@ #define RADIO_RST_PIN 8 -#if defined(T3_S3_V1_2_SX1262) +#if defined(USING_SX1262) #define RADIO_DIO1_PIN 33 #define RADIO_BUSY_PIN 34 -#elif defined(T3_S3_V1_2_SX1276) || defined(T3_S3_V1_2_SX1278) +#elif defined(USING_SX1276) || defined(USING_SX1278) //!SX1276/78 module only #define RADIO_BUSY_PIN 33 //DIO1 @@ -329,12 +329,12 @@ #define RADIO_DIO4_PIN 10 #define RADIO_DIO5_PIN 36 -#elif defined(T3_S3_V1_2_SX1280) +#elif defined(USING_SX1280) #define RADIO_DIO1_PIN 9 //SX1280 DIO1 = IO9 #define RADIO_BUSY_PIN 36 //SX1280 BUSY = IO36 -#elif defined(T3_S3_V1_2_SX1280_PA) +#elif defined(USING_SX1280PA) #define RADIO_DIO1_PIN 9 //SX1280 DIO1 = IO9 #define RADIO_BUSY_PIN 36 //SX1280 BUSY = IO36 @@ -342,10 +342,10 @@ #define RADIO_TX_PIN 10 -#elif defined(T3_S3_V1_2_LR1121) +#elif defined(USING_LR1121) #define RADIO_DIO9_PIN 36 //LR1121 DIO9 = IO36 -#define RADIO_BUSY_PIN 34 //LR1121 BUSY = IO33 +#define RADIO_BUSY_PIN 34 //LR1121 BUSY = IO34 #endif diff --git a/examples/OLED/SH1106IconMenu/utilities.h b/examples/OLED/SH1106IconMenu/utilities.h index 2f03bdd..9553407 100644 --- a/examples/OLED/SH1106IconMenu/utilities.h +++ b/examples/OLED/SH1106IconMenu/utilities.h @@ -255,35 +255,35 @@ #define BOARD_VARIANT_NAME "T3 V3.0 TCXO" -#elif defined(T3_S3_V1_2_SX1262) || \ - defined(T3_S3_V1_2_SX1276) || \ - defined(T3_S3_V1_2_SX1278) || \ - defined(T3_S3_V1_2_SX1280) || \ - defined(T3_S3_V1_2_SX1280_PA) || \ - defined(T3_S3_V1_2_LR1121) +#elif defined(T3_S3_V1_2_SX1262) || defined(ARDUINO_LILYGO_T3S3_SX1262) || \ + defined(T3_S3_V1_2_SX1276) || defined(ARDUINO_LILYGO_T3S3_SX1276) || \ + defined(T3_S3_V1_2_SX1278) || defined(ARDUINO_LILYGO_T3S3_SX1278) || \ + defined(T3_S3_V1_2_SX1280) || defined(ARDUINO_LILYGO_T3S3_SX1280) || \ + defined(T3_S3_V1_2_SX1280_PA) || defined(ARDUINO_LILYGO_T3S3_SX1280PA) || \ + defined(T3_S3_V1_2_LR1121) || defined(ARDUINO_LILYGO_T3S3_LR1121) -#if defined(T3_S3_V1_2_SX1262) +#if defined(T3_S3_V1_2_SX1262) || defined(ARDUINO_LILYGO_T3S3_SX1262) #ifndef USING_SX1262 #define USING_SX1262 #endif -#elif defined(T3_S3_V1_2_SX1276) +#elif defined(T3_S3_V1_2_SX1276) || defined(ARDUINO_LILYGO_T3S3_SX1276) #ifndef USING_SX1276 #define USING_SX1276 #endif -#elif defined(T3_S3_V1_2_SX1278) +#elif defined(T3_S3_V1_2_SX1278) || defined(ARDUINO_LILYGO_T3S3_SX1278) #ifndef USING_SX1278 #define USING_SX1278 #endif -#elif defined(T3_S3_V1_2_SX1280) +#elif defined(T3_S3_V1_2_SX1280) || defined(ARDUINO_LILYGO_T3S3_SX1280) #ifndef USING_SX1280 #define USING_SX1280 #endif -#elif defined(T3_S3_V1_2_SX1280_PA) -#ifndef USING_SX1280 -#define USING_SX1280 +#elif defined(T3_S3_V1_2_SX1280_PA) || defined(ARDUINO_LILYGO_T3S3_SX1280PA) +#ifndef USING_SX1280PA +#define USING_SX1280PA #endif -#elif defined(T3_S3_V1_2_LR1121) +#elif defined(T3_S3_V1_2_LR1121) || defined(ARDUINO_LILYGO_T3S3_LR1121) #ifndef USING_LR1121 #define USING_LR1121 #endif @@ -313,12 +313,12 @@ #define RADIO_RST_PIN 8 -#if defined(T3_S3_V1_2_SX1262) +#if defined(USING_SX1262) #define RADIO_DIO1_PIN 33 #define RADIO_BUSY_PIN 34 -#elif defined(T3_S3_V1_2_SX1276) || defined(T3_S3_V1_2_SX1278) +#elif defined(USING_SX1276) || defined(USING_SX1278) //!SX1276/78 module only #define RADIO_BUSY_PIN 33 //DIO1 @@ -329,12 +329,12 @@ #define RADIO_DIO4_PIN 10 #define RADIO_DIO5_PIN 36 -#elif defined(T3_S3_V1_2_SX1280) +#elif defined(USING_SX1280) #define RADIO_DIO1_PIN 9 //SX1280 DIO1 = IO9 #define RADIO_BUSY_PIN 36 //SX1280 BUSY = IO36 -#elif defined(T3_S3_V1_2_SX1280_PA) +#elif defined(USING_SX1280PA) #define RADIO_DIO1_PIN 9 //SX1280 DIO1 = IO9 #define RADIO_BUSY_PIN 36 //SX1280 BUSY = IO36 @@ -342,10 +342,10 @@ #define RADIO_TX_PIN 10 -#elif defined(T3_S3_V1_2_LR1121) +#elif defined(USING_LR1121) #define RADIO_DIO9_PIN 36 //LR1121 DIO9 = IO36 -#define RADIO_BUSY_PIN 34 //LR1121 BUSY = IO33 +#define RADIO_BUSY_PIN 34 //LR1121 BUSY = IO34 #endif diff --git a/examples/OLED/SH1106PrintUTF8/utilities.h b/examples/OLED/SH1106PrintUTF8/utilities.h index 2f03bdd..9553407 100644 --- a/examples/OLED/SH1106PrintUTF8/utilities.h +++ b/examples/OLED/SH1106PrintUTF8/utilities.h @@ -255,35 +255,35 @@ #define BOARD_VARIANT_NAME "T3 V3.0 TCXO" -#elif defined(T3_S3_V1_2_SX1262) || \ - defined(T3_S3_V1_2_SX1276) || \ - defined(T3_S3_V1_2_SX1278) || \ - defined(T3_S3_V1_2_SX1280) || \ - defined(T3_S3_V1_2_SX1280_PA) || \ - defined(T3_S3_V1_2_LR1121) +#elif defined(T3_S3_V1_2_SX1262) || defined(ARDUINO_LILYGO_T3S3_SX1262) || \ + defined(T3_S3_V1_2_SX1276) || defined(ARDUINO_LILYGO_T3S3_SX1276) || \ + defined(T3_S3_V1_2_SX1278) || defined(ARDUINO_LILYGO_T3S3_SX1278) || \ + defined(T3_S3_V1_2_SX1280) || defined(ARDUINO_LILYGO_T3S3_SX1280) || \ + defined(T3_S3_V1_2_SX1280_PA) || defined(ARDUINO_LILYGO_T3S3_SX1280PA) || \ + defined(T3_S3_V1_2_LR1121) || defined(ARDUINO_LILYGO_T3S3_LR1121) -#if defined(T3_S3_V1_2_SX1262) +#if defined(T3_S3_V1_2_SX1262) || defined(ARDUINO_LILYGO_T3S3_SX1262) #ifndef USING_SX1262 #define USING_SX1262 #endif -#elif defined(T3_S3_V1_2_SX1276) +#elif defined(T3_S3_V1_2_SX1276) || defined(ARDUINO_LILYGO_T3S3_SX1276) #ifndef USING_SX1276 #define USING_SX1276 #endif -#elif defined(T3_S3_V1_2_SX1278) +#elif defined(T3_S3_V1_2_SX1278) || defined(ARDUINO_LILYGO_T3S3_SX1278) #ifndef USING_SX1278 #define USING_SX1278 #endif -#elif defined(T3_S3_V1_2_SX1280) +#elif defined(T3_S3_V1_2_SX1280) || defined(ARDUINO_LILYGO_T3S3_SX1280) #ifndef USING_SX1280 #define USING_SX1280 #endif -#elif defined(T3_S3_V1_2_SX1280_PA) -#ifndef USING_SX1280 -#define USING_SX1280 +#elif defined(T3_S3_V1_2_SX1280_PA) || defined(ARDUINO_LILYGO_T3S3_SX1280PA) +#ifndef USING_SX1280PA +#define USING_SX1280PA #endif -#elif defined(T3_S3_V1_2_LR1121) +#elif defined(T3_S3_V1_2_LR1121) || defined(ARDUINO_LILYGO_T3S3_LR1121) #ifndef USING_LR1121 #define USING_LR1121 #endif @@ -313,12 +313,12 @@ #define RADIO_RST_PIN 8 -#if defined(T3_S3_V1_2_SX1262) +#if defined(USING_SX1262) #define RADIO_DIO1_PIN 33 #define RADIO_BUSY_PIN 34 -#elif defined(T3_S3_V1_2_SX1276) || defined(T3_S3_V1_2_SX1278) +#elif defined(USING_SX1276) || defined(USING_SX1278) //!SX1276/78 module only #define RADIO_BUSY_PIN 33 //DIO1 @@ -329,12 +329,12 @@ #define RADIO_DIO4_PIN 10 #define RADIO_DIO5_PIN 36 -#elif defined(T3_S3_V1_2_SX1280) +#elif defined(USING_SX1280) #define RADIO_DIO1_PIN 9 //SX1280 DIO1 = IO9 #define RADIO_BUSY_PIN 36 //SX1280 BUSY = IO36 -#elif defined(T3_S3_V1_2_SX1280_PA) +#elif defined(USING_SX1280PA) #define RADIO_DIO1_PIN 9 //SX1280 DIO1 = IO9 #define RADIO_BUSY_PIN 36 //SX1280 BUSY = IO36 @@ -342,10 +342,10 @@ #define RADIO_TX_PIN 10 -#elif defined(T3_S3_V1_2_LR1121) +#elif defined(USING_LR1121) #define RADIO_DIO9_PIN 36 //LR1121 DIO9 = IO36 -#define RADIO_BUSY_PIN 34 //LR1121 BUSY = IO33 +#define RADIO_BUSY_PIN 34 //LR1121 BUSY = IO34 #endif diff --git a/examples/OLED/SSD1306SimpleDemo/utilities.h b/examples/OLED/SSD1306SimpleDemo/utilities.h index 1640f71..f5d1a74 100644 --- a/examples/OLED/SSD1306SimpleDemo/utilities.h +++ b/examples/OLED/SSD1306SimpleDemo/utilities.h @@ -255,35 +255,35 @@ #define BOARD_VARIANT_NAME "T3 V3.0 TCXO" -#elif defined(T3_S3_V1_2_SX1262) || \ - defined(T3_S3_V1_2_SX1276) || \ - defined(T3_S3_V1_2_SX1278) || \ - defined(T3_S3_V1_2_SX1280) || \ - defined(T3_S3_V1_2_SX1280_PA) || \ - defined(T3_S3_V1_2_LR1121) +#elif defined(T3_S3_V1_2_SX1262) || defined(ARDUINO_LILYGO_T3S3_SX1262) || \ + defined(T3_S3_V1_2_SX1276) || defined(ARDUINO_LILYGO_T3S3_SX1276) || \ + defined(T3_S3_V1_2_SX1278) || defined(ARDUINO_LILYGO_T3S3_SX1278) || \ + defined(T3_S3_V1_2_SX1280) || defined(ARDUINO_LILYGO_T3S3_SX1280) || \ + defined(T3_S3_V1_2_SX1280_PA) || defined(ARDUINO_LILYGO_T3S3_SX1280PA) || \ + defined(T3_S3_V1_2_LR1121) || defined(ARDUINO_LILYGO_T3S3_LR1121) -#if defined(T3_S3_V1_2_SX1262) +#if defined(T3_S3_V1_2_SX1262) || defined(ARDUINO_LILYGO_T3S3_SX1262) #ifndef USING_SX1262 #define USING_SX1262 #endif -#elif defined(T3_S3_V1_2_SX1276) +#elif defined(T3_S3_V1_2_SX1276) || defined(ARDUINO_LILYGO_T3S3_SX1276) #ifndef USING_SX1276 #define USING_SX1276 #endif -#elif defined(T3_S3_V1_2_SX1278) +#elif defined(T3_S3_V1_2_SX1278) || defined(ARDUINO_LILYGO_T3S3_SX1278) #ifndef USING_SX1278 #define USING_SX1278 #endif -#elif defined(T3_S3_V1_2_SX1280) +#elif defined(T3_S3_V1_2_SX1280) || defined(ARDUINO_LILYGO_T3S3_SX1280) #ifndef USING_SX1280 #define USING_SX1280 #endif -#elif defined(T3_S3_V1_2_SX1280_PA) -#ifndef USING_SX1280 -#define USING_SX1280 +#elif defined(T3_S3_V1_2_SX1280_PA) || defined(ARDUINO_LILYGO_T3S3_SX1280PA) +#ifndef USING_SX1280PA +#define USING_SX1280PA #endif -#elif defined(T3_S3_V1_2_LR1121) +#elif defined(T3_S3_V1_2_LR1121) || defined(ARDUINO_LILYGO_T3S3_LR1121) #ifndef USING_LR1121 #define USING_LR1121 #endif @@ -313,12 +313,12 @@ #define RADIO_RST_PIN 8 -#if defined(T3_S3_V1_2_SX1262) +#if defined(USING_SX1262) #define RADIO_DIO1_PIN 33 #define RADIO_BUSY_PIN 34 -#elif defined(T3_S3_V1_2_SX1276) || defined(T3_S3_V1_2_SX1278) +#elif defined(USING_SX1276) || defined(USING_SX1278) //!SX1276/78 module only #define RADIO_BUSY_PIN 33 //DIO1 @@ -329,12 +329,12 @@ #define RADIO_DIO4_PIN 10 #define RADIO_DIO5_PIN 36 -#elif defined(T3_S3_V1_2_SX1280) +#elif defined(USING_SX1280) #define RADIO_DIO1_PIN 9 //SX1280 DIO1 = IO9 #define RADIO_BUSY_PIN 36 //SX1280 BUSY = IO36 -#elif defined(T3_S3_V1_2_SX1280_PA) +#elif defined(USING_SX1280PA) #define RADIO_DIO1_PIN 9 //SX1280 DIO1 = IO9 #define RADIO_BUSY_PIN 36 //SX1280 BUSY = IO36 @@ -342,10 +342,10 @@ #define RADIO_TX_PIN 10 -#elif defined(T3_S3_V1_2_LR1121) +#elif defined(USING_LR1121) #define RADIO_DIO9_PIN 36 //LR1121 DIO9 = IO36 -#define RADIO_BUSY_PIN 34 //LR1121 BUSY = IO33 +#define RADIO_BUSY_PIN 34 //LR1121 BUSY = IO34 #endif diff --git a/examples/OLED/SSD1306UiDemo/utilities.h b/examples/OLED/SSD1306UiDemo/utilities.h index 1640f71..f5d1a74 100644 --- a/examples/OLED/SSD1306UiDemo/utilities.h +++ b/examples/OLED/SSD1306UiDemo/utilities.h @@ -255,35 +255,35 @@ #define BOARD_VARIANT_NAME "T3 V3.0 TCXO" -#elif defined(T3_S3_V1_2_SX1262) || \ - defined(T3_S3_V1_2_SX1276) || \ - defined(T3_S3_V1_2_SX1278) || \ - defined(T3_S3_V1_2_SX1280) || \ - defined(T3_S3_V1_2_SX1280_PA) || \ - defined(T3_S3_V1_2_LR1121) +#elif defined(T3_S3_V1_2_SX1262) || defined(ARDUINO_LILYGO_T3S3_SX1262) || \ + defined(T3_S3_V1_2_SX1276) || defined(ARDUINO_LILYGO_T3S3_SX1276) || \ + defined(T3_S3_V1_2_SX1278) || defined(ARDUINO_LILYGO_T3S3_SX1278) || \ + defined(T3_S3_V1_2_SX1280) || defined(ARDUINO_LILYGO_T3S3_SX1280) || \ + defined(T3_S3_V1_2_SX1280_PA) || defined(ARDUINO_LILYGO_T3S3_SX1280PA) || \ + defined(T3_S3_V1_2_LR1121) || defined(ARDUINO_LILYGO_T3S3_LR1121) -#if defined(T3_S3_V1_2_SX1262) +#if defined(T3_S3_V1_2_SX1262) || defined(ARDUINO_LILYGO_T3S3_SX1262) #ifndef USING_SX1262 #define USING_SX1262 #endif -#elif defined(T3_S3_V1_2_SX1276) +#elif defined(T3_S3_V1_2_SX1276) || defined(ARDUINO_LILYGO_T3S3_SX1276) #ifndef USING_SX1276 #define USING_SX1276 #endif -#elif defined(T3_S3_V1_2_SX1278) +#elif defined(T3_S3_V1_2_SX1278) || defined(ARDUINO_LILYGO_T3S3_SX1278) #ifndef USING_SX1278 #define USING_SX1278 #endif -#elif defined(T3_S3_V1_2_SX1280) +#elif defined(T3_S3_V1_2_SX1280) || defined(ARDUINO_LILYGO_T3S3_SX1280) #ifndef USING_SX1280 #define USING_SX1280 #endif -#elif defined(T3_S3_V1_2_SX1280_PA) -#ifndef USING_SX1280 -#define USING_SX1280 +#elif defined(T3_S3_V1_2_SX1280_PA) || defined(ARDUINO_LILYGO_T3S3_SX1280PA) +#ifndef USING_SX1280PA +#define USING_SX1280PA #endif -#elif defined(T3_S3_V1_2_LR1121) +#elif defined(T3_S3_V1_2_LR1121) || defined(ARDUINO_LILYGO_T3S3_LR1121) #ifndef USING_LR1121 #define USING_LR1121 #endif @@ -313,12 +313,12 @@ #define RADIO_RST_PIN 8 -#if defined(T3_S3_V1_2_SX1262) +#if defined(USING_SX1262) #define RADIO_DIO1_PIN 33 #define RADIO_BUSY_PIN 34 -#elif defined(T3_S3_V1_2_SX1276) || defined(T3_S3_V1_2_SX1278) +#elif defined(USING_SX1276) || defined(USING_SX1278) //!SX1276/78 module only #define RADIO_BUSY_PIN 33 //DIO1 @@ -329,12 +329,12 @@ #define RADIO_DIO4_PIN 10 #define RADIO_DIO5_PIN 36 -#elif defined(T3_S3_V1_2_SX1280) +#elif defined(USING_SX1280) #define RADIO_DIO1_PIN 9 //SX1280 DIO1 = IO9 #define RADIO_BUSY_PIN 36 //SX1280 BUSY = IO36 -#elif defined(T3_S3_V1_2_SX1280_PA) +#elif defined(USING_SX1280PA) #define RADIO_DIO1_PIN 9 //SX1280 DIO1 = IO9 #define RADIO_BUSY_PIN 36 //SX1280 BUSY = IO36 @@ -342,10 +342,10 @@ #define RADIO_TX_PIN 10 -#elif defined(T3_S3_V1_2_LR1121) +#elif defined(USING_LR1121) #define RADIO_DIO9_PIN 36 //LR1121 DIO9 = IO36 -#define RADIO_BUSY_PIN 34 //LR1121 BUSY = IO33 +#define RADIO_BUSY_PIN 34 //LR1121 BUSY = IO34 #endif diff --git a/examples/PMU/utilities.h b/examples/PMU/utilities.h index 2f03bdd..9553407 100644 --- a/examples/PMU/utilities.h +++ b/examples/PMU/utilities.h @@ -255,35 +255,35 @@ #define BOARD_VARIANT_NAME "T3 V3.0 TCXO" -#elif defined(T3_S3_V1_2_SX1262) || \ - defined(T3_S3_V1_2_SX1276) || \ - defined(T3_S3_V1_2_SX1278) || \ - defined(T3_S3_V1_2_SX1280) || \ - defined(T3_S3_V1_2_SX1280_PA) || \ - defined(T3_S3_V1_2_LR1121) +#elif defined(T3_S3_V1_2_SX1262) || defined(ARDUINO_LILYGO_T3S3_SX1262) || \ + defined(T3_S3_V1_2_SX1276) || defined(ARDUINO_LILYGO_T3S3_SX1276) || \ + defined(T3_S3_V1_2_SX1278) || defined(ARDUINO_LILYGO_T3S3_SX1278) || \ + defined(T3_S3_V1_2_SX1280) || defined(ARDUINO_LILYGO_T3S3_SX1280) || \ + defined(T3_S3_V1_2_SX1280_PA) || defined(ARDUINO_LILYGO_T3S3_SX1280PA) || \ + defined(T3_S3_V1_2_LR1121) || defined(ARDUINO_LILYGO_T3S3_LR1121) -#if defined(T3_S3_V1_2_SX1262) +#if defined(T3_S3_V1_2_SX1262) || defined(ARDUINO_LILYGO_T3S3_SX1262) #ifndef USING_SX1262 #define USING_SX1262 #endif -#elif defined(T3_S3_V1_2_SX1276) +#elif defined(T3_S3_V1_2_SX1276) || defined(ARDUINO_LILYGO_T3S3_SX1276) #ifndef USING_SX1276 #define USING_SX1276 #endif -#elif defined(T3_S3_V1_2_SX1278) +#elif defined(T3_S3_V1_2_SX1278) || defined(ARDUINO_LILYGO_T3S3_SX1278) #ifndef USING_SX1278 #define USING_SX1278 #endif -#elif defined(T3_S3_V1_2_SX1280) +#elif defined(T3_S3_V1_2_SX1280) || defined(ARDUINO_LILYGO_T3S3_SX1280) #ifndef USING_SX1280 #define USING_SX1280 #endif -#elif defined(T3_S3_V1_2_SX1280_PA) -#ifndef USING_SX1280 -#define USING_SX1280 +#elif defined(T3_S3_V1_2_SX1280_PA) || defined(ARDUINO_LILYGO_T3S3_SX1280PA) +#ifndef USING_SX1280PA +#define USING_SX1280PA #endif -#elif defined(T3_S3_V1_2_LR1121) +#elif defined(T3_S3_V1_2_LR1121) || defined(ARDUINO_LILYGO_T3S3_LR1121) #ifndef USING_LR1121 #define USING_LR1121 #endif @@ -313,12 +313,12 @@ #define RADIO_RST_PIN 8 -#if defined(T3_S3_V1_2_SX1262) +#if defined(USING_SX1262) #define RADIO_DIO1_PIN 33 #define RADIO_BUSY_PIN 34 -#elif defined(T3_S3_V1_2_SX1276) || defined(T3_S3_V1_2_SX1278) +#elif defined(USING_SX1276) || defined(USING_SX1278) //!SX1276/78 module only #define RADIO_BUSY_PIN 33 //DIO1 @@ -329,12 +329,12 @@ #define RADIO_DIO4_PIN 10 #define RADIO_DIO5_PIN 36 -#elif defined(T3_S3_V1_2_SX1280) +#elif defined(USING_SX1280) #define RADIO_DIO1_PIN 9 //SX1280 DIO1 = IO9 #define RADIO_BUSY_PIN 36 //SX1280 BUSY = IO36 -#elif defined(T3_S3_V1_2_SX1280_PA) +#elif defined(USING_SX1280PA) #define RADIO_DIO1_PIN 9 //SX1280 DIO1 = IO9 #define RADIO_BUSY_PIN 36 //SX1280 BUSY = IO36 @@ -342,10 +342,10 @@ #define RADIO_TX_PIN 10 -#elif defined(T3_S3_V1_2_LR1121) +#elif defined(USING_LR1121) #define RADIO_DIO9_PIN 36 //LR1121 DIO9 = IO36 -#define RADIO_BUSY_PIN 34 //LR1121 BUSY = IO33 +#define RADIO_BUSY_PIN 34 //LR1121 BUSY = IO34 #endif diff --git a/examples/RadioLibExamples/Receive_Interrupt/utilities.h b/examples/RadioLibExamples/Receive_Interrupt/utilities.h index 2f03bdd..9553407 100644 --- a/examples/RadioLibExamples/Receive_Interrupt/utilities.h +++ b/examples/RadioLibExamples/Receive_Interrupt/utilities.h @@ -255,35 +255,35 @@ #define BOARD_VARIANT_NAME "T3 V3.0 TCXO" -#elif defined(T3_S3_V1_2_SX1262) || \ - defined(T3_S3_V1_2_SX1276) || \ - defined(T3_S3_V1_2_SX1278) || \ - defined(T3_S3_V1_2_SX1280) || \ - defined(T3_S3_V1_2_SX1280_PA) || \ - defined(T3_S3_V1_2_LR1121) +#elif defined(T3_S3_V1_2_SX1262) || defined(ARDUINO_LILYGO_T3S3_SX1262) || \ + defined(T3_S3_V1_2_SX1276) || defined(ARDUINO_LILYGO_T3S3_SX1276) || \ + defined(T3_S3_V1_2_SX1278) || defined(ARDUINO_LILYGO_T3S3_SX1278) || \ + defined(T3_S3_V1_2_SX1280) || defined(ARDUINO_LILYGO_T3S3_SX1280) || \ + defined(T3_S3_V1_2_SX1280_PA) || defined(ARDUINO_LILYGO_T3S3_SX1280PA) || \ + defined(T3_S3_V1_2_LR1121) || defined(ARDUINO_LILYGO_T3S3_LR1121) -#if defined(T3_S3_V1_2_SX1262) +#if defined(T3_S3_V1_2_SX1262) || defined(ARDUINO_LILYGO_T3S3_SX1262) #ifndef USING_SX1262 #define USING_SX1262 #endif -#elif defined(T3_S3_V1_2_SX1276) +#elif defined(T3_S3_V1_2_SX1276) || defined(ARDUINO_LILYGO_T3S3_SX1276) #ifndef USING_SX1276 #define USING_SX1276 #endif -#elif defined(T3_S3_V1_2_SX1278) +#elif defined(T3_S3_V1_2_SX1278) || defined(ARDUINO_LILYGO_T3S3_SX1278) #ifndef USING_SX1278 #define USING_SX1278 #endif -#elif defined(T3_S3_V1_2_SX1280) +#elif defined(T3_S3_V1_2_SX1280) || defined(ARDUINO_LILYGO_T3S3_SX1280) #ifndef USING_SX1280 #define USING_SX1280 #endif -#elif defined(T3_S3_V1_2_SX1280_PA) -#ifndef USING_SX1280 -#define USING_SX1280 +#elif defined(T3_S3_V1_2_SX1280_PA) || defined(ARDUINO_LILYGO_T3S3_SX1280PA) +#ifndef USING_SX1280PA +#define USING_SX1280PA #endif -#elif defined(T3_S3_V1_2_LR1121) +#elif defined(T3_S3_V1_2_LR1121) || defined(ARDUINO_LILYGO_T3S3_LR1121) #ifndef USING_LR1121 #define USING_LR1121 #endif @@ -313,12 +313,12 @@ #define RADIO_RST_PIN 8 -#if defined(T3_S3_V1_2_SX1262) +#if defined(USING_SX1262) #define RADIO_DIO1_PIN 33 #define RADIO_BUSY_PIN 34 -#elif defined(T3_S3_V1_2_SX1276) || defined(T3_S3_V1_2_SX1278) +#elif defined(USING_SX1276) || defined(USING_SX1278) //!SX1276/78 module only #define RADIO_BUSY_PIN 33 //DIO1 @@ -329,12 +329,12 @@ #define RADIO_DIO4_PIN 10 #define RADIO_DIO5_PIN 36 -#elif defined(T3_S3_V1_2_SX1280) +#elif defined(USING_SX1280) #define RADIO_DIO1_PIN 9 //SX1280 DIO1 = IO9 #define RADIO_BUSY_PIN 36 //SX1280 BUSY = IO36 -#elif defined(T3_S3_V1_2_SX1280_PA) +#elif defined(USING_SX1280PA) #define RADIO_DIO1_PIN 9 //SX1280 DIO1 = IO9 #define RADIO_BUSY_PIN 36 //SX1280 BUSY = IO36 @@ -342,10 +342,10 @@ #define RADIO_TX_PIN 10 -#elif defined(T3_S3_V1_2_LR1121) +#elif defined(USING_LR1121) #define RADIO_DIO9_PIN 36 //LR1121 DIO9 = IO36 -#define RADIO_BUSY_PIN 34 //LR1121 BUSY = IO33 +#define RADIO_BUSY_PIN 34 //LR1121 BUSY = IO34 #endif diff --git a/examples/RadioLibExamples/Transmit_Interrupt/utilities.h b/examples/RadioLibExamples/Transmit_Interrupt/utilities.h index 2f03bdd..9553407 100644 --- a/examples/RadioLibExamples/Transmit_Interrupt/utilities.h +++ b/examples/RadioLibExamples/Transmit_Interrupt/utilities.h @@ -255,35 +255,35 @@ #define BOARD_VARIANT_NAME "T3 V3.0 TCXO" -#elif defined(T3_S3_V1_2_SX1262) || \ - defined(T3_S3_V1_2_SX1276) || \ - defined(T3_S3_V1_2_SX1278) || \ - defined(T3_S3_V1_2_SX1280) || \ - defined(T3_S3_V1_2_SX1280_PA) || \ - defined(T3_S3_V1_2_LR1121) +#elif defined(T3_S3_V1_2_SX1262) || defined(ARDUINO_LILYGO_T3S3_SX1262) || \ + defined(T3_S3_V1_2_SX1276) || defined(ARDUINO_LILYGO_T3S3_SX1276) || \ + defined(T3_S3_V1_2_SX1278) || defined(ARDUINO_LILYGO_T3S3_SX1278) || \ + defined(T3_S3_V1_2_SX1280) || defined(ARDUINO_LILYGO_T3S3_SX1280) || \ + defined(T3_S3_V1_2_SX1280_PA) || defined(ARDUINO_LILYGO_T3S3_SX1280PA) || \ + defined(T3_S3_V1_2_LR1121) || defined(ARDUINO_LILYGO_T3S3_LR1121) -#if defined(T3_S3_V1_2_SX1262) +#if defined(T3_S3_V1_2_SX1262) || defined(ARDUINO_LILYGO_T3S3_SX1262) #ifndef USING_SX1262 #define USING_SX1262 #endif -#elif defined(T3_S3_V1_2_SX1276) +#elif defined(T3_S3_V1_2_SX1276) || defined(ARDUINO_LILYGO_T3S3_SX1276) #ifndef USING_SX1276 #define USING_SX1276 #endif -#elif defined(T3_S3_V1_2_SX1278) +#elif defined(T3_S3_V1_2_SX1278) || defined(ARDUINO_LILYGO_T3S3_SX1278) #ifndef USING_SX1278 #define USING_SX1278 #endif -#elif defined(T3_S3_V1_2_SX1280) +#elif defined(T3_S3_V1_2_SX1280) || defined(ARDUINO_LILYGO_T3S3_SX1280) #ifndef USING_SX1280 #define USING_SX1280 #endif -#elif defined(T3_S3_V1_2_SX1280_PA) -#ifndef USING_SX1280 -#define USING_SX1280 +#elif defined(T3_S3_V1_2_SX1280_PA) || defined(ARDUINO_LILYGO_T3S3_SX1280PA) +#ifndef USING_SX1280PA +#define USING_SX1280PA #endif -#elif defined(T3_S3_V1_2_LR1121) +#elif defined(T3_S3_V1_2_LR1121) || defined(ARDUINO_LILYGO_T3S3_LR1121) #ifndef USING_LR1121 #define USING_LR1121 #endif @@ -313,12 +313,12 @@ #define RADIO_RST_PIN 8 -#if defined(T3_S3_V1_2_SX1262) +#if defined(USING_SX1262) #define RADIO_DIO1_PIN 33 #define RADIO_BUSY_PIN 34 -#elif defined(T3_S3_V1_2_SX1276) || defined(T3_S3_V1_2_SX1278) +#elif defined(USING_SX1276) || defined(USING_SX1278) //!SX1276/78 module only #define RADIO_BUSY_PIN 33 //DIO1 @@ -329,12 +329,12 @@ #define RADIO_DIO4_PIN 10 #define RADIO_DIO5_PIN 36 -#elif defined(T3_S3_V1_2_SX1280) +#elif defined(USING_SX1280) #define RADIO_DIO1_PIN 9 //SX1280 DIO1 = IO9 #define RADIO_BUSY_PIN 36 //SX1280 BUSY = IO36 -#elif defined(T3_S3_V1_2_SX1280_PA) +#elif defined(USING_SX1280PA) #define RADIO_DIO1_PIN 9 //SX1280 DIO1 = IO9 #define RADIO_BUSY_PIN 36 //SX1280 BUSY = IO36 @@ -342,10 +342,10 @@ #define RADIO_TX_PIN 10 -#elif defined(T3_S3_V1_2_LR1121) +#elif defined(USING_LR1121) #define RADIO_DIO9_PIN 36 //LR1121 DIO9 = IO36 -#define RADIO_BUSY_PIN 34 //LR1121 BUSY = IO33 +#define RADIO_BUSY_PIN 34 //LR1121 BUSY = IO34 #endif diff --git a/examples/Sensor/BME280_AdvancedsettingsExample/utilities.h b/examples/Sensor/BME280_AdvancedsettingsExample/utilities.h index 2f03bdd..9553407 100644 --- a/examples/Sensor/BME280_AdvancedsettingsExample/utilities.h +++ b/examples/Sensor/BME280_AdvancedsettingsExample/utilities.h @@ -255,35 +255,35 @@ #define BOARD_VARIANT_NAME "T3 V3.0 TCXO" -#elif defined(T3_S3_V1_2_SX1262) || \ - defined(T3_S3_V1_2_SX1276) || \ - defined(T3_S3_V1_2_SX1278) || \ - defined(T3_S3_V1_2_SX1280) || \ - defined(T3_S3_V1_2_SX1280_PA) || \ - defined(T3_S3_V1_2_LR1121) +#elif defined(T3_S3_V1_2_SX1262) || defined(ARDUINO_LILYGO_T3S3_SX1262) || \ + defined(T3_S3_V1_2_SX1276) || defined(ARDUINO_LILYGO_T3S3_SX1276) || \ + defined(T3_S3_V1_2_SX1278) || defined(ARDUINO_LILYGO_T3S3_SX1278) || \ + defined(T3_S3_V1_2_SX1280) || defined(ARDUINO_LILYGO_T3S3_SX1280) || \ + defined(T3_S3_V1_2_SX1280_PA) || defined(ARDUINO_LILYGO_T3S3_SX1280PA) || \ + defined(T3_S3_V1_2_LR1121) || defined(ARDUINO_LILYGO_T3S3_LR1121) -#if defined(T3_S3_V1_2_SX1262) +#if defined(T3_S3_V1_2_SX1262) || defined(ARDUINO_LILYGO_T3S3_SX1262) #ifndef USING_SX1262 #define USING_SX1262 #endif -#elif defined(T3_S3_V1_2_SX1276) +#elif defined(T3_S3_V1_2_SX1276) || defined(ARDUINO_LILYGO_T3S3_SX1276) #ifndef USING_SX1276 #define USING_SX1276 #endif -#elif defined(T3_S3_V1_2_SX1278) +#elif defined(T3_S3_V1_2_SX1278) || defined(ARDUINO_LILYGO_T3S3_SX1278) #ifndef USING_SX1278 #define USING_SX1278 #endif -#elif defined(T3_S3_V1_2_SX1280) +#elif defined(T3_S3_V1_2_SX1280) || defined(ARDUINO_LILYGO_T3S3_SX1280) #ifndef USING_SX1280 #define USING_SX1280 #endif -#elif defined(T3_S3_V1_2_SX1280_PA) -#ifndef USING_SX1280 -#define USING_SX1280 +#elif defined(T3_S3_V1_2_SX1280_PA) || defined(ARDUINO_LILYGO_T3S3_SX1280PA) +#ifndef USING_SX1280PA +#define USING_SX1280PA #endif -#elif defined(T3_S3_V1_2_LR1121) +#elif defined(T3_S3_V1_2_LR1121) || defined(ARDUINO_LILYGO_T3S3_LR1121) #ifndef USING_LR1121 #define USING_LR1121 #endif @@ -313,12 +313,12 @@ #define RADIO_RST_PIN 8 -#if defined(T3_S3_V1_2_SX1262) +#if defined(USING_SX1262) #define RADIO_DIO1_PIN 33 #define RADIO_BUSY_PIN 34 -#elif defined(T3_S3_V1_2_SX1276) || defined(T3_S3_V1_2_SX1278) +#elif defined(USING_SX1276) || defined(USING_SX1278) //!SX1276/78 module only #define RADIO_BUSY_PIN 33 //DIO1 @@ -329,12 +329,12 @@ #define RADIO_DIO4_PIN 10 #define RADIO_DIO5_PIN 36 -#elif defined(T3_S3_V1_2_SX1280) +#elif defined(USING_SX1280) #define RADIO_DIO1_PIN 9 //SX1280 DIO1 = IO9 #define RADIO_BUSY_PIN 36 //SX1280 BUSY = IO36 -#elif defined(T3_S3_V1_2_SX1280_PA) +#elif defined(USING_SX1280PA) #define RADIO_DIO1_PIN 9 //SX1280 DIO1 = IO9 #define RADIO_BUSY_PIN 36 //SX1280 BUSY = IO36 @@ -342,10 +342,10 @@ #define RADIO_TX_PIN 10 -#elif defined(T3_S3_V1_2_LR1121) +#elif defined(USING_LR1121) #define RADIO_DIO9_PIN 36 //LR1121 DIO9 = IO36 -#define RADIO_BUSY_PIN 34 //LR1121 BUSY = IO33 +#define RADIO_BUSY_PIN 34 //LR1121 BUSY = IO34 #endif diff --git a/examples/Sensor/BME280_TestExample/utilities.h b/examples/Sensor/BME280_TestExample/utilities.h index 2f03bdd..9553407 100644 --- a/examples/Sensor/BME280_TestExample/utilities.h +++ b/examples/Sensor/BME280_TestExample/utilities.h @@ -255,35 +255,35 @@ #define BOARD_VARIANT_NAME "T3 V3.0 TCXO" -#elif defined(T3_S3_V1_2_SX1262) || \ - defined(T3_S3_V1_2_SX1276) || \ - defined(T3_S3_V1_2_SX1278) || \ - defined(T3_S3_V1_2_SX1280) || \ - defined(T3_S3_V1_2_SX1280_PA) || \ - defined(T3_S3_V1_2_LR1121) +#elif defined(T3_S3_V1_2_SX1262) || defined(ARDUINO_LILYGO_T3S3_SX1262) || \ + defined(T3_S3_V1_2_SX1276) || defined(ARDUINO_LILYGO_T3S3_SX1276) || \ + defined(T3_S3_V1_2_SX1278) || defined(ARDUINO_LILYGO_T3S3_SX1278) || \ + defined(T3_S3_V1_2_SX1280) || defined(ARDUINO_LILYGO_T3S3_SX1280) || \ + defined(T3_S3_V1_2_SX1280_PA) || defined(ARDUINO_LILYGO_T3S3_SX1280PA) || \ + defined(T3_S3_V1_2_LR1121) || defined(ARDUINO_LILYGO_T3S3_LR1121) -#if defined(T3_S3_V1_2_SX1262) +#if defined(T3_S3_V1_2_SX1262) || defined(ARDUINO_LILYGO_T3S3_SX1262) #ifndef USING_SX1262 #define USING_SX1262 #endif -#elif defined(T3_S3_V1_2_SX1276) +#elif defined(T3_S3_V1_2_SX1276) || defined(ARDUINO_LILYGO_T3S3_SX1276) #ifndef USING_SX1276 #define USING_SX1276 #endif -#elif defined(T3_S3_V1_2_SX1278) +#elif defined(T3_S3_V1_2_SX1278) || defined(ARDUINO_LILYGO_T3S3_SX1278) #ifndef USING_SX1278 #define USING_SX1278 #endif -#elif defined(T3_S3_V1_2_SX1280) +#elif defined(T3_S3_V1_2_SX1280) || defined(ARDUINO_LILYGO_T3S3_SX1280) #ifndef USING_SX1280 #define USING_SX1280 #endif -#elif defined(T3_S3_V1_2_SX1280_PA) -#ifndef USING_SX1280 -#define USING_SX1280 +#elif defined(T3_S3_V1_2_SX1280_PA) || defined(ARDUINO_LILYGO_T3S3_SX1280PA) +#ifndef USING_SX1280PA +#define USING_SX1280PA #endif -#elif defined(T3_S3_V1_2_LR1121) +#elif defined(T3_S3_V1_2_LR1121) || defined(ARDUINO_LILYGO_T3S3_LR1121) #ifndef USING_LR1121 #define USING_LR1121 #endif @@ -313,12 +313,12 @@ #define RADIO_RST_PIN 8 -#if defined(T3_S3_V1_2_SX1262) +#if defined(USING_SX1262) #define RADIO_DIO1_PIN 33 #define RADIO_BUSY_PIN 34 -#elif defined(T3_S3_V1_2_SX1276) || defined(T3_S3_V1_2_SX1278) +#elif defined(USING_SX1276) || defined(USING_SX1278) //!SX1276/78 module only #define RADIO_BUSY_PIN 33 //DIO1 @@ -329,12 +329,12 @@ #define RADIO_DIO4_PIN 10 #define RADIO_DIO5_PIN 36 -#elif defined(T3_S3_V1_2_SX1280) +#elif defined(USING_SX1280) #define RADIO_DIO1_PIN 9 //SX1280 DIO1 = IO9 #define RADIO_BUSY_PIN 36 //SX1280 BUSY = IO36 -#elif defined(T3_S3_V1_2_SX1280_PA) +#elif defined(USING_SX1280PA) #define RADIO_DIO1_PIN 9 //SX1280 DIO1 = IO9 #define RADIO_BUSY_PIN 36 //SX1280 BUSY = IO36 @@ -342,10 +342,10 @@ #define RADIO_TX_PIN 10 -#elif defined(T3_S3_V1_2_LR1121) +#elif defined(USING_LR1121) #define RADIO_DIO9_PIN 36 //LR1121 DIO9 = IO36 -#define RADIO_BUSY_PIN 34 //LR1121 BUSY = IO33 +#define RADIO_BUSY_PIN 34 //LR1121 BUSY = IO34 #endif diff --git a/examples/Sensor/BME280_UnifiedExample/utilities.h b/examples/Sensor/BME280_UnifiedExample/utilities.h index 2f03bdd..9553407 100644 --- a/examples/Sensor/BME280_UnifiedExample/utilities.h +++ b/examples/Sensor/BME280_UnifiedExample/utilities.h @@ -255,35 +255,35 @@ #define BOARD_VARIANT_NAME "T3 V3.0 TCXO" -#elif defined(T3_S3_V1_2_SX1262) || \ - defined(T3_S3_V1_2_SX1276) || \ - defined(T3_S3_V1_2_SX1278) || \ - defined(T3_S3_V1_2_SX1280) || \ - defined(T3_S3_V1_2_SX1280_PA) || \ - defined(T3_S3_V1_2_LR1121) +#elif defined(T3_S3_V1_2_SX1262) || defined(ARDUINO_LILYGO_T3S3_SX1262) || \ + defined(T3_S3_V1_2_SX1276) || defined(ARDUINO_LILYGO_T3S3_SX1276) || \ + defined(T3_S3_V1_2_SX1278) || defined(ARDUINO_LILYGO_T3S3_SX1278) || \ + defined(T3_S3_V1_2_SX1280) || defined(ARDUINO_LILYGO_T3S3_SX1280) || \ + defined(T3_S3_V1_2_SX1280_PA) || defined(ARDUINO_LILYGO_T3S3_SX1280PA) || \ + defined(T3_S3_V1_2_LR1121) || defined(ARDUINO_LILYGO_T3S3_LR1121) -#if defined(T3_S3_V1_2_SX1262) +#if defined(T3_S3_V1_2_SX1262) || defined(ARDUINO_LILYGO_T3S3_SX1262) #ifndef USING_SX1262 #define USING_SX1262 #endif -#elif defined(T3_S3_V1_2_SX1276) +#elif defined(T3_S3_V1_2_SX1276) || defined(ARDUINO_LILYGO_T3S3_SX1276) #ifndef USING_SX1276 #define USING_SX1276 #endif -#elif defined(T3_S3_V1_2_SX1278) +#elif defined(T3_S3_V1_2_SX1278) || defined(ARDUINO_LILYGO_T3S3_SX1278) #ifndef USING_SX1278 #define USING_SX1278 #endif -#elif defined(T3_S3_V1_2_SX1280) +#elif defined(T3_S3_V1_2_SX1280) || defined(ARDUINO_LILYGO_T3S3_SX1280) #ifndef USING_SX1280 #define USING_SX1280 #endif -#elif defined(T3_S3_V1_2_SX1280_PA) -#ifndef USING_SX1280 -#define USING_SX1280 +#elif defined(T3_S3_V1_2_SX1280_PA) || defined(ARDUINO_LILYGO_T3S3_SX1280PA) +#ifndef USING_SX1280PA +#define USING_SX1280PA #endif -#elif defined(T3_S3_V1_2_LR1121) +#elif defined(T3_S3_V1_2_LR1121) || defined(ARDUINO_LILYGO_T3S3_LR1121) #ifndef USING_LR1121 #define USING_LR1121 #endif @@ -313,12 +313,12 @@ #define RADIO_RST_PIN 8 -#if defined(T3_S3_V1_2_SX1262) +#if defined(USING_SX1262) #define RADIO_DIO1_PIN 33 #define RADIO_BUSY_PIN 34 -#elif defined(T3_S3_V1_2_SX1276) || defined(T3_S3_V1_2_SX1278) +#elif defined(USING_SX1276) || defined(USING_SX1278) //!SX1276/78 module only #define RADIO_BUSY_PIN 33 //DIO1 @@ -329,12 +329,12 @@ #define RADIO_DIO4_PIN 10 #define RADIO_DIO5_PIN 36 -#elif defined(T3_S3_V1_2_SX1280) +#elif defined(USING_SX1280) #define RADIO_DIO1_PIN 9 //SX1280 DIO1 = IO9 #define RADIO_BUSY_PIN 36 //SX1280 BUSY = IO36 -#elif defined(T3_S3_V1_2_SX1280_PA) +#elif defined(USING_SX1280PA) #define RADIO_DIO1_PIN 9 //SX1280 DIO1 = IO9 #define RADIO_BUSY_PIN 36 //SX1280 BUSY = IO36 @@ -342,10 +342,10 @@ #define RADIO_TX_PIN 10 -#elif defined(T3_S3_V1_2_LR1121) +#elif defined(USING_LR1121) #define RADIO_DIO9_PIN 36 //LR1121 DIO9 = IO36 -#define RADIO_BUSY_PIN 34 //LR1121 BUSY = IO33 +#define RADIO_BUSY_PIN 34 //LR1121 BUSY = IO34 #endif diff --git a/examples/Sensor/PCF8563_AlarmByUnits/utilities.h b/examples/Sensor/PCF8563_AlarmByUnits/utilities.h index 2f03bdd..9553407 100644 --- a/examples/Sensor/PCF8563_AlarmByUnits/utilities.h +++ b/examples/Sensor/PCF8563_AlarmByUnits/utilities.h @@ -255,35 +255,35 @@ #define BOARD_VARIANT_NAME "T3 V3.0 TCXO" -#elif defined(T3_S3_V1_2_SX1262) || \ - defined(T3_S3_V1_2_SX1276) || \ - defined(T3_S3_V1_2_SX1278) || \ - defined(T3_S3_V1_2_SX1280) || \ - defined(T3_S3_V1_2_SX1280_PA) || \ - defined(T3_S3_V1_2_LR1121) +#elif defined(T3_S3_V1_2_SX1262) || defined(ARDUINO_LILYGO_T3S3_SX1262) || \ + defined(T3_S3_V1_2_SX1276) || defined(ARDUINO_LILYGO_T3S3_SX1276) || \ + defined(T3_S3_V1_2_SX1278) || defined(ARDUINO_LILYGO_T3S3_SX1278) || \ + defined(T3_S3_V1_2_SX1280) || defined(ARDUINO_LILYGO_T3S3_SX1280) || \ + defined(T3_S3_V1_2_SX1280_PA) || defined(ARDUINO_LILYGO_T3S3_SX1280PA) || \ + defined(T3_S3_V1_2_LR1121) || defined(ARDUINO_LILYGO_T3S3_LR1121) -#if defined(T3_S3_V1_2_SX1262) +#if defined(T3_S3_V1_2_SX1262) || defined(ARDUINO_LILYGO_T3S3_SX1262) #ifndef USING_SX1262 #define USING_SX1262 #endif -#elif defined(T3_S3_V1_2_SX1276) +#elif defined(T3_S3_V1_2_SX1276) || defined(ARDUINO_LILYGO_T3S3_SX1276) #ifndef USING_SX1276 #define USING_SX1276 #endif -#elif defined(T3_S3_V1_2_SX1278) +#elif defined(T3_S3_V1_2_SX1278) || defined(ARDUINO_LILYGO_T3S3_SX1278) #ifndef USING_SX1278 #define USING_SX1278 #endif -#elif defined(T3_S3_V1_2_SX1280) +#elif defined(T3_S3_V1_2_SX1280) || defined(ARDUINO_LILYGO_T3S3_SX1280) #ifndef USING_SX1280 #define USING_SX1280 #endif -#elif defined(T3_S3_V1_2_SX1280_PA) -#ifndef USING_SX1280 -#define USING_SX1280 +#elif defined(T3_S3_V1_2_SX1280_PA) || defined(ARDUINO_LILYGO_T3S3_SX1280PA) +#ifndef USING_SX1280PA +#define USING_SX1280PA #endif -#elif defined(T3_S3_V1_2_LR1121) +#elif defined(T3_S3_V1_2_LR1121) || defined(ARDUINO_LILYGO_T3S3_LR1121) #ifndef USING_LR1121 #define USING_LR1121 #endif @@ -313,12 +313,12 @@ #define RADIO_RST_PIN 8 -#if defined(T3_S3_V1_2_SX1262) +#if defined(USING_SX1262) #define RADIO_DIO1_PIN 33 #define RADIO_BUSY_PIN 34 -#elif defined(T3_S3_V1_2_SX1276) || defined(T3_S3_V1_2_SX1278) +#elif defined(USING_SX1276) || defined(USING_SX1278) //!SX1276/78 module only #define RADIO_BUSY_PIN 33 //DIO1 @@ -329,12 +329,12 @@ #define RADIO_DIO4_PIN 10 #define RADIO_DIO5_PIN 36 -#elif defined(T3_S3_V1_2_SX1280) +#elif defined(USING_SX1280) #define RADIO_DIO1_PIN 9 //SX1280 DIO1 = IO9 #define RADIO_BUSY_PIN 36 //SX1280 BUSY = IO36 -#elif defined(T3_S3_V1_2_SX1280_PA) +#elif defined(USING_SX1280PA) #define RADIO_DIO1_PIN 9 //SX1280 DIO1 = IO9 #define RADIO_BUSY_PIN 36 //SX1280 BUSY = IO36 @@ -342,10 +342,10 @@ #define RADIO_TX_PIN 10 -#elif defined(T3_S3_V1_2_LR1121) +#elif defined(USING_LR1121) #define RADIO_DIO9_PIN 36 //LR1121 DIO9 = IO36 -#define RADIO_BUSY_PIN 34 //LR1121 BUSY = IO33 +#define RADIO_BUSY_PIN 34 //LR1121 BUSY = IO34 #endif diff --git a/examples/Sensor/PCF8563_SimpleTime/utilities.h b/examples/Sensor/PCF8563_SimpleTime/utilities.h index 2f03bdd..9553407 100644 --- a/examples/Sensor/PCF8563_SimpleTime/utilities.h +++ b/examples/Sensor/PCF8563_SimpleTime/utilities.h @@ -255,35 +255,35 @@ #define BOARD_VARIANT_NAME "T3 V3.0 TCXO" -#elif defined(T3_S3_V1_2_SX1262) || \ - defined(T3_S3_V1_2_SX1276) || \ - defined(T3_S3_V1_2_SX1278) || \ - defined(T3_S3_V1_2_SX1280) || \ - defined(T3_S3_V1_2_SX1280_PA) || \ - defined(T3_S3_V1_2_LR1121) +#elif defined(T3_S3_V1_2_SX1262) || defined(ARDUINO_LILYGO_T3S3_SX1262) || \ + defined(T3_S3_V1_2_SX1276) || defined(ARDUINO_LILYGO_T3S3_SX1276) || \ + defined(T3_S3_V1_2_SX1278) || defined(ARDUINO_LILYGO_T3S3_SX1278) || \ + defined(T3_S3_V1_2_SX1280) || defined(ARDUINO_LILYGO_T3S3_SX1280) || \ + defined(T3_S3_V1_2_SX1280_PA) || defined(ARDUINO_LILYGO_T3S3_SX1280PA) || \ + defined(T3_S3_V1_2_LR1121) || defined(ARDUINO_LILYGO_T3S3_LR1121) -#if defined(T3_S3_V1_2_SX1262) +#if defined(T3_S3_V1_2_SX1262) || defined(ARDUINO_LILYGO_T3S3_SX1262) #ifndef USING_SX1262 #define USING_SX1262 #endif -#elif defined(T3_S3_V1_2_SX1276) +#elif defined(T3_S3_V1_2_SX1276) || defined(ARDUINO_LILYGO_T3S3_SX1276) #ifndef USING_SX1276 #define USING_SX1276 #endif -#elif defined(T3_S3_V1_2_SX1278) +#elif defined(T3_S3_V1_2_SX1278) || defined(ARDUINO_LILYGO_T3S3_SX1278) #ifndef USING_SX1278 #define USING_SX1278 #endif -#elif defined(T3_S3_V1_2_SX1280) +#elif defined(T3_S3_V1_2_SX1280) || defined(ARDUINO_LILYGO_T3S3_SX1280) #ifndef USING_SX1280 #define USING_SX1280 #endif -#elif defined(T3_S3_V1_2_SX1280_PA) -#ifndef USING_SX1280 -#define USING_SX1280 +#elif defined(T3_S3_V1_2_SX1280_PA) || defined(ARDUINO_LILYGO_T3S3_SX1280PA) +#ifndef USING_SX1280PA +#define USING_SX1280PA #endif -#elif defined(T3_S3_V1_2_LR1121) +#elif defined(T3_S3_V1_2_LR1121) || defined(ARDUINO_LILYGO_T3S3_LR1121) #ifndef USING_LR1121 #define USING_LR1121 #endif @@ -313,12 +313,12 @@ #define RADIO_RST_PIN 8 -#if defined(T3_S3_V1_2_SX1262) +#if defined(USING_SX1262) #define RADIO_DIO1_PIN 33 #define RADIO_BUSY_PIN 34 -#elif defined(T3_S3_V1_2_SX1276) || defined(T3_S3_V1_2_SX1278) +#elif defined(USING_SX1276) || defined(USING_SX1278) //!SX1276/78 module only #define RADIO_BUSY_PIN 33 //DIO1 @@ -329,12 +329,12 @@ #define RADIO_DIO4_PIN 10 #define RADIO_DIO5_PIN 36 -#elif defined(T3_S3_V1_2_SX1280) +#elif defined(USING_SX1280) #define RADIO_DIO1_PIN 9 //SX1280 DIO1 = IO9 #define RADIO_BUSY_PIN 36 //SX1280 BUSY = IO36 -#elif defined(T3_S3_V1_2_SX1280_PA) +#elif defined(USING_SX1280PA) #define RADIO_DIO1_PIN 9 //SX1280 DIO1 = IO9 #define RADIO_BUSY_PIN 36 //SX1280 BUSY = IO36 @@ -342,10 +342,10 @@ #define RADIO_TX_PIN 10 -#elif defined(T3_S3_V1_2_LR1121) +#elif defined(USING_LR1121) #define RADIO_DIO9_PIN 36 //LR1121 DIO9 = IO36 -#define RADIO_BUSY_PIN 34 //LR1121 BUSY = IO33 +#define RADIO_BUSY_PIN 34 //LR1121 BUSY = IO34 #endif diff --git a/examples/Sensor/PCF8563_TimeLib/utilities.h b/examples/Sensor/PCF8563_TimeLib/utilities.h index 2f03bdd..9553407 100644 --- a/examples/Sensor/PCF8563_TimeLib/utilities.h +++ b/examples/Sensor/PCF8563_TimeLib/utilities.h @@ -255,35 +255,35 @@ #define BOARD_VARIANT_NAME "T3 V3.0 TCXO" -#elif defined(T3_S3_V1_2_SX1262) || \ - defined(T3_S3_V1_2_SX1276) || \ - defined(T3_S3_V1_2_SX1278) || \ - defined(T3_S3_V1_2_SX1280) || \ - defined(T3_S3_V1_2_SX1280_PA) || \ - defined(T3_S3_V1_2_LR1121) +#elif defined(T3_S3_V1_2_SX1262) || defined(ARDUINO_LILYGO_T3S3_SX1262) || \ + defined(T3_S3_V1_2_SX1276) || defined(ARDUINO_LILYGO_T3S3_SX1276) || \ + defined(T3_S3_V1_2_SX1278) || defined(ARDUINO_LILYGO_T3S3_SX1278) || \ + defined(T3_S3_V1_2_SX1280) || defined(ARDUINO_LILYGO_T3S3_SX1280) || \ + defined(T3_S3_V1_2_SX1280_PA) || defined(ARDUINO_LILYGO_T3S3_SX1280PA) || \ + defined(T3_S3_V1_2_LR1121) || defined(ARDUINO_LILYGO_T3S3_LR1121) -#if defined(T3_S3_V1_2_SX1262) +#if defined(T3_S3_V1_2_SX1262) || defined(ARDUINO_LILYGO_T3S3_SX1262) #ifndef USING_SX1262 #define USING_SX1262 #endif -#elif defined(T3_S3_V1_2_SX1276) +#elif defined(T3_S3_V1_2_SX1276) || defined(ARDUINO_LILYGO_T3S3_SX1276) #ifndef USING_SX1276 #define USING_SX1276 #endif -#elif defined(T3_S3_V1_2_SX1278) +#elif defined(T3_S3_V1_2_SX1278) || defined(ARDUINO_LILYGO_T3S3_SX1278) #ifndef USING_SX1278 #define USING_SX1278 #endif -#elif defined(T3_S3_V1_2_SX1280) +#elif defined(T3_S3_V1_2_SX1280) || defined(ARDUINO_LILYGO_T3S3_SX1280) #ifndef USING_SX1280 #define USING_SX1280 #endif -#elif defined(T3_S3_V1_2_SX1280_PA) -#ifndef USING_SX1280 -#define USING_SX1280 +#elif defined(T3_S3_V1_2_SX1280_PA) || defined(ARDUINO_LILYGO_T3S3_SX1280PA) +#ifndef USING_SX1280PA +#define USING_SX1280PA #endif -#elif defined(T3_S3_V1_2_LR1121) +#elif defined(T3_S3_V1_2_LR1121) || defined(ARDUINO_LILYGO_T3S3_LR1121) #ifndef USING_LR1121 #define USING_LR1121 #endif @@ -313,12 +313,12 @@ #define RADIO_RST_PIN 8 -#if defined(T3_S3_V1_2_SX1262) +#if defined(USING_SX1262) #define RADIO_DIO1_PIN 33 #define RADIO_BUSY_PIN 34 -#elif defined(T3_S3_V1_2_SX1276) || defined(T3_S3_V1_2_SX1278) +#elif defined(USING_SX1276) || defined(USING_SX1278) //!SX1276/78 module only #define RADIO_BUSY_PIN 33 //DIO1 @@ -329,12 +329,12 @@ #define RADIO_DIO4_PIN 10 #define RADIO_DIO5_PIN 36 -#elif defined(T3_S3_V1_2_SX1280) +#elif defined(USING_SX1280) #define RADIO_DIO1_PIN 9 //SX1280 DIO1 = IO9 #define RADIO_BUSY_PIN 36 //SX1280 BUSY = IO36 -#elif defined(T3_S3_V1_2_SX1280_PA) +#elif defined(USING_SX1280PA) #define RADIO_DIO1_PIN 9 //SX1280 DIO1 = IO9 #define RADIO_BUSY_PIN 36 //SX1280 BUSY = IO36 @@ -342,10 +342,10 @@ #define RADIO_TX_PIN 10 -#elif defined(T3_S3_V1_2_LR1121) +#elif defined(USING_LR1121) #define RADIO_DIO9_PIN 36 //LR1121 DIO9 = IO36 -#define RADIO_BUSY_PIN 34 //LR1121 BUSY = IO33 +#define RADIO_BUSY_PIN 34 //LR1121 BUSY = IO34 #endif diff --git a/examples/Sensor/PCF8563_TimeSynchronization/utilities.h b/examples/Sensor/PCF8563_TimeSynchronization/utilities.h index 2f03bdd..9553407 100644 --- a/examples/Sensor/PCF8563_TimeSynchronization/utilities.h +++ b/examples/Sensor/PCF8563_TimeSynchronization/utilities.h @@ -255,35 +255,35 @@ #define BOARD_VARIANT_NAME "T3 V3.0 TCXO" -#elif defined(T3_S3_V1_2_SX1262) || \ - defined(T3_S3_V1_2_SX1276) || \ - defined(T3_S3_V1_2_SX1278) || \ - defined(T3_S3_V1_2_SX1280) || \ - defined(T3_S3_V1_2_SX1280_PA) || \ - defined(T3_S3_V1_2_LR1121) +#elif defined(T3_S3_V1_2_SX1262) || defined(ARDUINO_LILYGO_T3S3_SX1262) || \ + defined(T3_S3_V1_2_SX1276) || defined(ARDUINO_LILYGO_T3S3_SX1276) || \ + defined(T3_S3_V1_2_SX1278) || defined(ARDUINO_LILYGO_T3S3_SX1278) || \ + defined(T3_S3_V1_2_SX1280) || defined(ARDUINO_LILYGO_T3S3_SX1280) || \ + defined(T3_S3_V1_2_SX1280_PA) || defined(ARDUINO_LILYGO_T3S3_SX1280PA) || \ + defined(T3_S3_V1_2_LR1121) || defined(ARDUINO_LILYGO_T3S3_LR1121) -#if defined(T3_S3_V1_2_SX1262) +#if defined(T3_S3_V1_2_SX1262) || defined(ARDUINO_LILYGO_T3S3_SX1262) #ifndef USING_SX1262 #define USING_SX1262 #endif -#elif defined(T3_S3_V1_2_SX1276) +#elif defined(T3_S3_V1_2_SX1276) || defined(ARDUINO_LILYGO_T3S3_SX1276) #ifndef USING_SX1276 #define USING_SX1276 #endif -#elif defined(T3_S3_V1_2_SX1278) +#elif defined(T3_S3_V1_2_SX1278) || defined(ARDUINO_LILYGO_T3S3_SX1278) #ifndef USING_SX1278 #define USING_SX1278 #endif -#elif defined(T3_S3_V1_2_SX1280) +#elif defined(T3_S3_V1_2_SX1280) || defined(ARDUINO_LILYGO_T3S3_SX1280) #ifndef USING_SX1280 #define USING_SX1280 #endif -#elif defined(T3_S3_V1_2_SX1280_PA) -#ifndef USING_SX1280 -#define USING_SX1280 +#elif defined(T3_S3_V1_2_SX1280_PA) || defined(ARDUINO_LILYGO_T3S3_SX1280PA) +#ifndef USING_SX1280PA +#define USING_SX1280PA #endif -#elif defined(T3_S3_V1_2_LR1121) +#elif defined(T3_S3_V1_2_LR1121) || defined(ARDUINO_LILYGO_T3S3_LR1121) #ifndef USING_LR1121 #define USING_LR1121 #endif @@ -313,12 +313,12 @@ #define RADIO_RST_PIN 8 -#if defined(T3_S3_V1_2_SX1262) +#if defined(USING_SX1262) #define RADIO_DIO1_PIN 33 #define RADIO_BUSY_PIN 34 -#elif defined(T3_S3_V1_2_SX1276) || defined(T3_S3_V1_2_SX1278) +#elif defined(USING_SX1276) || defined(USING_SX1278) //!SX1276/78 module only #define RADIO_BUSY_PIN 33 //DIO1 @@ -329,12 +329,12 @@ #define RADIO_DIO4_PIN 10 #define RADIO_DIO5_PIN 36 -#elif defined(T3_S3_V1_2_SX1280) +#elif defined(USING_SX1280) #define RADIO_DIO1_PIN 9 //SX1280 DIO1 = IO9 #define RADIO_BUSY_PIN 36 //SX1280 BUSY = IO36 -#elif defined(T3_S3_V1_2_SX1280_PA) +#elif defined(USING_SX1280PA) #define RADIO_DIO1_PIN 9 //SX1280 DIO1 = IO9 #define RADIO_BUSY_PIN 36 //SX1280 BUSY = IO36 @@ -342,10 +342,10 @@ #define RADIO_TX_PIN 10 -#elif defined(T3_S3_V1_2_LR1121) +#elif defined(USING_LR1121) #define RADIO_DIO9_PIN 36 //LR1121 DIO9 = IO36 -#define RADIO_BUSY_PIN 34 //LR1121 BUSY = IO33 +#define RADIO_BUSY_PIN 34 //LR1121 BUSY = IO34 #endif diff --git a/examples/Sensor/QMC6310_CalibrateExample/utilities.h b/examples/Sensor/QMC6310_CalibrateExample/utilities.h index 2f03bdd..9553407 100644 --- a/examples/Sensor/QMC6310_CalibrateExample/utilities.h +++ b/examples/Sensor/QMC6310_CalibrateExample/utilities.h @@ -255,35 +255,35 @@ #define BOARD_VARIANT_NAME "T3 V3.0 TCXO" -#elif defined(T3_S3_V1_2_SX1262) || \ - defined(T3_S3_V1_2_SX1276) || \ - defined(T3_S3_V1_2_SX1278) || \ - defined(T3_S3_V1_2_SX1280) || \ - defined(T3_S3_V1_2_SX1280_PA) || \ - defined(T3_S3_V1_2_LR1121) +#elif defined(T3_S3_V1_2_SX1262) || defined(ARDUINO_LILYGO_T3S3_SX1262) || \ + defined(T3_S3_V1_2_SX1276) || defined(ARDUINO_LILYGO_T3S3_SX1276) || \ + defined(T3_S3_V1_2_SX1278) || defined(ARDUINO_LILYGO_T3S3_SX1278) || \ + defined(T3_S3_V1_2_SX1280) || defined(ARDUINO_LILYGO_T3S3_SX1280) || \ + defined(T3_S3_V1_2_SX1280_PA) || defined(ARDUINO_LILYGO_T3S3_SX1280PA) || \ + defined(T3_S3_V1_2_LR1121) || defined(ARDUINO_LILYGO_T3S3_LR1121) -#if defined(T3_S3_V1_2_SX1262) +#if defined(T3_S3_V1_2_SX1262) || defined(ARDUINO_LILYGO_T3S3_SX1262) #ifndef USING_SX1262 #define USING_SX1262 #endif -#elif defined(T3_S3_V1_2_SX1276) +#elif defined(T3_S3_V1_2_SX1276) || defined(ARDUINO_LILYGO_T3S3_SX1276) #ifndef USING_SX1276 #define USING_SX1276 #endif -#elif defined(T3_S3_V1_2_SX1278) +#elif defined(T3_S3_V1_2_SX1278) || defined(ARDUINO_LILYGO_T3S3_SX1278) #ifndef USING_SX1278 #define USING_SX1278 #endif -#elif defined(T3_S3_V1_2_SX1280) +#elif defined(T3_S3_V1_2_SX1280) || defined(ARDUINO_LILYGO_T3S3_SX1280) #ifndef USING_SX1280 #define USING_SX1280 #endif -#elif defined(T3_S3_V1_2_SX1280_PA) -#ifndef USING_SX1280 -#define USING_SX1280 +#elif defined(T3_S3_V1_2_SX1280_PA) || defined(ARDUINO_LILYGO_T3S3_SX1280PA) +#ifndef USING_SX1280PA +#define USING_SX1280PA #endif -#elif defined(T3_S3_V1_2_LR1121) +#elif defined(T3_S3_V1_2_LR1121) || defined(ARDUINO_LILYGO_T3S3_LR1121) #ifndef USING_LR1121 #define USING_LR1121 #endif @@ -313,12 +313,12 @@ #define RADIO_RST_PIN 8 -#if defined(T3_S3_V1_2_SX1262) +#if defined(USING_SX1262) #define RADIO_DIO1_PIN 33 #define RADIO_BUSY_PIN 34 -#elif defined(T3_S3_V1_2_SX1276) || defined(T3_S3_V1_2_SX1278) +#elif defined(USING_SX1276) || defined(USING_SX1278) //!SX1276/78 module only #define RADIO_BUSY_PIN 33 //DIO1 @@ -329,12 +329,12 @@ #define RADIO_DIO4_PIN 10 #define RADIO_DIO5_PIN 36 -#elif defined(T3_S3_V1_2_SX1280) +#elif defined(USING_SX1280) #define RADIO_DIO1_PIN 9 //SX1280 DIO1 = IO9 #define RADIO_BUSY_PIN 36 //SX1280 BUSY = IO36 -#elif defined(T3_S3_V1_2_SX1280_PA) +#elif defined(USING_SX1280PA) #define RADIO_DIO1_PIN 9 //SX1280 DIO1 = IO9 #define RADIO_BUSY_PIN 36 //SX1280 BUSY = IO36 @@ -342,10 +342,10 @@ #define RADIO_TX_PIN 10 -#elif defined(T3_S3_V1_2_LR1121) +#elif defined(USING_LR1121) #define RADIO_DIO9_PIN 36 //LR1121 DIO9 = IO36 -#define RADIO_BUSY_PIN 34 //LR1121 BUSY = IO33 +#define RADIO_BUSY_PIN 34 //LR1121 BUSY = IO34 #endif diff --git a/examples/Sensor/QMC6310_CompassExample/utilities.h b/examples/Sensor/QMC6310_CompassExample/utilities.h index 2f03bdd..9553407 100644 --- a/examples/Sensor/QMC6310_CompassExample/utilities.h +++ b/examples/Sensor/QMC6310_CompassExample/utilities.h @@ -255,35 +255,35 @@ #define BOARD_VARIANT_NAME "T3 V3.0 TCXO" -#elif defined(T3_S3_V1_2_SX1262) || \ - defined(T3_S3_V1_2_SX1276) || \ - defined(T3_S3_V1_2_SX1278) || \ - defined(T3_S3_V1_2_SX1280) || \ - defined(T3_S3_V1_2_SX1280_PA) || \ - defined(T3_S3_V1_2_LR1121) +#elif defined(T3_S3_V1_2_SX1262) || defined(ARDUINO_LILYGO_T3S3_SX1262) || \ + defined(T3_S3_V1_2_SX1276) || defined(ARDUINO_LILYGO_T3S3_SX1276) || \ + defined(T3_S3_V1_2_SX1278) || defined(ARDUINO_LILYGO_T3S3_SX1278) || \ + defined(T3_S3_V1_2_SX1280) || defined(ARDUINO_LILYGO_T3S3_SX1280) || \ + defined(T3_S3_V1_2_SX1280_PA) || defined(ARDUINO_LILYGO_T3S3_SX1280PA) || \ + defined(T3_S3_V1_2_LR1121) || defined(ARDUINO_LILYGO_T3S3_LR1121) -#if defined(T3_S3_V1_2_SX1262) +#if defined(T3_S3_V1_2_SX1262) || defined(ARDUINO_LILYGO_T3S3_SX1262) #ifndef USING_SX1262 #define USING_SX1262 #endif -#elif defined(T3_S3_V1_2_SX1276) +#elif defined(T3_S3_V1_2_SX1276) || defined(ARDUINO_LILYGO_T3S3_SX1276) #ifndef USING_SX1276 #define USING_SX1276 #endif -#elif defined(T3_S3_V1_2_SX1278) +#elif defined(T3_S3_V1_2_SX1278) || defined(ARDUINO_LILYGO_T3S3_SX1278) #ifndef USING_SX1278 #define USING_SX1278 #endif -#elif defined(T3_S3_V1_2_SX1280) +#elif defined(T3_S3_V1_2_SX1280) || defined(ARDUINO_LILYGO_T3S3_SX1280) #ifndef USING_SX1280 #define USING_SX1280 #endif -#elif defined(T3_S3_V1_2_SX1280_PA) -#ifndef USING_SX1280 -#define USING_SX1280 +#elif defined(T3_S3_V1_2_SX1280_PA) || defined(ARDUINO_LILYGO_T3S3_SX1280PA) +#ifndef USING_SX1280PA +#define USING_SX1280PA #endif -#elif defined(T3_S3_V1_2_LR1121) +#elif defined(T3_S3_V1_2_LR1121) || defined(ARDUINO_LILYGO_T3S3_LR1121) #ifndef USING_LR1121 #define USING_LR1121 #endif @@ -313,12 +313,12 @@ #define RADIO_RST_PIN 8 -#if defined(T3_S3_V1_2_SX1262) +#if defined(USING_SX1262) #define RADIO_DIO1_PIN 33 #define RADIO_BUSY_PIN 34 -#elif defined(T3_S3_V1_2_SX1276) || defined(T3_S3_V1_2_SX1278) +#elif defined(USING_SX1276) || defined(USING_SX1278) //!SX1276/78 module only #define RADIO_BUSY_PIN 33 //DIO1 @@ -329,12 +329,12 @@ #define RADIO_DIO4_PIN 10 #define RADIO_DIO5_PIN 36 -#elif defined(T3_S3_V1_2_SX1280) +#elif defined(USING_SX1280) #define RADIO_DIO1_PIN 9 //SX1280 DIO1 = IO9 #define RADIO_BUSY_PIN 36 //SX1280 BUSY = IO36 -#elif defined(T3_S3_V1_2_SX1280_PA) +#elif defined(USING_SX1280PA) #define RADIO_DIO1_PIN 9 //SX1280 DIO1 = IO9 #define RADIO_BUSY_PIN 36 //SX1280 BUSY = IO36 @@ -342,10 +342,10 @@ #define RADIO_TX_PIN 10 -#elif defined(T3_S3_V1_2_LR1121) +#elif defined(USING_LR1121) #define RADIO_DIO9_PIN 36 //LR1121 DIO9 = IO36 -#define RADIO_BUSY_PIN 34 //LR1121 BUSY = IO33 +#define RADIO_BUSY_PIN 34 //LR1121 BUSY = IO34 #endif diff --git a/examples/Sensor/QMC6310_GetDataExample/utilities.h b/examples/Sensor/QMC6310_GetDataExample/utilities.h index 2f03bdd..9553407 100644 --- a/examples/Sensor/QMC6310_GetDataExample/utilities.h +++ b/examples/Sensor/QMC6310_GetDataExample/utilities.h @@ -255,35 +255,35 @@ #define BOARD_VARIANT_NAME "T3 V3.0 TCXO" -#elif defined(T3_S3_V1_2_SX1262) || \ - defined(T3_S3_V1_2_SX1276) || \ - defined(T3_S3_V1_2_SX1278) || \ - defined(T3_S3_V1_2_SX1280) || \ - defined(T3_S3_V1_2_SX1280_PA) || \ - defined(T3_S3_V1_2_LR1121) +#elif defined(T3_S3_V1_2_SX1262) || defined(ARDUINO_LILYGO_T3S3_SX1262) || \ + defined(T3_S3_V1_2_SX1276) || defined(ARDUINO_LILYGO_T3S3_SX1276) || \ + defined(T3_S3_V1_2_SX1278) || defined(ARDUINO_LILYGO_T3S3_SX1278) || \ + defined(T3_S3_V1_2_SX1280) || defined(ARDUINO_LILYGO_T3S3_SX1280) || \ + defined(T3_S3_V1_2_SX1280_PA) || defined(ARDUINO_LILYGO_T3S3_SX1280PA) || \ + defined(T3_S3_V1_2_LR1121) || defined(ARDUINO_LILYGO_T3S3_LR1121) -#if defined(T3_S3_V1_2_SX1262) +#if defined(T3_S3_V1_2_SX1262) || defined(ARDUINO_LILYGO_T3S3_SX1262) #ifndef USING_SX1262 #define USING_SX1262 #endif -#elif defined(T3_S3_V1_2_SX1276) +#elif defined(T3_S3_V1_2_SX1276) || defined(ARDUINO_LILYGO_T3S3_SX1276) #ifndef USING_SX1276 #define USING_SX1276 #endif -#elif defined(T3_S3_V1_2_SX1278) +#elif defined(T3_S3_V1_2_SX1278) || defined(ARDUINO_LILYGO_T3S3_SX1278) #ifndef USING_SX1278 #define USING_SX1278 #endif -#elif defined(T3_S3_V1_2_SX1280) +#elif defined(T3_S3_V1_2_SX1280) || defined(ARDUINO_LILYGO_T3S3_SX1280) #ifndef USING_SX1280 #define USING_SX1280 #endif -#elif defined(T3_S3_V1_2_SX1280_PA) -#ifndef USING_SX1280 -#define USING_SX1280 +#elif defined(T3_S3_V1_2_SX1280_PA) || defined(ARDUINO_LILYGO_T3S3_SX1280PA) +#ifndef USING_SX1280PA +#define USING_SX1280PA #endif -#elif defined(T3_S3_V1_2_LR1121) +#elif defined(T3_S3_V1_2_LR1121) || defined(ARDUINO_LILYGO_T3S3_LR1121) #ifndef USING_LR1121 #define USING_LR1121 #endif @@ -313,12 +313,12 @@ #define RADIO_RST_PIN 8 -#if defined(T3_S3_V1_2_SX1262) +#if defined(USING_SX1262) #define RADIO_DIO1_PIN 33 #define RADIO_BUSY_PIN 34 -#elif defined(T3_S3_V1_2_SX1276) || defined(T3_S3_V1_2_SX1278) +#elif defined(USING_SX1276) || defined(USING_SX1278) //!SX1276/78 module only #define RADIO_BUSY_PIN 33 //DIO1 @@ -329,12 +329,12 @@ #define RADIO_DIO4_PIN 10 #define RADIO_DIO5_PIN 36 -#elif defined(T3_S3_V1_2_SX1280) +#elif defined(USING_SX1280) #define RADIO_DIO1_PIN 9 //SX1280 DIO1 = IO9 #define RADIO_BUSY_PIN 36 //SX1280 BUSY = IO36 -#elif defined(T3_S3_V1_2_SX1280_PA) +#elif defined(USING_SX1280PA) #define RADIO_DIO1_PIN 9 //SX1280 DIO1 = IO9 #define RADIO_BUSY_PIN 36 //SX1280 BUSY = IO36 @@ -342,10 +342,10 @@ #define RADIO_TX_PIN 10 -#elif defined(T3_S3_V1_2_LR1121) +#elif defined(USING_LR1121) #define RADIO_DIO9_PIN 36 //LR1121 DIO9 = IO36 -#define RADIO_BUSY_PIN 34 //LR1121 BUSY = IO33 +#define RADIO_BUSY_PIN 34 //LR1121 BUSY = IO34 #endif diff --git a/examples/Sensor/QMC6310_GetPolarExample/utilities.h b/examples/Sensor/QMC6310_GetPolarExample/utilities.h index 2f03bdd..9553407 100644 --- a/examples/Sensor/QMC6310_GetPolarExample/utilities.h +++ b/examples/Sensor/QMC6310_GetPolarExample/utilities.h @@ -255,35 +255,35 @@ #define BOARD_VARIANT_NAME "T3 V3.0 TCXO" -#elif defined(T3_S3_V1_2_SX1262) || \ - defined(T3_S3_V1_2_SX1276) || \ - defined(T3_S3_V1_2_SX1278) || \ - defined(T3_S3_V1_2_SX1280) || \ - defined(T3_S3_V1_2_SX1280_PA) || \ - defined(T3_S3_V1_2_LR1121) +#elif defined(T3_S3_V1_2_SX1262) || defined(ARDUINO_LILYGO_T3S3_SX1262) || \ + defined(T3_S3_V1_2_SX1276) || defined(ARDUINO_LILYGO_T3S3_SX1276) || \ + defined(T3_S3_V1_2_SX1278) || defined(ARDUINO_LILYGO_T3S3_SX1278) || \ + defined(T3_S3_V1_2_SX1280) || defined(ARDUINO_LILYGO_T3S3_SX1280) || \ + defined(T3_S3_V1_2_SX1280_PA) || defined(ARDUINO_LILYGO_T3S3_SX1280PA) || \ + defined(T3_S3_V1_2_LR1121) || defined(ARDUINO_LILYGO_T3S3_LR1121) -#if defined(T3_S3_V1_2_SX1262) +#if defined(T3_S3_V1_2_SX1262) || defined(ARDUINO_LILYGO_T3S3_SX1262) #ifndef USING_SX1262 #define USING_SX1262 #endif -#elif defined(T3_S3_V1_2_SX1276) +#elif defined(T3_S3_V1_2_SX1276) || defined(ARDUINO_LILYGO_T3S3_SX1276) #ifndef USING_SX1276 #define USING_SX1276 #endif -#elif defined(T3_S3_V1_2_SX1278) +#elif defined(T3_S3_V1_2_SX1278) || defined(ARDUINO_LILYGO_T3S3_SX1278) #ifndef USING_SX1278 #define USING_SX1278 #endif -#elif defined(T3_S3_V1_2_SX1280) +#elif defined(T3_S3_V1_2_SX1280) || defined(ARDUINO_LILYGO_T3S3_SX1280) #ifndef USING_SX1280 #define USING_SX1280 #endif -#elif defined(T3_S3_V1_2_SX1280_PA) -#ifndef USING_SX1280 -#define USING_SX1280 +#elif defined(T3_S3_V1_2_SX1280_PA) || defined(ARDUINO_LILYGO_T3S3_SX1280PA) +#ifndef USING_SX1280PA +#define USING_SX1280PA #endif -#elif defined(T3_S3_V1_2_LR1121) +#elif defined(T3_S3_V1_2_LR1121) || defined(ARDUINO_LILYGO_T3S3_LR1121) #ifndef USING_LR1121 #define USING_LR1121 #endif @@ -313,12 +313,12 @@ #define RADIO_RST_PIN 8 -#if defined(T3_S3_V1_2_SX1262) +#if defined(USING_SX1262) #define RADIO_DIO1_PIN 33 #define RADIO_BUSY_PIN 34 -#elif defined(T3_S3_V1_2_SX1276) || defined(T3_S3_V1_2_SX1278) +#elif defined(USING_SX1276) || defined(USING_SX1278) //!SX1276/78 module only #define RADIO_BUSY_PIN 33 //DIO1 @@ -329,12 +329,12 @@ #define RADIO_DIO4_PIN 10 #define RADIO_DIO5_PIN 36 -#elif defined(T3_S3_V1_2_SX1280) +#elif defined(USING_SX1280) #define RADIO_DIO1_PIN 9 //SX1280 DIO1 = IO9 #define RADIO_BUSY_PIN 36 //SX1280 BUSY = IO36 -#elif defined(T3_S3_V1_2_SX1280_PA) +#elif defined(USING_SX1280PA) #define RADIO_DIO1_PIN 9 //SX1280 DIO1 = IO9 #define RADIO_BUSY_PIN 36 //SX1280 BUSY = IO36 @@ -342,10 +342,10 @@ #define RADIO_TX_PIN 10 -#elif defined(T3_S3_V1_2_LR1121) +#elif defined(USING_LR1121) #define RADIO_DIO9_PIN 36 //LR1121 DIO9 = IO36 -#define RADIO_BUSY_PIN 34 //LR1121 BUSY = IO33 +#define RADIO_BUSY_PIN 34 //LR1121 BUSY = IO34 #endif diff --git a/examples/Sensor/QMI8658_BlockExample/utilities.h b/examples/Sensor/QMI8658_BlockExample/utilities.h index 2f03bdd..9553407 100644 --- a/examples/Sensor/QMI8658_BlockExample/utilities.h +++ b/examples/Sensor/QMI8658_BlockExample/utilities.h @@ -255,35 +255,35 @@ #define BOARD_VARIANT_NAME "T3 V3.0 TCXO" -#elif defined(T3_S3_V1_2_SX1262) || \ - defined(T3_S3_V1_2_SX1276) || \ - defined(T3_S3_V1_2_SX1278) || \ - defined(T3_S3_V1_2_SX1280) || \ - defined(T3_S3_V1_2_SX1280_PA) || \ - defined(T3_S3_V1_2_LR1121) +#elif defined(T3_S3_V1_2_SX1262) || defined(ARDUINO_LILYGO_T3S3_SX1262) || \ + defined(T3_S3_V1_2_SX1276) || defined(ARDUINO_LILYGO_T3S3_SX1276) || \ + defined(T3_S3_V1_2_SX1278) || defined(ARDUINO_LILYGO_T3S3_SX1278) || \ + defined(T3_S3_V1_2_SX1280) || defined(ARDUINO_LILYGO_T3S3_SX1280) || \ + defined(T3_S3_V1_2_SX1280_PA) || defined(ARDUINO_LILYGO_T3S3_SX1280PA) || \ + defined(T3_S3_V1_2_LR1121) || defined(ARDUINO_LILYGO_T3S3_LR1121) -#if defined(T3_S3_V1_2_SX1262) +#if defined(T3_S3_V1_2_SX1262) || defined(ARDUINO_LILYGO_T3S3_SX1262) #ifndef USING_SX1262 #define USING_SX1262 #endif -#elif defined(T3_S3_V1_2_SX1276) +#elif defined(T3_S3_V1_2_SX1276) || defined(ARDUINO_LILYGO_T3S3_SX1276) #ifndef USING_SX1276 #define USING_SX1276 #endif -#elif defined(T3_S3_V1_2_SX1278) +#elif defined(T3_S3_V1_2_SX1278) || defined(ARDUINO_LILYGO_T3S3_SX1278) #ifndef USING_SX1278 #define USING_SX1278 #endif -#elif defined(T3_S3_V1_2_SX1280) +#elif defined(T3_S3_V1_2_SX1280) || defined(ARDUINO_LILYGO_T3S3_SX1280) #ifndef USING_SX1280 #define USING_SX1280 #endif -#elif defined(T3_S3_V1_2_SX1280_PA) -#ifndef USING_SX1280 -#define USING_SX1280 +#elif defined(T3_S3_V1_2_SX1280_PA) || defined(ARDUINO_LILYGO_T3S3_SX1280PA) +#ifndef USING_SX1280PA +#define USING_SX1280PA #endif -#elif defined(T3_S3_V1_2_LR1121) +#elif defined(T3_S3_V1_2_LR1121) || defined(ARDUINO_LILYGO_T3S3_LR1121) #ifndef USING_LR1121 #define USING_LR1121 #endif @@ -313,12 +313,12 @@ #define RADIO_RST_PIN 8 -#if defined(T3_S3_V1_2_SX1262) +#if defined(USING_SX1262) #define RADIO_DIO1_PIN 33 #define RADIO_BUSY_PIN 34 -#elif defined(T3_S3_V1_2_SX1276) || defined(T3_S3_V1_2_SX1278) +#elif defined(USING_SX1276) || defined(USING_SX1278) //!SX1276/78 module only #define RADIO_BUSY_PIN 33 //DIO1 @@ -329,12 +329,12 @@ #define RADIO_DIO4_PIN 10 #define RADIO_DIO5_PIN 36 -#elif defined(T3_S3_V1_2_SX1280) +#elif defined(USING_SX1280) #define RADIO_DIO1_PIN 9 //SX1280 DIO1 = IO9 #define RADIO_BUSY_PIN 36 //SX1280 BUSY = IO36 -#elif defined(T3_S3_V1_2_SX1280_PA) +#elif defined(USING_SX1280PA) #define RADIO_DIO1_PIN 9 //SX1280 DIO1 = IO9 #define RADIO_BUSY_PIN 36 //SX1280 BUSY = IO36 @@ -342,10 +342,10 @@ #define RADIO_TX_PIN 10 -#elif defined(T3_S3_V1_2_LR1121) +#elif defined(USING_LR1121) #define RADIO_DIO9_PIN 36 //LR1121 DIO9 = IO36 -#define RADIO_BUSY_PIN 34 //LR1121 BUSY = IO33 +#define RADIO_BUSY_PIN 34 //LR1121 BUSY = IO34 #endif diff --git a/examples/Sensor/QMI8658_GetDataExample/utilities.h b/examples/Sensor/QMI8658_GetDataExample/utilities.h index 2f03bdd..9553407 100644 --- a/examples/Sensor/QMI8658_GetDataExample/utilities.h +++ b/examples/Sensor/QMI8658_GetDataExample/utilities.h @@ -255,35 +255,35 @@ #define BOARD_VARIANT_NAME "T3 V3.0 TCXO" -#elif defined(T3_S3_V1_2_SX1262) || \ - defined(T3_S3_V1_2_SX1276) || \ - defined(T3_S3_V1_2_SX1278) || \ - defined(T3_S3_V1_2_SX1280) || \ - defined(T3_S3_V1_2_SX1280_PA) || \ - defined(T3_S3_V1_2_LR1121) +#elif defined(T3_S3_V1_2_SX1262) || defined(ARDUINO_LILYGO_T3S3_SX1262) || \ + defined(T3_S3_V1_2_SX1276) || defined(ARDUINO_LILYGO_T3S3_SX1276) || \ + defined(T3_S3_V1_2_SX1278) || defined(ARDUINO_LILYGO_T3S3_SX1278) || \ + defined(T3_S3_V1_2_SX1280) || defined(ARDUINO_LILYGO_T3S3_SX1280) || \ + defined(T3_S3_V1_2_SX1280_PA) || defined(ARDUINO_LILYGO_T3S3_SX1280PA) || \ + defined(T3_S3_V1_2_LR1121) || defined(ARDUINO_LILYGO_T3S3_LR1121) -#if defined(T3_S3_V1_2_SX1262) +#if defined(T3_S3_V1_2_SX1262) || defined(ARDUINO_LILYGO_T3S3_SX1262) #ifndef USING_SX1262 #define USING_SX1262 #endif -#elif defined(T3_S3_V1_2_SX1276) +#elif defined(T3_S3_V1_2_SX1276) || defined(ARDUINO_LILYGO_T3S3_SX1276) #ifndef USING_SX1276 #define USING_SX1276 #endif -#elif defined(T3_S3_V1_2_SX1278) +#elif defined(T3_S3_V1_2_SX1278) || defined(ARDUINO_LILYGO_T3S3_SX1278) #ifndef USING_SX1278 #define USING_SX1278 #endif -#elif defined(T3_S3_V1_2_SX1280) +#elif defined(T3_S3_V1_2_SX1280) || defined(ARDUINO_LILYGO_T3S3_SX1280) #ifndef USING_SX1280 #define USING_SX1280 #endif -#elif defined(T3_S3_V1_2_SX1280_PA) -#ifndef USING_SX1280 -#define USING_SX1280 +#elif defined(T3_S3_V1_2_SX1280_PA) || defined(ARDUINO_LILYGO_T3S3_SX1280PA) +#ifndef USING_SX1280PA +#define USING_SX1280PA #endif -#elif defined(T3_S3_V1_2_LR1121) +#elif defined(T3_S3_V1_2_LR1121) || defined(ARDUINO_LILYGO_T3S3_LR1121) #ifndef USING_LR1121 #define USING_LR1121 #endif @@ -313,12 +313,12 @@ #define RADIO_RST_PIN 8 -#if defined(T3_S3_V1_2_SX1262) +#if defined(USING_SX1262) #define RADIO_DIO1_PIN 33 #define RADIO_BUSY_PIN 34 -#elif defined(T3_S3_V1_2_SX1276) || defined(T3_S3_V1_2_SX1278) +#elif defined(USING_SX1276) || defined(USING_SX1278) //!SX1276/78 module only #define RADIO_BUSY_PIN 33 //DIO1 @@ -329,12 +329,12 @@ #define RADIO_DIO4_PIN 10 #define RADIO_DIO5_PIN 36 -#elif defined(T3_S3_V1_2_SX1280) +#elif defined(USING_SX1280) #define RADIO_DIO1_PIN 9 //SX1280 DIO1 = IO9 #define RADIO_BUSY_PIN 36 //SX1280 BUSY = IO36 -#elif defined(T3_S3_V1_2_SX1280_PA) +#elif defined(USING_SX1280PA) #define RADIO_DIO1_PIN 9 //SX1280 DIO1 = IO9 #define RADIO_BUSY_PIN 36 //SX1280 BUSY = IO36 @@ -342,10 +342,10 @@ #define RADIO_TX_PIN 10 -#elif defined(T3_S3_V1_2_LR1121) +#elif defined(USING_LR1121) #define RADIO_DIO9_PIN 36 //LR1121 DIO9 = IO36 -#define RADIO_BUSY_PIN 34 //LR1121 BUSY = IO33 +#define RADIO_BUSY_PIN 34 //LR1121 BUSY = IO34 #endif diff --git a/examples/Sensor/QMI8658_InterruptBlockExample/utilities.h b/examples/Sensor/QMI8658_InterruptBlockExample/utilities.h index 2f03bdd..9553407 100644 --- a/examples/Sensor/QMI8658_InterruptBlockExample/utilities.h +++ b/examples/Sensor/QMI8658_InterruptBlockExample/utilities.h @@ -255,35 +255,35 @@ #define BOARD_VARIANT_NAME "T3 V3.0 TCXO" -#elif defined(T3_S3_V1_2_SX1262) || \ - defined(T3_S3_V1_2_SX1276) || \ - defined(T3_S3_V1_2_SX1278) || \ - defined(T3_S3_V1_2_SX1280) || \ - defined(T3_S3_V1_2_SX1280_PA) || \ - defined(T3_S3_V1_2_LR1121) +#elif defined(T3_S3_V1_2_SX1262) || defined(ARDUINO_LILYGO_T3S3_SX1262) || \ + defined(T3_S3_V1_2_SX1276) || defined(ARDUINO_LILYGO_T3S3_SX1276) || \ + defined(T3_S3_V1_2_SX1278) || defined(ARDUINO_LILYGO_T3S3_SX1278) || \ + defined(T3_S3_V1_2_SX1280) || defined(ARDUINO_LILYGO_T3S3_SX1280) || \ + defined(T3_S3_V1_2_SX1280_PA) || defined(ARDUINO_LILYGO_T3S3_SX1280PA) || \ + defined(T3_S3_V1_2_LR1121) || defined(ARDUINO_LILYGO_T3S3_LR1121) -#if defined(T3_S3_V1_2_SX1262) +#if defined(T3_S3_V1_2_SX1262) || defined(ARDUINO_LILYGO_T3S3_SX1262) #ifndef USING_SX1262 #define USING_SX1262 #endif -#elif defined(T3_S3_V1_2_SX1276) +#elif defined(T3_S3_V1_2_SX1276) || defined(ARDUINO_LILYGO_T3S3_SX1276) #ifndef USING_SX1276 #define USING_SX1276 #endif -#elif defined(T3_S3_V1_2_SX1278) +#elif defined(T3_S3_V1_2_SX1278) || defined(ARDUINO_LILYGO_T3S3_SX1278) #ifndef USING_SX1278 #define USING_SX1278 #endif -#elif defined(T3_S3_V1_2_SX1280) +#elif defined(T3_S3_V1_2_SX1280) || defined(ARDUINO_LILYGO_T3S3_SX1280) #ifndef USING_SX1280 #define USING_SX1280 #endif -#elif defined(T3_S3_V1_2_SX1280_PA) -#ifndef USING_SX1280 -#define USING_SX1280 +#elif defined(T3_S3_V1_2_SX1280_PA) || defined(ARDUINO_LILYGO_T3S3_SX1280PA) +#ifndef USING_SX1280PA +#define USING_SX1280PA #endif -#elif defined(T3_S3_V1_2_LR1121) +#elif defined(T3_S3_V1_2_LR1121) || defined(ARDUINO_LILYGO_T3S3_LR1121) #ifndef USING_LR1121 #define USING_LR1121 #endif @@ -313,12 +313,12 @@ #define RADIO_RST_PIN 8 -#if defined(T3_S3_V1_2_SX1262) +#if defined(USING_SX1262) #define RADIO_DIO1_PIN 33 #define RADIO_BUSY_PIN 34 -#elif defined(T3_S3_V1_2_SX1276) || defined(T3_S3_V1_2_SX1278) +#elif defined(USING_SX1276) || defined(USING_SX1278) //!SX1276/78 module only #define RADIO_BUSY_PIN 33 //DIO1 @@ -329,12 +329,12 @@ #define RADIO_DIO4_PIN 10 #define RADIO_DIO5_PIN 36 -#elif defined(T3_S3_V1_2_SX1280) +#elif defined(USING_SX1280) #define RADIO_DIO1_PIN 9 //SX1280 DIO1 = IO9 #define RADIO_BUSY_PIN 36 //SX1280 BUSY = IO36 -#elif defined(T3_S3_V1_2_SX1280_PA) +#elif defined(USING_SX1280PA) #define RADIO_DIO1_PIN 9 //SX1280 DIO1 = IO9 #define RADIO_BUSY_PIN 36 //SX1280 BUSY = IO36 @@ -342,10 +342,10 @@ #define RADIO_TX_PIN 10 -#elif defined(T3_S3_V1_2_LR1121) +#elif defined(USING_LR1121) #define RADIO_DIO9_PIN 36 //LR1121 DIO9 = IO36 -#define RADIO_BUSY_PIN 34 //LR1121 BUSY = IO33 +#define RADIO_BUSY_PIN 34 //LR1121 BUSY = IO34 #endif diff --git a/examples/Sensor/QMI8658_InterruptExample/utilities.h b/examples/Sensor/QMI8658_InterruptExample/utilities.h index 2f03bdd..9553407 100644 --- a/examples/Sensor/QMI8658_InterruptExample/utilities.h +++ b/examples/Sensor/QMI8658_InterruptExample/utilities.h @@ -255,35 +255,35 @@ #define BOARD_VARIANT_NAME "T3 V3.0 TCXO" -#elif defined(T3_S3_V1_2_SX1262) || \ - defined(T3_S3_V1_2_SX1276) || \ - defined(T3_S3_V1_2_SX1278) || \ - defined(T3_S3_V1_2_SX1280) || \ - defined(T3_S3_V1_2_SX1280_PA) || \ - defined(T3_S3_V1_2_LR1121) +#elif defined(T3_S3_V1_2_SX1262) || defined(ARDUINO_LILYGO_T3S3_SX1262) || \ + defined(T3_S3_V1_2_SX1276) || defined(ARDUINO_LILYGO_T3S3_SX1276) || \ + defined(T3_S3_V1_2_SX1278) || defined(ARDUINO_LILYGO_T3S3_SX1278) || \ + defined(T3_S3_V1_2_SX1280) || defined(ARDUINO_LILYGO_T3S3_SX1280) || \ + defined(T3_S3_V1_2_SX1280_PA) || defined(ARDUINO_LILYGO_T3S3_SX1280PA) || \ + defined(T3_S3_V1_2_LR1121) || defined(ARDUINO_LILYGO_T3S3_LR1121) -#if defined(T3_S3_V1_2_SX1262) +#if defined(T3_S3_V1_2_SX1262) || defined(ARDUINO_LILYGO_T3S3_SX1262) #ifndef USING_SX1262 #define USING_SX1262 #endif -#elif defined(T3_S3_V1_2_SX1276) +#elif defined(T3_S3_V1_2_SX1276) || defined(ARDUINO_LILYGO_T3S3_SX1276) #ifndef USING_SX1276 #define USING_SX1276 #endif -#elif defined(T3_S3_V1_2_SX1278) +#elif defined(T3_S3_V1_2_SX1278) || defined(ARDUINO_LILYGO_T3S3_SX1278) #ifndef USING_SX1278 #define USING_SX1278 #endif -#elif defined(T3_S3_V1_2_SX1280) +#elif defined(T3_S3_V1_2_SX1280) || defined(ARDUINO_LILYGO_T3S3_SX1280) #ifndef USING_SX1280 #define USING_SX1280 #endif -#elif defined(T3_S3_V1_2_SX1280_PA) -#ifndef USING_SX1280 -#define USING_SX1280 +#elif defined(T3_S3_V1_2_SX1280_PA) || defined(ARDUINO_LILYGO_T3S3_SX1280PA) +#ifndef USING_SX1280PA +#define USING_SX1280PA #endif -#elif defined(T3_S3_V1_2_LR1121) +#elif defined(T3_S3_V1_2_LR1121) || defined(ARDUINO_LILYGO_T3S3_LR1121) #ifndef USING_LR1121 #define USING_LR1121 #endif @@ -313,12 +313,12 @@ #define RADIO_RST_PIN 8 -#if defined(T3_S3_V1_2_SX1262) +#if defined(USING_SX1262) #define RADIO_DIO1_PIN 33 #define RADIO_BUSY_PIN 34 -#elif defined(T3_S3_V1_2_SX1276) || defined(T3_S3_V1_2_SX1278) +#elif defined(USING_SX1276) || defined(USING_SX1278) //!SX1276/78 module only #define RADIO_BUSY_PIN 33 //DIO1 @@ -329,12 +329,12 @@ #define RADIO_DIO4_PIN 10 #define RADIO_DIO5_PIN 36 -#elif defined(T3_S3_V1_2_SX1280) +#elif defined(USING_SX1280) #define RADIO_DIO1_PIN 9 //SX1280 DIO1 = IO9 #define RADIO_BUSY_PIN 36 //SX1280 BUSY = IO36 -#elif defined(T3_S3_V1_2_SX1280_PA) +#elif defined(USING_SX1280PA) #define RADIO_DIO1_PIN 9 //SX1280 DIO1 = IO9 #define RADIO_BUSY_PIN 36 //SX1280 BUSY = IO36 @@ -342,10 +342,10 @@ #define RADIO_TX_PIN 10 -#elif defined(T3_S3_V1_2_LR1121) +#elif defined(USING_LR1121) #define RADIO_DIO9_PIN 36 //LR1121 DIO9 = IO36 -#define RADIO_BUSY_PIN 34 //LR1121 BUSY = IO33 +#define RADIO_BUSY_PIN 34 //LR1121 BUSY = IO34 #endif diff --git a/examples/Sensor/QMI8658_LockingMechanismExample/utilities.h b/examples/Sensor/QMI8658_LockingMechanismExample/utilities.h index 2f03bdd..9553407 100644 --- a/examples/Sensor/QMI8658_LockingMechanismExample/utilities.h +++ b/examples/Sensor/QMI8658_LockingMechanismExample/utilities.h @@ -255,35 +255,35 @@ #define BOARD_VARIANT_NAME "T3 V3.0 TCXO" -#elif defined(T3_S3_V1_2_SX1262) || \ - defined(T3_S3_V1_2_SX1276) || \ - defined(T3_S3_V1_2_SX1278) || \ - defined(T3_S3_V1_2_SX1280) || \ - defined(T3_S3_V1_2_SX1280_PA) || \ - defined(T3_S3_V1_2_LR1121) +#elif defined(T3_S3_V1_2_SX1262) || defined(ARDUINO_LILYGO_T3S3_SX1262) || \ + defined(T3_S3_V1_2_SX1276) || defined(ARDUINO_LILYGO_T3S3_SX1276) || \ + defined(T3_S3_V1_2_SX1278) || defined(ARDUINO_LILYGO_T3S3_SX1278) || \ + defined(T3_S3_V1_2_SX1280) || defined(ARDUINO_LILYGO_T3S3_SX1280) || \ + defined(T3_S3_V1_2_SX1280_PA) || defined(ARDUINO_LILYGO_T3S3_SX1280PA) || \ + defined(T3_S3_V1_2_LR1121) || defined(ARDUINO_LILYGO_T3S3_LR1121) -#if defined(T3_S3_V1_2_SX1262) +#if defined(T3_S3_V1_2_SX1262) || defined(ARDUINO_LILYGO_T3S3_SX1262) #ifndef USING_SX1262 #define USING_SX1262 #endif -#elif defined(T3_S3_V1_2_SX1276) +#elif defined(T3_S3_V1_2_SX1276) || defined(ARDUINO_LILYGO_T3S3_SX1276) #ifndef USING_SX1276 #define USING_SX1276 #endif -#elif defined(T3_S3_V1_2_SX1278) +#elif defined(T3_S3_V1_2_SX1278) || defined(ARDUINO_LILYGO_T3S3_SX1278) #ifndef USING_SX1278 #define USING_SX1278 #endif -#elif defined(T3_S3_V1_2_SX1280) +#elif defined(T3_S3_V1_2_SX1280) || defined(ARDUINO_LILYGO_T3S3_SX1280) #ifndef USING_SX1280 #define USING_SX1280 #endif -#elif defined(T3_S3_V1_2_SX1280_PA) -#ifndef USING_SX1280 -#define USING_SX1280 +#elif defined(T3_S3_V1_2_SX1280_PA) || defined(ARDUINO_LILYGO_T3S3_SX1280PA) +#ifndef USING_SX1280PA +#define USING_SX1280PA #endif -#elif defined(T3_S3_V1_2_LR1121) +#elif defined(T3_S3_V1_2_LR1121) || defined(ARDUINO_LILYGO_T3S3_LR1121) #ifndef USING_LR1121 #define USING_LR1121 #endif @@ -313,12 +313,12 @@ #define RADIO_RST_PIN 8 -#if defined(T3_S3_V1_2_SX1262) +#if defined(USING_SX1262) #define RADIO_DIO1_PIN 33 #define RADIO_BUSY_PIN 34 -#elif defined(T3_S3_V1_2_SX1276) || defined(T3_S3_V1_2_SX1278) +#elif defined(USING_SX1276) || defined(USING_SX1278) //!SX1276/78 module only #define RADIO_BUSY_PIN 33 //DIO1 @@ -329,12 +329,12 @@ #define RADIO_DIO4_PIN 10 #define RADIO_DIO5_PIN 36 -#elif defined(T3_S3_V1_2_SX1280) +#elif defined(USING_SX1280) #define RADIO_DIO1_PIN 9 //SX1280 DIO1 = IO9 #define RADIO_BUSY_PIN 36 //SX1280 BUSY = IO36 -#elif defined(T3_S3_V1_2_SX1280_PA) +#elif defined(USING_SX1280PA) #define RADIO_DIO1_PIN 9 //SX1280 DIO1 = IO9 #define RADIO_BUSY_PIN 36 //SX1280 BUSY = IO36 @@ -342,10 +342,10 @@ #define RADIO_TX_PIN 10 -#elif defined(T3_S3_V1_2_LR1121) +#elif defined(USING_LR1121) #define RADIO_DIO9_PIN 36 //LR1121 DIO9 = IO36 -#define RADIO_BUSY_PIN 34 //LR1121 BUSY = IO33 +#define RADIO_BUSY_PIN 34 //LR1121 BUSY = IO34 #endif diff --git a/examples/Sensor/QMI8658_MadgwickAHRS/utilities.h b/examples/Sensor/QMI8658_MadgwickAHRS/utilities.h index 2f03bdd..9553407 100644 --- a/examples/Sensor/QMI8658_MadgwickAHRS/utilities.h +++ b/examples/Sensor/QMI8658_MadgwickAHRS/utilities.h @@ -255,35 +255,35 @@ #define BOARD_VARIANT_NAME "T3 V3.0 TCXO" -#elif defined(T3_S3_V1_2_SX1262) || \ - defined(T3_S3_V1_2_SX1276) || \ - defined(T3_S3_V1_2_SX1278) || \ - defined(T3_S3_V1_2_SX1280) || \ - defined(T3_S3_V1_2_SX1280_PA) || \ - defined(T3_S3_V1_2_LR1121) +#elif defined(T3_S3_V1_2_SX1262) || defined(ARDUINO_LILYGO_T3S3_SX1262) || \ + defined(T3_S3_V1_2_SX1276) || defined(ARDUINO_LILYGO_T3S3_SX1276) || \ + defined(T3_S3_V1_2_SX1278) || defined(ARDUINO_LILYGO_T3S3_SX1278) || \ + defined(T3_S3_V1_2_SX1280) || defined(ARDUINO_LILYGO_T3S3_SX1280) || \ + defined(T3_S3_V1_2_SX1280_PA) || defined(ARDUINO_LILYGO_T3S3_SX1280PA) || \ + defined(T3_S3_V1_2_LR1121) || defined(ARDUINO_LILYGO_T3S3_LR1121) -#if defined(T3_S3_V1_2_SX1262) +#if defined(T3_S3_V1_2_SX1262) || defined(ARDUINO_LILYGO_T3S3_SX1262) #ifndef USING_SX1262 #define USING_SX1262 #endif -#elif defined(T3_S3_V1_2_SX1276) +#elif defined(T3_S3_V1_2_SX1276) || defined(ARDUINO_LILYGO_T3S3_SX1276) #ifndef USING_SX1276 #define USING_SX1276 #endif -#elif defined(T3_S3_V1_2_SX1278) +#elif defined(T3_S3_V1_2_SX1278) || defined(ARDUINO_LILYGO_T3S3_SX1278) #ifndef USING_SX1278 #define USING_SX1278 #endif -#elif defined(T3_S3_V1_2_SX1280) +#elif defined(T3_S3_V1_2_SX1280) || defined(ARDUINO_LILYGO_T3S3_SX1280) #ifndef USING_SX1280 #define USING_SX1280 #endif -#elif defined(T3_S3_V1_2_SX1280_PA) -#ifndef USING_SX1280 -#define USING_SX1280 +#elif defined(T3_S3_V1_2_SX1280_PA) || defined(ARDUINO_LILYGO_T3S3_SX1280PA) +#ifndef USING_SX1280PA +#define USING_SX1280PA #endif -#elif defined(T3_S3_V1_2_LR1121) +#elif defined(T3_S3_V1_2_LR1121) || defined(ARDUINO_LILYGO_T3S3_LR1121) #ifndef USING_LR1121 #define USING_LR1121 #endif @@ -313,12 +313,12 @@ #define RADIO_RST_PIN 8 -#if defined(T3_S3_V1_2_SX1262) +#if defined(USING_SX1262) #define RADIO_DIO1_PIN 33 #define RADIO_BUSY_PIN 34 -#elif defined(T3_S3_V1_2_SX1276) || defined(T3_S3_V1_2_SX1278) +#elif defined(USING_SX1276) || defined(USING_SX1278) //!SX1276/78 module only #define RADIO_BUSY_PIN 33 //DIO1 @@ -329,12 +329,12 @@ #define RADIO_DIO4_PIN 10 #define RADIO_DIO5_PIN 36 -#elif defined(T3_S3_V1_2_SX1280) +#elif defined(USING_SX1280) #define RADIO_DIO1_PIN 9 //SX1280 DIO1 = IO9 #define RADIO_BUSY_PIN 36 //SX1280 BUSY = IO36 -#elif defined(T3_S3_V1_2_SX1280_PA) +#elif defined(USING_SX1280PA) #define RADIO_DIO1_PIN 9 //SX1280 DIO1 = IO9 #define RADIO_BUSY_PIN 36 //SX1280 BUSY = IO36 @@ -342,10 +342,10 @@ #define RADIO_TX_PIN 10 -#elif defined(T3_S3_V1_2_LR1121) +#elif defined(USING_LR1121) #define RADIO_DIO9_PIN 36 //LR1121 DIO9 = IO36 -#define RADIO_BUSY_PIN 34 //LR1121 BUSY = IO33 +#define RADIO_BUSY_PIN 34 //LR1121 BUSY = IO34 #endif diff --git a/examples/Sensor/QMI8658_PedometerExample/utilities.h b/examples/Sensor/QMI8658_PedometerExample/utilities.h index 2f03bdd..9553407 100644 --- a/examples/Sensor/QMI8658_PedometerExample/utilities.h +++ b/examples/Sensor/QMI8658_PedometerExample/utilities.h @@ -255,35 +255,35 @@ #define BOARD_VARIANT_NAME "T3 V3.0 TCXO" -#elif defined(T3_S3_V1_2_SX1262) || \ - defined(T3_S3_V1_2_SX1276) || \ - defined(T3_S3_V1_2_SX1278) || \ - defined(T3_S3_V1_2_SX1280) || \ - defined(T3_S3_V1_2_SX1280_PA) || \ - defined(T3_S3_V1_2_LR1121) +#elif defined(T3_S3_V1_2_SX1262) || defined(ARDUINO_LILYGO_T3S3_SX1262) || \ + defined(T3_S3_V1_2_SX1276) || defined(ARDUINO_LILYGO_T3S3_SX1276) || \ + defined(T3_S3_V1_2_SX1278) || defined(ARDUINO_LILYGO_T3S3_SX1278) || \ + defined(T3_S3_V1_2_SX1280) || defined(ARDUINO_LILYGO_T3S3_SX1280) || \ + defined(T3_S3_V1_2_SX1280_PA) || defined(ARDUINO_LILYGO_T3S3_SX1280PA) || \ + defined(T3_S3_V1_2_LR1121) || defined(ARDUINO_LILYGO_T3S3_LR1121) -#if defined(T3_S3_V1_2_SX1262) +#if defined(T3_S3_V1_2_SX1262) || defined(ARDUINO_LILYGO_T3S3_SX1262) #ifndef USING_SX1262 #define USING_SX1262 #endif -#elif defined(T3_S3_V1_2_SX1276) +#elif defined(T3_S3_V1_2_SX1276) || defined(ARDUINO_LILYGO_T3S3_SX1276) #ifndef USING_SX1276 #define USING_SX1276 #endif -#elif defined(T3_S3_V1_2_SX1278) +#elif defined(T3_S3_V1_2_SX1278) || defined(ARDUINO_LILYGO_T3S3_SX1278) #ifndef USING_SX1278 #define USING_SX1278 #endif -#elif defined(T3_S3_V1_2_SX1280) +#elif defined(T3_S3_V1_2_SX1280) || defined(ARDUINO_LILYGO_T3S3_SX1280) #ifndef USING_SX1280 #define USING_SX1280 #endif -#elif defined(T3_S3_V1_2_SX1280_PA) -#ifndef USING_SX1280 -#define USING_SX1280 +#elif defined(T3_S3_V1_2_SX1280_PA) || defined(ARDUINO_LILYGO_T3S3_SX1280PA) +#ifndef USING_SX1280PA +#define USING_SX1280PA #endif -#elif defined(T3_S3_V1_2_LR1121) +#elif defined(T3_S3_V1_2_LR1121) || defined(ARDUINO_LILYGO_T3S3_LR1121) #ifndef USING_LR1121 #define USING_LR1121 #endif @@ -313,12 +313,12 @@ #define RADIO_RST_PIN 8 -#if defined(T3_S3_V1_2_SX1262) +#if defined(USING_SX1262) #define RADIO_DIO1_PIN 33 #define RADIO_BUSY_PIN 34 -#elif defined(T3_S3_V1_2_SX1276) || defined(T3_S3_V1_2_SX1278) +#elif defined(USING_SX1276) || defined(USING_SX1278) //!SX1276/78 module only #define RADIO_BUSY_PIN 33 //DIO1 @@ -329,12 +329,12 @@ #define RADIO_DIO4_PIN 10 #define RADIO_DIO5_PIN 36 -#elif defined(T3_S3_V1_2_SX1280) +#elif defined(USING_SX1280) #define RADIO_DIO1_PIN 9 //SX1280 DIO1 = IO9 #define RADIO_BUSY_PIN 36 //SX1280 BUSY = IO36 -#elif defined(T3_S3_V1_2_SX1280_PA) +#elif defined(USING_SX1280PA) #define RADIO_DIO1_PIN 9 //SX1280 DIO1 = IO9 #define RADIO_BUSY_PIN 36 //SX1280 BUSY = IO36 @@ -342,10 +342,10 @@ #define RADIO_TX_PIN 10 -#elif defined(T3_S3_V1_2_LR1121) +#elif defined(USING_LR1121) #define RADIO_DIO9_PIN 36 //LR1121 DIO9 = IO36 -#define RADIO_BUSY_PIN 34 //LR1121 BUSY = IO33 +#define RADIO_BUSY_PIN 34 //LR1121 BUSY = IO34 #endif diff --git a/examples/Sensor/QMI8658_ReadFromFifoExample/utilities.h b/examples/Sensor/QMI8658_ReadFromFifoExample/utilities.h index 2f03bdd..9553407 100644 --- a/examples/Sensor/QMI8658_ReadFromFifoExample/utilities.h +++ b/examples/Sensor/QMI8658_ReadFromFifoExample/utilities.h @@ -255,35 +255,35 @@ #define BOARD_VARIANT_NAME "T3 V3.0 TCXO" -#elif defined(T3_S3_V1_2_SX1262) || \ - defined(T3_S3_V1_2_SX1276) || \ - defined(T3_S3_V1_2_SX1278) || \ - defined(T3_S3_V1_2_SX1280) || \ - defined(T3_S3_V1_2_SX1280_PA) || \ - defined(T3_S3_V1_2_LR1121) +#elif defined(T3_S3_V1_2_SX1262) || defined(ARDUINO_LILYGO_T3S3_SX1262) || \ + defined(T3_S3_V1_2_SX1276) || defined(ARDUINO_LILYGO_T3S3_SX1276) || \ + defined(T3_S3_V1_2_SX1278) || defined(ARDUINO_LILYGO_T3S3_SX1278) || \ + defined(T3_S3_V1_2_SX1280) || defined(ARDUINO_LILYGO_T3S3_SX1280) || \ + defined(T3_S3_V1_2_SX1280_PA) || defined(ARDUINO_LILYGO_T3S3_SX1280PA) || \ + defined(T3_S3_V1_2_LR1121) || defined(ARDUINO_LILYGO_T3S3_LR1121) -#if defined(T3_S3_V1_2_SX1262) +#if defined(T3_S3_V1_2_SX1262) || defined(ARDUINO_LILYGO_T3S3_SX1262) #ifndef USING_SX1262 #define USING_SX1262 #endif -#elif defined(T3_S3_V1_2_SX1276) +#elif defined(T3_S3_V1_2_SX1276) || defined(ARDUINO_LILYGO_T3S3_SX1276) #ifndef USING_SX1276 #define USING_SX1276 #endif -#elif defined(T3_S3_V1_2_SX1278) +#elif defined(T3_S3_V1_2_SX1278) || defined(ARDUINO_LILYGO_T3S3_SX1278) #ifndef USING_SX1278 #define USING_SX1278 #endif -#elif defined(T3_S3_V1_2_SX1280) +#elif defined(T3_S3_V1_2_SX1280) || defined(ARDUINO_LILYGO_T3S3_SX1280) #ifndef USING_SX1280 #define USING_SX1280 #endif -#elif defined(T3_S3_V1_2_SX1280_PA) -#ifndef USING_SX1280 -#define USING_SX1280 +#elif defined(T3_S3_V1_2_SX1280_PA) || defined(ARDUINO_LILYGO_T3S3_SX1280PA) +#ifndef USING_SX1280PA +#define USING_SX1280PA #endif -#elif defined(T3_S3_V1_2_LR1121) +#elif defined(T3_S3_V1_2_LR1121) || defined(ARDUINO_LILYGO_T3S3_LR1121) #ifndef USING_LR1121 #define USING_LR1121 #endif @@ -313,12 +313,12 @@ #define RADIO_RST_PIN 8 -#if defined(T3_S3_V1_2_SX1262) +#if defined(USING_SX1262) #define RADIO_DIO1_PIN 33 #define RADIO_BUSY_PIN 34 -#elif defined(T3_S3_V1_2_SX1276) || defined(T3_S3_V1_2_SX1278) +#elif defined(USING_SX1276) || defined(USING_SX1278) //!SX1276/78 module only #define RADIO_BUSY_PIN 33 //DIO1 @@ -329,12 +329,12 @@ #define RADIO_DIO4_PIN 10 #define RADIO_DIO5_PIN 36 -#elif defined(T3_S3_V1_2_SX1280) +#elif defined(USING_SX1280) #define RADIO_DIO1_PIN 9 //SX1280 DIO1 = IO9 #define RADIO_BUSY_PIN 36 //SX1280 BUSY = IO36 -#elif defined(T3_S3_V1_2_SX1280_PA) +#elif defined(USING_SX1280PA) #define RADIO_DIO1_PIN 9 //SX1280 DIO1 = IO9 #define RADIO_BUSY_PIN 36 //SX1280 BUSY = IO36 @@ -342,10 +342,10 @@ #define RADIO_TX_PIN 10 -#elif defined(T3_S3_V1_2_LR1121) +#elif defined(USING_LR1121) #define RADIO_DIO9_PIN 36 //LR1121 DIO9 = IO36 -#define RADIO_BUSY_PIN 34 //LR1121 BUSY = IO33 +#define RADIO_BUSY_PIN 34 //LR1121 BUSY = IO34 #endif diff --git a/examples/Sensor/QMI8658_WakeOnMotion/utilities.h b/examples/Sensor/QMI8658_WakeOnMotion/utilities.h index 2f03bdd..9553407 100644 --- a/examples/Sensor/QMI8658_WakeOnMotion/utilities.h +++ b/examples/Sensor/QMI8658_WakeOnMotion/utilities.h @@ -255,35 +255,35 @@ #define BOARD_VARIANT_NAME "T3 V3.0 TCXO" -#elif defined(T3_S3_V1_2_SX1262) || \ - defined(T3_S3_V1_2_SX1276) || \ - defined(T3_S3_V1_2_SX1278) || \ - defined(T3_S3_V1_2_SX1280) || \ - defined(T3_S3_V1_2_SX1280_PA) || \ - defined(T3_S3_V1_2_LR1121) +#elif defined(T3_S3_V1_2_SX1262) || defined(ARDUINO_LILYGO_T3S3_SX1262) || \ + defined(T3_S3_V1_2_SX1276) || defined(ARDUINO_LILYGO_T3S3_SX1276) || \ + defined(T3_S3_V1_2_SX1278) || defined(ARDUINO_LILYGO_T3S3_SX1278) || \ + defined(T3_S3_V1_2_SX1280) || defined(ARDUINO_LILYGO_T3S3_SX1280) || \ + defined(T3_S3_V1_2_SX1280_PA) || defined(ARDUINO_LILYGO_T3S3_SX1280PA) || \ + defined(T3_S3_V1_2_LR1121) || defined(ARDUINO_LILYGO_T3S3_LR1121) -#if defined(T3_S3_V1_2_SX1262) +#if defined(T3_S3_V1_2_SX1262) || defined(ARDUINO_LILYGO_T3S3_SX1262) #ifndef USING_SX1262 #define USING_SX1262 #endif -#elif defined(T3_S3_V1_2_SX1276) +#elif defined(T3_S3_V1_2_SX1276) || defined(ARDUINO_LILYGO_T3S3_SX1276) #ifndef USING_SX1276 #define USING_SX1276 #endif -#elif defined(T3_S3_V1_2_SX1278) +#elif defined(T3_S3_V1_2_SX1278) || defined(ARDUINO_LILYGO_T3S3_SX1278) #ifndef USING_SX1278 #define USING_SX1278 #endif -#elif defined(T3_S3_V1_2_SX1280) +#elif defined(T3_S3_V1_2_SX1280) || defined(ARDUINO_LILYGO_T3S3_SX1280) #ifndef USING_SX1280 #define USING_SX1280 #endif -#elif defined(T3_S3_V1_2_SX1280_PA) -#ifndef USING_SX1280 -#define USING_SX1280 +#elif defined(T3_S3_V1_2_SX1280_PA) || defined(ARDUINO_LILYGO_T3S3_SX1280PA) +#ifndef USING_SX1280PA +#define USING_SX1280PA #endif -#elif defined(T3_S3_V1_2_LR1121) +#elif defined(T3_S3_V1_2_LR1121) || defined(ARDUINO_LILYGO_T3S3_LR1121) #ifndef USING_LR1121 #define USING_LR1121 #endif @@ -313,12 +313,12 @@ #define RADIO_RST_PIN 8 -#if defined(T3_S3_V1_2_SX1262) +#if defined(USING_SX1262) #define RADIO_DIO1_PIN 33 #define RADIO_BUSY_PIN 34 -#elif defined(T3_S3_V1_2_SX1276) || defined(T3_S3_V1_2_SX1278) +#elif defined(USING_SX1276) || defined(USING_SX1278) //!SX1276/78 module only #define RADIO_BUSY_PIN 33 //DIO1 @@ -329,12 +329,12 @@ #define RADIO_DIO4_PIN 10 #define RADIO_DIO5_PIN 36 -#elif defined(T3_S3_V1_2_SX1280) +#elif defined(USING_SX1280) #define RADIO_DIO1_PIN 9 //SX1280 DIO1 = IO9 #define RADIO_BUSY_PIN 36 //SX1280 BUSY = IO36 -#elif defined(T3_S3_V1_2_SX1280_PA) +#elif defined(USING_SX1280PA) #define RADIO_DIO1_PIN 9 //SX1280 DIO1 = IO9 #define RADIO_BUSY_PIN 36 //SX1280 BUSY = IO36 @@ -342,10 +342,10 @@ #define RADIO_TX_PIN 10 -#elif defined(T3_S3_V1_2_LR1121) +#elif defined(USING_LR1121) #define RADIO_DIO9_PIN 36 //LR1121 DIO9 = IO36 -#define RADIO_BUSY_PIN 34 //LR1121 BUSY = IO33 +#define RADIO_BUSY_PIN 34 //LR1121 BUSY = IO34 #endif diff --git a/examples/T3S3Factory/utilities.h b/examples/T3S3Factory/utilities.h index 2f03bdd..9553407 100644 --- a/examples/T3S3Factory/utilities.h +++ b/examples/T3S3Factory/utilities.h @@ -255,35 +255,35 @@ #define BOARD_VARIANT_NAME "T3 V3.0 TCXO" -#elif defined(T3_S3_V1_2_SX1262) || \ - defined(T3_S3_V1_2_SX1276) || \ - defined(T3_S3_V1_2_SX1278) || \ - defined(T3_S3_V1_2_SX1280) || \ - defined(T3_S3_V1_2_SX1280_PA) || \ - defined(T3_S3_V1_2_LR1121) +#elif defined(T3_S3_V1_2_SX1262) || defined(ARDUINO_LILYGO_T3S3_SX1262) || \ + defined(T3_S3_V1_2_SX1276) || defined(ARDUINO_LILYGO_T3S3_SX1276) || \ + defined(T3_S3_V1_2_SX1278) || defined(ARDUINO_LILYGO_T3S3_SX1278) || \ + defined(T3_S3_V1_2_SX1280) || defined(ARDUINO_LILYGO_T3S3_SX1280) || \ + defined(T3_S3_V1_2_SX1280_PA) || defined(ARDUINO_LILYGO_T3S3_SX1280PA) || \ + defined(T3_S3_V1_2_LR1121) || defined(ARDUINO_LILYGO_T3S3_LR1121) -#if defined(T3_S3_V1_2_SX1262) +#if defined(T3_S3_V1_2_SX1262) || defined(ARDUINO_LILYGO_T3S3_SX1262) #ifndef USING_SX1262 #define USING_SX1262 #endif -#elif defined(T3_S3_V1_2_SX1276) +#elif defined(T3_S3_V1_2_SX1276) || defined(ARDUINO_LILYGO_T3S3_SX1276) #ifndef USING_SX1276 #define USING_SX1276 #endif -#elif defined(T3_S3_V1_2_SX1278) +#elif defined(T3_S3_V1_2_SX1278) || defined(ARDUINO_LILYGO_T3S3_SX1278) #ifndef USING_SX1278 #define USING_SX1278 #endif -#elif defined(T3_S3_V1_2_SX1280) +#elif defined(T3_S3_V1_2_SX1280) || defined(ARDUINO_LILYGO_T3S3_SX1280) #ifndef USING_SX1280 #define USING_SX1280 #endif -#elif defined(T3_S3_V1_2_SX1280_PA) -#ifndef USING_SX1280 -#define USING_SX1280 +#elif defined(T3_S3_V1_2_SX1280_PA) || defined(ARDUINO_LILYGO_T3S3_SX1280PA) +#ifndef USING_SX1280PA +#define USING_SX1280PA #endif -#elif defined(T3_S3_V1_2_LR1121) +#elif defined(T3_S3_V1_2_LR1121) || defined(ARDUINO_LILYGO_T3S3_LR1121) #ifndef USING_LR1121 #define USING_LR1121 #endif @@ -313,12 +313,12 @@ #define RADIO_RST_PIN 8 -#if defined(T3_S3_V1_2_SX1262) +#if defined(USING_SX1262) #define RADIO_DIO1_PIN 33 #define RADIO_BUSY_PIN 34 -#elif defined(T3_S3_V1_2_SX1276) || defined(T3_S3_V1_2_SX1278) +#elif defined(USING_SX1276) || defined(USING_SX1278) //!SX1276/78 module only #define RADIO_BUSY_PIN 33 //DIO1 @@ -329,12 +329,12 @@ #define RADIO_DIO4_PIN 10 #define RADIO_DIO5_PIN 36 -#elif defined(T3_S3_V1_2_SX1280) +#elif defined(USING_SX1280) #define RADIO_DIO1_PIN 9 //SX1280 DIO1 = IO9 #define RADIO_BUSY_PIN 36 //SX1280 BUSY = IO36 -#elif defined(T3_S3_V1_2_SX1280_PA) +#elif defined(USING_SX1280PA) #define RADIO_DIO1_PIN 9 //SX1280 DIO1 = IO9 #define RADIO_BUSY_PIN 36 //SX1280 BUSY = IO36 @@ -342,10 +342,10 @@ #define RADIO_TX_PIN 10 -#elif defined(T3_S3_V1_2_LR1121) +#elif defined(USING_LR1121) #define RADIO_DIO9_PIN 36 //LR1121 DIO9 = IO36 -#define RADIO_BUSY_PIN 34 //LR1121 BUSY = IO33 +#define RADIO_BUSY_PIN 34 //LR1121 BUSY = IO34 #endif