Update camera pin definitions

cnadler86 · Oct 16, 2024 · bf88dd2 · bf88dd2
1 parent 44e6a96
commit bf88dd2
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 79 deletions.
diff --git a/.github/workflows/ESP32.yml b/.github/workflows/ESP32.yml
@@ -110,8 +110,7 @@ jobs:
           - ESP32_GENERIC_S3-SPIRAM_OCT@ESP32S3_CAM_LCD
           - ESP32_GENERIC_S3-SPIRAM_OCT@ESP32S3_EYE
           - ESP32_GENERIC_S3-SPIRAM_OCT@FREENOVE_ESP32S3_CAM
-          - ESP32_GENERIC_S3-SPIRAM_OCT@DFRobot_FireBeetle2_ESP32S3
-          - ESP32_GENERIC_S3-SPIRAM_OCT@DFRobot_Romeo_ESP32S3
+          - ESP32_GENERIC_S3-SPIRAM_OCT@DFRobot_ESP32S3
           - ESP32_GENERIC_S3-SPIRAM_OCT@NEW_ESPS3_RE1_0
           - ESP32_GENERIC_S3-SPIRAM_OCT@XENOIONEX
 

diff --git a/src/camera_pins.h b/src/camera_pins.h
@@ -3,23 +3,23 @@
 #define MICROPY_CAMERA_MODEL_PINS_H
 
 #if defined(MICROPY_CAMERA_MODEL_WROVER_KIT)
-#define MICROPY_CAMERA_PIN_PWDN    -1
-#define MICROPY_CAMERA_PIN_RESET   -1
-#define MICROPY_CAMERA_PIN_XCLK    21
-#define MICROPY_CAMERA_PIN_SIOD   26
-#define MICROPY_CAMERA_PIN_SIOC    27
-
-#define MICROPY_CAMERA_PIN_D7      35
-#define MICROPY_CAMERA_PIN_D6      34
-#define MICROPY_CAMERA_PIN_D5      39
-#define MICROPY_CAMERA_PIN_D4      36
-#define MICROPY_CAMERA_PIN_D3      19
-#define MICROPY_CAMERA_PIN_D2      18
+#define MICROPY_CAMERA_PIN_PWDN     -1
+#define MICROPY_CAMERA_PIN_RESET    -1
+#define MICROPY_CAMERA_PIN_XCLK     21
+#define MICROPY_CAMERA_PIN_SIOD     26
+#define MICROPY_CAMERA_PIN_SIOC     27
+
+#define MICROPY_CAMERA_PIN_D7       35
+#define MICROPY_CAMERA_PIN_D6       34
+#define MICROPY_CAMERA_PIN_D5       39
+#define MICROPY_CAMERA_PIN_D4       36
+#define MICROPY_CAMERA_PIN_D3       19
+#define MICROPY_CAMERA_PIN_D2       18
 #define MICROPY_CAMERA_PIN_D1       5
 #define MICROPY_CAMERA_PIN_D0       4
-#define MICROPY_CAMERA_PIN_VSYNC   25
-#define MICROPY_CAMERA_PIN_HREF    23
-#define MICROPY_CAMERA_PIN_PCLK    22
+#define MICROPY_CAMERA_PIN_VSYNC    25
+#define MICROPY_CAMERA_PIN_HREF     23
+#define MICROPY_CAMERA_PIN_PCLK     22
 
 #elif defined(MICROPY_CAMERA_MODEL_ESP_EYE)
 #define MICROPY_CAMERA_PIN_PWDN    -1
@@ -40,9 +40,7 @@
 #define MICROPY_CAMERA_PIN_HREF    27
 #define MICROPY_CAMERA_PIN_PCLK    25
 
-#define LED_GPIO_NUM     22
-
-#elif defined(MICROPY_CAMERA_MODEL_M5STACK_PSRAM)
+#elif defined(MICROPY_CAMERA_MODEL_M5STACK_PSRAM) || defined(MICROPY_CAMERA_MODEL_M5STACK_UNITCAM)
 #define MICROPY_CAMERA_PIN_PWDN     -1
 #define MICROPY_CAMERA_PIN_RESET    15
 #define MICROPY_CAMERA_PIN_XCLK     27
@@ -61,26 +59,7 @@
 #define MICROPY_CAMERA_PIN_HREF     26
 #define MICROPY_CAMERA_PIN_PCLK     21
 
-#elif defined(MICROPY_CAMERA_MODEL_M5STACK_V2_PSRAM)
-#define MICROPY_CAMERA_PIN_PWDN     -1
-#define MICROPY_CAMERA_PIN_RESET    15
-#define MICROPY_CAMERA_PIN_XCLK     27
-#define MICROPY_CAMERA_PIN_SIOD     22
-#define MICROPY_CAMERA_PIN_SIOC     23
-
-#define MICROPY_CAMERA_PIN_D7       19
-#define MICROPY_CAMERA_PIN_D6       36
-#define MICROPY_CAMERA_PIN_D5       18
-#define MICROPY_CAMERA_PIN_D4       39
-#define MICROPY_CAMERA_PIN_D3        5
-#define MICROPY_CAMERA_PIN_D2       34
-#define MICROPY_CAMERA_PIN_D1       35
-#define MICROPY_CAMERA_PIN_D0       32
-#define MICROPY_CAMERA_PIN_VSYNC    25
-#define MICROPY_CAMERA_PIN_HREF     26
-#define MICROPY_CAMERA_PIN_PCLK     21
-
-#elif defined(MICROPY_CAMERA_MODEL_M5STACK_WIDE)
+#elif defined(MICROPY_CAMERA_MODEL_M5STACK_V2_PSRAM) || defined(MICROPY_CAMERA_MODEL_M5STACK_WIDE)
 #define MICROPY_CAMERA_PIN_PWDN     -1
 #define MICROPY_CAMERA_PIN_RESET    15
 #define MICROPY_CAMERA_PIN_XCLK     27
