Нова сумісність: ESP32-S3, ESP32-C3

.github/workflows/compile.yml

@@ -17,6 +17,7 @@
             uses: ./.github/workflows/firmware-compile
             with:
               project-folder: firmware
+              project-env: firmware
           - name: Copy bin file
             run: |
               cp -f ${{ github.workspace }}/firmware/.pio/build/firmware/firmware.bin ${{ github.workspace }}/firmware.bin
@@ -25,6 +26,23 @@
             with:
               name: firmware.bin
               path: ${{ github.workspace }}/firmware.bin
+    compile_firmware_esp32s3:
+      runs-on: ubuntu-latest
+      steps:
+        - uses: actions/checkout@v4
+        - name: Compile firmware
+          uses: ./.github/workflows/firmware-compile
+          with:
+            project-folder: firmware
+            project-env: firmware_esp32s3
+        - name: Copy bin file
+          run: |
+            cp -f ${{ github.workspace }}/firmware/.pio/build/firmware_esp32s3/firmware.bin ${{ github.workspace }}/firmware-esp32s3.bin
+        - name: Upload firmware esp32s3
+          uses: actions/upload-artifact@v4
+          with:
+            name: firmware-esp32s3.bin
+            path: ${{ github.workspace }}/firmware-esp32s3.bin
     compile_firmware_lite:
         runs-on: ubuntu-latest
         steps:
@@ -36,6 +54,7 @@
             uses: ./.github/workflows/firmware-compile
             with:
               project-folder: firmware
+              project-env: firmware
           - name: Copy bin file
             run: |
               cp -f ${{ github.workspace }}/firmware/.pio/build/firmware/firmware.bin ${{ github.workspace }}/firmware-lite.bin
@@ -56,6 +75,7 @@
             uses: ./.github/workflows/firmware-compile
             with:
               project-folder: firmware
+              project-env: firmware
           - name: Copy bin file
             run: |
               cp -f ${{ github.workspace }}/firmware/.pio/build/firmware/firmware.bin ${{ github.workspace }}/firmware-jaam2-test.bin
@@ -80,6 +100,7 @@
           uses: ./.github/workflows/firmware-compile
           with:
             project-folder: updater
+            project-env: updater
         - name: Copy bin file
           run: |
             cp -f ${{ github.workspace }}/updater/.pio/build/updater/firmware.bin ${{ github.workspace }}/updater.bin

.github/workflows/firmware-compile/action.yml

@@ -24,4 +24,4 @@ runs:
       run: pip install --upgrade platformio
     - name: Build ${{ inputs.project-folder }}
       shell: bash
-      run: pio run -d ${{ inputs.project-folder }}
+      run: pio run -d ${{ inputs.project-folder }} -e ${{ inputs.project-env }}

firmware/platformio.ini

@@ -8,14 +8,14 @@
 ; Please visit documentation for the other options and examples
 ; https://docs.platformio.org/page/projectconf.html
 
-[env:firmware]
+[platformio]
+default_envs = firmware
+
+[common]
 platform = espressif32@6.9.0
-board = esp32dev
 framework = arduino
 monitor_speed = 115200
 board_build.partitions = min_spiffs.csv
-# uncomment the following line to enable crash backtrace
-; monitor_filters = esp32_exception_decoder
 lib_deps = 
 	https://github.com/MatheusAlvesA/ArduinoAsync.git
 	adafruit/Adafruit SSD1306@2.5.13
@@ -30,6 +30,16 @@ lib_deps =
 	sensirion/arduino-sht@1.2.6
 	soylentorange/forcedBMX280@1.1.1
 	dawidchyrzynski/home-assistant-integration@2.1.0
-    https://github.com/J-A-A-M/melody-player.git@2.4.0
+	https://github.com/J-A-A-M/melody-player.git@2.4.0
 	yasheena/TelnetSpy@1.4
 	mathertel/OneButton@2.6.1
+
+[env:firmware]
+extends = common
+board = esp32dev
+build_flags = -D BOARD_ESP32=1
+
+[env:firmware_esp32s3]
+extends = common
+board = esp32-s3-devkitc-1
+build_flags = -D BOARD_ESP32S3=1

firmware/src/Constants.h

@@ -339,3 +339,16 @@ static SettingListItem LEGACY_OPTIONS[LEGACY_OPTIONS_COUNT] = {
 };
 
 static const size_t MAX_JSON_SIZE = 6000; // 6KB
