Added support for Arduino Uno and SD breakout board.

Author: Daniel Noguerol

SIO2Arduino.ino

@@ -25,46 +25,34 @@
 #include "atari.h"
 #include "sio_channel.h"
 #include "disk_drive.h"
-#include "log.h"
 #ifdef LCD_DISPLAY
 #include <LiquidCrystal.h>
 #endif
-#ifndef HARDWARE_UART
-#include <SoftwareSerial.h>
-#endif
-
-#define STATE_INIT           1
-#define STATE_WAIT_CMD_START 2
-#define STATE_READ_CMD       3
-#define STATE_WAIT_CMD_END   4
 
-// globals
+/**
+ * Global variables
+ */
 DriveAccess driveAccess(getDeviceStatus, readSector, writeSector, format);
 DriveControl driveControl(getFileList, mountFile);
-#ifdef HARDWARE_UART
-  SIOChannel sioChannel(PIN_ATARI_CMD, &HARDWARE_UART, &driveAccess, &driveControl);
-#else
-  SoftwareSerial serial(PIN_SERIAL_RX, PIN_SERIAL_TX);
-  SIOChannel sioChannel(PIN_ATARI_CMD, &serial, &driveAccess, &driveControl);
-#endif
-#ifdef LCD_DISPLAY
-LiquidCrystal lcd(PIN_LCD_RD,PIN_LCD_ENABLE,PIN_LCD_DB4,PIN_LCD_DB5,PIN_LCD_DB6,PIN_LCD_DB7);
-#endif
+SIOChannel sioChannel(PIN_ATARI_CMD, &SIO_UART, &driveAccess, &driveControl);
 File root;
 File file; // TODO: make this unnecessary
 DiskDrive drive1;
+#ifdef SELECTOR_BUTTON
 boolean isSwitchPressed = false;
