Merge branch 'master' of github.com:FujiNetWIFI/fujinet-platformio

data/webui/config/nugget-iec.yaml

@@ -0,0 +1,18 @@
+paths:
+  font_path: /file?
+  css_path: /file?css
+  js_path: /file?js
+components:
+  network: true
+  hardware: true
+  hosts_list: true
+  mount_list: true
+  printer_settings: true
+  modem_settings: false
+  hsio_settings: false
+  timezone: true
+  udp_stream: true
+  program_recorder: false
+  disk_swap: true
+  boot_settings: true
+  apetime: false

include/pinmap.h

@@ -9,6 +9,7 @@
 #include "pinmap/adamv1.h"
 #include "pinmap/iec.h"
 #include "pinmap/iec-d32pro.h"
+#include "pinmap/iec-nugget.h"
 #include "pinmap/fujiloaf-rev0.h"
 #include "pinmap/fujiapple-iec.h"
 #include "pinmap/esp32s3.h"

include/pinmap/iec-nugget.h

@@ -0,0 +1,59 @@
+#ifndef PINMAP_IEC_NUGGET_H
+#define PINMAP_IEC_NUGGET_H
+
+#ifdef PINMAP_IEC_NUGGET
+
+/* SD Card */
+// pins 12-15 are used to interface with the JTAG debugger
+// so leave them alone if we're using JTAG
+#ifndef JTAG
+#define PIN_CARD_DETECT         GPIO_NUM_12 // fnSystem.h
+#define PIN_CARD_DETECT_FIX     GPIO_NUM_15 // fnSystem.h
+#endif
+
+#define PIN_SD_HOST_CS          GPIO_NUM_4  // LOLIN D32 Pro
+#define PIN_SD_HOST_MISO        GPIO_NUM_19
+#define PIN_SD_HOST_MOSI        GPIO_NUM_23
+#define PIN_SD_HOST_SCK         GPIO_NUM_18
+
+/* UART */
+#define PIN_UART0_RX            GPIO_NUM_3  // fnUART.cpp
+#define PIN_UART0_TX            GPIO_NUM_1
+#define PIN_UART1_RX            GPIO_NUM_9
+#define PIN_UART1_TX            GPIO_NUM_10
+#define PIN_UART2_RX            GPIO_NUM_33
+#define PIN_UART2_TX            GPIO_NUM_21
+
+/* Buttons */
+#define PIN_BUTTON_A            GPIO_NUM_NC  // keys.cpp
+#define PIN_BUTTON_B            GPIO_NUM_NC
+#define PIN_BUTTON_C            GPIO_NUM_NC
+
+/* LEDs */
+#define PIN_LED_WIFI            GPIO_NUM_5 // led.cpp
+#define PIN_LED_BUS             GPIO_NUM_2 // 4 FN
+
+// pins 12-15 are used to interface with the JTAG debugger
+// so leave them alone if we're using JTAG
+#ifndef JTAG
+#define PIN_LED_BT              GPIO_NUM_13
+#else
+#define PIN_LED_BT              GPIO_NUM_5  // LOLIN D32 PRO
+#endif
+
+/* Audio Output */
+#define PIN_DAC1                GPIO_NUM_25 // samlib.h
+
+/* Commodore IEC Pins */
+//#define IEC_HAS_RESET // Reset line is available
+
+#define PIN_IEC_RESET           GPIO_NUM_34
+#define PIN_IEC_ATN             GPIO_NUM_32
+#define PIN_IEC_CLK_IN          GPIO_NUM_33
+#define PIN_IEC_CLK_OUT         GPIO_NUM_33
+#define PIN_IEC_DATA_IN         GPIO_NUM_14
+#define PIN_IEC_DATA_OUT        GPIO_NUM_14
+#define PIN_IEC_SRQ             GPIO_NUM_27
+
+#endif // PINMAP_IEC_NUGGET
+#endif // PINMAP_IEC_NUGGET_H

