Add builds for esp32s2 and esp32s3 targets

.github/workflows/esp32.yml

@@ -35,6 +35,7 @@ jobs:
             product_name: "sht4x"
             company_uuid: "tendry-lab-"
             config: ".env/sht4x_verifier_configuration"
+        target: ["esp32", "esp32s2", "esp32s3"]
     env:
       SOURCE_PATH: project
       IDF_PATH: esp-idf
@@ -98,11 +99,11 @@ jobs:
       - name: prepare firmware configuration
         uses: ./project/ci-components/.github/actions/esp32/config
         with:
-          PROJECT_NAME: ${{ matrix.project.project_name }}
+          PROJECT_NAME: ${{ matrix.project.project_name }}-${{ matrix.target }}
           PRODUCT_NAME: ${{ matrix.project.product_name }}
           COMPANY_UUID: ${{ matrix.project.company_uuid }}
           BUILD_VERSION: ${{ steps.version_formatter.outputs.build_version }}
-          BUILD_CONFIG_PATH: ${{ matrix.project.config }}
+          BUILD_CONFIG_PATH: ${{ matrix.project.config }}-${{ matrix.target }}
           PROJECT_CONFIG_PATH: ${{ env.SOURCE_PATH }}/projects/config.yml
 
       - name: build firmware
@@ -111,13 +112,13 @@ jobs:
           IDF_PATH: ${{ env.IDF_PATH }}
           PROJECT_PATH: ${{ env.SOURCE_PATH }}/projects/${{ matrix.project.project_name }}
           CONFIGURATION_PATH_CCACHE: ${{ env.CONFIGURATION_PATH_CCACHE }}
-          CONFIGURATION_PATH_PROJECT: ${{ matrix.project.config }}
+          CONFIGURATION_PATH_PROJECT: ${{ matrix.project.config }}-${{ matrix.target }}
 
       - name: upload firmware
         uses: ./project/ci-components/.github/actions/esp32/upload
         with:
           PROJECT_PATH: ${{ env.SOURCE_PATH }}/projects/${{ matrix.project.project_name }}
-          ARTIFACT_NAME: ${{ matrix.project.project_name }}-${{ steps.version_formatter.outputs.build_version }}
+          ARTIFACT_NAME: ${{ matrix.project.project_name }}-${{ matrix.target }}-${{ steps.version_formatter.outputs.build_version }}
 
   firmware_release:
     runs-on: ubuntu-latest

components/ocs_io/CMakeLists.txt

