Merge branch 'master' into lynx-compile

Author: FozzTexx

.github/workflows/build-fujinet-pc.yml

@@ -47,12 +47,16 @@ jobs:
             runner: ubuntu-24.04
             target: ubuntu-24.04-amd64
             default-shell: bash
-          - name: macOS 13
-            target: macos-13
-            runner: macos-13
+          - name: macOS 15 ARM
+            target: macos-15-arm64
+            runner: macos-15
             default-shell: bash
-          - name: macOS 14
-            target: macos-14
+          - name: macOS 15 Intel
+            target: macos-15-x64
+            runner: macos-15-intel
+            default-shell: bash
+          - name: macOS 14 ARM
+            target: macos-14-arm64
             runner: macos-14
             default-shell: bash
           - name: Windows

.gitignore

@@ -58,6 +58,7 @@ fujinet_releases/*
 *~
 *.orig
 *.rej
+*.lst
 
 # espressif managed components
 managed_components

coding-standard.py

@@ -46,6 +46,11 @@ class FormatError(Enum):
   IllegalTabs = auto()
   CodingStandardViolation = auto()
 
+class TabsOk(Enum):
+  Nope = auto()      # Calling it "None" seems confusing
+  Leading = auto()
+  AllTabs = auto()
+
 ErrorStrings = {
   FormatError.TrailingWhitespace: "Trailing whitespace",
   FormatError.IllegalTabs: "Tab characters",
@@ -65,6 +70,8 @@ def build_argparser():
   group = parser.add_mutually_exclusive_group()
   group.add_argument("--fix", action="store_true", help="rewrite improperly formatted files")
   group.add_argument("--show", action="store_true", help="print reformatted file on stdout")
+  group.add_argument("-l", "--list", action="store_true",
+                     help="only print filenames of improperly formatted files")
   return parser
 
 class ClangFormatter:
@@ -140,9 +147,11 @@ def __init__(self, path, contents=None):
     if contents is None:
       raise ValueError("Contents not provided")
 
-    self.allowLeadingTab = False
+    self.allowTabs = TabsOk.Nope
     if self.isMakefile:
-      self.allowLeadingTab = True
+      self.allowTabs = TabsOk.Leading
+    elif self.isAssembly:
+      self.allowTabs = TabsOk.AllTabs
 
     return
 
@@ -153,7 +162,7 @@ def splitLeadingTab(self, line):
     """
     prefix = ""
     suffix = line
-    if self.allowLeadingTab:
+    if self.allowTabs == TabsOk.Leading:
       if line and line[0] == '\t':
         prefix = line[:1]
         suffix = line[1:]
@@ -177,7 +186,7 @@ def fixupWhitespace(self):
     lines = []
     for line in self.contents:
       line = line.rstrip()
-      if "\t" in line:
+      if self.allowTabs != TabsOk.AllTabs and "\t" in line:
         prefix, suffix = self.splitLeadingTab(line)
         while "\t" in suffix:
           column = suffix.index("\t")
@@ -243,9 +252,6 @@ def checkFormatting(self, repo):
       else:
         formatted = self.fixupWhitespace()
 
-    elif self.isMakefile:
-      formatted = self.fixupWhitespace()
-
     else:
       formatted = self.fixupWhitespace()
 
@@ -268,7 +274,7 @@ def classifyErrors(self):
       trailingStart = len(line.rstrip())
       line = line[:trailingStart]
       prefix, suffix = self.splitLeadingTab(line)
-      if "\t" in suffix:
+      if self.allowTabs != TabsOk.AllTabs and "\t" in suffix:
         errors.add(FormatError.IllegalTabs)
         break
 
@@ -308,7 +314,8 @@ def displayErrors(self, errs, formatted):
 
   @property
   def isClang(self):
-    return self.path.suffix in ClangFormatter.TYPES
+    #return self.path.suffix in ClangFormatter.TYPES
+    return False
 
   @property
   def isMakefile(self):
@@ -317,6 +324,12 @@ def isMakefile(self):
         return True
     return False
 
+  @property
+  def isAssembly(self):
+    if self.path.suffix in [".asm", ".s"]:
+      return True
+    return False
+
   @property
   def isPython(self):
     if self.path.suffix == ".py" or self.contents[0].startswith("#!/usr/bin/env python"):
@@ -444,6 +457,7 @@ def main():
 
   doFix = False
   doShow = False
+  doList = False
 
   script_mode = os.path.basename(sys.argv[0])
   if script_mode == "pre-commit":
@@ -455,6 +469,7 @@ def main():
   else:
     doFix = args.fix
     doShow = args.show
+    doList = args.list
     to_check = args.file
 
   if doShow and len(to_check) > 1:
@@ -470,7 +485,9 @@ def main():
 
     if TextFile.pathIsText(path):
       tfile = TextFile(path, repo.getContents(path))
-      if doShow:
+      if doList:
+        print(tfile.path)
+      elif doShow:
         tfile.show()
       elif doFix:
         tfile.update()

fujinet_pc.cmake

@@ -238,7 +238,6 @@ set(SOURCES src/main.cpp
     lib/network-protocol/SMB.h lib/network-protocol/SMB.cpp
     lib/network-protocol/SSH.h lib/network-protocol/SSH.cpp
     lib/network-protocol/SD.h lib/network-protocol/SD.cpp
-    lib/fuji/fujiCmd.h
     lib/fuji/fujiHost.h lib/fuji/fujiHost.cpp
     lib/fuji/fujiDisk.h lib/fuji/fujiDisk.cpp
     lib/bus/bus.h
@@ -247,7 +246,7 @@ set(SOURCES src/main.cpp
     lib/device/printer.h
     lib/device/modem.h
     lib/device/cassette.h
-    lib/device/fuji.h
+    lib/device/fujiDevice.h
     lib/device/network.h
     lib/device/udpstream.h
     lib/device/siocpm.h
@@ -276,7 +275,7 @@ if(FUJINET_TARGET STREQUAL "ATARI")
     lib/device/sio/printer.h lib/device/sio/printer.cpp
     lib/device/sio/printerlist.h lib/device/sio/printerlist.cpp
     lib/device/sio/cassette.h lib/device/sio/cassette.cpp
-    lib/device/sio/fuji.h lib/device/sio/fuji.cpp
+    lib/device/sio/sioFuji.h lib/device/sio/sioFuji.cpp
     lib/device/sio/network.h lib/device/sio/network.cpp
     lib/device/sio/udpstream.h lib/device/sio/udpstream.cpp
     lib/device/sio/voice.h lib/device/sio/voice.cpp
@@ -336,7 +335,7 @@ if(FUJINET_TARGET STREQUAL "APPLE")
     lib/device/iwm/printer.h lib/device/iwm/printer.cpp
     lib/device/iwm/printerlist.h lib/device/iwm/printerlist.cpp
     lib/device/iwm/modem.h lib/device/iwm/modem.cpp
-    lib/device/iwm/fuji.h lib/device/iwm/fuji.cpp
+    lib/device/iwm/iwmFuji.h lib/device/iwm/iwmFuji.cpp
     lib/device/iwm/network.h lib/device/iwm/network.cpp
     lib/device/iwm/clock.h lib/device/iwm/clock.cpp
     lib/device/iwm/cpm.h lib/device/iwm/cpm.cpp
@@ -368,7 +367,7 @@ if(FUJINET_TARGET STREQUAL "COCO")
     lib/media/drivewire/mediaTypeMRM.h lib/media/drivewire/mediaTypeMRM.cpp
     lib/media/drivewire/mediaTypeVDK.h lib/media/drivewire/mediaTypeVDK.cpp
 
-    lib/device/drivewire/fuji.h lib/device/drivewire/fuji.cpp
+    lib/device/drivewire/drivewireFuji.h lib/device/drivewire/drivewireFuji.cpp
     lib/device/drivewire/network.h lib/device/drivewire/network.cpp
     lib/device/drivewire/dload.h lib/device/drivewire/dload.cpp
     lib/device/drivewire/disk.h lib/device/drivewire/disk.cpp

include/fujiCommandID.h

@@ -0,0 +1,143 @@
+#ifndef FUJI_COMMANDS_H
+#define FUJI_COMMANDS_H
+
+/*
+ * Fuji Device Command Definitions
+ */
+
+enum fujiCommandID_t {
+  FUJICMD_RESET                      = 0xFF,
+  FUJICMD_SPECIAL_QUERY              = 0xFF,
+  FUJICMD_GET_SSID                   = 0xFE,
+  FUJICMD_PASSWORD                   = 0xFE,
+  FUJICMD_SCAN_NETWORKS              = 0xFD,
+  FUJICMD_USERNAME                   = 0xFD,
+  FUJICMD_GET_SCAN_RESULT            = 0xFC,
+  FUJICMD_JSON                       = 0xFC,
+  FUJICMD_SET_SSID                   = 0xFB,
+  FUJICMD_GET_WIFISTATUS             = 0xFA,
+  FUJICMD_MOUNT_HOST                 = 0xF9,
+  FUJICMD_MOUNT_IMAGE                = 0xF8,
+  FUJICMD_OPEN_DIRECTORY             = 0xF7,
+  FUJICMD_READ_DIR_ENTRY             = 0xF6,
+  FUJICMD_CLOSE_DIRECTORY            = 0xF5,
+  FUJICMD_READ_HOST_SLOTS            = 0xF4,
+  FUJICMD_WRITE_HOST_SLOTS           = 0xF3,
+  FUJICMD_READ_DEVICE_SLOTS          = 0xF2,
+  FUJICMD_WRITE_DEVICE_SLOTS         = 0xF1,
+  FUJICMD_ENABLE_UDPSTREAM           = 0xF0,
+  FUJICMD_SET_BAUDRATE               = 0xEB,
+  FUJICMD_GET_WIFI_ENABLED           = 0xEA,
+  FUJICMD_UNMOUNT_IMAGE              = 0xE9,
+  FUJICMD_GET_ADAPTERCONFIG          = 0xE8,
+  FUJICMD_NEW_DISK                   = 0xE7,
+  FUJICMD_UNMOUNT_HOST               = 0xE6,
+  FUJICMD_GET_DIRECTORY_POSITION     = 0xE5,
+  FUJICMD_SET_DIRECTORY_POSITION     = 0xE4,
+  FUJICMD_SET_HSIO_INDEX             = 0xE3,
+  FUJICMD_SET_DEVICE_FULLPATH        = 0xE2,
+  FUJICMD_SET_HOST_PREFIX            = 0xE1,
+  FUJICMD_GET_HOST_PREFIX            = 0xE0,
+  FUJICMD_SET_SIO_EXTERNAL_CLOCK     = 0xDF,
+  FUJICMD_WRITE_APPKEY               = 0xDE,
+  FUJICMD_READ_APPKEY                = 0xDD,
+  FUJICMD_OPEN_APPKEY                = 0xDC,
+  FUJICMD_CLOSE_APPKEY               = 0xDB,
+  FUJICMD_GET_DEVICE_FULLPATH        = 0xDA,
+  FUJICMD_CONFIG_BOOT                = 0xD9,
+  FUJICMD_COPY_FILE                  = 0xD8,
+  FUJICMD_MOUNT_ALL                  = 0xD7,
+  FUJICMD_HRS232_WRITE               = 0xD7,
+  FUJICMD_SET_BOOT_MODE              = 0xD6,
+  FUJICMD_ENABLE_DEVICE              = 0xD5,
+  FUJICMD_DISABLE_DEVICE             = 0xD4,
+  FUJICMD_RANDOM_NUMBER              = 0xD3,
+  FUJICMD_HRS232_STATUS              = 0xD3,
+  FUJICMD_GET_TIME                   = 0xD2,
+  FUJICMD_HRS232_READ                = 0xD2,
+  FUJICMD_DEVICE_ENABLE_STATUS       = 0xD1,
+  FUJICMD_BASE64_ENCODE_INPUT        = 0xD0,
+  FUJICMD_HRS232_PUT                 = 0xD0,
+  FUJICMD_BASE64_ENCODE_COMPUTE      = 0xCF,
+  FUJICMD_BASE64_ENCODE_LENGTH       = 0xCE,
+  FUJICMD_BASE64_ENCODE_OUTPUT       = 0xCD,
+  FUJICMD_BASE64_DECODE_INPUT        = 0xCC,
+  FUJICMD_BASE64_DECODE_COMPUTE      = 0xCB,
+  FUJICMD_BASE64_DECODE_LENGTH       = 0xCA,
+  FUJICMD_BASE64_DECODE_OUTPUT       = 0xC9,
+  FUJICMD_HASH_INPUT                 = 0xC8,
+  FUJICMD_HASH_COMPUTE               = 0xC7,
+  FUJICMD_HASH_LENGTH                = 0xC6,
+  FUJICMD_HASH_OUTPUT                = 0xC5,
+  FUJICMD_GET_ADAPTERCONFIG_EXTENDED = 0xC4,
+  FUJICMD_HASH_COMPUTE_NO_CLEAR      = 0xC3,
+  FUJICMD_HASH_CLEAR                 = 0xC2,
+  FUJICMD_GET_HEAP                   = 0xC1,
+  FUJICMD_QRCODE_OUTPUT              = 0xBF,
+  FUJICMD_QRCODE_LENGTH              = 0xBE,
+  FUJICMD_QRCODE_ENCODE              = 0xBD,
+  FUJICMD_QRCODE_INPUT               = 0xBC,
+  FUJICMD_GET_DEVICE8_FULLPATH       = 0xA7,
+  FUJICMD_GET_DEVICE7_FULLPATH       = 0xA6,
+  FUJICMD_GET_DEVICE6_FULLPATH       = 0xA5,
+  FUJICMD_GET_DEVICE5_FULLPATH       = 0xA4,
+  FUJICMD_GET_DEVICE4_FULLPATH       = 0xA3,
+  FUJICMD_GET_DEVICE3_FULLPATH       = 0xA2,
+  FUJICMD_HRS232_FORMAT_MEDIUM       = 0xA2,
+  FUJICMD_GET_DEVICE2_FULLPATH       = 0xA1,
+  FUJICMD_HRS232_FORMAT              = 0xA1,
+  FUJICMD_GET_DEVICE1_FULLPATH       = 0xA0,
+  FUJICMD_GETTZTIME                  = 0x9A,
+  FUJICMD_SETTZ                      = 0x99,
+  FUJICMD_GETTIME                    = 0x93,
+  FUJICMD_JSON_QUERY                 = 0x81,
+  FUJICMD_JSON_PARSE                 = 0x80,
+  FUJICMD_GET_REMOTE                 = 0x72, // r
+  FUJICMD_CLOSE_CLIENT               = 0x63, // c
+  FUJICMD_TIMER                      = 0x5A, // Z
+  FUJICMD_STREAM                     = 0x58, // X
+  FUJICMD_WRITE                      = 0x57, // W
+  FUJICMD_TRANSLATION                = 0x54, // T
+  FUJICMD_STATUS                     = 0x53, // S
+  FUJICMD_READ                       = 0x52, // R
+  FUJICMD_QUERY                      = 0x51, // Q
+  FUJICMD_PUT                        = 0x50, // P
+  FUJICMD_PARSE                      = 0x50, // P
+  FUJICMD_AUTOANSWER                 = 0x4F, // O
+  FUJICMD_PERCOM_WRITE               = 0x4F, // O
+  FUJICMD_OPEN                       = 0x4F, // O
+  FUJICMD_BAUDRATELOCK               = 0x4E, // N
+  FUJICMD_PERCOM_READ                = 0x4E, // N
+  FUJICMD_UNLISTEN                   = 0x4D, // M
+  FUJICMD_LISTEN                     = 0x4C, // L
+  FUJICMD_GET_ERROR                  = 0x45, // E
+  FUJICMD_SET_DESTINATION            = 0x44, // D
+  FUJICMD_SET_DUMP                   = 0x44, // D
+  FUJICMD_CLOSE                      = 0x43, // C
+  FUJICMD_CONFIGURE                  = 0x42, // B
+  FUJICMD_CONTROL                    = 0x41, // A
+  FUJICMD_TYPE3_POLL                 = 0x40, // @
+  FUJICMD_TYPE1_POLL                 = 0x3F,
+  FUJICMD_HSIO_INDEX                 = 0x3F, // ?
+  FUJICMD_GETCWD                     = 0x30, // 0
+  FUJICMD_CHDIR                      = 0x2C, // ,
+  FUJICMD_RMDIR                      = 0x2B, // +
+  FUJICMD_MKDIR                      = 0x2A, // *
+  FUJICMD_TELL                       = 0x26, // &
+  FUJICMD_LOAD_HANDLER               = 0x26, // &
+  FUJICMD_SEEK                       = 0x25, // %
+  FUJICMD_UNLOCK                     = 0x24, // $
+  FUJICMD_LOCK                       = 0x23, // #
+  FUJICMD_FORMAT_MEDIUM              = 0x22, // "
+  FUJICMD_DELETE                     = 0x21, // !
+  FUJICMD_LOAD_RELOCATOR             = 0x21, // !
+  FUJICMD_FORMAT                     = 0x21, // !
+  FUJICMD_RENAME                     = 0x20,
+  FUJICMD_NAK                        = 0x15, // ASCII NAK
+  FUJICMD_ACK                        = 0x06, // ASCII ACK
+  FUJICMD_SEND_ERROR                 = 0x02,
+  FUJICMD_SEND_RESPONSE              = 0x01,
+  FUJICMD_DEVICE_READY               = 0x00,
+};
+
+#endif /* FUJI_COMMANDS_H */

