Revert "[adam] new disk improvements."

This reverts commit 4cc184d.
FujiNetWIFI · Oct 12, 2023 · 6e7cdb3 · 6e7cdb3
1 parent 4cc184d
commit 6e7cdb3
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 11 deletions.
diff --git a/data/webui/device_specific/BUILD_ADAM/autorun.ddp b/data/webui/device_specific/BUILD_ADAM/autorun.ddp
diff --git a/lib/device/adamnet/fuji.cpp b/lib/device/adamnet/fuji.cpp
@@ -916,28 +916,28 @@ void adamFuji::adamnet_new_disk()
 
     adamnet_recv(); // CK
 
-    if (newImageStarted)
+    fujiDisk &disk = _fnDisks[ds];
+    fujiHost &host = _fnHosts[hs];
+
+    if (host.file_exists((const char *)p))
     {
-        adamnet_response_ack(true);
-        newImageStarted = false;
+        AdamNet.start_time = esp_timer_get_time();
+        adamnet_response_ack();
         return;
     }
-
-    fujiDisk &disk = _fnDisks[ds];
-    fujiHost &host = _fnHosts[hs];
-
     disk.host_slot = hs;
     disk.access_mode = DISK_ACCESS_MODE_WRITE;
     strlcpy(disk.filename, (const char *)p, 256);
 
-    newImageStarted = true;
-
     disk.fileh = host.file_open(disk.filename, disk.filename, sizeof(disk.filename), "w");
 
     Debug_printf("Creating file %s on host slot %u mounting in disk slot %u numblocks: %lu\n", disk.filename, hs, ds, numBlocks);
 
     disk.disk_dev.write_blank(disk.fileh, numBlocks);
 
+    AdamNet.start_time = esp_timer_get_time();
+    adamnet_response_ack();
+
     fclose(disk.fileh);
 }
 

diff --git a/lib/device/adamnet/fuji.h b/lib/device/adamnet/fuji.h
@@ -80,8 +80,6 @@ class adamFuji : public virtualDevice
 
     appkey _current_appkey;
 
-    bool newImageStarted = false;
-
 protected:
     void adamnet_reset_fujinet();          // 0xFF
     void adamnet_net_get_ssid();           // 0xFE