From 264d77816864b2a4f7c67e6e47869895cbe23f86 Mon Sep 17 00:00:00 2001 From: taco Date: Wed, 12 Aug 2026 22:28:05 +1000 Subject: [PATCH 1/3] Revert "T096 PA_CTX pin direction workaround" This reverts commit 82de18fb0e1b74382fb1c190ad62de0c0aef1e60. --- variants/heltec_t096/LoRaFEMControl.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/variants/heltec_t096/LoRaFEMControl.cpp b/variants/heltec_t096/LoRaFEMControl.cpp index 45bbfd64..fb60a8f7 100644 --- a/variants/heltec_t096/LoRaFEMControl.cpp +++ b/variants/heltec_t096/LoRaFEMControl.cpp @@ -21,7 +21,6 @@ void LoRaFEMControl::setSleepModeEnable(void) void LoRaFEMControl::setTxModeEnable(void) { - pinMode(P_LORA_KCT8103L_PA_CTX, OUTPUT); // force pinMode before transmit as temporary workaround for https://github.com/meshcore-dev/MeshCore/issues/3151 digitalWrite(P_LORA_KCT8103L_PA_CSD, HIGH); digitalWrite(P_LORA_KCT8103L_PA_CTX, HIGH); } From f43e1cde8938c38371fdf93a51dc1c8b4e289384 Mon Sep 17 00:00:00 2001 From: taco Date: Wed, 12 Aug 2026 22:28:36 +1000 Subject: [PATCH 2/3] Revert "t096 compiler layout workaround" This reverts commit 9c60f9696ecdab55c1527ca2235bfc2c022bb290. --- src/helpers/CommonCLI.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/helpers/CommonCLI.h b/src/helpers/CommonCLI.h index 3143acd2..2a9ec43b 100644 --- a/src/helpers/CommonCLI.h +++ b/src/helpers/CommonCLI.h @@ -79,8 +79,7 @@ private: def("bw", _parent->bw); def("sf", _parent->sf); def("cr", _parent->cr); - static const char radio_cad_key[] = {'c', 'a', 'd', '\0'}; // workaround for T096, don't touch without testing T096 repeater still transmit - def(radio_cad_key, _parent->cad_enabled); + def("cad", _parent->cad_enabled); def("int_thr", _parent->interference_threshold); def("rxgain", _parent->rx_boosted_gain); def("fem_rxgain", _parent->rx_boosted_gain); From 49d9f9a83931815bb937a8ef72f74161e7d2a45d Mon Sep 17 00:00:00 2001 From: taco Date: Wed, 12 Aug 2026 22:31:57 +1000 Subject: [PATCH 3/3] Heltec T096: fix PIN_SPI1_MISO Setting SPI pins to values that are OOB of the g_ADigitalPinMap[] array causes OOB reads. This variant.h has pin 0 as 0xFF which passes through as NRFX_SPIM_PIN_NOT_USED. --- variants/heltec_t096/variant.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/variants/heltec_t096/variant.h b/variants/heltec_t096/variant.h index c240c1f2..bfbf2e63 100644 --- a/variants/heltec_t096/variant.h +++ b/variants/heltec_t096/variant.h @@ -104,7 +104,7 @@ #define PIN_SPI_SCK (32 + 8) #define PIN_SPI_NSS LORA_CS -#define PIN_SPI1_MISO (-1) +#define PIN_SPI1_MISO (0) #define PIN_SPI1_MOSI (0+17) #define PIN_SPI1_SCK (0+20)