From 309a3d5396a4d421f5a74c17b80aa1605e74a714 Mon Sep 17 00:00:00 2001 From: code8buster Date: Sun, 30 Oct 2022 22:27:16 -0400 Subject: [PATCH 1/4] Rearranging deck chairs, 900M22S working, 30S not --- variants/diy/dr-dev/variant.h | 51 ++++++++++++++++++----------------- 1 file changed, 26 insertions(+), 25 deletions(-) diff --git a/variants/diy/dr-dev/variant.h b/variants/diy/dr-dev/variant.h index 6356cad14..e670c5a91 100644 --- a/variants/diy/dr-dev/variant.h +++ b/variants/diy/dr-dev/variant.h @@ -1,47 +1,54 @@ // For OLED LCD -#define I2C_SDA 21 -#define I2C_SCL 22 +#define HAS_WIRE 0 +#define HAS_SCREEN 0 +#define I2C_SDA 4 +#define I2C_SCL 5 // GPS #undef GPS_RX_PIN #define GPS_RX_PIN NOT_A_PIN -#undef WANT_GPS +#define HAS_GPS 0 -#define BUTTON_PIN 2 // The middle button GPIO on the T-Beam +#define BUTTON_PIN 13 // The middle button GPIO on the T-Beam #define BUTTON_NEED_PULLUP #define EXT_NOTIFY_OUT 12 // Overridden default pin to use for Ext Notify Module (#975). -#define LORA_DIO0 -1 // a No connect on the SX1262/SX1268 module -#define LORA_RESET -1 // RST for SX1276, and for SX1262/SX1268 -#define LORA_DIO1 27 // IRQ for SX1262/SX1268 (IO26 FOR 22S) -#define LORA_DIO2 NOT_A_PIN // BUSY for SX1262/SX1268 -#define LORA_DIO3 // Not connected on PCB, but internally on the SX1262/SX1268, if DIO3 is high the TXCO is enabled +#define LORA_DIO0 NOT_A_PIN // a No connect on the SX1262/SX1268 module +#define LORA_RESET NOT_A_PIN // RST for SX1276, and for SX1262/SX1268 +#define LORA_DIO3 NOT_A_PIN // Not connected on PCB, but internally on the SX1262/SX1268, if DIO3 is high the TXCO is enabled // In transmitting, set TXEN as high communication level，RXEN pin is low level; // In receiving, set RXEN as high communication level, TXEN is lowlevel; // Before powering off, set TXEN、RXEN as low level. -#define LORA_RXEN 17 // Input - RF switch RX control, connecting external MCU IO, valid in high level -#define LORA_TXEN -1 // Input - RF switch TX control, connecting external MCU IO or DIO2, valid in high level -/* --PINS FOR THE 900M22S + #undef RF95_SCK #define RF95_SCK 18 #undef RF95_MISO #define RF95_MISO 19 #undef RF95_MOSI #define RF95_MOSI 23 + +// --PINS FOR THE 900M22S + +#define LORA_DIO1 26 // IRQ for SX1262/SX1268 +#define LORA_DIO2 22 // BUSY for SX1262/SX1268 +#define LORA_TXEN NOT_A_PIN // Input - RF switch TX control, connecting external MCU IO or DIO2, valid in high level +#define LORA_RXEN 17 // Input - RF switch RX control, connecting external MCU IO, valid in high level #undef RF95_NSS #define RF95_NSS 16 -*/ +#define SX126X_BUSY 22 + // PINS FOR THE 900M30S -#undef RF95_SCK -#define RF95_SCK 18 -#undef RF95_MISO -#define RF95_MISO 19 -#undef RF95_MOSI -#define RF95_MOSI 23 +/* +#define LORA_DIO1 27 // IRQ for SX1262/SX1268 +#define LORA_RXEN 21 // Input - RF switch RX control, connecting external MCU IO, valid in high level +#define LORA_DIO2 35 // BUSY for SX1262/SX1268 +#define LORA_TXEN NOT_A_PIN // Input - RF switch TX control, connecting external MCU IO or DIO2, valid in high level #undef RF95_NSS #define RF95_NSS 33 +#define SX126X_BUSY 35 +*/ // RX/TX for RFM95/SX127x #define RF95_RXEN LORA_RXEN @@ -51,7 +58,6 @@ // common pinouts for SX126X modules #define SX126X_CS 33 #define SX126X_DIO1 LORA_DIO1 -#define SX126X_BUSY 35 #define SX126X_RESET LORA_RESET #define SX126X_RXEN LORA_RXEN #define SX126X_TXEN LORA_TXEN @@ -61,9 +67,4 @@ #define USE_SX1262 #define USE_SX1268 #define USE_LLCC68 - -#ifdef EBYTE_E22 -// Internally the TTGO module hooks the SX126x-DIO2 in to control the TX/RX switch -// (which is the default for the sx1262interface code) #define SX126X_E22 -#endif From 8fa71afb72689255cc0f3cade37f0303efb30824 Mon Sep 17 00:00:00 2001 From: code8buster Date: Sun, 30 Oct 2022 22:30:33 -0400 Subject: [PATCH 2/4] We do have wire, just not where it's expected --- variants/diy/dr-dev/variant.h | 1 - 1 file changed, 1 deletion(-) diff --git a/variants/diy/dr-dev/variant.h b/variants/diy/dr-dev/variant.h index e670c5a91..b756536af 100644 --- a/variants/diy/dr-dev/variant.h +++ b/variants/diy/dr-dev/variant.h @@ -1,5 +1,4 @@ // For OLED LCD -#define HAS_WIRE 0 #define HAS_SCREEN 0 #define I2C_SDA 4 #define I2C_SCL 5 From 3d8e6aead291e80b6bb8add8645a7041a5496cf2 Mon Sep 17 00:00:00 2001 From: code8buster Date: Mon, 31 Oct 2022 21:39:11 -0400 Subject: [PATCH 3/4] Put more of the module specific pins in their blocks --- variants/diy/dr-dev/variant.h | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/variants/diy/dr-dev/variant.h b/variants/diy/dr-dev/variant.h index b756536af..7d0625907 100644 --- a/variants/diy/dr-dev/variant.h +++ b/variants/diy/dr-dev/variant.h @@ -1,4 +1,4 @@ -// For OLED LCD +// Initialize i2c bus on sd_dat and esp_led pins, respectively. We need a bus to not hang on boot #define HAS_SCREEN 0 #define I2C_SDA 4 #define I2C_SCL 5 @@ -27,7 +27,7 @@ #undef RF95_MOSI #define RF95_MOSI 23 -// --PINS FOR THE 900M22S +// PINS FOR THE 900M22S #define LORA_DIO1 26 // IRQ for SX1262/SX1268 #define LORA_DIO2 22 // BUSY for SX1262/SX1268 @@ -36,17 +36,19 @@ #undef RF95_NSS #define RF95_NSS 16 #define SX126X_BUSY 22 +#define SX126X_CS 16 // PINS FOR THE 900M30S /* #define LORA_DIO1 27 // IRQ for SX1262/SX1268 -#define LORA_RXEN 21 // Input - RF switch RX control, connecting external MCU IO, valid in high level #define LORA_DIO2 35 // BUSY for SX1262/SX1268 #define LORA_TXEN NOT_A_PIN // Input - RF switch TX control, connecting external MCU IO or DIO2, valid in high level +#define LORA_RXEN 21 // Input - RF switch RX control, connecting external MCU IO, valid in high level #undef RF95_NSS #define RF95_NSS 33 #define SX126X_BUSY 35 +#define SX126X_CS 33 */ // RX/TX for RFM95/SX127x @@ -55,15 +57,15 @@ // #define RF95_TCXO // common pinouts for SX126X modules -#define SX126X_CS 33 + #define SX126X_DIO1 LORA_DIO1 #define SX126X_RESET LORA_RESET #define SX126X_RXEN LORA_RXEN #define SX126X_TXEN LORA_TXEN // supported modules list -#define USE_RF95 // RFM95/SX127x +//#define USE_RF95 // RFM95/SX127x #define USE_SX1262 -#define USE_SX1268 -#define USE_LLCC68 +//#define USE_SX1268 +//#define USE_LLCC68 #define SX126X_E22 From 32ad8aaa4e84f2b2968accacc6e07927bb08e3ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20G=C3=B6ttgens?= Date: Wed, 2 Nov 2022 10:17:59 +0100 Subject: [PATCH 4/4] tryfix compile with NO_SCREEN --- src/graphics/Screen.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/graphics/Screen.h b/src/graphics/Screen.h index cee00f174..23828b3ee 100644 --- a/src/graphics/Screen.h +++ b/src/graphics/Screen.h @@ -10,7 +10,7 @@ namespace graphics class Screen { public: - Screen(char){} + explicit Screen(char){} void onPress() {} void setup() {} void setOn(bool) {}