Update examples

This commit is contained in:
lewisxhe 2024-06-29 16:24:28 +08:00
commit 72b54f1b2f
3 changed files with 26 additions and 24 deletions

View file

@ -23,13 +23,13 @@
#define CONFIG_RADIO_FREQ 868.0 #define CONFIG_RADIO_FREQ 868.0
#define CONFIG_RADIO_OUTPUT_POWER 17 #define CONFIG_RADIO_OUTPUT_POWER 17
#define CONFIG_RADIO_BW 125.0 #define CONFIG_RADIO_BW 125.0
SX1276 radio = new Module(RADIO_CS_PIN, RADIO_DIO0_PIN, RADIO_RST_PIN, RADIO_BUSY_PIN); SX1276 radio = new Module(RADIO_CS_PIN, RADIO_DIO0_PIN, RADIO_RST_PIN, RADIO_DIO1_PIN);
#elif defined(USING_SX1278) #elif defined(USING_SX1278)
#define CONFIG_RADIO_FREQ 433.0 #define CONFIG_RADIO_FREQ 433.0
#define CONFIG_RADIO_OUTPUT_POWER 17 #define CONFIG_RADIO_OUTPUT_POWER 17
#define CONFIG_RADIO_BW 125.0 #define CONFIG_RADIO_BW 125.0
SX1278 radio = new Module(RADIO_CS_PIN, RADIO_DIO0_PIN, RADIO_RST_PIN, RADIO_BUSY_PIN); SX1278 radio = new Module(RADIO_CS_PIN, RADIO_DIO0_PIN, RADIO_RST_PIN, RADIO_DIO1_PIN);
#elif defined(USING_SX1262) #elif defined(USING_SX1262)
#define CONFIG_RADIO_FREQ 868.0 #define CONFIG_RADIO_FREQ 868.0
@ -42,12 +42,14 @@ SX1262 radio = new Module(RADIO_CS_PIN, RADIO_DIO1_PIN, RADIO_RST_PIN, RADIO_BUS
#define CONFIG_RADIO_FREQ 2400.0 #define CONFIG_RADIO_FREQ 2400.0
#define CONFIG_RADIO_OUTPUT_POWER 13 #define CONFIG_RADIO_OUTPUT_POWER 13
#define CONFIG_RADIO_BW 203.125 #define CONFIG_RADIO_BW 203.125
#ifdef T3_S3_V1_2_SX1280_PA
// PA Version power range : -18 ~ 3dBm
#undef CONFIG_RADIO_OUTPUT_POWER
#define CONFIG_RADIO_OUTPUT_POWER 3
#endif
SX1280 radio = new Module(RADIO_CS_PIN, RADIO_DIO1_PIN, RADIO_RST_PIN, RADIO_BUSY_PIN); SX1280 radio = new Module(RADIO_CS_PIN, RADIO_DIO1_PIN, RADIO_RST_PIN, RADIO_BUSY_PIN);
#elif defined(USING_SX1280PA)
#define CONFIG_RADIO_FREQ 2400.0
#define CONFIG_RADIO_OUTPUT_POWER 3 // PA Version power range : -18 ~ 3dBm
#define CONFIG_RADIO_BW 203.125
SX1280 radio = new Module(RADIO_CS_PIN, RADIO_DIO1_PIN, RADIO_RST_PIN, RADIO_BUSY_PIN);
#elif defined(USING_SX1268) #elif defined(USING_SX1268)
#define CONFIG_RADIO_FREQ 433.0 #define CONFIG_RADIO_FREQ 433.0
#define CONFIG_RADIO_OUTPUT_POWER 22 #define CONFIG_RADIO_OUTPUT_POWER 22
@ -186,7 +188,7 @@ void setup()
while (true); while (true);
} }
#if !defined(USING_SX1280) && !defined(USING_LR1121) #if !defined(USING_SX1280) && !defined(USING_LR1121) && !defined(USING_SX1280PA)
/* /*
* Sets current limit for over current protection at transmitter amplifier. * Sets current limit for over current protection at transmitter amplifier.
* SX1278/SX1276 : Allowed values range from 45 to 120 mA in 5 mA steps and 120 to 240 mA in 10 mA steps. * SX1278/SX1276 : Allowed values range from 45 to 120 mA in 5 mA steps and 120 to 240 mA in 10 mA steps.

View file

@ -18,16 +18,16 @@
#define CONFIG_RADIO_FREQ 868.0 #define CONFIG_RADIO_FREQ 868.0
#define CONFIG_RADIO_OUTPUT_POWER 17 #define CONFIG_RADIO_OUTPUT_POWER 17
#define CONFIG_RADIO_BW 125.0 #define CONFIG_RADIO_BW 125.0
SX1276 radio = new Module(RADIO_CS_PIN, RADIO_DIO0_PIN, RADIO_RST_PIN, RADIO_BUSY_PIN); SX1276 radio = new Module(RADIO_CS_PIN, RADIO_DIO0_PIN, RADIO_RST_PIN, RADIO_DIO1_PIN);
#elif defined(USING_SX1278) #elif defined(USING_SX1278)
#define CONFIG_RADIO_FREQ 433.0 #define CONFIG_RADIO_FREQ 433.0
#define CONFIG_RADIO_OUTPUT_POWER 17 #define CONFIG_RADIO_OUTPUT_POWER 17
#define CONFIG_RADIO_BW 125.0 #define CONFIG_RADIO_BW 125.0
SX1278 radio = new Module(RADIO_CS_PIN, RADIO_DIO0_PIN, RADIO_RST_PIN, RADIO_BUSY_PIN); SX1278 radio = new Module(RADIO_CS_PIN, RADIO_DIO0_PIN, RADIO_RST_PIN, RADIO_DIO1_PIN);
#elif defined(USING_SX1262) #elif defined(USING_SX1262)
#define CONFIG_RADIO_FREQ 868.0 #define CONFIG_RADIO_FREQ 850.0
#define CONFIG_RADIO_OUTPUT_POWER 22 #define CONFIG_RADIO_OUTPUT_POWER 22
#define CONFIG_RADIO_BW 125.0 #define CONFIG_RADIO_BW 125.0
@ -37,11 +37,12 @@ SX1262 radio = new Module(RADIO_CS_PIN, RADIO_DIO1_PIN, RADIO_RST_PIN, RADIO_BUS
#define CONFIG_RADIO_FREQ 2400.0 #define CONFIG_RADIO_FREQ 2400.0
#define CONFIG_RADIO_OUTPUT_POWER 13 #define CONFIG_RADIO_OUTPUT_POWER 13
#define CONFIG_RADIO_BW 203.125 #define CONFIG_RADIO_BW 203.125
#ifdef T3_S3_V1_2_SX1280_PA SX1280 radio = new Module(RADIO_CS_PIN, RADIO_DIO1_PIN, RADIO_RST_PIN, RADIO_BUSY_PIN);
// PA Version power range : -18 ~ 3dBm
#undef CONFIG_RADIO_OUTPUT_POWER #elif defined(USING_SX1280PA)
#define CONFIG_RADIO_OUTPUT_POWER 3 #define CONFIG_RADIO_FREQ 2400.0
#endif #define CONFIG_RADIO_OUTPUT_POWER 3 // PA Version power range : -18 ~ 3dBm
#define CONFIG_RADIO_BW 203.125
SX1280 radio = new Module(RADIO_CS_PIN, RADIO_DIO1_PIN, RADIO_RST_PIN, RADIO_BUSY_PIN); SX1280 radio = new Module(RADIO_CS_PIN, RADIO_DIO1_PIN, RADIO_RST_PIN, RADIO_BUSY_PIN);
#elif defined(USING_SX1268) #elif defined(USING_SX1268)
@ -182,7 +183,7 @@ void setup()
while (true); while (true);
} }
#if !defined(USING_SX1280) && !defined(USING_LR1121) #if !defined(USING_SX1280) && !defined(USING_LR1121) && !defined(USING_SX1280PA)
/* /*
* Sets current limit for over current protection at transmitter amplifier. * Sets current limit for over current protection at transmitter amplifier.
* SX1278/SX1276 : Allowed values range from 45 to 120 mA in 5 mA steps and 120 to 240 mA in 10 mA steps. * SX1278/SX1276 : Allowed values range from 45 to 120 mA in 5 mA steps and 120 to 240 mA in 10 mA steps.

View file

@ -24,7 +24,6 @@ using namespace ace_button;
void radioTx(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y); void radioTx(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y);
void radioRx(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y); void radioRx(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y);
void hwInfo(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y); void hwInfo(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y);
void setFlag(void);
#if defined(USING_SX1276) #if defined(USING_SX1276)
#define CONFIG_RADIO_FREQ 868.0 #define CONFIG_RADIO_FREQ 868.0
@ -51,11 +50,11 @@ SX1262 radio = new Module(RADIO_CS_PIN, RADIO_DIO1_PIN, RADIO_RST_PIN, RADIO_BUS
#define CONFIG_RADIO_BW 203.125 #define CONFIG_RADIO_BW 203.125
SX1280 radio = new Module(RADIO_CS_PIN, RADIO_DIO1_PIN, RADIO_RST_PIN, RADIO_BUSY_PIN); SX1280 radio = new Module(RADIO_CS_PIN, RADIO_DIO1_PIN, RADIO_RST_PIN, RADIO_BUSY_PIN);
#elif defined(USING_SX1268) #elif defined(USING_SX1280PA)
#define CONFIG_RADIO_FREQ 433.0 #define CONFIG_RADIO_FREQ 2400.0
#define CONFIG_RADIO_OUTPUT_POWER 22 #define CONFIG_RADIO_OUTPUT_POWER 3 // PA Version power range : -18 ~ 3dBm
#define CONFIG_RADIO_BW 125.0 #define CONFIG_RADIO_BW 203.125
SX1268 radio = new Module(RADIO_CS_PIN, RADIO_DIO1_PIN, RADIO_RST_PIN, RADIO_BUSY_PIN); SX1280 radio = new Module(RADIO_CS_PIN, RADIO_DIO1_PIN, RADIO_RST_PIN, RADIO_BUSY_PIN);
#elif defined(USING_LR1121) #elif defined(USING_LR1121)
@ -258,7 +257,7 @@ void setup()
while (true); while (true);
} }
#if !defined(USING_SX1280) && !defined(USING_LR1121) #if !defined(USING_SX1280) && !defined(USING_LR1121) && !defined(USING_SX1280PA)
/* /*
* Sets current limit for over current protection at transmitter amplifier. * Sets current limit for over current protection at transmitter amplifier.
* SX1278/SX1276 : Allowed values range from 45 to 120 mA in 5 mA steps and 120 to 240 mA in 10 mA steps. * SX1278/SX1276 : Allowed values range from 45 to 120 mA in 5 mA steps and 120 to 240 mA in 10 mA steps.