Add RS232 S3 partitions to build firmware zip and add RS232 S3 to nightly build (FujiNetWIFI#965)

* Add partition JSON to build firmware zip for ESP32S3

* Add RS232 (S3) to nightly build

* Bump ESP32S3 platform version to 6.10.0 and add to ini files

---------

Co-authored-by: Thomas Cherryhomes <[email protected]>

Author: mozzwald

.github/workflows/nightly.yml

@@ -12,7 +12,7 @@ jobs:
     runs-on: "ubuntu-latest"
     strategy:
       matrix:
-        target-platform: [ATARI, ADAM, APPLE, IEC-LOLIN-D32, IEC-NUGGET, COCO, MASTERIES-REVAB, MASTERIES-REVA-SPIFIX]
+        target-platform: [ATARI, ADAM, APPLE, IEC-LOLIN-D32, IEC-NUGGET, COCO, MASTERIES-REVAB, MASTERIES-REVA-SPIFIX, RS232]
 
     steps:
     - name: Checkout Source

.github/workflows/platformio.release-RS232.ini

@@ -0,0 +1,18 @@
+[fujinet]
+build_platform = BUILD_RS232
+build_bus      = rs232
+build_board    = fujinet-rs232-s3
+
+[env]
+upload_port = /dev/ttyACM0 ; Linux esp32s3
+monitor_port = /dev/ttyACM0 ; Linux esp32s3
+
+[env:fujinet-rs232-s3]
+platform = espressif32@${fujinet.esp32s3_platform_version}
+platform_packages = ${fujinet.esp32s3_platform_packages}
+board = esp32-s3-wroom-1-n16r8
+build_type = debug
+build_flags =
+    ${env.build_flags}
+    -D PINMAP_RS232_S3
+board_build.cmake_extra_args = -D CONFIG_IDF_TARGET_ESP32S3=1 ; extra arguments for CMake

build-platforms/platformio-fujinet-rs232-s3.ini

@@ -8,8 +8,8 @@ upload_port = /dev/ttyACM0 ; Linux esp32s3
 monitor_port = /dev/ttyACM0 ; Linux esp32s3
 
 [env:fujinet-rs232-s3]
-platform = espressif32@${fujinet.esp32_platform_version}
-platform_packages = ${fujinet.esp32_platform_packages}
+platform = espressif32@${fujinet.esp32s3_platform_version}
+platform_packages = ${fujinet.esp32s3_platform_packages}
 board = esp32-s3-wroom-1-n16r8
 build_type = debug
 build_flags =

build_firmwarezip.py

@@ -137,6 +137,29 @@ def makezip(source, target, env):
                     "offset": "0xA70000"
                 }
             ]
+        elif config[environment]['board'] == "esp32-s3-wroom-1-n16r8":
+            json_contents['files'] += [
+                {
+                    "filename": "bootloader.bin",
+                    "offset": "0x0000"
+                },
+                {
+                    "filename": "partitions.bin",
+                    "offset": "0x8000"
+                },
+                {
+                    "filename": "firmware.bin",
+                    "offset": "0x10000"
+                },
+                {
+                    "filename": "update.bin",
+                    "offset": "0xA10000"
+                },
+                {
+                    "filename": "littlefs.bin",
+                    "offset": "0xA70000"
+                }
+            ]
         elif config[environment]['board'] == "fujinet-v1-8mb":
             json_contents['files'] += [
                 {
@@ -160,6 +183,29 @@ def makezip(source, target, env):
                     "offset": "0x570000"
                 }
             ]
+        elif config[environment]['board'] == "esp32-s3-wroom-1-n16r8":
+            json_contents['files'] += [
+                {
+                    "filename": "bootloader.bin",
+                    "offset": "0x0000"
+                },
+                {
+                    "filename": "partitions.bin",
+                    "offset": "0x8000"
+                },
+                {
+                    "filename": "firmware.bin",
+                    "offset": "0x10000"
+                },
+                {
+                    "filename": "update.bin",
+                    "offset": "0x510000"
+                },
+                {
+                    "filename": "littlefs.bin",
+                    "offset": "0x570000"
+                }
+            ]
         elif config[environment]['board'] == "fujinet-v1-4mb":
             json_contents['files'] += [
                 {

platformio-ini-files/platformio.common.ini

@@ -16,6 +16,8 @@
 ;esp32_platform_version = 6.3.2
 esp32_platform_version = 6.10.0
 esp32_platform_packages = 
+esp32s3_platform_version = 6.10.0
+esp32s3_platform_packages =
 
 ; SPIFFS/LITTLEFS
 flash_filesystem = FLASH_LITTLEFS

platformio-sample.ini

@@ -23,7 +23,7 @@
 esp32_platform_version = 6.10.0 ; latest
 esp32_platform_packages = 
 ;    toolchain-riscv32-esp @ 8.4.0+2021r2-patch5 ; required for platform version < 5.3.0, remove this line when upgrading to the >=5.3.0
-esp32s3_platform_version = 6.3.2
+esp32s3_platform_version = 6.10.0
 esp32s3_platform_packages =
 
 ; Choose SPIFFS or LITTLEFS for the filesystem used on internal flash