@@ -1,30 +1,33 @@
-idf_component_register(
-    SRCS
+set(COMPONENT_SRCS
     "gpio/default_gpio.cpp"
     "gpio/delay_gpio.cpp"
     "gpio/gpio_guard.cpp"
 
     "gpio/target_esp32/basic_gpio.cpp"
     "gpio/target_esp32/isr_event_service.cpp"
-
     "adc/target_esp32/oneshot_reader.cpp"
     "adc/target_esp32/oneshot_store.cpp"
     "adc/target_esp32/basic_converter.cpp"
-    "adc/target_esp32/line_fitting_converter.cpp"
-
     "spi/target_esp32/master_store.cpp"
     "spi/target_esp32/master_transceiver.cpp"
-
     "i2c/target_esp32/master_store.cpp"
     "i2c/target_esp32/master_transceiver.cpp"
+)
+
+if(IDF_TARGET STREQUAL "esp32")
+    list(APPEND COMPONENT_SRCS "adc/target_esp32/line_fitting_converter.cpp")
+endif()
+
+idf_component_register(
+    SRCS ${COMPONENT_SRCS}
 
     REQUIRES
     "driver"
     "esp_adc"
+
     "ocs_scheduler"
     "ocs_core"
     "ocs_status"
 
-    INCLUDE_DIRS
-    ".."
+    INCLUDE_DIRS ".."
 )

components/ocs_io/test/adc/target_esp32/test_oneshot_store.cpp

@@ -8,7 +8,6 @@
 #include "soc/soc_caps.h"
 #include "unity.h"
 
-#include "ocs_io/adc/target_esp32/line_fitting_converter.h"
 #include "ocs_io/adc/target_esp32/oneshot_store.h"
 
 namespace ocs {
@@ -79,7 +78,6 @@ TEST_CASE("Oneshot ADC store: read/convert operations", "[ocs_io], [adc_oneshot_
 
     for (const auto& unit : units) {
         OneshotStore store(unit, ADC_ATTEN_DB_12, ADC_BITWIDTH_10);
-        LineFittingConverter converter(unit, ADC_ATTEN_DB_12, ADC_BITWIDTH_10);
 
         const Channel channel = ADC_CHANNEL_5;
 
@@ -88,9 +86,6 @@ TEST_CASE("Oneshot ADC store: read/convert operations", "[ocs_io], [adc_oneshot_
 
         int raw = 0;
         TEST_ASSERT_EQUAL(status::StatusCode::OK, reader->read(raw));
-
-        int voltage = 0;
-        TEST_ASSERT_EQUAL(status::StatusCode::OK, converter.convert(voltage, raw));
     }
 }
 

projects/config.yml

@@ -1,11 +1,61 @@
 projects:
-  unittest:
-    desc: "Unit tests"
+  unittest-esp32:
+    desc: "Unit tests firmware for esp32"
     config:
       - CONFIG_OCS_TEST_UNIT_WIFI_STA_ENABLED=y
-  ds18b20-verifier:
-    desc: "DS18B20 Sensor Verification"
-  sht4x-verifier:
-    desc: "SHT4x Sensor Verification"
-  ds-rom-code-scanner:
-    desc: "DS Sensor Rom Code Scanner"
+  unittest-esp32s2:
+    desc: "Unit tests firmware for esp32s2"
+    config:
+      - CONFIG_OCS_TEST_UNIT_WIFI_STA_ENABLED=y
+      - CONFIG_ESP_CONSOLE_USB_CDC=y
+      - CONFIG_ESP_CONSOLE_UART_DEFAULT=n
+      - CONFIG_IDF_TARGET="esp32s2"
+  unittest-esp32s3:
+    desc: "Unit tests firmware for esp32s3"
+    config:
+      - CONFIG_OCS_TEST_UNIT_WIFI_STA_ENABLED=y
+      - CONFIG_ESP_CONSOLE_USB_CDC=y
+      - CONFIG_ESP_CONSOLE_UART_DEFAULT=n
+      - CONFIG_IDF_TARGET="esp32s3"
+  ds18b20-verifier-esp32:
+    desc: "DS18B20 sensor verification firmware for esp32"
+  ds18b20-verifier-esp32s2:
+    desc: "DS18B20 sensor verification firmware for esp32s2"
+    config:
+      - CONFIG_ESP_CONSOLE_USB_CDC=y
+      - CONFIG_ESP_CONSOLE_UART_DEFAULT=n
+      - CONFIG_IDF_TARGET="esp32s2"
+  ds18b20-verifier-esp32s3:
+    desc: "DS18B20 sensor verification firmware for esp32s3"
+    config:
+      - CONFIG_ESP_CONSOLE_USB_CDC=y
+      - CONFIG_ESP_CONSOLE_UART_DEFAULT=n
+      - CONFIG_IDF_TARGET="esp32s3"
+  sht4x-verifier-esp32:
+    desc: "SHT4x sensor verification firmware for esp32"
+  sht4x-verifier-esp32s2:
+    desc: "SHT4x sensor verification firmware for esp32s2"
+    config:
+      - CONFIG_ESP_CONSOLE_USB_CDC=y
+      - CONFIG_ESP_CONSOLE_UART_DEFAULT=n
+      - CONFIG_IDF_TARGET="esp32s2"
+  sht4x-verifier-esp32s3:
+    desc: "SHT4x sensor verification firmware for esp32s3"
+    config:
+      - CONFIG_ESP_CONSOLE_USB_CDC=y
+      - CONFIG_ESP_CONSOLE_UART_DEFAULT=n
+      - CONFIG_IDF_TARGET="esp32s3"
+  ds-rom-code-scanner-esp32:
+    desc: "DS sensor rom code scanner firmware for esp32"
+  ds-rom-code-scanner-esp32s2:
+    desc: "DS sensor rom code scanner firmware for esp32s2"
+    config:
+      - CONFIG_ESP_CONSOLE_USB_CDC=y
+      - CONFIG_ESP_CONSOLE_UART_DEFAULT=n
+      - CONFIG_IDF_TARGET="esp32s2"
+  ds-rom-code-scanner-esp32s3:
+    desc: "DS sensor rom code scanner firmware for esp32s3"
+    config:
+      - CONFIG_ESP_CONSOLE_USB_CDC=y
+      - CONFIG_ESP_CONSOLE_UART_DEFAULT=n
+      - CONFIG_IDF_TARGET="esp32s3"