+
+// Визначення пінів для різних плат
+#if defined(BOARD_ESP32S3)
+    #define SUPPORTED_LEDS_PINS {2, 4, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21}
+#elif defined(BOARD_ESP32)
+    #define SUPPORTED_LEDS_PINS {2, 4, 12, 13, 14, 15, 16, 17, 18, 25, 26, 27, 32, 33}
+#else
+    #error "Платформа не підтримується!"
+#endif
+
+// Макрос для генерації switch-case для кожного піна
+#define GENERATE_PIN_CASE(pin) \
+    case pin: FastLED.addLeds<NEOPIXEL, pin>(const_cast<CRGB*>(leds), pixelcount); break;

firmware/src/Definitions.h

@@ -1,6 +1,8 @@
 #define LITE 0
 #define TEST_MODE 0
 #define TELNET_ENABLED 0
+//#define BOARD_ESP32 1
+//#define BOARD_ESP32S3 0
 #if LITE
 #define ARDUINO_OTA_ENABLED 0
 #define FW_UPDATE_ENABLED 0

firmware/src/JaamFirmware.cpp

@@ -3426,15 +3426,13 @@ void initLegacy() {
 #endif
   switch (settings.getInt(LEGACY)) {
   case 0:
-    LOG.println("Mode: jaam 1");
+    LOG.println("Mode: jaam 1");    
 
-    pinMode(settings.getInt(POWER_PIN), OUTPUT);
-    pinMode(settings.getInt(WIFI_PIN), OUTPUT);
-    pinMode(settings.getInt(DATA_PIN), OUTPUT);
-    pinMode(settings.getInt(HA_PIN), OUTPUT);
-    //pinMode(settings.reservedpin, OUTPUT);
-
-    servicePin(POWER, HIGH, false);
+    settings.saveInt(POWER_PIN, 12, false);
+    settings.saveInt(WIFI_PIN, 14, false);
+    settings.saveInt(DATA_PIN, 25, false);
+    settings.saveInt(HA_PIN, 26, false);
+    settings.saveInt(RESERVED_PIN, 27, false);
 
     settings.saveInt(KYIV_DISTRICT_MODE, 3, false);
     settings.saveInt(MAIN_LED_PIN, 13, false);
@@ -3446,6 +3444,14 @@ void initLegacy() {
     settings.saveInt(DISPLAY_MODEL, 1, false);
     settings.saveInt(DISPLAY_HEIGHT, 64, false);
     settings.saveBool(USE_TOUCH_BUTTON_1, 0, false);
+
+    pinMode(settings.getInt(POWER_PIN), OUTPUT);
+    pinMode(settings.getInt(WIFI_PIN), OUTPUT);
+    pinMode(settings.getInt(DATA_PIN), OUTPUT);
+    pinMode(settings.getInt(HA_PIN), OUTPUT);
+
+    servicePin(POWER, HIGH, false);
+
     break;
   case 1:
     LOG.println("Mode: transcarpathia");
@@ -3521,57 +3527,64 @@ void initClearPin() {
 }
 
 void initFastledStrip(uint8_t pin, const CRGB *leds, int pixelcount) {
-  switch (pin)
-  {
-  case 2:
-    FastLED.addLeds<NEOPIXEL, 2>(const_cast<CRGB*>(leds), pixelcount);
-    break;
-  case 4:
-    FastLED.addLeds<NEOPIXEL, 4>(const_cast<CRGB*>(leds), pixelcount);
-    break;
-  case 12:
-    FastLED.addLeds<NEOPIXEL, 12>(const_cast<CRGB*>(leds), pixelcount);
-    break;
-  case 13:
-    FastLED.addLeds<NEOPIXEL, 13>(const_cast<CRGB*>(leds), pixelcount);
-    break;
-  case 14:
-    FastLED.addLeds<NEOPIXEL, 14>(const_cast<CRGB*>(leds), pixelcount);
-    break;
-  case 15:
-    FastLED.addLeds<NEOPIXEL, 15>(const_cast<CRGB*>(leds), pixelcount);
-    break;
-  case 16:
-    FastLED.addLeds<NEOPIXEL, 16>(const_cast<CRGB*>(leds), pixelcount);
-    break;
-  case 17:
-    FastLED.addLeds<NEOPIXEL, 17>(const_cast<CRGB*>(leds), pixelcount);
-    break;
-  case 18:
-    FastLED.addLeds<NEOPIXEL, 18>(const_cast<CRGB*>(leds), pixelcount);
-    break;
-  case 25:
-    FastLED.addLeds<NEOPIXEL, 25>(const_cast<CRGB*>(leds), pixelcount);
-    break;
-  case 26:
-    FastLED.addLeds<NEOPIXEL, 26>(const_cast<CRGB*>(leds), pixelcount);
-    break;
-  case 27:
-    FastLED.addLeds<NEOPIXEL, 27>(const_cast<CRGB*>(leds), pixelcount);
-    break;
-  case 32:
-    FastLED.addLeds<NEOPIXEL, 32>(const_cast<CRGB*>(leds), pixelcount);
-    break;
-  case 33:
-    FastLED.addLeds<NEOPIXEL, 33>(const_cast<CRGB*>(leds), pixelcount);
-    break;
-  default:
-    LOG.print("This PIN is not supported for LEDs: ");
-    LOG.println(pin);
-    break;
-  }
+    bool isSupported = false;
+
+    // Перевірка, чи пін входить до підтримуваних
+    for (auto supportedPin : SUPPORTED_LEDS_PINS) {
+        if (pin == supportedPin) {
+            isSupported = true;
+            break;
+        }
+    }
+
+    if (!isSupported) {
+        LOG.print("This PIN is not supported for LEDs: ");
+        LOG.println(pin);
+        return;
+    }
+
+    switch (pin) {
+      #if defined(BOARD_ESP32S3)
+        GENERATE_PIN_CASE(2)
+        GENERATE_PIN_CASE(4)
+        GENERATE_PIN_CASE(8)
+        GENERATE_PIN_CASE(9)
+        GENERATE_PIN_CASE(10)
+        GENERATE_PIN_CASE(11)
+        GENERATE_PIN_CASE(12)
+        GENERATE_PIN_CASE(13)
+        GENERATE_PIN_CASE(14)
+        GENERATE_PIN_CASE(15)
+        GENERATE_PIN_CASE(16)
+        GENERATE_PIN_CASE(17)
+        GENERATE_PIN_CASE(18)
+        GENERATE_PIN_CASE(19)
+        GENERATE_PIN_CASE(20)
+        GENERATE_PIN_CASE(21)
+      #elif defined(BOARD_ESP32)
+        GENERATE_PIN_CASE(2)
+        GENERATE_PIN_CASE(4)
+        GENERATE_PIN_CASE(12)
+        GENERATE_PIN_CASE(13)
+        GENERATE_PIN_CASE(14)
+        GENERATE_PIN_CASE(15)
+        GENERATE_PIN_CASE(16)
+        GENERATE_PIN_CASE(17)
+        GENERATE_PIN_CASE(18)
+        GENERATE_PIN_CASE(25)
+        GENERATE_PIN_CASE(26)
+        GENERATE_PIN_CASE(27)
+        GENERATE_PIN_CASE(32)
+        GENERATE_PIN_CASE(33)
+      #endif
+      default:
+        LOG.print("Error: Unexpected pin configuration for this board: ");
+        LOG.println(pin);
+        break;
+    }
 }
 
+
 void initStrip() {
   LOG.println("Init leds");
   LOG.print("pixelpin: ");

firmware/src/JaamSettings.cpp

@@ -41,11 +41,11 @@ std::map<Type, SettingItemInt> intSettings = {
     {CLEAR_PIN, {"cp", -1}},
     {BUZZER_PIN, {"bzp", -1}},
     {LIGHT_SENSOR_PIN, {"lp", -1}},
-    {POWER_PIN, {"powp", 12}},
-    {WIFI_PIN, {"wifip", 14}},
-    {DATA_PIN, {"datap", 25}},
-    {HA_PIN, {"hap", 26}},
-    {RESERVED_PIN, {"resp", 27}},
+    {POWER_PIN, {"powp", -1}},
+    {WIFI_PIN, {"wifip", -1}},
+    {DATA_PIN, {"datap", -1}},
+    {HA_PIN, {"hap", -1}},
+    {RESERVED_PIN, {"resp", -1}},
     {ALERT_CLEAR_PIN_MODE, {"acpm", 0}},
     {HA_MQTT_PORT, {"ha_mqttport", 1883}},
     {CURRENT_BRIGHTNESS, {"cbr", 50}},