lib/device/iwm/disk.cpp

@@ -515,17 +515,33 @@ mediatype_t iwmDisk::mount(FILE *f, const char *filename, uint32_t disksize, med
   }
 
   // Determine MediaType based on filename extension
-  if (disk_type == MEDIATYPE_UNKNOWN && filename != nullptr)
+  if (disk_type == MEDIATYPE_UNKNOWN && filename != nullptr) {
     disk_type = MediaType::discover_mediatype(filename);
+    if (disk_type == MEDIATYPE_DSK) {
+        // determine DO or PO based on file contents
+        disk_type = MediaType::discover_dsk_mediatype(f, disksize);
+    }
+  }
 
   if (deviceSlot < 4) // SP drive
   {    
     switch (disk_type)
     {
+    case MEDIATYPE_DO:
+        Debug_printf("\r\nMedia Type DO");
+        _disk = new MediaTypeDO();
+        _disk->_media_host = host;
+        _disk->_mediatype = disk_type;
+        strcpy(_disk->_disk_filename, filename);
+        mt = _disk->mount(f, disksize);
+
+        device_active = true; //change status only after we are mounted
+        break;
     case MEDIATYPE_PO:
         Debug_printf("\r\nMedia Type PO");
         _disk = new MediaTypePO();
         _disk->_media_host = host;
+        _disk->_mediatype = disk_type;
         strcpy(_disk->_disk_filename, filename);
         mt = _disk->mount(f, disksize);
 
@@ -535,8 +551,6 @@ mediatype_t iwmDisk::mount(FILE *f, const char *filename, uint32_t disksize, med
           readonly = false;
 
         device_active = true; //change status only after we are mounted
-        //_disk->fileptr() = f;
-        // mt = MEDIATYPE_PO;
         break;
     default:
         Debug_printf("\r\nMedia Type UNKNOWN for SP Drive - no mount in disk.cpp");
@@ -548,7 +562,8 @@ mediatype_t iwmDisk::mount(FILE *f, const char *filename, uint32_t disksize, med
   {
     switch (disk_type)
     {
-      case MEDIATYPE_DSK:
+      case MEDIATYPE_DO:
+      case MEDIATYPE_PO:
       case MEDIATYPE_WOZ:
           theFuji._fnDisk2s[deviceSlot - 4].init();
           theFuji._fnDisk2s[deviceSlot - 4].mount(f, disk_type); // modulo to ensure device 0 or 1

lib/device/iwm/disk2.cpp

@@ -60,10 +60,12 @@ mediatype_t iwmDisk2::mount(FILE *f, mediatype_t disk_type)//, const char *filen
         mt = ((MediaTypeWOZ *)_disk)->mount(f);
         change_track(0); // initialize spi buffer
         break;
-    case MEDIATYPE_DSK:
+    case MEDIATYPE_DO:
+    case MEDIATYPE_PO:
         Debug_printf("\nMounting Media Type DSK");
         device_active = true;
         _disk = new MediaTypeDSK();
+        _disk->_mediatype = disk_type;
         mt = ((MediaTypeDSK *)_disk)->mount(f);
         change_track(0); // initialize spi buffer
         break;

lib/device/iwm/fuji.cpp

@@ -1105,7 +1105,7 @@ void iwmFuji::setup(iwmBus *iwmbus)
 
 int iwmFuji::get_disk_id(int drive_slot)
 {
-    return -1;
+    return 0;
 }
 std::string iwmFuji::get_host_prefix(int host_slot)
 {

lib/hardware/keys.cpp

@@ -74,6 +74,13 @@ void KeyManager::setup()
 #endif
     }
 
+#ifdef NO_BUTTONS
+    _keys[eKey::BUTTON_A].disabled = true;
+    _keys[eKey::BUTTON_B].disabled = true;
+    _keys[eKey::BUTTON_C].disabled = true;
+    Debug_println("NO_BUTTONS: disabled all buttons");
+#endif /* PINMAP_IEC_NUGGET */
+
 #endif /* PINMAP_ESP32S3 */
 
     // Start a new task to check the status of the buttons

lib/media/apple/mediaType.cpp

@@ -1,6 +1,7 @@
 #ifdef BUILD_APPLE
 
 #include "mediaType.h"
+#include "utils.h"
 
 #include <cstdint>
 #include <cstring>
@@ -58,8 +59,37 @@ mediatype_t MediaType::discover_mediatype(const char *filename)
         const char *ext = filename + l - 2;
         if (strcasecmp(ext, "PO") == 0)
             return MEDIATYPE_PO;
+        else if (strcasecmp(ext, "DO") == 0)
+            return MEDIATYPE_DO;
     }
     return MEDIATYPE_UNKNOWN;
 }
 
-#endif // NEW_TARGET
+mediatype_t MediaType::discover_dsk_mediatype(FILE *f, uint32_t disksize)
+{
+    mediatype_t default_mt = MEDIATYPE_DO;
+
+    const size_t header_size = 64;
+    uint8_t hdr[header_size];
+
+    // a ProDOS Volume Directory Header is always in block 2,
+    // if the file is in ProDOS order, it will be at offset 1024 
+    if (fseek(f, 1024, SEEK_SET) != 0)
+        return default_mt;
+
+    if (fread(hdr, 1, header_size, f) != header_size)
+        return default_mt;
+
+    uint16_t prevPointer = UINT16_FROM_HILOBYTES(hdr[1], hdr[0]);
+    uint8_t  storage_type = hdr[4] >> 4;
+    uint16_t total_blocks = UINT16_FROM_HILOBYTES(hdr[0x2A], hdr[0x29]);
+
+    if (prevPointer == 0 && storage_type == 0xF && total_blocks == (disksize / 512)) {
+        // looks like a valid volume header, assume file is in ProDOS order 
+        return MEDIATYPE_PO;
+    }
+
+    return default_mt;
+}
+
+#endif // BUILD_APPLE

lib/media/apple/mediaType.h

@@ -17,9 +17,10 @@
 enum mediatype_t 
 {
     MEDIATYPE_UNKNOWN = 0,
+    MEDIATYPE_DO,
+    MEDIATYPE_DSK,
     MEDIATYPE_PO,
     MEDIATYPE_WOZ,
-    MEDIATYPE_DSK,
     MEDIATYPE_COUNT
 };
 
@@ -85,6 +86,7 @@ class MediaType
     virtual bool status() = 0;
 
     static mediatype_t discover_mediatype(const char *filename);
+    static mediatype_t discover_dsk_mediatype(FILE* f, uint32_t disksize);
 
     // void dump_percom_block();
     // void derive_percom_block(uint16_t numSectors);

lib/media/apple/mediaTypeDO.cpp

@@ -0,0 +1,99 @@
+#ifdef BUILD_APPLE
+
+#include "mediaTypeDO.h"
+
+#include <cstring>
+#include "utils.h"
+#include "../../include/debug.h"
+
+#define BYTES_PER_BLOCK 512
+#define BLOCKS_PER_TRACK 8
+#define BYTES_PER_SECTOR 256
+#define BYTES_PER_TRACK 4096
+
+// .DO (DOS ordered) disk images are stored in DOS 3.3 logical sector order.
+// Each 512 byte ProDOS block is stored as two 256 byte DOS sectors.
+// see https://retrocomputing.stackexchange.com/questions/15056/converting-apple-ii-prodos-blocks-to-dos-tracks-and-sectors
+
+// This table maps ProDOS blocks to pairs of DOS logical sectors.
+static const int prodos2dos[8][2] = { {0, 14}, {13, 12}, {11, 10}, {9, 8}, {7, 6}, {5, 4}, {3, 2}, {1, 15} };
+
+bool MediaTypeDO::read(uint32_t blockNum, uint16_t *count, uint8_t* buffer)
+{
+    bool err = false;
+    uint32_t track = blockNum / BLOCKS_PER_TRACK;
+    const int* sectors = prodos2dos[blockNum % BLOCKS_PER_TRACK];
+
+    err = read_sector(track, sectors[0], buffer);
+
+    if (!err)
+        err = read_sector(track, sectors[1], &buffer[BYTES_PER_SECTOR]);
+
+    return err;
+}
+
+bool MediaTypeDO::read_sector(int track, int sector, uint8_t* buffer)
+{
+    Debug_printf("\r\nMediaTypeDO read track %d sector %d", track, sector);
+
+    bool err = false;
+    uint32_t offset = (track * BYTES_PER_TRACK) + (sector * BYTES_PER_SECTOR);
+
+    err = fseek(_media_fileh, offset, SEEK_SET) != 0;
+
+    if (!err)
+        err = fread(buffer, 1, BYTES_PER_SECTOR, _media_fileh) != BYTES_PER_SECTOR;
+
+    return err;
+}
+
+bool MediaTypeDO::write(uint32_t blockNum, uint16_t *count, uint8_t* buffer)
+{
+    // Return an error if we're trying to write beyond the end of the disk
+    if (blockNum >= num_blocks)
+    {
+        Debug_printf("\r\nwrite block BEYOND END %lu > %lu", blockNum, num_blocks);
+        return true;
+    }
+
+    bool err = false;
+    uint32_t track = blockNum / BLOCKS_PER_TRACK;
+    const int* sectors = prodos2dos[blockNum % BLOCKS_PER_TRACK];
+
+    err = write_sector(track, sectors[0], buffer);
+
+    if (!err)
+        err = write_sector(track, sectors[1], &buffer[BYTES_PER_SECTOR]);
+
+    return err;
+}
+
+bool MediaTypeDO::write_sector(int track, int sector, uint8_t* buffer)
+{
+    Debug_printf("\r\nMediaTypeDO write track %d sector %d", track, sector);
+
+    bool err = false;
+    uint32_t offset = (track * BYTES_PER_TRACK) + (sector * BYTES_PER_SECTOR);
+
+    err = fseek(_media_fileh, offset, SEEK_SET) != 0;
+
+    if (!err)
+        err = fwrite(buffer, 1, BYTES_PER_SECTOR, _media_fileh) != BYTES_PER_SECTOR;
+
+    return err;
+}
+
+bool MediaTypeDO::format(uint16_t *respopnsesize)
+{
+    return false;
+}
+
+mediatype_t MediaTypeDO::mount(FILE *f, uint32_t disksize)
+{
+    diskiiemulation = false;
+    _media_fileh = f;
+    num_blocks = disksize / BYTES_PER_BLOCK;
+    return MEDIATYPE_DO;
+}
+
+#endif // BUILD_APPLE

lib/media/apple/mediaTypeDO.h

@@ -0,0 +1,26 @@
+#ifndef _MEDIATYPE_DO_
+#define _MEDIATYPE_DO_
+
+#include <stdio.h>
+
+#include "mediaType.h"
+
+class MediaTypeDO : public MediaType
+{
+private:
+    bool read_sector(int track, int sector, uint8_t* buffer);
+    bool write_sector(int track, int sector, uint8_t* buffer);
+
+public:
+    virtual bool read(uint32_t blockNum, uint16_t *count, uint8_t* buffer) override;
+    virtual bool write(uint32_t blockNum, uint16_t *count, uint8_t* buffer) override;
+
+    virtual bool format(uint16_t *respopnsesize) override;
+
+    virtual mediatype_t mount(FILE *f, uint32_t disksize) override;
+
+    virtual bool status() override {return (_media_fileh != nullptr);}
+};
+
+
+#endif // _MEDIATYPE_DO_