Merge pull request #16 from jcook793/sdfat2-support

Updated SdCard to version 2

Author: whizzosoftware

SIO2Arduino.ino

@@ -46,7 +46,7 @@ void changeDirectory(int ix);
 DriveAccess driveAccess(getDeviceStatus, readSector, writeSector, format);
 DriveControl driveControl(getFileList, mountFileIndex, changeDirectory);
 SIOChannel sioChannel(PIN_ATARI_CMD, &SIO_UART, &driveAccess, &driveControl);
-Sd2Card card;
+SdFat32 card;
 SdFile currDir;
 SdFile file; // TODO: make this unnecessary
 DiskDrive drive1;
@@ -63,10 +63,18 @@ LiquidCrystal lcd(PIN_LCD_RD,PIN_LCD_ENABLE,PIN_LCD_DB4,PIN_LCD_DB5,PIN_LCD_DB6,
 #endif
 
 void setup() {
-#ifdef DEBUG
-  // set up logging serial port
-  LOGGING_UART.begin(115200);
-#endif
+  #ifdef DEBUG
+    // set up logging serial port
+    LOGGING_UART.begin(115200);
+    while (!LOGGING_UART) {
+      yield();
+    }
+    LOG_MSG_CR(F("Debug logging enabled"));
+    #ifdef ARDUINO_UNO
+      LOG_MSG_CR(F("WARNING: using debug logging with Uno, which only has 1 UART - SIO will conflict"));
+      LOG_MSG_FLUSH(); // make sure this log displays before making the SIO connection
+    #endif
+  #endif
 
   // initialize serial port to Atari
   SIO_UART.begin(19200);
@@ -190,18 +198,18 @@ boolean format(int deviceId, int density) {
 }
 
 void changeDisk(int deviceId) {
-  dir_t dir;
+  DirFat_t dir;
   char name[13];
   boolean imageChanged = false;
 
   while (!imageChanged) {
     // get next dir entry
-    int8_t result = currDir.readDir((dir_t*)&dir);
+    int8_t result = currDir.readDir((DirFat_t*)&dir);
 
     // if we got back a 0, rewind the directory and get the first dir entry
     if (!result) {
       currDir.rewind();
-      result = currDir.readDir((dir_t*)&dir);
+      result = currDir.readDir((DirFat_t*)&dir);
     }
 
     // if we have a valid file response code, open it
@@ -253,20 +261,20 @@ void createFilename(char* filename, char* name) {
  * entries = a pointer to the a FileEntry array to hold the returned data
  */
 int getFileList(int startIndex, int count, FileEntry *entries) {
-  dir_t dir;
+  DirFat_t dir;
   int currentEntry = 0;
 
   currDir.rewind();
 
   int ix = 0;
   while (ix < count) {
-    if (currDir.readDir((dir_t*)&dir) < 1) {
+    if (currDir.readDir((DirFat_t*)&dir) < 1) {
       break;
     }
-    if (isValidFilename((char*)&dir.name) || (DIR_IS_SUBDIR(&dir) && dir.name[0] != '.')) {
+    if (isValidFilename((char*)&dir.name) || (isSubdir(&dir) && dir.name[0] != '.')) {
       if (currentEntry >= startIndex) {
         memcpy(entries[ix].name, dir.name, 11);
-        if (DIR_IS_SUBDIR(&dir)) {
+        if (isSubdir(&dir)) {
           entries[ix].isDirectory = true;
         } else {
           entries[ix].isDirectory = false;

config.h

@@ -23,7 +23,6 @@
 #ifndef CONFIG_H
 #define CONFIG_H
 
-#define USE_SD_VOLUME
 /**
  * These are SIO2Arduino feature definitions.
  */
@@ -141,9 +140,11 @@
   #define LOGGING_UART Serial
   #define LOG_MSG(...) LOGGING_UART.print(__VA_ARGS__)
   #define LOG_MSG_CR(...) LOGGING_UART.println(__VA_ARGS__)
+  #define LOG_MSG_FLUSH() LOGGING_UART.flush()
 #else
   #define LOG_MSG(...)
   #define LOG_MSG_CR(...)
+  #define LOG_MSG_FLUSH()
 #endif
 
 #endif

readme.txt

@@ -1,6 +1,7 @@
 SIO2Arduino is an open-source implementation of the Atari SIO device protocol that runs on Arduino hardware. Arduino hardware is open-source and can be assembled by hand or purchased preassembled.
 
 Note: You will need the SdFat library (https://github.com/greiman/SdFat) in your Arduino libraries directory in order to compile.
+This has been tested using SdFat version 2.1.2.
 
 For more information on SIO2Arduino, see the website at: 
 http://www.whizzosoftware.com/sio2arduino