lib/FileSystem/fnFsLittleFS.cpp

@@ -223,10 +223,10 @@ bool FileSystemLittleFS::start()
     // strlcpy(_basepath, "/flash", sizeof(_basepath));
 
     esp_vfs_littlefs_conf_t conf = {
-      .base_path = "",
-      .partition_label = "storage",
-      .format_if_mount_failed = false,
-      .dont_mount = false
+        .base_path = "",
+        .partition_label = "storage",
+        .format_if_mount_failed = false,
+        .dont_mount = false
     };
 
     esp_err_t e = esp_vfs_littlefs_register(&conf);
@@ -236,7 +236,7 @@ bool FileSystemLittleFS::start()
         #ifdef DEBUG
         Debug_printv("Failed to mount LittleFS partition, err = %d\r\n", e);
         #endif
-        _started = false;
+        //_started = false;
     }
     else
     {
@@ -254,4 +254,34 @@ bool FileSystemLittleFS::start()
     return _started;
 }
 
+
+bool FileSystemLittleFS::stop()
+{
+    if(!_started)
+        return true;
+
+    esp_err_t e = esp_vfs_littlefs_unregister("storage");
+
+    if (e != ESP_OK)
+    {
+        #ifdef DEBUG
+        Debug_printv("Failed to unmount LittleFS partition, err = %d\r\n", e);
+        #endif
+    }
+    else
+    {
+        _started = false;
+    #ifdef DEBUG        
+        Debug_println("LittleFS unmounted.");
+        /*
+        size_t total = 0, used = 0;
+        esp_littlefs_info(NULL, &total, &used);
+        Debug_printv("  partition size: %u, used: %u, free: %u\r\n", total, used, total-used);
+        */
+    #endif
+    }
+
+    return !_started;
+}
+
 #endif // FLASH_LITTLEFS