Add firmware update and file copy commands to iecFuji (#1200)

* Add firmware update and file copy commands to iecFuji

* Refactor enable and disable device functions to accept device IDs as parameters

* Add DIR_OPTION_UNSORTED to support unsorted directory entries (#1201)

* Enhance device slot enable/disable functionality in fnConfig (#1203)

* Refactor QR code version handling and update output mode enumeration (#1202)

Author: idolpx

include/fujiCommandID.h

@@ -80,6 +80,7 @@ enum fujiCommandID_t : uint8_t {
     FUJICMD_GET_DEVICE3_FULLPATH       = 0xA2,
     FUJICMD_GET_DEVICE2_FULLPATH       = 0xA1,
     FUJICMD_GET_DEVICE1_FULLPATH       = 0xA0,
+    FUJICMD_UPDATE_FIRMWARE            = 0x90,
     FUJICMD_STATUS                     = 0x53, // S
     FUJICMD_HSIO_INDEX                 = 0x3F, // ?
     FUJICMD_NAK                        = 0x15, // ASCII NAK

lib/device/iec/iecFuji.cpp

@@ -480,6 +480,10 @@ void iecFuji::process_basic_commands()
         fujicmd_generate_guid();
         response = mstr::toPETSCII2(response);
     }
+    else if (payload.find("copy") != std::string::npos)
+        copy_file_basic();
+    else if (payload.find("update") != std::string::npos)
+        update_firmware();
     else if (payload.find("bptiming") != std::string::npos)
     {
         if ( pt.size() < 3 )
@@ -535,6 +539,8 @@ bool iecFuji::is_supported(uint8_t cmd)
     case FUJICMD_WRITE_APPKEY:
     case FUJICMD_WRITE_DEVICE_SLOTS:
     case FUJICMD_WRITE_HOST_SLOTS:
+    case FUJICMD_COPY_FILE:
+    case FUJICMD_UPDATE_FIRMWARE:
         result = true;
         break;
     }
@@ -694,6 +700,9 @@ void iecFuji::process_immediate_raw_cmds()
         fujicmd_generate_guid();
         response = mstr::toPETSCII2(response);
         break;
+    case FUJICMD_UPDATE_FIRMWARE:
+        update_firmware();
+        break;
     default:
         // not an immediate command, so exit without changing current_fuji_cmd, as we need to be sent data
         was_immediate_cmd = false;
@@ -817,36 +826,78 @@ void iecFuji::net_set_ssid_basic(bool store)
     fujicmd_net_set_ssid_success(net_config.ssid, net_config.password, store);
 }
 
-void iecFuji::enable_device_basic()
+void iecFuji::enable_device_basic(std::string ids)
 {
+    if(ids.empty()) {
     // Strip off the ENABLE: part of the command
-    pt[0] = pt[0].substr(7, std::string::npos);
+        pt[0] = pt[0].substr(7, std::string::npos);
+    } else {
+        pt = util_tokenize(ids, ',');
+    }
 
     // Enable devices
     for (int i = 0; i < pt.size(); i++) {
         uint8_t device = atoi(pt[i].c_str());
-        auto d = SYSTEM_BUS.findDevice(device, true);
-        if (d) {
-            d->setActive(true);
-            Debug_printv("Enable Device #%d [%d]", device, d->isActive());
+        if (device == 0) {
+            // special case for device 0, we want to enable all drives if that is the case
+            for (int dnum = 1; dnum <= MAX_DISK_DEVICES; dnum++) {
+                auto d = SYSTEM_BUS.m_devices[dnum];
+                if (d) {
+                    d->setActive(true);
+                    Config.store_device_slot_enable(dnum, true);
+                    Debug_printv("Enable Device #%d [%d]", (dnum + 7), d->isActive());
+                }
+            }
+            break;
+        }
+        else
+        {
+            auto d = SYSTEM_BUS.findDevice(device, true);
+            if (d) {
+                d->setActive(true);
+                Config.store_device_slot_enable((device - 7), true);
+                Debug_printv("Enable Device #%d [%d]", device, d->isActive());
+            }
         }
     }
+    Config.save();
 }
 
-void iecFuji::disable_device_basic()
+void iecFuji::disable_device_basic(std::string ids)
 {
+    if(ids.empty()) {
     // Strip off the DISABLE: part of the command
-    pt[0] = pt[0].substr(8, std::string::npos);
+        pt[0] = pt[0].substr(8, std::string::npos);
+    } else {
+        pt = util_tokenize(ids, ',');
+    }
 
     // Disable devices
     for (int i = 0; i < pt.size(); i++) {
         uint8_t device = atoi(pt[i].c_str());
-        auto d = SYSTEM_BUS.findDevice(device, true);
-        if (d) {
-            d->setActive(false);
-            Debug_printv("Disable Device #%d [%d]", device, d->isActive());
+        if (device == 0) {
+            // special case for device 0, we want to disable all drives if that is the case
+            for (int dnum = 1; dnum <= MAX_DISK_DEVICES; dnum++) {
+                auto d = SYSTEM_BUS.m_devices[dnum];
+                if (d) {
+                    d->setActive(false);
+                    Config.store_device_slot_enable(dnum, false);
+                    Debug_printv("Disable Device #%d [%d]", (dnum + 7), d->isActive());
+                }
+            }
+            break;
+        }
+        else
+        {
+            auto d = SYSTEM_BUS.findDevice(device, true);
+            if (d) {
+                d->setActive(false);
+                Config.store_device_slot_enable((device - 7), false);
+                Debug_printv("Disable Device #%d [%d]", device, d->isActive());
+            }
         }
     }
+    Config.save();
 }
 
 void iecFuji::net_set_ssid_raw(bool store)
@@ -1971,4 +2022,101 @@ void iecFuji::hash_clear()
     hasher.clear();
 }
 
+void iecFuji::copy_file_basic()
+{
+    if (pt.size() != 2)
+    {
+        Debug_printv("error: bad args");
+        response = "BAD COPY ARGS";
+        return;
+    }
+
+    // Strip off the COPY: part of the command
+    pt[0] = pt[0].substr(5, std::string::npos);
+    if (mstr::isNumeric(pt[0])) {
+        // Find SSID by CRC8 Number
+        pt[0] = fnWiFi.get_network_name_by_crc8(std::stoi(pt[0]));
+    }
+
+    copy_file(pt[0], pt[1]);
+}
+
+void iecFuji::copy_file_raw()
+{
+    copy_file(pt[0], pt[1]);
+}
+
+void iecFuji::copy_file(std::string source, std::string destination)
+{
+    std::unique_ptr<MFile> in_file(MFSOwner::File(source));
+    std::unique_ptr<MFile> out_file(MFSOwner::File(destination));
+
+    // If destination is a directory then save with source filename
+    if ( out_file->isDirectory() )
+    {
+        destination += "/" + in_file->name;
+        out_file.reset(MFSOwner::File(destination));
+    }
+
+    // Create streams and copy file
+    {
+        auto in_stream = in_file->getSourceStream(std::ios_base::in);
+        if (in_stream == nullptr)
+        {
+            Serial.printf("2 Error: Can't open source!\r\n");
+            set_fuji_iec_status(62, "can't open source stream");
+            return;
+        }
+
+        auto out_stream = out_file->getSourceStream(std::ios_base::out);
+        if (out_stream == nullptr)
+        {
+            Serial.printf("2 Error: Can't open destination!\r\n");
+            set_fuji_iec_status(62, "can't open destination stream");
+            return;
+        }
+
+        Debug_printv("size[%lu] name[%s] url[%s] destination[%s]", in_file->size, in_file->name.c_str(), in_stream->url.c_str(), destination.c_str());
+
+        // Receive File
+        int count = 0;
+        uint8_t bytes[255];
+        while (true)
+        {
+            int bytes_read = in_stream->read(bytes, 255);
+            if (bytes_read < 1)
+            {
+                if (in_stream->available())
+                    Serial.printf("\nError reading '%s'\r", in_file->name.c_str());
+                break;
+            }
+
+            int bytes_written = out_stream->write(bytes, bytes_read);
+            if (bytes_written != bytes_read)
+            {
+                Serial.printf("\nError writing '%s'\r", out_file->name.c_str());
+                break;
+            }
+
+            // Show percentage complete in stdout
+            uint8_t percent = (in_stream->position() * 100) / in_stream->size();
+#ifdef ENABLE_DISPLAY
+            LEDS.progress = percent;
+#endif
+            Serial.printf("Downloading '%s' %d%% [%lu]\r", in_file->name.c_str(), percent, in_stream->position());
+            count++;
+        }
+        Serial.printf("\n");
+    }
+
+    set_fuji_iec_status(0, "");
+}
+
+void iecFuji::update_firmware()
+{
+    fnSystem.update_firmware();
+    set_fuji_iec_status(0, "");
+}
+
+
 #endif /* BUILD_IEC */

lib/device/iec/iecFuji.h

@@ -185,6 +185,11 @@ class iecFuji : public fujiDevice
     void set_boot_config_basic();
     void set_boot_config_raw();
 
+    // 0xD8
+    void copy_file(std::string source, std::string destination);
+    void copy_file_basic();
+    void copy_file_raw();
+
     // 0xD6
     void set_boot_mode_basic();
     void set_boot_mode_raw();
@@ -213,6 +218,9 @@ class iecFuji : public fujiDevice
     void hash_clear();
     void hash_clear_raw();
 
+    // Commodore specific
+    void update_firmware();
+
     // Commodore specific
     void local_ip();
     void netmask();
@@ -222,8 +230,8 @@ class iecFuji : public fujiDevice
     void bssid();
     void fn_version();
 
-    void enable_device_basic();
-    void disable_device_basic();
+    void enable_device_basic(std::string ids = "");
+    void disable_device_basic(std::string ids = "");
 
     bool check_appkey_creator(bool check_is_write);