djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

esp32/machine_pin: Don't expose pins 33-37 when octal SPIRAM is enabled.

Browse Source 
For ESP32-S3 configurations, CONFIG_SPIRAM_MODE_OCT requires pins 33-37 for
PSRAM.  So exclude them from the machine_pin_type and machine_pin_irq_type
object tables.
This commit is contained in:
Stephane Smith 2022-04-13 17:25:29 +00:00 committed by Damien George
parent ae3d5289a5
commit 7005354099
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ports/esp32/machine_pin.c
View File

@ -191,11 +191,19 @@ STATIC const machine_pin_obj_t machine_pin_obj[] = {
{{NULL}, -1}, // 30 FLASH/PSRAM
{{NULL}, -1}, // 31 FLASH/PSRAM
{{NULL}, -1}, // 32 FLASH/PSRAM
#if CONFIG_SPIRAM_MODE_OCT
{{NULL}, -1}, // 33 FLASH/PSRAM
{{NULL}, -1}, // 34 FLASH/PSRAM
{{NULL}, -1}, // 35 FLASH/PSRAM
{{NULL}, -1}, // 36 FLASH/PSRAM
{{NULL}, -1}, // 37 FLASH/PSRAM
#else
{{&machine_pin_type}, GPIO_NUM_33},
{{&machine_pin_type}, GPIO_NUM_34},
{{&machine_pin_type}, GPIO_NUM_35},
{{&machine_pin_type}, GPIO_NUM_36},
{{&machine_pin_type}, GPIO_NUM_37},
#endif
{{&machine_pin_type}, GPIO_NUM_38},
{{&machine_pin_type}, GPIO_NUM_39}, // MTCLK
{{&machine_pin_type}, GPIO_NUM_40}, // MTDO
@ -658,11 +666,19 @@ STATIC const machine_pin_irq_obj_t machine_pin_irq_object[] = {
{{NULL}, -1}, // 30 FLASH/PSRAM
{{NULL}, -1}, // 31 FLASH/PSRAM
{{NULL}, -1}, // 32 FLASH/PSRAM
#if CONFIG_SPIRAM_MODE_OCT
{{NULL}, -1}, // 33 FLASH/PSRAM
{{NULL}, -1}, // 34 FLASH/PSRAM
{{NULL}, -1}, // 35 FLASH/PSRAM
{{NULL}, -1}, // 36 FLASH/PSRAM
{{NULL}, -1}, // 37 FLASH/PSRAM
#else
{{&machine_pin_irq_type}, GPIO_NUM_33},
{{&machine_pin_irq_type}, GPIO_NUM_34},
{{&machine_pin_irq_type}, GPIO_NUM_35},
{{&machine_pin_irq_type}, GPIO_NUM_36},
{{&machine_pin_irq_type}, GPIO_NUM_37},
#endif
{{&machine_pin_irq_type}, GPIO_NUM_38},
{{&machine_pin_irq_type}, GPIO_NUM_39},
{{&machine_pin_irq_type}, GPIO_NUM_40},