@@ -118,25 +97,6 @@
 #define MICROPY_CAMERA_PIN_HREF     26
 #define MICROPY_CAMERA_PIN_PCLK     21
 
-#elif defined(MICROPY_CAMERA_MODEL_M5STACK_UNITCAM)
-#define MICROPY_CAMERA_PIN_PWDN     -1
-#define MICROPY_CAMERA_PIN_RESET    15
-#define MICROPY_CAMERA_PIN_XCLK     27
-#define MICROPY_CAMERA_PIN_SIOD     25
-#define MICROPY_CAMERA_PIN_SIOC     23
-
-#define MICROPY_CAMERA_PIN_D7       19
-#define MICROPY_CAMERA_PIN_D6       36
-#define MICROPY_CAMERA_PIN_D5       18
-#define MICROPY_CAMERA_PIN_D4       39
-#define MICROPY_CAMERA_PIN_D3        5
-#define MICROPY_CAMERA_PIN_D2       34
-#define MICROPY_CAMERA_PIN_D1       35
-#define MICROPY_CAMERA_PIN_D0       32
-#define MICROPY_CAMERA_PIN_VSYNC    22
-#define MICROPY_CAMERA_PIN_HREF     26
-#define MICROPY_CAMERA_PIN_PCLK     21
-
 #elif defined(MICROPY_CAMERA_MODEL_M5STACK_CAMS3_UNIT)
 #define MICROPY_CAMERA_PIN_PWDN  -1
 #define MICROPY_CAMERA_PIN_RESET 21
@@ -175,25 +135,6 @@
 #define MICROPY_CAMERA_PIN_HREF     23
 #define MICROPY_CAMERA_PIN_PCLK     22
 
-#elif defined(MICROPY_CAMERA_MODEL_TTGO_T_JOURNAL)
-#define MICROPY_CAMERA_PIN_PWDN      0
-#define MICROPY_CAMERA_PIN_RESET    15
-#define MICROPY_CAMERA_PIN_XCLK     27
-#define MICROPY_CAMERA_PIN_SIOD     25
-#define MICROPY_CAMERA_PIN_SIOC     23
-
-#define MICROPY_CAMERA_PIN_D7       19
-#define MICROPY_CAMERA_PIN_D6       36
-#define MICROPY_CAMERA_PIN_D5       18
-#define MICROPY_CAMERA_PIN_D4       39
-#define MICROPY_CAMERA_PIN_D3        5
-#define MICROPY_CAMERA_PIN_D2       34
-#define MICROPY_CAMERA_PIN_D1       35
-#define MICROPY_CAMERA_PIN_D0       17
-#define MICROPY_CAMERA_PIN_VSYNC    22
-#define MICROPY_CAMERA_PIN_HREF     26
-#define MICROPY_CAMERA_PIN_PCLK     21
-
 #elif defined(MICROPY_CAMERA_MODEL_XIAO_ESP32S3)
 #define MICROPY_CAMERA_PIN_PWDN     -1
 #define MICROPY_CAMERA_PIN_RESET    -1
@@ -280,7 +221,7 @@
 #define MICROPY_CAMERA_PIN_HREF     7
 #define MICROPY_CAMERA_PIN_PCLK     13
 
-#elif defined(MICROPY_CAMERA_MODEL_DFRobot_FireBeetle2_ESP32S3) || defined(MICROPY_CAMERA_MODEL_DFRobot_Romeo_ESP32S3)
+#elif defined(MICROPY_CAMERA_MODEL_DFRobot_ESP32S3)
 #define MICROPY_CAMERA_PIN_PWDN     -1
 #define MICROPY_CAMERA_PIN_RESET    -1
 #define MICROPY_CAMERA_PIN_XCLK     45
@@ -299,6 +240,25 @@
 #define MICROPY_CAMERA_PIN_HREF     42
 #define MICROPY_CAMERA_PIN_PCLK     5
 
+#elif defined(MICROPY_CAMERA_MODEL_TTGO_T_JOURNAL)
+#define MICROPY_CAMERA_PIN_PWDN      0
+#define MICROPY_CAMERA_PIN_RESET    15
+#define MICROPY_CAMERA_PIN_XCLK     27
+#define MICROPY_CAMERA_PIN_SIOD     25
+#define MICROPY_CAMERA_PIN_SIOC     23
+
+#define MICROPY_CAMERA_PIN_D7       19
+#define MICROPY_CAMERA_PIN_D6       36
+#define MICROPY_CAMERA_PIN_D5       18
+#define MICROPY_CAMERA_PIN_D4       39
+#define MICROPY_CAMERA_PIN_D3        5
+#define MICROPY_CAMERA_PIN_D2       34
+#define MICROPY_CAMERA_PIN_D1       35
+#define MICROPY_CAMERA_PIN_D0       17
+#define MICROPY_CAMERA_PIN_VSYNC    22
+#define MICROPY_CAMERA_PIN_HREF     26
+#define MICROPY_CAMERA_PIN_PCLK     21
+
 #elif defined(MICROPY_CAMERA_MODEL_TTGO_T_CAMERA_PLUS)
 #define MICROPY_CAMERA_PIN_PWDN    -1
 #define MICROPY_CAMERA_PIN_RESET   -1