+#endif
+#ifdef LCD_DISPLAY
+LiquidCrystal lcd(PIN_LCD_RD,PIN_LCD_ENABLE,PIN_LCD_DB4,PIN_LCD_DB5,PIN_LCD_DB6,PIN_LCD_DB7);
+#endif
 
 void setup() {
+#ifdef DEBUG
   // set up logging serial port
-  Serial.begin(115200);
+  LOGGING_UART.begin(115200);
+#endif
 
   // initialize serial port to Atari
-  #ifdef HARDWARE_UART
-    HARDWARE_UART.begin(19200);
-  #else
-    serial.begin(19200);
-  #endif
+  SIO_UART.begin(19200);
 
   // set pin modes
   #ifdef SELECTOR_BUTTON
@@ -79,8 +67,8 @@ void setup() {
 
   // initialize SD card
   LOG_MSG("Initializing SD card...");
-  pinMode(PIN_SD_CARD, OUTPUT);
-  if (!SD.begin(PIN_SD_CARD)) {
+  pinMode(PIN_SD_CS, OUTPUT);
+  if (!SD.begin(PIN_SD_CS)) {
     LOG_MSG_CR(" failed.");
     return;
   }
@@ -107,7 +95,7 @@ void loop() {
   #endif
 }
 
-void serialEvent1() {
+void SIO_CALLBACK() {
   // inform the SIO channel that an incoming byte is available
   sioChannel.processIncomingByte();
 }

config.h

@@ -20,41 +20,86 @@
  * along with SIO2Arduino; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
+#ifndef CONFIG_H
+#define CONFIG_H
 
-/*
+/**
  * These are SIO2Arduino feature definitions.
  */
 
-// uncomment to use an LCD display
+// These are the Arduino devices that can be used. I'm sure others would work,
+// but these are the only ones I have to test with. Only one of these should
+// be uncommented.
+#define ARDUINO_UNO              // Arduino Uno board
+//#define ARDUINO_MEGA           // Arduino Mega 2560/ADK board
+
+// Uncomment this line if you are using an LCD display
 //#define LCD_DISPLAY
 
-// uncomment to use a selector button
+// Uncomment this line if you are using a hardware button for image selection
 #define SELECTOR_BUTTON
 
-// uncomment (and name appropriately) to use a hardware UART for serial communication (e.g. Arduino Mega)
-//#define HARDWARE_UART   Serial1
+// uncomment if using an Ethernet sheild for SD capabilities
+//#define ETHERNET_SHIELD
+
+// uncomment this to enable debug logging -- make sure the HARDWARE_UART isn't the same as
+// the LOGGING_UART defined at the bottom of the file
+#define DEBUG 
 
 /*
  * These are the Arduino pin definitions.
  */
 
-#define PIN_ATARI_CMD   2    // the Atari SIO command line
-#define PIN_SD_CARD     4    // the SD card pin
+#define PIN_ATARI_CMD         2    // the Atari SIO command line - usually the purple wire on the SIO cable
 
-#ifndef HARDWARE_UART
-#define PIN_SERIAL_RX   5
-#define PIN_SERIAL_TX   6
+#ifdef ETHERNET_SHIELD
+  #define PIN_SD_CS           4    // the SD CS line
+#else
+  #ifdef ARDUINO_MEGA
+    #define PIN_SD_CS         53   // the SD breakout board's CD (card detect) pin
+    #define PIN_SD_DI         52   // the SD breakout board's DI pin
+    #define PIN_SD_DO         51   // the SD breakout board's DO pin
+    #define PIN_SD_CLK        50   // the SD breakout board's CLK pin
+  #else
+    #define PIN_SD_CS         10   // the SD breakout board's CD (card detect) pin
+    #define PIN_SD_DI         11   // the SD breakout board's DI pin
+    #define PIN_SD_DO         12   // the SD breakout board's DO pin
+    #define PIN_SD_CLK        13   // the SD breakout board's CLK pin
+  #endif
 #endif
 
 #ifdef SELECTOR_BUTTON
-#define PIN_SELECTOR    8    // the selector button pin
+  #define PIN_SELECTOR        3    // the selector button pin
 #endif
 
 #ifdef LCD_DISPLAY
-#define PIN_LCD_RD      30   // *
-#define PIN_LCD_ENABLE  32   // *
-#define PIN_LCD_DB4     40   // * LCD display pins
-#define PIN_LCD_DB5     38   // *
-#define PIN_LCD_DB6     36   // *
-#define PIN_LCD_DB7     34   // *
+  #define PIN_LCD_RD          4    // *
+  #define PIN_LCD_ENABLE      5    // *
+  #define PIN_LCD_DB4         9    // * LCD display pins
+  #define PIN_LCD_DB5         8    // *
+  #define PIN_LCD_DB6         7    // *
+  #define PIN_LCD_DB7         6    // *
+#endif
+
+// the hardware UART to use for SIO bus communication
+#ifdef ARDUINO_MEGA
+  #define SIO_UART     Serial1
+  #define SIO_CALLBACK serialEvent1
+#else
+  #define SIO_UART     Serial
+  #define SIO_CALLBACK serialEvent
+#endif
+
+/**
+ * Logging/debug config
+ */
+#ifdef DEBUG
+  #define LOGGING_UART Serial
+  #define LOG_MSG(...) LOGGING_UART.print(__VA_ARGS__)
+  #define LOG_MSG_CR(...) LOGGING_UART.println(__VA_ARGS__)
+#else
+  #define LOG_MSG(...)
+  #define LOG_MSG_CR(...)
+#endif
+
 #endif

disk_drive.cpp

@@ -21,7 +21,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 #include "disk_drive.h"
-#include "log.h"
 
 DiskDrive::DiskDrive() {
   // reset device status

disk_image.cpp

@@ -21,7 +21,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 #include "disk_image.h"
-#include "log.h"
+#include "config.h"
 
 DiskImage::DiskImage() {
   m_fileRef = NULL;
@@ -41,8 +41,13 @@ boolean DiskImage::setFile(File* file) {
   if (loadFile(file)) {
     // create new sector buffer
     m_sectorBuffer.data = (byte*)malloc(sizeof(byte) * m_sectorSize);
-    LOG_MSG_CR(file->name());
-    return true;
+    if (!m_sectorBuffer.data) {
+      LOG_MSG_CR("Unable to allocate memory for sector buffer");
+      return false;
+    } else {
+      LOG_MSG_CR(file->name());
+      return true;
+    }
   } else {
     m_fileRef = NULL;
   }

log.h

@@ -21,7 +21,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 #include "sio_channel.h"
-#include "log.h"
+#include "config.h"
 
 SIOChannel::SIOChannel(int cmdPin, Stream* stream, DriveAccess *driveAccess, DriveControl *driveControl) {
   m_cmdPin = cmdPin;