Merge branch 'master' into fix/allow-tabs-in-assembly

Author: tschak909

.github/workflows/autobuild.yml

@@ -20,7 +20,15 @@ jobs:
     runs-on: "ubuntu-latest"
     strategy:
       matrix:
-        target-platform: [ATARI, ATARI-esp32-s3-wroom-1-n16r8, ADAM, APPLE, IEC-LOLIN-D32, IEC-NUGGET, COCO]
+        target-platform:
+          - ADAM
+          - APPLE
+          - ATARI
+          - ATARI-esp32-s3-wroom-1-n16r8
+          - COCO
+          - IEC-LOLIN-D32
+          - IEC-NUGGET
+          - RS232
 
     steps:
     - name: Checkout Source
@@ -72,3 +80,9 @@ jobs:
 
     - name: Build release
       run: cd "$GITHUB_WORKSPACE" && /usr/bin/bash ./build.sh -z -l "$GITHUB_WORKSPACE"/.github/workflows/platformio.release-${{ matrix.target-platform }}.ini -i "$GITHUB_WORKSPACE"/platformio-generated.ini
+
+    - name: Upload firmware zip for ${{ matrix.target-platform }}
+      uses: actions/upload-artifact@v4
+      with:
+        name: ${{ matrix.target-platform }}
+        path: firmware/**

.github/workflows/check-formatting.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, RS232]
+        target-platform: [ATARI, ATARI-8mb, ADAM, APPLE, IEC-LOLIN-D32, IEC-NUGGET, COCO, MASTERIES-REVAB, MASTERIES-REVA-SPIFIX, RS232]
 
     steps:
     - name: Checkout Source

.github/workflows/nightly.yml

@@ -17,7 +17,16 @@ jobs:
     runs-on: "ubuntu-latest"
     strategy:
       matrix:
-        target-platform: [ATARI, ATARI-8mb, ADAM, APPLE, COCO, IEC-LOLIN-D32, MASTERIES-REVAB, MASTERIES-REVA-SPIFIX]
+        target-platform:
+          - ADAM
+          - APPLE
+          - ATARI
+          - ATARI-8mb
+          - COCO
+          - IEC-LOLIN-D32
+          - MASTERIES-REVA-SPIFIX
+          - MASTERIES-REVAB
+          - RS232
     env:
       TAG_NAME: ${{ github.event.inputs.tag || github.ref_name }}
 

.github/workflows/release.yml

@@ -59,3 +59,6 @@ fujinet_releases/*
 *.orig
 *.rej
 *.lst
+
+# espressif managed components
+managed_components

.gitignore

@@ -1,7 +1,7 @@
 SHELL=/bin/bash -o pipefail
 
 define builder
-  ./build.sh $1 | sed -e 's/\033[[][0-9][0-9]*m//g'
+  ./build.sh $1 2>&1 | sed -e 's/'$$'\033''[[][0-9][0-9]*m//g'
 endef
 
 .PHONY: upload uploadfs build all
@@ -18,8 +18,23 @@ build:
 all:
 	$(call builder, -a)
 
-pc:
-	$(call builder, -p APPLE)
+zip:
+	$(call builder, -z)
+
+atari-lwm:
+	$(call builder, -p ATARI -g)
+
+coco-lwm:
+	$(call builder, -p COCO -g)
+
+rs232-lwm:
+	$(call builder, -p RS232 -g)
+
+apple-lwm:
+	$(call builder, -p APPLE -g)
+
+pico-de-coco:
+	make -C pico/coco/build
 
 clean:
 	$(call builder, -c)

Makefile

@@ -0,0 +1,40 @@
+{
+  "build": {
+    "arduino": {
+      "ldscript": "esp32s3_out.ld"
+    },
+    "core": "esp32",
+    "extra_flags": [
+      "-DBOARD_HAS_PSRAM",
+      "-DARDUINO_USB_MODE=1",
+      "-DARDUINO_USB_CDC_ON_BOOT=1"
+    ],
+    "f_cpu": "240000000L",
+    "f_flash": "80000000L",
+    "flash_mode": "qio",
+    "mcu": "esp32s3",
+    "variant": "esp32s3",
+    "partitions": "fujinet_partitions_4MB_noupdate.csv"
+},
+  "connectivity": [
+    "wifi"
+  ],
+  "debug": {
+    "openocd_target": "esp32s3.cfg"
+  },
+  "frameworks": [
+    "espidf"
+  ],
+  "name": "ESP32-S3-XDRIVE N4R2",
+  "upload": {
+    "flash_size": "4MB",
+    "maximum_ram_size": 327680,
+    "maximum_size": 4194304,    
+    "use_1200bps_touch": true,
+    "wait_for_upload_port": true,
+    "require_upload_port": true,
+    "speed": 460800
+  },
+  "url": "https://github.com/FujiNetWIFI/fujinet-firmware",
+  "vendor": "FujiNet Project"
+}

boards/esp32-s3-xdrive-n4r2.json

@@ -0,0 +1,15 @@
+[fujinet]
+build_platform = BUILD_ATARI
+build_bus      = SIO
+build_board    = fujinet-atari-esp32-s3-xdrive-n4r2
+
+[env:fujinet-atari-esp32-s3-xdrive-n4r2]
+platform = espressif32@${fujinet.esp32_platform_version}
+platform_packages = ${fujinet.esp32_platform_packages}
+board = esp32-s3-xdrive-n4r2
+build_type = debug
+build_flags =
+    ${env.build_flags}
+    -D PINMAP_ESP32S3_XDRIVE
+board_build.partitions = fujinet_partitions_4MB_noupdate.csv
+

build-platforms/platformio-fujinet-atari-esp32-s3-xdrive-n4r2.ini

@@ -7,7 +7,7 @@ build_board    = fujinet-coco-devkitc
 upload_port = /dev/ttyUSB0
 upload_speed = 460800
 monitor_port = /dev/ttyUSB0
-monitor_speed = 115200
+monitor_speed = 460800
 
 [env:fujinet-coco-devkitc]
 platform = espressif32@${fujinet.esp32_platform_version}

build-platforms/platformio-fujinet-coco-devkitc.ini

@@ -252,6 +252,25 @@ def makezip(source, target, env):
                     "offset": "0xA70000"
                 }
             ]
+        elif config[environment]['board'] == "esp32-s3-xdrive-n4r2":
+            json_contents['files'] += [
+                {
+                    "filename": "bootloader.bin",
+                    "offset": "0x0000"
+                },
+                {
+                    "filename": "partitions.bin",
+                    "offset": "0x8000"
+                },
+                {
+                    "filename": "firmware.bin",
+                    "offset": "0x10000"
+                },
+                {
+                    "filename": "littlefs.bin",
+                    "offset": "0x250000"
+                }
+            ]            
         # Save Release JSON
         with open('firmware/release.json', 'w') as f:
             f.write(json.dumps(json_contents, indent=4))