feat(hardware): Add support for boards based on Freenove ESP32S3-WROOM design (N16R8)

.github/workflows/build-release.yaml

@@ -41,7 +41,7 @@ jobs:
         plat:
          - esp32cam
          - xiao-esp32s3-sense
-
+         - freenove-esp32s3-n16r8
     steps:
     - name: Checkout branch
       if: ${{ ! needs.prepare-release.outputs.release_created }}
@@ -182,6 +182,7 @@ jobs:
         plat:
          - esp32cam
          - xiao-esp32s3-sense
+         - freenove-esp32s3-n16r8
 
     # Sets permissions of the GITHUB_TOKEN to allow downloading artifacts
     permissions:

README.md

@@ -48,6 +48,7 @@ As a result, you get the digitized value of your meter. There are several option
 |:---                                                                            |:---      |:---           |:--- 
 | [ESP32-CAM](http://www.ai-thinker.com/pro_view-24.html)                        | ESP32    | All           |⚠️ Only boards with >4MB RAM are supported<br>⚠️ Beware of inferior quality Chinese clones
 | [XIAO ESP32 Sense](https://www.seeedstudio.com/XIAO-ESP32S3-Sense-p-5639.html) | ESP32S3  | $\ge$ v17.0.0 |⚠️ Running quite hot, a small heat sink is recommended<br>ℹ️ No onboard illumination: Separate illumination (PWM controlable LED / Intelligent LED) required
+| [ESP32S3-WROOM](https://github.com/Freenove/Freenove_ESP32_S3_WROOM_Board) | ESP32S3-WROOM-1-N16R8 | $\ge$ v17.0.0 |ℹ️ SOC and pin compatible borads of Freenove ESP32S3-WROOM with 16MB flash and 8MB RAM supported
 
 ### Camera
 | Camera Type                                                                             | Sensor Resolution  | Digital Zoom | Firmware Release | Remarks                       

code/.gitignore

@@ -9,4 +9,6 @@ dependencies.lock
 sdkconfig.esp32cam
 sdkconfig.esp32cam-localbuild
 sdkconfig.xiao-esp32s3-sense
-sdkconfig.xiao-esp32s3-sense-localbuild
+sdkconfig.xiao-esp32s3-sense-localbuild
+sdkconfig.freenove-esp32s3-n16r8
+sdkconfig.freenove-esp32s3-n16r8-localbuild

code/components/camera_ctrl/ClassControlCamera.cpp

@@ -1054,12 +1054,21 @@ void ClassControlCamera::setStatusLed(bool _status)
         /* Set the GPIO as a push/pull output */
         gpio_set_direction(GPIO_STATUS_LED_ONBOARD, GPIO_MODE_OUTPUT);
 
+#ifdef GPIO_STATUS_LED_ONBOARD_LOWACTIVE
         if (!_status) {
             gpio_set_level(GPIO_STATUS_LED_ONBOARD, 1);
         }
         else {
             gpio_set_level(GPIO_STATUS_LED_ONBOARD, 0);
         }
+#else
+        if (_status) {
+            gpio_set_level(GPIO_STATUS_LED_ONBOARD, 1);
+        }
+        else {
+            gpio_set_level(GPIO_STATUS_LED_ONBOARD, 0);
+        }
+#endif // GPIO_STATUS_LED_ONBOARD_LOWACTIVE
     }
 }
 

code/components/gpio_ctrl/gpioControl.cpp

@@ -249,7 +249,7 @@ esp_err_t GpioHandler::loadParameter()
         for (int i = 0; i < GPIO_SPARE_PIN_COUNT; ++i) {
             if (strcmp(gpio_spare_usage[i], FLASHLIGHT_SMARTLED) == 0) {
                 GpioPin *gpioPin = new GpioPin((gpio_num_t)gpio_spare[i], ("gpio" + std::to_string((int)gpio_spare[i])).c_str(),
-                                               GPIO_PIN_MODE_FLASHLIGHT_SMARTLED, GPIO_INTR_DISABLE, 200, 5000, false, false, "",
+                                               GPIO_PIN_MODE_FLASHLIGHT_SMARTLED, GPIO_INTR_DISABLE, 200, 5000, false, false, false, "",
                                                GPIO_FLASHLIGHT_DEFAULT_SMARTLED_TYPE, GPIO_FLASHLIGHT_DEFAULT_SMARTLED_QUANTITY,
                                                Rgb{255, 255, 255}, 100);
                 (*gpioMap)[(gpio_num_t)gpio_spare[i]] = gpioPin;

code/components/mainprocess_ctrl/MainFlowControl.cpp

@@ -72,21 +72,20 @@ bool doInit(void)
         cameraCtrl.printCamInfo();
     }
 
-    // Init main flow components
-    // ********************************************
-    if (!flowctrl.initFlow()) {
-        flowctrl.deinitFlow();
-        return false;
-    }
-
     // Init GPIO handler
     // Note: It has to be initialized before MQTT (topic subscription)
-    // and after flow init (MQTT main topic parameter)
     // ********************************************
     if (!gpio_handler_init()) {
         bRetVal = false;
     }
 
+    // Init main flow components
+    // ********************************************
+    if (!flowctrl.initFlow()) {
+        flowctrl.deinitFlow();
+        return false;
+    }
+
     // Init MQTT service
     // ********************************************
 #ifdef ENABLE_MQTT
@@ -937,6 +936,8 @@ void task_autodoFlow(void *pvParameter)
                 publishMqttData(mqttServer_getMainTopic() + "/process/status/process_state", flowctrl.getActualProcessState(), 1, false);
 #endif // ENABLE_MQTT
 
+                gpio_handler_init(); // Init GPIO handler to handle flashlight requests during setup
+
                 while (true) { // Waiting for a REQUEST
                     vTaskDelay(1000 / portTICK_PERIOD_MS);
                     if (reloadConfig) {

code/components/misc_helper/statusled.cpp

@@ -24,27 +24,53 @@ void task_StatusLED(void *pvParameter)
 
         esp_rom_gpio_pad_select_gpio(GPIO_STATUS_LED_ONBOARD);         // Init the GPIO
         gpio_set_direction(GPIO_STATUS_LED_ONBOARD, GPIO_MODE_OUTPUT); // Set the GPIO as a push/pull output
-        gpio_set_level(GPIO_STATUS_LED_ONBOARD, 1);                    // LED off
 
-        for (int i = 0; i < 2;) // Default: repeat 2 times
-        {
+#ifdef GPIO_STATUS_LED_ONBOARD_LOWACTIVE
+        gpio_set_level(GPIO_STATUS_LED_ONBOARD, 1); // LED off
+#else
+        gpio_set_level(GPIO_STATUS_LED_ONBOARD, 0); // LED off
+#endif // GPIO_STATUS_LED_ONBOARD_LOWACTIVE
+
+        for (int i = 0; i < 2;) { // Default: repeat 2 times
             if (!StatusLEDDataInt.bInfinite) {
                 ++i;
             }
 
             for (int j = 0; j < StatusLEDDataInt.iSourceBlinkCnt; ++j) {
+#ifdef GPIO_STATUS_LED_ONBOARD_LOWACTIVE
                 gpio_set_level(GPIO_STATUS_LED_ONBOARD, 0);
+#else
+                gpio_set_level(GPIO_STATUS_LED_ONBOARD, 1);
+#endif // GPIO_STATUS_LED_ONBOARD_LOWACTIVE
+
                 vTaskDelay(StatusLEDDataInt.iBlinkTime / portTICK_PERIOD_MS);
+
+#ifdef GPIO_STATUS_LED_ONBOARD_LOWACTIVE
                 gpio_set_level(GPIO_STATUS_LED_ONBOARD, 1);
+#else
+                gpio_set_level(GPIO_STATUS_LED_ONBOARD, 0);
+#endif // GPIO_STATUS_LED_ONBOARD_LOWACTIVE
+
                 vTaskDelay(StatusLEDDataInt.iBlinkTime / portTICK_PERIOD_MS);
             }
 
             vTaskDelay(500 / portTICK_PERIOD_MS); // Delay between module code and error code
 
             for (int j = 0; j < StatusLEDDataInt.iCodeBlinkCnt; ++j) {
+#ifdef GPIO_STATUS_LED_ONBOARD_LOWACTIVE
                 gpio_set_level(GPIO_STATUS_LED_ONBOARD, 0);
+#else
+                gpio_set_level(GPIO_STATUS_LED_ONBOARD, 1);
+#endif // GPIO_STATUS_LED_ONBOARD_LOWACTIVE
+
                 vTaskDelay(StatusLEDDataInt.iBlinkTime / portTICK_PERIOD_MS);
+
+#ifdef GPIO_STATUS_LED_ONBOARD_LOWACTIVE
                 gpio_set_level(GPIO_STATUS_LED_ONBOARD, 1);
+#else
+                gpio_set_level(GPIO_STATUS_LED_ONBOARD, 0);
+#endif // GPIO_STATUS_LED_ONBOARD_LOWACTIVE
+
                 vTaskDelay(StatusLEDDataInt.iBlinkTime / portTICK_PERIOD_MS);
             }
             vTaskDelay(1500 / portTICK_PERIOD_MS); // Delay to signal new round
@@ -146,5 +172,9 @@ void setStatusLedOff(void)
 
     esp_rom_gpio_pad_select_gpio(GPIO_STATUS_LED_ONBOARD);         // Init the GPIO
     gpio_set_direction(GPIO_STATUS_LED_ONBOARD, GPIO_MODE_OUTPUT); // Set the GPIO as a push/pull output
-    gpio_set_level(GPIO_STATUS_LED_ONBOARD, 1);                    // LED off
+#ifdef GPIO_STATUS_LED_ONBOARD_LOWACTIVE
+    gpio_set_level(GPIO_STATUS_LED_ONBOARD, 1); // LED off
+#else
+    gpio_set_level(GPIO_STATUS_LED_ONBOARD, 0); // LED off
+#endif // GPIO_STATUS_LED_ONBOARD_LOWACTIVE
 }