Skip to content

Commit e39a187

Browse files
committed
[ESP32-P4] GPIO 35 button sensing [skip ci]
1 parent 9d9f2aa commit e39a187

2 files changed

Lines changed: 13 additions & 4 deletions

File tree

software/firmware/source/SoftRF/src/platform/ESP32.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5266,6 +5266,7 @@ static void ESP32_Button_setup()
52665266
esp32_board == ESP32_LILYGO_T3S3_OLED ||
52675267
esp32_board == ESP32_ELECROW_TN_M2 ||
52685268
esp32_board == ESP32_EBYTE_HUB_900TB ||
5269+
esp32_board == ESP32_P4_DEVKIT ||
52695270
esp32_board == ESP32_S3_DEVKIT) {
52705271
button_pin = esp32_board == ESP32_S2_T8_V1_1 ? SOC_GPIO_PIN_T8_S2_BUTTON :
52715272
esp32_board == ESP32_S3_DEVKIT ? SOC_GPIO_PIN_S3_BUTTON :
@@ -5274,6 +5275,7 @@ static void ESP32_Button_setup()
52745275
esp32_board == ESP32_LILYGO_T3S3_OLED ? SOC_GPIO_PIN_S3_BUTTON :
52755276
esp32_board == ESP32_ELECROW_TN_M2 ? SOC_GPIO_PIN_M2_BUTTON_1 :
52765277
esp32_board == ESP32_EBYTE_HUB_900TB ? SOC_GPIO_PIN_S3_BUTTON :
5278+
esp32_board == ESP32_P4_DEVKIT ? SOC_GPIO_PIN_P4_BUTTON :
52775279
esp32_board == ESP32_LILYGO_T_TWR2 ?
52785280
SOC_GPIO_PIN_TWR2_ENC_BUTTON : SOC_GPIO_PIN_TBEAM_V05_BUTTON;
52795281

@@ -5372,9 +5374,11 @@ static void ESP32_Button_fini()
53725374
esp32_board == ESP32_LILYGO_T3S3_OLED ||
53735375
esp32_board == ESP32_ELECROW_TN_M2 ||
53745376
esp32_board == ESP32_EBYTE_HUB_900TB ||
5377+
esp32_board == ESP32_P4_DEVKIT ||
53755378
esp32_board == ESP32_S3_DEVKIT) {
53765379
int button_pin = esp32_board == ESP32_S2_T8_V1_1 ? SOC_GPIO_PIN_T8_S2_BUTTON :
53775380
esp32_board == ESP32_ELECROW_TN_M2 ? SOC_GPIO_PIN_M2_BUTTON_1 :
5381+
esp32_board == ESP32_P4_DEVKIT ? SOC_GPIO_PIN_P4_BUTTON :
53785382
esp32_board == ESP32_LILYGO_T_TWR2 ?
53795383
SOC_GPIO_PIN_TWR2_ENC_BUTTON : SOC_GPIO_PIN_S3_BUTTON;
53805384
while (digitalRead(button_pin) == (esp32_board == ESP32_ELECROW_TN_M2 ? HIGH : LOW));

software/firmware/source/SoftRF/src/platform/ESP32.h

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ static inline color_t uni_Color(uint8_t r, uint8_t g, uint8_t b) {
172172
#elif defined(CONFIG_IDF_TARGET_ESP32H2)
173173
#define SOC_GPIO_PIN_LED SOC_UNUSED_PIN /* TBD */
174174
#elif defined(CONFIG_IDF_TARGET_ESP32P4)
175-
#define SOC_GPIO_PIN_LED SOC_UNUSED_PIN /* TBD */
175+
#define SOC_GPIO_PIN_LED 46 /* TBD */
176176
#else
177177
#error "This ESP32 family build variant is not supported!"
178178
#endif
@@ -184,7 +184,7 @@ static inline color_t uni_Color(uint8_t r, uint8_t g, uint8_t b) {
184184
hw_info.model == SOFTRF_MODEL_INK ?\
185185
SOC_GPIO_PIN_T3S3_LED : \
186186
hw_info.model == SOFTRF_MODEL_STANDALONE && \
187-
hw_info.revision == 4 ?\
187+
hw_info.revision == STD_EDN_REV_BPICOW ?\
188188
SOC_GPIO_PIN_BPIPW_STATUS : \
189189
hw_info.model == SOFTRF_MODEL_GIZMO ?\
190190
SOC_GPIO_PIN_M2_LED : \
@@ -215,7 +215,10 @@ static inline color_t uni_Color(uint8_t r, uint8_t g, uint8_t b) {
215215
SOC_GPIO_PIN_T3S3_GNSS_PPS : \
216216
(hw_info.model == SOFTRF_MODEL_GIZMO ? \
217217
SOC_GPIO_PIN_M2_GNSS_PPS : \
218-
SOC_UNUSED_PIN))))))
218+
(hw_info.model == SOFTRF_MODEL_STANDALONE && \
219+
hw_info.revision == STD_EDN_REV_WT99P4C5 ?\
220+
SOC_GPIO_PIN_P4_GNSS_PPS : \
221+
SOC_UNUSED_PIN)))))))
219222

220223
#define SOC_GPIO_PIN_BUZZER (hw_info.model == SOFTRF_MODEL_PRIME_MK2 ? \
221224
SOC_UNUSED_PIN : \
@@ -227,7 +230,9 @@ static inline color_t uni_Color(uint8_t r, uint8_t g, uint8_t b) {
227230
(esp32_board == ESP32_BANANA_PICOW ? \
228231
SOC_GPIO_PIN_BPIPW_BUZZER : \
229232
(esp32_board == ESP32_ELECROW_TN_M2 ? \
230-
SOC_GPIO_PIN_M2_BUZZER : SOC_UNUSED_PIN))))))
233+
SOC_GPIO_PIN_M2_BUZZER : \
234+
(esp32_board == ESP32_P4_DEVKIT ? \
235+
SOC_GPIO_PIN_P4_BUZZER : SOC_UNUSED_PIN)))))))
231236

232237
/* SPI (does match Heltec & TTGO LoRa32 pins mapping) */
233238
#define SOC_GPIO_PIN_MOSI 27

0 commit comments

Comments
 (0)