diff options
| author | Donald Delmar Davis <don@suspectdevices.com> | 2012-10-17 20:36:43 -0700 |
|---|---|---|
| committer | Donald Delmar Davis <don@suspectdevices.com> | 2012-10-17 20:36:43 -0700 |
| commit | 0d4c2699ced7558e3afc69198de05fdd73a4d29b (patch) | |
| tree | b948a324d4b763cf45e480836768f07e36a45067 | |
| parent | ca70518b303b1006d6969e2f0cb288b2d773292e (diff) | |
fs work
92 files changed, 310 insertions, 9815 deletions
diff --git a/dumblogger/Monitor.cpp b/dumblogger/Monitor.cpp index 6b8297d..730d108 100644 --- a/dumblogger/Monitor.cpp +++ b/dumblogger/Monitor.cpp @@ -33,6 +33,7 @@ const char *keywords = KEYWORDS LOGGERKEYWORDS; +char debugBuffer[MAX_COMMAND_LINE_LENGTH]; //return buffer for console actions allocate this once use it often. char actionBuffer[MAX_COMMAND_LINE_LENGTH]; //return buffer for console actions allocate this once use it often. const char *theNak="NAK:"; @@ -77,12 +78,26 @@ char * lookupKey(int ndx, char *keyBuff) { return keyBuff; } -void toDevice(char *buff){ - usart_tx(USART1, (uint8_t *)buff, strlen(buff)); +void toDevice(const char *format, ...){ + va_list args; + va_start( args, format ); + vsprintf(actionBuffer, format, args ); + usart_tx(USART1, (uint8_t *)actionBuffer, strlen(actionBuffer)); usart_tx(USART1, (uint8_t *)"\r\n", 2); - ; + va_end(args); +} + +void debug(const char *format, ...){ + va_list args; + va_start( args, format ); + debugBuffer[0]='L',debugBuffer[1]='D',debugBuffer[2]='B',debugBuffer[3]=':', + vsprintf(debugBuffer+4, format, args ); + if(SerialUSB.isConnected() && (SerialUSB.getDTR() || SerialUSB.getRTS())) { + SerialUSB.write(debugBuffer); + SerialUSB.write("\r\n"); + } + va_end(args); } -extern "C" {int sdoPrintf(char *out, const char *format, ...);} void toConsole(const char *format, ...){ va_list args; @@ -98,7 +113,7 @@ void toConsole(const char *format, ...){ uint8_t NOPaction(uint8_t source) { if (source==CONSOLE) { - toConsole("DBG: Forwarding (%c%c%c)!", + debug("Forwarding (%c%c%c)!", consoleComm.line[0], consoleComm.line[1], consoleComm.line[2]); toDevice((char *)consoleComm.line); diff --git a/dumblogger/Monitor.h b/dumblogger/Monitor.h index 419241d..167bd10 100644 --- a/dumblogger/Monitor.h +++ b/dumblogger/Monitor.h @@ -144,7 +144,7 @@ _DTM_,_DID_,_LVB_,_LSV_ #include <stdint.h> #include <wirish/wirish.h> -#include "MapleFreeRTOS.h" +//#include "MapleFreeRTOS.h" #include <libmaple/timer.h> #include <libmaple/usart.h> @@ -175,7 +175,7 @@ typedef struct __cmdbuff { int kwIndex; bool gotline; uint8_t len; - xSemaphoreHandle xGotLineSemaphore; +// xSemaphoreHandle xGotLineSemaphore; } cmdBuffer; @@ -199,7 +199,7 @@ char *lookupKey(int ndx, unsigned char *keyBuffer); int handleDeviceInput(cmdBuffer *); int handleConsoleInput(cmdBuffer *); void toConsole(const char *format, ...); -void toDevice(char *); +void toDevice(const char *format, ...); void registerAction(uint8_t, actionptr); char *actBuff(const char *format, ...); #endif diff --git a/dumblogger/Utilities.cpp b/dumblogger/Utilities.cpp index dc16ca5..4e5a0d6 100644 --- a/dumblogger/Utilities.cpp +++ b/dumblogger/Utilities.cpp @@ -41,26 +41,17 @@ int openNextFile() { int max=0; char numpart[4]; root.rewind(); - while (root.readDir(p)>0) { + while (root.readDir(&p)>0) { //Watchdog_Reset(); togglePin(YEL_LED); togglePin(GRN_LED); - // done if past last used entry - if (p.name[0] == DIR_NAME_FREE) break; - - // skip deleted entry and entries for . and .. - if (p.name[0] == DIR_NAME_DELETED || p.name[0] == '.') continue; - - // only list subdirectories and files - if (!DIR_IS_FILE_OR_SUBDIR(&p)) continue; - #ifdef REMOVE_ALL_ZERO_LENGTH_FILES // delete 0 length files; if (p.fileSize==0) { p.name[0] = DIR_NAME_DELETED; continue; - + } #endif if (!strncmp("LOG", p.name, 3) && !strncmp("TXT", p.name+8, 3)) { @@ -77,9 +68,49 @@ int openNextFile() { p.name[8],p.name[9],p.name[10],max); */ } - //SdVolume::CacheFlush(); to finish deleting files. + //SdVolume::CacheFlush(); to finish deleting files. return max; } +char * nextFileName(bool rewind){ + static dir_t p; + //bool done=false; + if (rewind) root.rewind(); + if (root.readDir(&p)>0) { + return p.name; + } + return NULL; +} + +uint8_t DIRaction(uint8_t source){ + bool firstname=true; + char * filename; + toConsole("SOD:"); + while ((filename=nextFileName(firstname))!=NULL) { + toConsole("%s",filename); + firstname=false; + } + toConsole("EOD:"); +} + +int sdCardInit(void) { + if (!card.init()) { + return(_SD_CARD_INIT_FAILED_); + } + delay(100); + + // initialize a FAT volume + if (!volume.init(&card)) { + return(_SD_VOLUME_INIT_FAILED_); + } + + // open the root directory + if (!root.openRoot(&volume)) { + return(_SD_OPEN_ROOT_FAILED_); + } + return(_SD_CARD_OK_); +} + + diff --git a/dumblogger/Utilities.h b/dumblogger/Utilities.h index 81f30e1..1443c71 100644 --- a/dumblogger/Utilities.h +++ b/dumblogger/Utilities.h @@ -34,7 +34,9 @@ #include <SdFat.h> #include <HardwareSPI.h> #include <string.h> +#include <wirish/wirish.h> // move this to a project settings file. +#include "Monitor.h" #define BLU_LED 19 #define YEL_LED 18 @@ -42,10 +44,17 @@ #define LED_ON LOW #define LED_OFF HIGH +enum sdCardErrors { + _SD_CARD_OK_=0, + _SD_CARD_INIT_FAILED_, + _SD_VOLUME_INIT_FAILED_, + _SD_OPEN_ROOT_FAILED_, +}; + /*----------------------------------------------------------------------------- * file handling *----------------------------------------------------------------------------*/ - +extern HardwareSPI spi; extern Sd2Card card; extern SdVolume volume; extern SdFile root; @@ -53,3 +62,6 @@ extern SdFile file; int openNextFile(void); +int sdCardInit(void); +uint8_t DIRaction(uint8_t source); + diff --git a/dumblogger/datalogger.cpp b/dumblogger/datalogger.cpp index d5cee0f..40ec6e8 100644 --- a/dumblogger/datalogger.cpp +++ b/dumblogger/datalogger.cpp @@ -65,6 +65,7 @@ #include <libmaple/usart.h> //extern "C" { #include "Monitor.h" +#include "Utilities.h" //} /* Global Variables */ @@ -74,7 +75,9 @@ HardwareSPI spi(1); //Sd2Card card(&spi); -Sd2Card card; +//Sd2Card card;HardwareSPI spi(1); +Sd2Card card(spi, USE_NSS_PIN); + SdVolume volume; SdFile root; SdFile file; @@ -95,12 +98,12 @@ time_t epoch=0; #define MAX_TIME_LENGTH 24 -char deviceSSN[MAX_SSN_LENGTH]="00000000000"; +char deviceSSN[MAX_SSN_LENGTH]="00000000100"; char deviceHWV[MAX_HWV_LENGTH]="0"; char deviceSWV[MAX_SWV_LENGTH]="0.0-000000"; time_t deviceLastContact=0L; bool deviceIsConnected=false; - +int sdCardStatus=0; const int sensor_pin = 12; @@ -109,7 +112,8 @@ const int sensor_pin = 12; *----------------------------------------------------------------------------*/ void hardwareSetup(void) { - spi.begin(SPI_281_250KHZ, MSBFIRST, 0); + spi.begin(SPI_281_250KHZ, MSBFIRST, 0); // move to sdcard init? + pinMode(YEL_LED, OUTPUT); pinMode(GRN_LED, OUTPUT); @@ -118,22 +122,10 @@ void hardwareSetup(void) { digitalWrite(BLU_LED, LOW); digitalWrite(GRN_LED, HIGH); SerialUSB.begin(); - - if (!card.init(&spi)) { - //if (!card.init()) { - toConsole("FTL: card.init failed"); - } - delay(100); - - // initialize a FAT volume - if (!volume.init(&card)) { - toConsole("FTL: volume.init failed\r\n"); - } - - // open the root directory - if (!root.openRoot(&volume)) - toConsole("FTL: openRoot failed\r\n"); - + Serial1.begin(9600); + Serial2.begin(9600); + // probably should initialize the monitor. + sdCardStatus=sdCardInit(); } /*-----------------------------------------------------------------------Setup() @@ -154,6 +146,9 @@ void setup( void ) // Setup the sensor pin as an analog input pinMode(sensor_pin,INPUT_ANALOG); + registerAction(_DIR_, DIRaction); + + } /*---------------------------------------------------------------------LedTask() diff --git a/dumblogger/libraries/SDfat/.svn/all-wcprops b/dumblogger/libraries/SDfat/.svn/all-wcprops deleted file mode 100644 index 21137f1..0000000 --- a/dumblogger/libraries/SDfat/.svn/all-wcprops +++ /dev/null @@ -1,71 +0,0 @@ -K 25 -svn:wc:ra_dav:version-url -V 33 -/svn/!svn/ver/8/trunk/maple-sdfat -END -SdVolume.cpp -K 25 -svn:wc:ra_dav:version-url -V 46 -/svn/!svn/ver/6/trunk/maple-sdfat/SdVolume.cpp -END -rules.mk -K 25 -svn:wc:ra_dav:version-url -V 42 -/svn/!svn/ver/9/trunk/maple-sdfat/rules.mk -END -Sd2Card.cpp -K 25 -svn:wc:ra_dav:version-url -V 46 -/svn/!svn/ver/10/trunk/maple-sdfat/Sd2Card.cpp -END -Sd2PinMap.h -K 25 -svn:wc:ra_dav:version-url -V 45 -/svn/!svn/ver/6/trunk/maple-sdfat/Sd2PinMap.h -END -SdFatUtil.h -K 25 -svn:wc:ra_dav:version-url -V 45 -/svn/!svn/ver/6/trunk/maple-sdfat/SdFatUtil.h -END -SdFat.h -K 25 -svn:wc:ra_dav:version-url -V 41 -/svn/!svn/ver/6/trunk/maple-sdfat/SdFat.h -END -SdFile.cpp -K 25 -svn:wc:ra_dav:version-url -V 44 -/svn/!svn/ver/6/trunk/maple-sdfat/SdFile.cpp -END -SdInfo.h -K 25 -svn:wc:ra_dav:version-url -V 42 -/svn/!svn/ver/6/trunk/maple-sdfat/SdInfo.h -END -FatStructs.h -K 25 -svn:wc:ra_dav:version-url -V 47 -/svn/!svn/ver/11/trunk/maple-sdfat/FatStructs.h -END -Sd2Card.h -K 25 -svn:wc:ra_dav:version-url -V 43 -/svn/!svn/ver/6/trunk/maple-sdfat/Sd2Card.h -END -SdFatmainpage.h -K 25 -svn:wc:ra_dav:version-url -V 49 -/svn/!svn/ver/6/trunk/maple-sdfat/SdFatmainpage.h -END diff --git a/dumblogger/libraries/SDfat/.svn/entries b/dumblogger/libraries/SDfat/.svn/entries deleted file mode 100644 index b456c41..0000000 --- a/dumblogger/libraries/SDfat/.svn/entries +++ /dev/null @@ -1,405 +0,0 @@ -10 - -dir -8 -https://maple-sdfat.googlecode.com/svn/trunk/maple-sdfat -https://maple-sdfat.googlecode.com/svn - - - -2011-05-15T20:43:48.488246Z -8 -Jason.Vreeland@gmail.com - - - - - - - - - - - - - - -1c6c76e6-65e3-e54d-cebe-539f9b1c8f54 - -SdVolume.cpp -file - - - - -2012-07-19T00:13:14.000000Z -a45256de6641dad86a7e4be9810f5c59 -2011-05-15T17:29:00.744550Z -5 -Jason.Vreeland@gmail.com - - - - - - - - - - - - - - - - - - - - - -10505 - -rules.mk -file -9 - - - -2012-07-19T00:16:22.000000Z -77d78415c8416263f3ff7f62ff9894a3 -2012-07-19T00:37:08.053046Z -9 -DDelmarDavis@gmail.com - - - - - - - - - - - - - - - - - - - - - -647 - -Sd2Card.cpp -file -10 - - - -2012-07-19T00:48:43.000000Z -9603578b65a0e320703f970ebc1fce4f -2012-07-19T00:53:34.823390Z -10 -DDelmarDavis@gmail.com - - - - - - - - - - - - - - - - - - - - - -19968 - -Sd2PinMap.h -file - - - - -2012-07-19T00:13:14.000000Z -8de18227ac23ecf3a6f41c6065b7c1ae -2011-05-14T18:03:04.855990Z -2 -Jason.Vreeland@gmail.com - - - - - - - - - - - - - - - - - - - - - -12659 - -SdFatUtil.h -file - - - - -2012-07-19T00:13:14.000000Z -9da6c73179c555889217c09ada582127 -2011-05-14T18:03:04.855990Z -2 -Jason.Vreeland@gmail.com - - - - - - - - - - - - - - - - - - - - - -2574 - -SdFat.h -file - - - - -2012-07-19T00:13:14.000000Z -91b9b499f5dd10508fd9991f8d22cfd6 -2011-05-14T18:03:04.855990Z -2 -Jason.Vreeland@gmail.com - - - - - - - - - - - - - - - - - - - - - -22378 - -SdFile.cpp -file - - - - -2012-07-19T00:13:14.000000Z -111c4593eaed2cee758a8cf8e7161c60 -2011-05-14T18:03:04.855990Z -2 -Jason.Vreeland@gmail.com - - - - - - - - - - - - - - - - - - - - - -41959 - -SdInfo.h -file - - - - -2012-07-19T00:13:14.000000Z -c6b081761af95cc898694c0635c4ff79 -2011-05-14T18:03:04.855990Z -2 -Jason.Vreeland@gmail.com - - - - - - - - - - - - - - - - - - - - - -7260 - -FatStructs.h -file -11 - - - -2012-07-19T01:36:17.000000Z -24b243546df0ce6c0e64034981d22f3e -2012-07-19T01:36:43.639025Z -11 -DDelmarDavis@gmail.com - - - - - - - - - - - - - - - - - - - - - -17235 - -Sd2Card.h -file - - - - -2012-07-19T00:13:14.000000Z -83b1446a7e910b13d1b36a67105db753 -2011-05-14T18:03:04.855990Z -2 -Jason.Vreeland@gmail.com - - - - - - - - - - - - - - - - - - - - - -7524 - -SdFatmainpage.h -file - - - - -2012-07-19T00:13:14.000000Z -c03028484b575694f4e7e6b5ffc3fbde -2011-05-14T18:03:04.855990Z -2 -Jason.Vreeland@gmail.com - - - - - - - - - - - - - - - - - - - - - -8205 - -examples -dir - diff --git a/dumblogger/libraries/SDfat/.svn/text-base/FatStructs.h.svn-base b/dumblogger/libraries/SDfat/.svn/text-base/FatStructs.h.svn-base deleted file mode 100644 index 083c884..0000000 --- a/dumblogger/libraries/SDfat/.svn/text-base/FatStructs.h.svn-base +++ /dev/null @@ -1,424 +0,0 @@ -/* Arduino SdFat Library
- * Copyright (C) 2009 by William Greiman
- *
- * This file is part of the Arduino SdFat Library
- *
- * This Library is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This Library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Arduino SdFat Library. If not, see
- * <http://www.gnu.org/licenses/>.
- *
- * Originally ported to the maple platform by Jason Vreeland <jason.vreeland@gmail.com>
- * Patched by Donald Delmar Davis <don@suspectdevices.com> fixing issues 1-3
- *
- */
-#ifndef FatStructs_h
-#define FatStructs_h
-
-/**
- * \file
- * FAT file structures
- */
-/*
- * mostly from Microsoft document fatgen103.doc
- * http://www.microsoft.com/whdc/system/platform/firmware/fatgen.mspx
- */
-//------------------------------------------------------------------------------
-/** Value for byte 510 of boot block or MBR */
-uint8_t const BOOTSIG0 = 0X55;
-/** Value for byte 511 of boot block or MBR */
-uint8_t const BOOTSIG1 = 0XAA;
-//------------------------------------------------------------------------------
-/**
- * \struct partitionTable
- * \brief MBR partition table entry
- *
- * A partition table entry for a MBR formatted storage device.
- * The MBR partition table has four entries.
- */
-struct partitionTable {
- /**
- * Boot Indicator . Indicates whether the volume is the active
- * partition. Legal values include: 0X00. Do not use for booting.
- * 0X80 Active partition.
- */
- uint8_t boot;
- /**
- * Head part of Cylinder-head-sector address of the first block in
- * the partition. Legal values are 0-255. Only used in old PC BIOS.
- */
- uint8_t beginHead;
- /**
- * Sector part of Cylinder-head-sector address of the first block in
- * the partition. Legal values are 1-63. Only used in old PC BIOS.
- */
-
- uint8_t beginSector : 6;
- /** High bits cylinder for first block in partition. */
- uint8_t beginCylinderHigh : 2;
- /**
- * Combine beginCylinderLow with beginCylinderHigh. Legal values
- * are 0-1023. Only used in old PC BIOS.
- */
- uint8_t beginCylinderLow;
- /**
- * Partition type. See defines that begin with PART_TYPE_ for
- * some Microsoft partition types.
- */
- uint8_t type;
- /**
- * head part of cylinder-head-sector address of the last sector in the
- * partition. Legal values are 0-255. Only used in old PC BIOS.
- */
- uint8_t endHead;
- /**
- * Sector part of cylinder-head-sector address of the last sector in
- * the partition. Legal values are 1-63. Only used in old PC BIOS.
- */
- uint8_t endSector : 6;
- /** High bits of end cylinder */
- uint8_t endCylinderHigh : 2;
- /**
- * Combine endCylinderLow with endCylinderHigh. Legal values
- * are 0-1023. Only used in old PC BIOS.
- */
- uint8_t endCylinderLow;
- /** Logical block address of the first block in the partition. */
- uint32_t firstSector;
- /** Length of the partition, in blocks. */
- uint32_t totalSectors;
-}__attribute__ ((packed));
-/** Type name for partitionTable */
-typedef struct partitionTable part_t;
-//------------------------------------------------------------------------------
-/**
- * \struct masterBootRecord
- *
- * \brief Master Boot Record
- *
- * The first block of a storage device that is formatted with a MBR.
- */
-struct masterBootRecord {
- /** Code Area for master boot program. */
- uint8_t codeArea[440];
- /** Optional WindowsNT disk signature. May contain more boot code. */
- uint32_t diskSignature;
- /** Usually zero but may be more boot code. */
- uint16_t usuallyZero;
- /** Partition tables. */
- part_t part[4];
- /** First MBR signature byte. Must be 0X55 */
- uint8_t mbrSig0;
- /** Second MBR signature byte. Must be 0XAA */
- uint8_t mbrSig1;
-}__attribute__ ((packed));
-/** Type name for masterBootRecord */
-typedef struct masterBootRecord mbr_t;
-//------------------------------------------------------------------------------
-/**
- * \struct biosParmBlock
- *
- * \brief BIOS parameter block
- *
- * The BIOS parameter block describes the physical layout of a FAT volume.
- */
-struct biosParmBlock {
- /**
- * Count of bytes per sector. This value may take on only the
- * following values: 512, 1024, 2048 or 4096
- */
- uint16_t bytesPerSector;
- /**
- * Number of sectors per allocation unit. This value must be a
- * power of 2 that is greater than 0. The legal values are
- * 1, 2, 4, 8, 16, 32, 64, and 128.
- */
- uint8_t sectorsPerCluster;
- /**
- * Number of sectors before the first FAT.
- * This value must not be zero.
- */
- uint16_t reservedSectorCount;
- /** The count of FAT data structures on the volume. This field should
- * always contain the value 2 for any FAT volume of any type.
- */
- uint8_t fatCount;
- /**
- * For FAT12 and FAT16 volumes, this field contains the count of
- * 32-byte directory entries in the root directory. For FAT32 volumes,
- * this field must be set to 0. For FAT12 and FAT16 volumes, this
- * value should always specify a count that when multiplied by 32
- * results in a multiple of bytesPerSector. FAT16 volumes should
- * use the value 512.
- */
- uint16_t rootDirEntryCount;
- /**
- * This field is the old 16-bit total count of sectors on the volume.
- * This count includes the count of all sectors in all four regions
- * of the volume. This field can be 0; if it is 0, then totalSectors32
- * must be non-zero. For FAT32 volumes, this field must be 0. For
- * FAT12 and FAT16 volumes, this field contains the sector count, and
- * totalSectors32 is 0 if the total sector count fits
- * (is less than 0x10000).
- */
- uint16_t totalSectors16;
- /**
- * This dates back to the old MS-DOS 1.x media determination and is
- * no longer usually used for anything. 0xF8 is the standard value
- * for fixed (non-removable) media. For removable media, 0xF0 is
- * frequently used. Legal values are 0xF0 or 0xF8-0xFF.
- */
- uint8_t mediaType;
- /**
- * Count of sectors occupied by one FAT on FAT12/FAT16 volumes.
- * On FAT32 volumes this field must be 0, and sectorsPerFat32
- * contains the FAT size count.
- */
- uint16_t sectorsPerFat16;
- /** Sectors per track for interrupt 0x13. Not used otherwise. */
- uint16_t sectorsPerTrtack;
- /** Number of heads for interrupt 0x13. Not used otherwise. */
- uint16_t headCount;
- /**
- * Count of hidden sectors preceding the partition that contains this
- * FAT volume. This field is generally only relevant for media
- * visible on interrupt 0x13.
- */
- uint32_t hidddenSectors;
- /**
- * This field is the new 32-bit total count of sectors on the volume.
- * This count includes the count of all sectors in all four regions
- * of the volume. This field can be 0; if it is 0, then
- * totalSectors16 must be non-zero.
- */
- uint32_t totalSectors32;
- /**
- * Count of sectors occupied by one FAT on FAT32 volumes.
- */
- uint32_t sectorsPerFat32;
- /**
- * This field is only defined for FAT32 media and does not exist on
- * FAT12 and FAT16 media.
- * Bits 0-3 -- Zero-based number of active FAT.
- * Only valid if mirroring is disabled.
- * Bits 4-6 -- Reserved.
- * Bit 7 -- 0 means the FAT is mirrored at runtime into all FATs.
- * -- 1 means only one FAT is active; it is the one referenced in bits 0-3.
- * Bits 8-15 -- Reserved.
- */
- uint16_t fat32Flags;
- /**
- * FAT32 version. High byte is major revision number.
- * Low byte is minor revision number. Only 0.0 define.
- */
- uint16_t fat32Version;
- /**
- * Cluster number of the first cluster of the root directory for FAT32.
- * This usually 2 but not required to be 2.
- */
- uint32_t fat32RootCluster;
- /**
- * Sector number of FSINFO structure in the reserved area of the
- * FAT32 volume. Usually 1.
- */
- uint16_t fat32FSInfo;
- /**
- * If non-zero, indicates the sector number in the reserved area
- * of the volume of a copy of the boot record. Usually 6.
- * No value other than 6 is recommended.
- */
- uint16_t fat32BackBootBlock;
- /**
- * Reserved for future expansion. Code that formats FAT32 volumes
- * should always set all of the bytes of this field to 0.
- */
- uint8_t fat32Reserved[12];
-}__attribute__ ((packed));
-/** Type name for biosParmBlock */
-typedef struct biosParmBlock bpb_t;
-//------------------------------------------------------------------------------
-/**
- * \struct fat32BootSector
- *
- * \brief Boot sector for a FAT16 or FAT32 volume.
- *
- */
-struct fat32BootSector {
- /** X86 jmp to boot program */
- uint8_t jmpToBootCode[3];
- /** informational only - don't depend on it */
- uint8_t oemName[8];
- /** BIOS Parameter Block */
- bpb_t bpb;
- /** for int0x13 use value 0X80 for hard drive */
- uint8_t driveNumber;
- /** used by Windows NT - should be zero for FAT */
- uint8_t reserved1;
- /** 0X29 if next three fields are valid */
- uint8_t bootSignature;
- /** usually generated by combining date and time */
- uint32_t volumeSerialNumber;
- /** should match volume label in root dir */
- uint8_t volumeLabel[11];
- /** informational only - don't depend on it */
- uint8_t fileSystemType[8];
- /** X86 boot code */
- uint8_t bootCode[420];
- /** must be 0X55 */
- uint8_t bootSectorSig0;
- /** must be 0XAA */
- uint8_t bootSectorSig1;
-}__attribute__ ((packed));
-//------------------------------------------------------------------------------
-// End Of Chain values for FAT entries
-/** FAT16 end of chain value used by Microsoft. */
-uint16_t const FAT16EOC = 0XFFFF;
-/** Minimum value for FAT16 EOC. Use to test for EOC. */
-uint16_t const FAT16EOC_MIN = 0XFFF8;
-/** FAT32 end of chain value used by Microsoft. */
-uint32_t const FAT32EOC = 0X0FFFFFFF;
-/** Minimum value for FAT32 EOC. Use to test for EOC. */
-uint32_t const FAT32EOC_MIN = 0X0FFFFFF8;
-/** Mask a for FAT32 entry. Entries are 28 bits. */
-uint32_t const FAT32MASK = 0X0FFFFFFF;
-
-/** Type name for fat32BootSector */
-typedef struct fat32BootSector fbs_t;
-//------------------------------------------------------------------------------
-/**
- * \struct directoryEntry
- * \brief FAT short directory entry
- *
- * Short means short 8.3 name, not the entry size.
- *
- * Date Format. A FAT directory entry date stamp is a 16-bit field that is
- * basically a date relative to the MS-DOS epoch of 01/01/1980. Here is the
- * format (bit 0 is the LSB of the 16-bit word, bit 15 is the MSB of the
- * 16-bit word):
- *
- * Bits 9-15: Count of years from 1980, valid value range 0-127
- * inclusive (1980-2107).
- *
- * Bits 5-8: Month of year, 1 = January, valid value range 1-12 inclusive.
- *
- * Bits 0-4: Day of month, valid value range 1-31 inclusive.
- *
- * Time Format. A FAT directory entry time stamp is a 16-bit field that has
- * a granularity of 2 seconds. Here is the format (bit 0 is the LSB of the
- * 16-bit word, bit 15 is the MSB of the 16-bit word).
- *
- * Bits 11-15: Hours, valid value range 0-23 inclusive.
- *
- * Bits 5-10: Minutes, valid value range 0-59 inclusive.
- *
- * Bits 0-4: 2-second count, valid value range 0-29 inclusive (0 - 58 seconds).
- *
- * The valid time range is from Midnight 00:00:00 to 23:59:58.
- */
-struct directoryEntry {
- /**
- * Short 8.3 name.
- * The first eight bytes contain the file name with blank fill.
- * The last three bytes contain the file extension with blank fill.
- */
- char name[11];
- /** Entry attributes.
- *
- * The upper two bits of the attribute byte are reserved and should
- * always be set to 0 when a file is created and never modified or
- * looked at after that. See defines that begin with DIR_ATT_.
- */
- uint8_t attributes;
- /**
- * Reserved for use by Windows NT. Set value to 0 when a file is
- * created and never modify or look at it after that.
- */
- uint8_t reservedNT;
- /**
- * The granularity of the seconds part of creationTime is 2 seconds
- * so this field is a count of tenths of a second and its valid
- * value range is 0-199 inclusive. (WHG note - seems to be hundredths)
- */
- uint8_t creationTimeTenths;
- /** Time file was created. */
- uint16_t creationTime;
- /** Date file was created. */
- uint16_t creationDate;
- /**
- * Last access date. Note that there is no last access time, only
- * a date. This is the date of last read or write. In the case of
- * a write, this should be set to the same date as lastWriteDate.
- */
- uint16_t lastAccessDate;
- /**
- * High word of this entry's first cluster number (always 0 for a
- * FAT12 or FAT16 volume).
- */
- uint16_t firstClusterHigh;
- /** Time of last write. File creation is considered a write. */
- uint16_t lastWriteTime;
- /** Date of last write. File creation is considered a write. */
- uint16_t lastWriteDate;
- /** Low word of this entry's first cluster number. */
- uint16_t firstClusterLow;
- /** 32-bit unsigned holding this file's size in bytes. */
- uint32_t fileSize;
-}__attribute__ ((packed));
-//------------------------------------------------------------------------------
-// Definitions for directory entries
-//
-/** Type name for directoryEntry */
-typedef struct directoryEntry dir_t;
-/** escape for name[0] = 0XE5 */
-uint8_t const DIR_NAME_0XE5 = 0X05;
-/** name[0] value for entry that is free after being "deleted" */
-uint8_t const DIR_NAME_DELETED = 0XE5;
-/** name[0] value for entry that is free and no allocated entries follow */
-uint8_t const DIR_NAME_FREE = 0X00;
-/** file is read-only */
-uint8_t const DIR_ATT_READ_ONLY = 0X01;
-/** File should hidden in directory listings */
-uint8_t const DIR_ATT_HIDDEN = 0X02;
-/** Entry is for a system file */
-uint8_t const DIR_ATT_SYSTEM = 0X04;
-/** Directory entry contains the volume label */
-uint8_t const DIR_ATT_VOLUME_ID = 0X08;
-/** Entry is for a directory */
-uint8_t const DIR_ATT_DIRECTORY = 0X10;
-/** Old DOS archive bit for backup support */
-uint8_t const DIR_ATT_ARCHIVE = 0X20;
-/** Test value for long name entry. Test is
- (d->attributes & DIR_ATT_LONG_NAME_MASK) == DIR_ATT_LONG_NAME. */
-uint8_t const DIR_ATT_LONG_NAME = 0X0F;
-/** Test mask for long name entry */
-uint8_t const DIR_ATT_LONG_NAME_MASK = 0X3F;
-/** defined attribute bits */
-uint8_t const DIR_ATT_DEFINED_BITS = 0X3F;
-/** Directory entry is part of a long name */
-static inline uint8_t DIR_IS_LONG_NAME(const dir_t* dir) {
- return (dir->attributes & DIR_ATT_LONG_NAME_MASK) == DIR_ATT_LONG_NAME;
-}
-/** Mask for file/subdirectory tests */
-uint8_t const DIR_ATT_FILE_TYPE_MASK = (DIR_ATT_VOLUME_ID | DIR_ATT_DIRECTORY);
-/** Directory entry is for a file */
-static inline uint8_t DIR_IS_FILE(const dir_t* dir) {
- return (dir->attributes & DIR_ATT_FILE_TYPE_MASK) == 0;
-}
-/** Directory entry is for a subdirectory */
-static inline uint8_t DIR_IS_SUBDIR(const dir_t* dir) {
- return (dir->attributes & DIR_ATT_FILE_TYPE_MASK) == DIR_ATT_DIRECTORY;
-}
-/** Directory entry is for a file or subdirectory */
-static inline uint8_t DIR_IS_FILE_OR_SUBDIR(const dir_t* dir) {
- return (dir->attributes & DIR_ATT_VOLUME_ID) == 0;
-}
-#endif // FatStructs_h
diff --git a/dumblogger/libraries/SDfat/.svn/text-base/Sd2Card.cpp.svn-base b/dumblogger/libraries/SDfat/.svn/text-base/Sd2Card.cpp.svn-base deleted file mode 100644 index 594092b..0000000 --- a/dumblogger/libraries/SDfat/.svn/text-base/Sd2Card.cpp.svn-base +++ /dev/null @@ -1,703 +0,0 @@ -/* Arduino Sd2Card Library
- * Copyright (C) 2009 by William Greiman
- *
- * This file is part of the Arduino Sd2Card Library
- *
- * This Library is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This Library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Arduino Sd2Card Library. If not, see
- * <http://www.gnu.org/licenses/>.
- *
- * Originally ported to the maple platform by Jason Vreeland <jason.vreeland@gmail.com>
- * Patched by Donald Delmar Davis <don@suspectdevices.com> fixing issues #1-3
- *
- */
-#include <WProgram.h>
-#include "Sd2Card.h"
-#include "HardwareSPI.h"
-#include "spi.h"
-
-//pointer to spi object
-HardwareSPI *SPIn;
-
-//------------------------------------------------------------------------------
-// functions for hardware SPI
-/** Send a byte to the card */
-static void spiSend(uint8_t b)
-{
- SPIn->send(b);
- //while(SPIn->busy())
- //{
- //}
-}
-/** Receive a byte from the card */
-static uint8_t spiRec(void)
-{
- return SPIn->send(0XFF);
-// return SPIn->read();
-}
-
-//------------------------------------------------------------------------------
-// send command and return error code. Return zero for OK
-uint8_t Sd2Card::cardCommand(uint8_t cmd, uint32_t arg) {
- // end read if in partialBlockRead mode
- readEnd();
-
- // select card
- chipSelectLow();
-
- // wait up to 300 ms if busy
- waitNotBusy(300);
-
- // send command
- spiSend(cmd | 0x40);
-
- // send argument
- for (int8_t s = 24; s >= 0; s -= 8)
- spiSend(arg >> s);
-
- // send CRC
- uint8_t crc = 0XFF;
- if (cmd == CMD0) crc = 0X95; // correct crc for CMD0 with arg 0
- if (cmd == CMD8) crc = 0X87; // correct crc for CMD8 with arg 0X1AA
- spiSend(crc);
-
- // wait for response
- for (uint8_t i = 0; ((status_ = spiRec()) & 0X80) && i != 0XFF; i++);
- return status_;
-}
-//------------------------------------------------------------------------------
-/**
- * Determine the size of an SD flash memory card.
- *
- * \return The number of 512 byte data blocks in the card
- * or zero if an error occurs.
- */
-uint32_t Sd2Card::cardSize(void) {
- csd_t csd;
- if (!readCSD(&csd)) return 0;
- if (csd.v1.csd_ver == 0) {
- uint8_t read_bl_len = csd.v1.read_bl_len;
- uint16_t c_size = (csd.v1.c_size_high << 10)
- | (csd.v1.c_size_mid << 2) | csd.v1.c_size_low;
- uint8_t c_size_mult = (csd.v1.c_size_mult_high << 1)
- | csd.v1.c_size_mult_low;
- return (uint32_t)(c_size + 1) << (c_size_mult + read_bl_len - 7);
- } else if (csd.v2.csd_ver == 1) {
- uint32_t c_size = ((uint32_t)csd.v2.c_size_high << 16)
- | (csd.v2.c_size_mid << 8) | csd.v2.c_size_low;
- return (c_size + 1) << 10;
- } else {
- error(SD_CARD_ERROR_BAD_CSD);
- return 0;
- }
-}
-//------------------------------------------------------------------------------
-void Sd2Card::chipSelectHigh(void)
-{
- digitalWrite(SPIn->nssPin(), HIGH);
-}
-
-//------------------------------------------------------------------------------
-void Sd2Card::chipSelectLow(void)
-{
- digitalWrite(SPIn->nssPin(), LOW);
-}
-
-//------------------------------------------------------------------------------
-/** Erase a range of blocks.
- *
- * \param[in] firstBlock The address of the first block in the range.
- * \param[in] lastBlock The address of the last block in the range.
- *
- * \note This function requests the SD card to do a flash erase for a
- * range of blocks. The data on the card after an erase operation is
- * either 0 or 1, depends on the card vendor. The card must support
- * single block erase.
- *
- * \return The value one, true, is returned for success and
- * the value zero, false, is returned for failure.
- */
-uint8_t Sd2Card::erase(uint32_t firstBlock, uint32_t lastBlock)
-{
- if (!eraseSingleBlockEnable())
- {
- error(SD_CARD_ERROR_ERASE_SINGLE_BLOCK);
- SerialUSB.println("Error: Erase Single Block");
- goto fail;
- }
- if (type_ != SD_CARD_TYPE_SDHC)
- {
- firstBlock <<= 9;
- lastBlock <<= 9;
- }
- if (cardCommand(CMD32, firstBlock)
- || cardCommand(CMD33, lastBlock)
- || cardCommand(CMD38, 0))
- {
- error(SD_CARD_ERROR_ERASE);
- SerialUSB.println("Error: Erase");
- goto fail;
- }
- if (!waitNotBusy(SD_ERASE_TIMEOUT))
- {
- error(SD_CARD_ERROR_ERASE_TIMEOUT);
- SerialUSB.println("Error: Erase timeout");
- goto fail;
- }
- chipSelectHigh();
- return true;
-
- fail:
- chipSelectHigh();
- SerialUSB.println("Error: Sd2Card::Erase()");
- return false;
-}
-//------------------------------------------------------------------------------
-/** Determine if card supports single block erase.
- *
- * \return The value one, true, is returned if single block erase is supported.
- * The value zero, false, is returned if single block erase is not supported.
- */
-uint8_t Sd2Card::eraseSingleBlockEnable(void)
-{
- csd_t csd;
- return readCSD(&csd) ? csd.v1.erase_blk_en : 0;
-}
-//------------------------------------------------------------------------------
-/**
- * Initialize an SD flash memory card.
- *
- * \param[in] sckRateID SPI clock rate selector. See setSckRate().
- * \param[in] chipSelectPin SD chip select pin number.
- *
- * \return The value one, true, is returned for success and
- * the value zero, false, is returned for failure. The reason for failure
- * can be determined by calling errorCode() and errorData().
- */
-uint8_t Sd2Card::init(HardwareSPI *s)
-{
- errorCode_ = inBlock_ = partialBlockRead_ = type_ = 0;
- // 16-bit init start time allows over a minute
-
- uint16_t t0 = (uint16_t)millis();
- uint32_t arg;
- SPIn = s;
-
- pinMode(SPIn->nssPin(),OUTPUT);
-
- // set pin modes
-/* pinMode(chipSelectPin_, OUTPUT);
- chipSelectHigh();
- pinMode(SPI_MISO_PIN, INPUT);
- pinMode(SPI_MOSI_PIN, OUTPUT);
- pinMode(SPI_SCK_PIN, OUTPUT);
-*/
-
- // SS must be in output mode even it is not chip select
-// pinMode(SS_PIN, OUTPUT);
- // Enable SPI, Master, clock rate f_osc/128
-// SPCR = (1 << SPE) | (1 << MSTR) | (1 << SPR1) | (1 << SPR0);
- // clear double speed
-// SPSR &= ~(1 << SPI2X);
-
- // must supply min of 74 clock cycles with CS high.
-
- chipSelectHigh();
- for (uint8_t i = 0; i < 10; i++) spiSend(0XFF);
- chipSelectLow();
-
- // command to go idle in SPI mode
- while ((status_ = cardCommand(CMD0, 0)) != R1_IDLE_STATE)
- {
- if (((uint16_t)millis() - t0) > SD_INIT_TIMEOUT)
- {
- SerialUSB.println("Error: CMD0");
- error(SD_CARD_ERROR_CMD0);
- goto fail;
- }
- }
- // check SD version
- if ((cardCommand(CMD8, 0x1AA) & R1_ILLEGAL_COMMAND))
- {
- type(SD_CARD_TYPE_SD1);
- }
- else
- {
- // only need last byte of r7 response
- for (uint8_t i = 0; i < 4; i++)
- status_ = spiRec();
- if (status_ != 0XAA)
- {
- error(SD_CARD_ERROR_CMD8);
- SerialUSB.println("Error: CMD8");
- goto fail;
- }
- type(SD_CARD_TYPE_SD2);
- }
- // initialize card and send host supports SDHC if SD2
- arg = (type() == SD_CARD_TYPE_SD2) ? 0X40000000 : 0;
-
- while ((status_ = cardAcmd(ACMD41, arg)) != R1_READY_STATE)
- {
- // check for timeout
- if (((uint16_t)millis() - t0) > SD_INIT_TIMEOUT)
- {
- SerialUSB.println("Error: ACMD41");
- error(SD_CARD_ERROR_ACMD41);
- goto fail;
- }
- }
- // if SD2 read OCR register to check for SDHC card
- if (type() == SD_CARD_TYPE_SD2)
- {
- if (cardCommand(CMD58, 0))
- {
- SerialUSB.println("Error: CMD58");
- error(SD_CARD_ERROR_CMD58);
- goto fail;
- }
- if ((spiRec() & 0XC0) == 0XC0)
- type(SD_CARD_TYPE_SDHC);
- // discard rest of ocr - contains allowed voltage range
- for (uint8_t i = 0; i < 3; i++)
- spiRec();
- }
- chipSelectHigh();
-
-// return setSckRate(sckRateID);
- return true;
-
- fail:
- chipSelectHigh();
- SerialUSB.println("Error: Sd2Card::init()");
- return false;
-}
-//------------------------------------------------------------------------------
-/**
- * Enable or disable partial block reads.
- *
- * Enabling partial block reads improves performance by allowing a block
- * to be read over the SPI bus as several sub-blocks. Errors may occur
- * if the time between reads is too long since the SD card may timeout.
- * The SPI SS line will be held low until the entire block is read or
- * readEnd() is called.
- *
- * Use this for applications like the Adafruit Wave Shield.
- *
- * \param[in] value The value TRUE (non-zero) or FALSE (zero).)
- */
-void Sd2Card::partialBlockRead(uint8_t value)
-{
- readEnd();
- partialBlockRead_ = value;
-}
-//------------------------------------------------------------------------------
-/**
- * Read a 512 byte block from an SD card device.
- *
- * \param[in] block Logical block to be read.
- * \param[out] dst Pointer to the location that will receive the data.
-
- * \return The value one, true, is returned for success and
- * the value zero, false, is returned for failure.
- */
-uint8_t Sd2Card::readBlock(uint32_t block, uint8_t* dst)
-{
- return readData(block, 0, 512, dst);
-}
-//------------------------------------------------------------------------------
-/**
- * Read part of a 512 byte block from an SD card.
- *
- * \param[in] block Logical block to be read.
- * \param[in] offset Number of bytes to skip at start of block
- * \param[out] dst Pointer to the location that will receive the data.
- * \param[in] count Number of bytes to read
- * \return The value one, true, is returned for success and
- * the value zero, false, is returned for failure.
- */
-uint8_t Sd2Card::readData(uint32_t block,
- uint16_t offset, uint16_t count, uint8_t* dst)
-{
- uint16_t n;
- if (count == 0) return true;
- if ((count + offset) > 512)
- {
- goto fail;
- }
- if (!inBlock_ || block != block_ || offset < offset_)
- {
- block_ = block;
- // use address if not SDHC card
- if (type()!= SD_CARD_TYPE_SDHC)
- block <<= 9;
- if (cardCommand(CMD17, block))
- {
- error(SD_CARD_ERROR_CMD17);
- SerialUSB.println("Error: CMD17");
- goto fail;
- }
- if (!waitStartBlock())
- {
- goto fail;
- }
- offset_ = 0;
- inBlock_ = 1;
- }
-
-#ifdef OPTIMIZE_HARDWARE_SPI
-/* // start first spi transfer
- SPDR = 0XFF;
-
- // skip data before offset
- for (;offset_ < offset; offset_++) {
- while (!(SPSR & (1 << SPIF)));
- SPDR = 0XFF;
- }
- // transfer data
- n = count - 1;
- for (uint16_t i = 0; i < n; i++) {
- while (!(SPSR & (1 << SPIF)));
- dst[i] = SPDR;
- SPDR = 0XFF;
- }
- // wait for last byte
- while (!(SPSR & (1 << SPIF)));
- dst[n] = SPDR;
-*/
-#else // OPTIMIZE_HARDWARE_SPI
-
- // skip data before offset
- for (;offset_ < offset; offset_++)
- {
- spiRec();
- }
- // transfer data
- for (uint16_t i = 0; i < count; i++)
- {
- dst[i] = spiRec();
- }
-
-#endif // OPTIMIZE_HARDWARE_SPI
-
- offset_ += count;
- if (!partialBlockRead_ || offset_ >= 512)
- {
- // read rest of data, checksum and set chip select high
- readEnd();
- }
- return true;
-
- fail:
- chipSelectHigh();
- SerialUSB.println("Error: Sd2Card::readData()");
- return false;
-}
-//------------------------------------------------------------------------------
-/** Skip remaining data in a block when in partial block read mode. */
-void Sd2Card::readEnd(void)
-{
- if (inBlock_)
- {
- // skip data and crc
-#ifdef OPTIMIZE_HARDWARE_SPI
- // optimize skip for hardware
-/* SPDR = 0XFF;
- while (offset_++ < 513) {
- while (!(SPSR & (1 << SPIF)));
- SPDR = 0XFF;
- }
- // wait for last crc byte
- while (!(SPSR & (1 << SPIF)));
-*/
-#else // OPTIMIZE_HARDWARE_SPI
- while (offset_++ < 514)
- spiRec();
-#endif // OPTIMIZE_HARDWARE_SPI
- chipSelectHigh();
- inBlock_ = 0;
- }
-}
-//------------------------------------------------------------------------------
-/** read CID or CSR register */
-uint8_t Sd2Card::readRegister(uint8_t cmd, void* buf)
-{
- uint8_t* dst = reinterpret_cast<uint8_t*>(buf);
- if (cardCommand(cmd, 0))
- {
- error(SD_CARD_ERROR_READ_REG);
- SerialUSB.println("Error: Read reg");
- goto fail;
- }
- if (!waitStartBlock())
- goto fail;
- // transfer data
- for (uint16_t i = 0; i < 16; i++)
- dst[i] = spiRec();
- spiRec(); // get first crc byte
- spiRec(); // get second crc byte
- chipSelectHigh();
- return true;
-
- fail:
- SerialUSB.println("Error: Sd2Card::readRegister()");
- chipSelectHigh();
- return false;
-}
-//------------------------------------------------------------------------------
-/**
- * Set the SPI clock rate.
- *
- * \param[in] sckRateID A value in the range [0, 6].
- *
- * The SPI clock will be set to F_CPU/pow(2, 1 + sckRateID). The maximum
- * SPI rate is F_CPU/2 for \a sckRateID = 0 and the minimum rate is F_CPU/128
- * for \a scsRateID = 6.
- *
- * \return The value one, true, is returned for success and the value zero,
- * false, is returned for an invalid value of \a sckRateID.
- */
-uint8_t Sd2Card::setSckRate(uint8_t sckRateID) {
-/* if (sckRateID > 6) {
- error(SD_CARD_ERROR_SCK_RATE);
- return false;
- }
- // see avr processor datasheet for SPI register bit definitions
- if ((sckRateID & 1) || sckRateID == 6) {
- SPSR &= ~(1 << SPI2X);
- } else {
- SPSR |= (1 << SPI2X);
- }
- SPCR &= ~((1 <<SPR1) | (1 << SPR0));
- SPCR |= (sckRateID & 4 ? (1 << SPR1) : 0)
- | (sckRateID & 2 ? (1 << SPR0) : 0);
-*/
- return true;
-}
-//------------------------------------------------------------------------------
-// wait for card to go not busy
-uint8_t Sd2Card::waitNotBusy(uint16_t timeoutMillis)
-{
- uint16_t t0 = millis();
- do
- {
- if (spiRec() == 0XFF)
- return true;
- }
- while (((uint16_t)millis() - t0) < timeoutMillis);
- return false;
-}
-//------------------------------------------------------------------------------
-/** Wait for start block token */
-uint8_t Sd2Card::waitStartBlock(void)
-{
- uint16_t t0 = millis();
- while ((status_ = spiRec()) == 0XFF)
- {
- if (((uint16_t)millis() - t0) > SD_READ_TIMEOUT)
- {
- error(SD_CARD_ERROR_READ_TIMEOUT);
- SerialUSB.println("Error: Read timeout");
- goto fail;
- }
- }
- if (status_ != DATA_START_BLOCK)
- {
- error(SD_CARD_ERROR_READ);
- SerialUSB.println("Error: Read");
- goto fail;
- }
- return true;
-
- fail:
- chipSelectHigh();
- SerialUSB.println("Error: Sd2Card::waitStartBlock()");
- return false;
-}
-//------------------------------------------------------------------------------
-/**
- * Writes a 512 byte block to an SD card.
- *
- * \param[in] blockNumber Logical block to be written.
- * \param[in] src Pointer to the location of the data to be written.
- * \return The value one, true, is returned for success and
- * the value zero, false, is returned for failure.
- */
-uint8_t Sd2Card::writeBlock(uint32_t blockNumber, const uint8_t* src)
-{
-#if SD_PROTECT_BLOCK_ZERO
- // don't allow write to first block
- if (blockNumber == 0)
- {
- error(SD_CARD_ERROR_WRITE_BLOCK_ZERO);
- SerialUSB.println("Error: Write block zero");
- goto fail;
- }
-#endif // SD_PROTECT_BLOCK_ZERO
-
- // use address if not SDHC card
- if (type() != SD_CARD_TYPE_SDHC)
- blockNumber <<= 9;
- if (cardCommand(CMD24, blockNumber))
- {
- SerialUSB.println("Error: CMD42");
- error(SD_CARD_ERROR_CMD24);
- goto fail;
- }
- if (!writeData(DATA_START_BLOCK, src))
- goto fail;
-
- // wait for flash programming to complete
- if (!waitNotBusy(SD_WRITE_TIMEOUT))
- {
- error(SD_CARD_ERROR_WRITE_TIMEOUT);
- SerialUSB.println("Error: Write timeout");
- goto fail;
- }
- // response is r2 so get and check two bytes for nonzero
- if (cardCommand(CMD13, 0) || spiRec())
- {
- error(SD_CARD_ERROR_WRITE_PROGRAMMING);
- SerialUSB.println("Error: Write programming");
- goto fail;
- }
- chipSelectHigh();
- return true;
-
- fail:
- chipSelectHigh();
- SerialUSB.println("Error: Sd2Card::writeBlock");
- return false;
-}
-//------------------------------------------------------------------------------
-/** Write one data block in a multiple block write sequence */
-uint8_t Sd2Card::writeData(const uint8_t* src)
-{
- // wait for previous write to finish
- if (!waitNotBusy(SD_WRITE_TIMEOUT))
- {
- error(SD_CARD_ERROR_WRITE_MULTIPLE);
- SerialUSB.println("Error: writeData");
- chipSelectHigh();
- return false;
- }
- return writeData(WRITE_MULTIPLE_TOKEN, src);
-}
-//------------------------------------------------------------------------------
-// send one block of data for write block or write multiple blocks
-uint8_t Sd2Card::writeData(uint8_t token, const uint8_t* src) {
-#ifdef OPTIMIZE_HARDWARE_SPI
-/*
- // send data - optimized loop
- SPDR = token;
-
- // send two byte per iteration
- for (uint16_t i = 0; i < 512; i += 2) {
- while (!(SPSR & (1 << SPIF)));
- SPDR = src[i];
- while (!(SPSR & (1 << SPIF)));
- SPDR = src[i+1];
- }
-
- // wait for last data byte
- while (!(SPSR & (1 << SPIF)));
-*/
-#else // OPTIMIZE_HARDWARE_SPI
- spiSend(token);
- for (uint16_t i = 0; i < 512; i++)
- {
- spiSend(src[i]);
- }
-#endif // OPTIMIZE_HARDWARE_SPI
- spiSend(0xff); // dummy crc
- spiSend(0xff); // dummy crc
-
- status_ = spiRec();
- if ((status_ & DATA_RES_MASK) != DATA_RES_ACCEPTED)
- {
- error(SD_CARD_ERROR_WRITE);
- chipSelectHigh();
- SerialUSB.println("Error: Write");
- SerialUSB.println("Error: Sd2Card::writeData()");
- return false;
- }
- return true;
-}
-//------------------------------------------------------------------------------
-/** Start a write multiple blocks sequence.
- *
- * \param[in] blockNumber Address of first block in sequence.
- * \param[in] eraseCount The number of blocks to be pre-erased.
- *
- * \note This function is used with writeData() and writeStop()
- * for optimized multiple block writes.
- *
- * \return The value one, true, is returned for success and
- * the value zero, false, is returned for failure.
- */
-uint8_t Sd2Card::writeStart(uint32_t blockNumber, uint32_t eraseCount)
-{
-#if SD_PROTECT_BLOCK_ZERO
- // don't allow write to first block
- if (blockNumber == 0)
- {
- error(SD_CARD_ERROR_WRITE_BLOCK_ZERO);
- SerialUSB.println("Error: Write block zero");
- goto fail;
- }
-#endif // SD_PROTECT_BLOCK_ZERO
- // send pre-erase count
- if (cardAcmd(ACMD23, eraseCount))
- {
- SerialUSB.println("Error: ACMD23");
- error(SD_CARD_ERROR_ACMD23);
- goto fail;
- }
- // use address if not SDHC card
- if (type() != SD_CARD_TYPE_SDHC)
- blockNumber <<= 9;
- if (cardCommand(CMD25, blockNumber))
- {
- error(SD_CARD_ERROR_CMD25);
- SerialUSB.println("Error: CMD25");
- goto fail;
- }
- return true;
-
- fail:
- chipSelectHigh();
- SerialUSB.println("Error: Sd2Card::writeStart()");
- return false;
-}
-//------------------------------------------------------------------------------
-/** End a write multiple blocks sequence.
- *
-* \return The value one, true, is returned for success and
- * the value zero, false, is returned for failure.
- */
-uint8_t Sd2Card::writeStop(void)
-{
- if (!waitNotBusy(SD_WRITE_TIMEOUT))
- goto fail;
- spiSend(STOP_TRAN_TOKEN);
- if (!waitNotBusy(SD_WRITE_TIMEOUT))
- goto fail;
- chipSelectHigh();
- return true;
-
- fail:
- error(SD_CARD_ERROR_STOP_TRAN);
- chipSelectHigh();
- SerialUSB.println("Error: Sd2Card::writeStop()");
- return false;
-}
diff --git a/dumblogger/libraries/SDfat/.svn/text-base/Sd2Card.h.svn-base b/dumblogger/libraries/SDfat/.svn/text-base/Sd2Card.h.svn-base deleted file mode 100644 index 40adb68..0000000 --- a/dumblogger/libraries/SDfat/.svn/text-base/Sd2Card.h.svn-base +++ /dev/null @@ -1,191 +0,0 @@ -/* Arduino Sd2Card Library
- * Copyright (C) 2009 by William Greiman
- *
- * This file is part of the Arduino Sd2Card Library
- *
- * This Library is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This Library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Arduino Sd2Card Library. If not, see
- * <http://www.gnu.org/licenses/>.
- */
-#ifndef Sd2Card_h
-#define Sd2Card_h
-/**
- * \file
- * Sd2Card class
- */
-#include "Sd2PinMap.h"
-#include "SdInfo.h"
-#include "HardwareSPI.h"
-
-/** Set SCK to max rate of F_CPU/2. See Sd2Card::setSckRate(). */
-uint8_t const SPI_FULL_SPEED = 0;
-/** Set SCK rate to F_CPU/4. See Sd2Card::setSckRate(). */
-uint8_t const SPI_HALF_SPEED = 1;
-/** Set SCK rate to F_CPU/8. Sd2Card::setSckRate(). */
-uint8_t const SPI_QUARTER_SPEED = 2;
-//------------------------------------------------------------------------------
-/** Protect block zero from write if nonzero */
-#define SD_PROTECT_BLOCK_ZERO 1
-/** init timeout ms */
-uint16_t const SD_INIT_TIMEOUT = 2000;
-/** erase timeout ms */
-uint16_t const SD_ERASE_TIMEOUT = 10000;
-/** read timeout ms */
-uint16_t const SD_READ_TIMEOUT = 300;
-/** write time out ms */
-uint16_t const SD_WRITE_TIMEOUT = 600;
-//------------------------------------------------------------------------------
-// SD card errors
-/** timeout error for command CMD0 */
-uint8_t const SD_CARD_ERROR_CMD0 = 0X1;
-/** CMD8 was not accepted - not a valid SD card*/
-uint8_t const SD_CARD_ERROR_CMD8 = 0X2;
-/** card returned an error response for CMD17 (read block) */
-uint8_t const SD_CARD_ERROR_CMD17 = 0X3;
-/** card returned an error response for CMD24 (write block) */
-uint8_t const SD_CARD_ERROR_CMD24 = 0X4;
-/** WRITE_MULTIPLE_BLOCKS command failed */
-uint8_t const SD_CARD_ERROR_CMD25 = 0X05;
-/** card returned an error response for CMD58 (read OCR) */
-uint8_t const SD_CARD_ERROR_CMD58 = 0X06;
-/** SET_WR_BLK_ERASE_COUNT failed */
-uint8_t const SD_CARD_ERROR_ACMD23 = 0X07;
-/** card's ACMD41 initialization process timeout */
-uint8_t const SD_CARD_ERROR_ACMD41 = 0X08;
-/** card returned a bad CSR version field */
-uint8_t const SD_CARD_ERROR_BAD_CSD = 0X09;
-/** erase block group command failed */
-uint8_t const SD_CARD_ERROR_ERASE = 0X0A;
-/** card not capable of single block erase */
-uint8_t const SD_CARD_ERROR_ERASE_SINGLE_BLOCK = 0X0B;
-/** Erase sequence timed out */
-uint8_t const SD_CARD_ERROR_ERASE_TIMEOUT = 0X0C;
-/** card returned an error token instead of read data */
-uint8_t const SD_CARD_ERROR_READ = 0X0D;
-/** read CID or CSD failed */
-uint8_t const SD_CARD_ERROR_READ_REG = 0X0E;
-/** timeout while waiting for start of read data */
-uint8_t const SD_CARD_ERROR_READ_TIMEOUT = 0X0F;
-/** card did not accept STOP_TRAN_TOKEN */
-uint8_t const SD_CARD_ERROR_STOP_TRAN = 0X10;
-/** card returned an error token as a response to a write operation */
-uint8_t const SD_CARD_ERROR_WRITE = 0X11;
-/** attempt to write protected block zero */
-uint8_t const SD_CARD_ERROR_WRITE_BLOCK_ZERO = 0X12;
-/** card did not go ready for a multiple block write */
-uint8_t const SD_CARD_ERROR_WRITE_MULTIPLE = 0X13;
-/** card returned an error to a CMD13 status check after a write */
-uint8_t const SD_CARD_ERROR_WRITE_PROGRAMMING = 0X14;
-/** timeout occurred during write programming */
-uint8_t const SD_CARD_ERROR_WRITE_TIMEOUT = 0X15;
-/** incorrect rate selected */
-uint8_t const SD_CARD_ERROR_SCK_RATE = 0X16;
-//------------------------------------------------------------------------------
-// card types
-/** Standard capacity V1 SD card */
-uint8_t const SD_CARD_TYPE_SD1 = 1;
-/** Standard capacity V2 SD card */
-uint8_t const SD_CARD_TYPE_SD2 = 2;
-/** High Capacity SD card */
-uint8_t const SD_CARD_TYPE_SDHC = 3;
-//------------------------------------------------------------------------------
-/**
- * \class Sd2Card
- * \brief Raw access to SD and SDHC flash memory cards.
- */
-class Sd2Card {
- public:
- /** Construct an instance of Sd2Card. */
- Sd2Card(void) : errorCode_(0), inBlock_(0), partialBlockRead_(0), type_(0) {}
- uint32_t cardSize(void);
- uint8_t erase(uint32_t firstBlock, uint32_t lastBlock);
- uint8_t eraseSingleBlockEnable(void);
- /**
- * \return error code for last error. See Sd2Card.h for a list of error codes.
- */
- uint8_t errorCode(void) const {return errorCode_;}
- /** \return error data for last error. */
- uint8_t errorData(void) const {return status_;}
- /**
- * Initialize an SD flash memory card with default clock rate and chip
- * select pin. See sd2Card::init(uint8_t sckRateID, uint8_t chipSelectPin).
- */
- uint8_t init(void) {
-// return init(SPI_FULL_SPEED, SD_CHIP_SELECT_PIN);
- return false;
- }
-
- /**
- * Initialize an SD flash memory card with the selected SPI clock rate
- * and the default SD chip select pin.
- * See sd2Card::init(uint8_t sckRateID, uint8_t chipSelectPin).
- */
- uint8_t init(uint8_t sckRateID) {
-// return init(sckRateID, SD_CHIP_SELECT_PIN);
- return false;
- }
-
- uint8_t init(HardwareSPI *);
- void partialBlockRead(uint8_t value);
- /** Returns the current value, true or false, for partial block read. */
- uint8_t partialBlockRead(void) const {return partialBlockRead_;}
- uint8_t readBlock(uint32_t block, uint8_t* dst);
- uint8_t readData(uint32_t block,
- uint16_t offset, uint16_t count, uint8_t* dst);
- /**
- * Read a cards CID register. The CID contains card identification
- * information such as Manufacturer ID, Product name, Product serial
- * number and Manufacturing date. */
- uint8_t readCID(cid_t* cid) {
- return readRegister(CMD10, cid);
- }
- /**
- * Read a cards CSD register. The CSD contains Card-Specific Data that
- * provides information regarding access to the card's contents. */
- uint8_t readCSD(csd_t* csd) {
- return readRegister(CMD9, csd);
- }
- void readEnd(void);
- uint8_t setSckRate(uint8_t sckRateID);
- /** Return the card type: SD V1, SD V2 or SDHC */
- uint8_t type(void) const {return type_;}
- uint8_t writeBlock(uint32_t blockNumber, const uint8_t* src);
- uint8_t writeData(const uint8_t* src);
- uint8_t writeStart(uint32_t blockNumber, uint32_t eraseCount);
- uint8_t writeStop(void);
- private:
- uint32_t block_;
- uint8_t chipSelectPin_;
- uint8_t errorCode_;
- uint8_t inBlock_;
- uint16_t offset_;
- uint8_t partialBlockRead_;
- uint8_t status_;
- uint8_t type_;
- // private functions
- uint8_t cardAcmd(uint8_t cmd, uint32_t arg) {
- cardCommand(CMD55, 0);
- return cardCommand(cmd, arg);
- }
- uint8_t cardCommand(uint8_t cmd, uint32_t arg);
- void error(uint8_t code) {errorCode_ = code;}
- uint8_t readRegister(uint8_t cmd, void* buf);
- uint8_t sendWriteCommand(uint32_t blockNumber, uint32_t eraseCount);
- void chipSelectHigh(void);
- void chipSelectLow(void);
- void type(uint8_t value) {type_ = value;}
- uint8_t waitNotBusy(uint16_t timeoutMillis);
- uint8_t writeData(uint8_t token, const uint8_t* src);
- uint8_t waitStartBlock(void);
-};
-#endif // Sd2Card_h
diff --git a/dumblogger/libraries/SDfat/.svn/text-base/Sd2PinMap.h.svn-base b/dumblogger/libraries/SDfat/.svn/text-base/Sd2PinMap.h.svn-base deleted file mode 100644 index f23e969..0000000 --- a/dumblogger/libraries/SDfat/.svn/text-base/Sd2PinMap.h.svn-base +++ /dev/null @@ -1,357 +0,0 @@ -/* Arduino SdFat Library
- * Copyright (C) 2010 by William Greiman
- *
- * This file is part of the Arduino SdFat Library
- *
- * This Library is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This Library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Arduino SdFat Library. If not, see
- * <http://www.gnu.org/licenses/>.
- */
-// Warning this file was generated by a program.
-#ifndef Sd2PinMap_h
-#define Sd2PinMap_h
-
-#include <stdint.h>
-
-//------------------------------------------------------------------------------
-/** struct for mapping digital pins */
-struct pin_map_t
-{
- volatile uint8_t* ddr;
- volatile uint8_t* pin;
- volatile uint8_t* port;
- uint8_t bit;
-};
-/*
-//------------------------------------------------------------------------------
-#if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
-// Mega
-
-// Two Wire (aka I2C) ports
-uint8_t const SDA_PIN = 20;
-uint8_t const SCL_PIN = 21;
-
-// SPI port
-uint8_t const SS_PIN = 53;
-uint8_t const MOSI_PIN = 51;
-uint8_t const MISO_PIN = 50;
-uint8_t const SCK_PIN = 52;
-
-static const pin_map_t digitalPinMap[] = {
- {&DDRE, &PINE, &PORTE, 0}, // E0 0
- {&DDRE, &PINE, &PORTE, 1}, // E1 1
- {&DDRE, &PINE, &PORTE, 4}, // E4 2
- {&DDRE, &PINE, &PORTE, 5}, // E5 3
- {&DDRG, &PING, &PORTG, 5}, // G5 4
- {&DDRE, &PINE, &PORTE, 3}, // E3 5
- {&DDRH, &PINH, &PORTH, 3}, // H3 6
- {&DDRH, &PINH, &PORTH, 4}, // H4 7
- {&DDRH, &PINH, &PORTH, 5}, // H5 8
- {&DDRH, &PINH, &PORTH, 6}, // H6 9
- {&DDRB, &PINB, &PORTB, 4}, // B4 10
- {&DDRB, &PINB, &PORTB, 5}, // B5 11
- {&DDRB, &PINB, &PORTB, 6}, // B6 12
- {&DDRB, &PINB, &PORTB, 7}, // B7 13
- {&DDRJ, &PINJ, &PORTJ, 1}, // J1 14
- {&DDRJ, &PINJ, &PORTJ, 0}, // J0 15
- {&DDRH, &PINH, &PORTH, 1}, // H1 16
- {&DDRH, &PINH, &PORTH, 0}, // H0 17
- {&DDRD, &PIND, &PORTD, 3}, // D3 18
- {&DDRD, &PIND, &PORTD, 2}, // D2 19
- {&DDRD, &PIND, &PORTD, 1}, // D1 20
- {&DDRD, &PIND, &PORTD, 0}, // D0 21
- {&DDRA, &PINA, &PORTA, 0}, // A0 22
- {&DDRA, &PINA, &PORTA, 1}, // A1 23
- {&DDRA, &PINA, &PORTA, 2}, // A2 24
- {&DDRA, &PINA, &PORTA, 3}, // A3 25
- {&DDRA, &PINA, &PORTA, 4}, // A4 26
- {&DDRA, &PINA, &PORTA, 5}, // A5 27
- {&DDRA, &PINA, &PORTA, 6}, // A6 28
- {&DDRA, &PINA, &PORTA, 7}, // A7 29
- {&DDRC, &PINC, &PORTC, 7}, // C7 30
- {&DDRC, &PINC, &PORTC, 6}, // C6 31
- {&DDRC, &PINC, &PORTC, 5}, // C5 32
- {&DDRC, &PINC, &PORTC, 4}, // C4 33
- {&DDRC, &PINC, &PORTC, 3}, // C3 34
- {&DDRC, &PINC, &PORTC, 2}, // C2 35
- {&DDRC, &PINC, &PORTC, 1}, // C1 36
- {&DDRC, &PINC, &PORTC, 0}, // C0 37
- {&DDRD, &PIND, &PORTD, 7}, // D7 38
- {&DDRG, &PING, &PORTG, 2}, // G2 39
- {&DDRG, &PING, &PORTG, 1}, // G1 40
- {&DDRG, &PING, &PORTG, 0}, // G0 41
- {&DDRL, &PINL, &PORTL, 7}, // L7 42
- {&DDRL, &PINL, &PORTL, 6}, // L6 43
- {&DDRL, &PINL, &PORTL, 5}, // L5 44
- {&DDRL, &PINL, &PORTL, 4}, // L4 45
- {&DDRL, &PINL, &PORTL, 3}, // L3 46
- {&DDRL, &PINL, &PORTL, 2}, // L2 47
- {&DDRL, &PINL, &PORTL, 1}, // L1 48
- {&DDRL, &PINL, &PORTL, 0}, // L0 49
- {&DDRB, &PINB, &PORTB, 3}, // B3 50
- {&DDRB, &PINB, &PORTB, 2}, // B2 51
- {&DDRB, &PINB, &PORTB, 1}, // B1 52
- {&DDRB, &PINB, &PORTB, 0}, // B0 53
- {&DDRF, &PINF, &PORTF, 0}, // F0 54
- {&DDRF, &PINF, &PORTF, 1}, // F1 55
- {&DDRF, &PINF, &PORTF, 2}, // F2 56
- {&DDRF, &PINF, &PORTF, 3}, // F3 57
- {&DDRF, &PINF, &PORTF, 4}, // F4 58
- {&DDRF, &PINF, &PORTF, 5}, // F5 59
- {&DDRF, &PINF, &PORTF, 6}, // F6 60
- {&DDRF, &PINF, &PORTF, 7}, // F7 61
- {&DDRK, &PINK, &PORTK, 0}, // K0 62
- {&DDRK, &PINK, &PORTK, 1}, // K1 63
- {&DDRK, &PINK, &PORTK, 2}, // K2 64
- {&DDRK, &PINK, &PORTK, 3}, // K3 65
- {&DDRK, &PINK, &PORTK, 4}, // K4 66
- {&DDRK, &PINK, &PORTK, 5}, // K5 67
- {&DDRK, &PINK, &PORTK, 6}, // K6 68
- {&DDRK, &PINK, &PORTK, 7} // K7 69
-};
-//------------------------------------------------------------------------------
-#elif defined(__AVR_ATmega644P__) || defined(__AVR_ATmega644__)
-// Sanguino
-
-// Two Wire (aka I2C) ports
-uint8_t const SDA_PIN = 17;
-uint8_t const SCL_PIN = 18;
-
-// SPI port
-uint8_t const SS_PIN = 4;
-uint8_t const MOSI_PIN = 5;
-uint8_t const MISO_PIN = 6;
-uint8_t const SCK_PIN = 7;
-
-static const pin_map_t digitalPinMap[] = {
- {&DDRB, &PINB, &PORTB, 0}, // B0 0
- {&DDRB, &PINB, &PORTB, 1}, // B1 1
- {&DDRB, &PINB, &PORTB, 2}, // B2 2
- {&DDRB, &PINB, &PORTB, 3}, // B3 3
- {&DDRB, &PINB, &PORTB, 4}, // B4 4
- {&DDRB, &PINB, &PORTB, 5}, // B5 5
- {&DDRB, &PINB, &PORTB, 6}, // B6 6
- {&DDRB, &PINB, &PORTB, 7}, // B7 7
- {&DDRD, &PIND, &PORTD, 0}, // D0 8
- {&DDRD, &PIND, &PORTD, 1}, // D1 9
- {&DDRD, &PIND, &PORTD, 2}, // D2 10
- {&DDRD, &PIND, &PORTD, 3}, // D3 11
- {&DDRD, &PIND, &PORTD, 4}, // D4 12
- {&DDRD, &PIND, &PORTD, 5}, // D5 13
- {&DDRD, &PIND, &PORTD, 6}, // D6 14
- {&DDRD, &PIND, &PORTD, 7}, // D7 15
- {&DDRC, &PINC, &PORTC, 0}, // C0 16
- {&DDRC, &PINC, &PORTC, 1}, // C1 17
- {&DDRC, &PINC, &PORTC, 2}, // C2 18
- {&DDRC, &PINC, &PORTC, 3}, // C3 19
- {&DDRC, &PINC, &PORTC, 4}, // C4 20
- {&DDRC, &PINC, &PORTC, 5}, // C5 21
- {&DDRC, &PINC, &PORTC, 6}, // C6 22
- {&DDRC, &PINC, &PORTC, 7}, // C7 23
- {&DDRA, &PINA, &PORTA, 7}, // A7 24
- {&DDRA, &PINA, &PORTA, 6}, // A6 25
- {&DDRA, &PINA, &PORTA, 5}, // A5 26
- {&DDRA, &PINA, &PORTA, 4}, // A4 27
- {&DDRA, &PINA, &PORTA, 3}, // A3 28
- {&DDRA, &PINA, &PORTA, 2}, // A2 29
- {&DDRA, &PINA, &PORTA, 1}, // A1 30
- {&DDRA, &PINA, &PORTA, 0} // A0 31
-};
-//------------------------------------------------------------------------------
-#elif defined(__AVR_ATmega32U4__)
-// Teensy 2.0
-
-// Two Wire (aka I2C) ports
-uint8_t const SDA_PIN = 6;
-uint8_t const SCL_PIN = 5;
-
-// SPI port
-uint8_t const SS_PIN = 0;
-uint8_t const MOSI_PIN = 2;
-uint8_t const MISO_PIN = 3;
-uint8_t const SCK_PIN = 1;
-
-static const pin_map_t digitalPinMap[] = {
- {&DDRB, &PINB, &PORTB, 0}, // B0 0
- {&DDRB, &PINB, &PORTB, 1}, // B1 1
- {&DDRB, &PINB, &PORTB, 2}, // B2 2
- {&DDRB, &PINB, &PORTB, 3}, // B3 3
- {&DDRB, &PINB, &PORTB, 7}, // B7 4
- {&DDRD, &PIND, &PORTD, 0}, // D0 5
- {&DDRD, &PIND, &PORTD, 1}, // D1 6
- {&DDRD, &PIND, &PORTD, 2}, // D2 7
- {&DDRD, &PIND, &PORTD, 3}, // D3 8
- {&DDRC, &PINC, &PORTC, 6}, // C6 9
- {&DDRC, &PINC, &PORTC, 7}, // C7 10
- {&DDRD, &PIND, &PORTD, 6}, // D6 11
- {&DDRD, &PIND, &PORTD, 7}, // D7 12
- {&DDRB, &PINB, &PORTB, 4}, // B4 13
- {&DDRB, &PINB, &PORTB, 5}, // B5 14
- {&DDRB, &PINB, &PORTB, 6}, // B6 15
- {&DDRF, &PINF, &PORTF, 7}, // F7 16
- {&DDRF, &PINF, &PORTF, 6}, // F6 17
- {&DDRF, &PINF, &PORTF, 5}, // F5 18
- {&DDRF, &PINF, &PORTF, 4}, // F4 19
- {&DDRF, &PINF, &PORTF, 1}, // F1 20
- {&DDRF, &PINF, &PORTF, 0}, // F0 21
- {&DDRD, &PIND, &PORTD, 4}, // D4 22
- {&DDRD, &PIND, &PORTD, 5}, // D5 23
- {&DDRE, &PINE, &PORTE, 6} // E6 24
-};
-//------------------------------------------------------------------------------
-#elif defined(__AVR_AT90USB646__) || defined(__AVR_AT90USB1286__)
-// Teensy++ 1.0 & 2.0
-
-// Two Wire (aka I2C) ports
-uint8_t const SDA_PIN = 1;
-uint8_t const SCL_PIN = 0;
-
-// SPI port
-uint8_t const SS_PIN = 20;
-uint8_t const MOSI_PIN = 22;
-uint8_t const MISO_PIN = 23;
-uint8_t const SCK_PIN = 21;
-
-static const pin_map_t digitalPinMap[] = {
- {&DDRD, &PIND, &PORTD, 0}, // D0 0
- {&DDRD, &PIND, &PORTD, 1}, // D1 1
- {&DDRD, &PIND, &PORTD, 2}, // D2 2
- {&DDRD, &PIND, &PORTD, 3}, // D3 3
- {&DDRD, &PIND, &PORTD, 4}, // D4 4
- {&DDRD, &PIND, &PORTD, 5}, // D5 5
- {&DDRD, &PIND, &PORTD, 6}, // D6 6
- {&DDRD, &PIND, &PORTD, 7}, // D7 7
- {&DDRE, &PINE, &PORTE, 0}, // E0 8
- {&DDRE, &PINE, &PORTE, 1}, // E1 9
- {&DDRC, &PINC, &PORTC, 0}, // C0 10
- {&DDRC, &PINC, &PORTC, 1}, // C1 11
- {&DDRC, &PINC, &PORTC, 2}, // C2 12
- {&DDRC, &PINC, &PORTC, 3}, // C3 13
- {&DDRC, &PINC, &PORTC, 4}, // C4 14
- {&DDRC, &PINC, &PORTC, 5}, // C5 15
- {&DDRC, &PINC, &PORTC, 6}, // C6 16
- {&DDRC, &PINC, &PORTC, 7}, // C7 17
- {&DDRE, &PINE, &PORTE, 6}, // E6 18
- {&DDRE, &PINE, &PORTE, 7}, // E7 19
- {&DDRB, &PINB, &PORTB, 0}, // B0 20
- {&DDRB, &PINB, &PORTB, 1}, // B1 21
- {&DDRB, &PINB, &PORTB, 2}, // B2 22
- {&DDRB, &PINB, &PORTB, 3}, // B3 23
- {&DDRB, &PINB, &PORTB, 4}, // B4 24
- {&DDRB, &PINB, &PORTB, 5}, // B5 25
- {&DDRB, &PINB, &PORTB, 6}, // B6 26
- {&DDRB, &PINB, &PORTB, 7}, // B7 27
- {&DDRA, &PINA, &PORTA, 0}, // A0 28
- {&DDRA, &PINA, &PORTA, 1}, // A1 29
- {&DDRA, &PINA, &PORTA, 2}, // A2 30
- {&DDRA, &PINA, &PORTA, 3}, // A3 31
- {&DDRA, &PINA, &PORTA, 4}, // A4 32
- {&DDRA, &PINA, &PORTA, 5}, // A5 33
- {&DDRA, &PINA, &PORTA, 6}, // A6 34
- {&DDRA, &PINA, &PORTA, 7}, // A7 35
- {&DDRE, &PINE, &PORTE, 4}, // E4 36
- {&DDRE, &PINE, &PORTE, 5}, // E5 37
- {&DDRF, &PINF, &PORTF, 0}, // F0 38
- {&DDRF, &PINF, &PORTF, 1}, // F1 39
- {&DDRF, &PINF, &PORTF, 2}, // F2 40
- {&DDRF, &PINF, &PORTF, 3}, // F3 41
- {&DDRF, &PINF, &PORTF, 4}, // F4 42
- {&DDRF, &PINF, &PORTF, 5}, // F5 43
- {&DDRF, &PINF, &PORTF, 6}, // F6 44
- {&DDRF, &PINF, &PORTF, 7} // F7 45
-};
-//------------------------------------------------------------------------------
-#else // defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
-// 168 and 328 Arduinos
-
-// Two Wire (aka I2C) ports
-uint8_t const SDA_PIN = 18;
-uint8_t const SCL_PIN = 19;
-
-// SPI port
-uint8_t const SS_PIN = 10;
-uint8_t const MOSI_PIN = 11;
-uint8_t const MISO_PIN = 12;
-uint8_t const SCK_PIN = 13;
-
-static const pin_map_t digitalPinMap[] = {
- {&DDRD, &PIND, &PORTD, 0}, // D0 0
- {&DDRD, &PIND, &PORTD, 1}, // D1 1
- {&DDRD, &PIND, &PORTD, 2}, // D2 2
- {&DDRD, &PIND, &PORTD, 3}, // D3 3
- {&DDRD, &PIND, &PORTD, 4}, // D4 4
- {&DDRD, &PIND, &PORTD, 5}, // D5 5
- {&DDRD, &PIND, &PORTD, 6}, // D6 6
- {&DDRD, &PIND, &PORTD, 7}, // D7 7
- {&DDRB, &PINB, &PORTB, 0}, // B0 8
- {&DDRB, &PINB, &PORTB, 1}, // B1 9
- {&DDRB, &PINB, &PORTB, 2}, // B2 10
- {&DDRB, &PINB, &PORTB, 3}, // B3 11
- {&DDRB, &PINB, &PORTB, 4}, // B4 12
- {&DDRB, &PINB, &PORTB, 5}, // B5 13
- {&DDRC, &PINC, &PORTC, 0}, // C0 14
- {&DDRC, &PINC, &PORTC, 1}, // C1 15
- {&DDRC, &PINC, &PORTC, 2}, // C2 16
- {&DDRC, &PINC, &PORTC, 3}, // C3 17
- {&DDRC, &PINC, &PORTC, 4}, // C4 18
- {&DDRC, &PINC, &PORTC, 5} // C5 19
-};
-#endif // defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
-//------------------------------------------------------------------------------
-static const uint8_t digitalPinCount = sizeof(digitalPinMap)/sizeof(pin_map_t);
-
-uint8_t badPinNumber(void)
- __attribute__((error("Pin number is too large or not a constant")));
-
-static inline __attribute__((always_inline))
- uint8_t getPinMode(uint8_t pin) {
- if (__builtin_constant_p(pin) && pin < digitalPinCount) {
- return (*digitalPinMap[pin].ddr >> digitalPinMap[pin].bit) & 1;
- } else {
- return badPinNumber();
- }
-}
-static inline __attribute__((always_inline))
- void setPinMode(uint8_t pin, uint8_t mode) {
- if (__builtin_constant_p(pin) && pin < digitalPinCount) {
- if (mode) {
- *digitalPinMap[pin].ddr |= 1 << digitalPinMap[pin].bit;
- } else {
- *digitalPinMap[pin].ddr &= ~(1 << digitalPinMap[pin].bit);
- }
- } else {
- badPinNumber();
- }
-}
-static inline __attribute__((always_inline))
- uint8_t fastDigitalRead(uint8_t pin) {
- if (__builtin_constant_p(pin) && pin < digitalPinCount) {
- return (*digitalPinMap[pin].pin >> digitalPinMap[pin].bit) & 1;
- } else {
- return badPinNumber();
- }
-}
-static inline __attribute__((always_inline))
- void fastDigitalWrite(uint8_t pin, uint8_t value) {
- if (__builtin_constant_p(pin) && pin < digitalPinCount) {
- if (value) {
- *digitalPinMap[pin].port |= 1 << digitalPinMap[pin].bit;
- } else {
- *digitalPinMap[pin].port &= ~(1 << digitalPinMap[pin].bit);
- }
- } else {
- badPinNumber();
- }
-}
-*/
-#endif // Sd2PinMap_h
diff --git a/dumblogger/libraries/SDfat/.svn/text-base/SdFat.h.svn-base b/dumblogger/libraries/SDfat/.svn/text-base/SdFat.h.svn-base deleted file mode 100644 index 7914fc5..0000000 --- a/dumblogger/libraries/SDfat/.svn/text-base/SdFat.h.svn-base +++ /dev/null @@ -1,547 +0,0 @@ -/* Arduino SdFat Library
- * Copyright (C) 2009 by William Greiman
- *
- * This file is part of the Arduino SdFat Library
- *
- * This Library is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This Library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Arduino SdFat Library. If not, see
- * <http://www.gnu.org/licenses/>.
- */
-#ifndef SdFat_h
-#define SdFat_h
-/**
- * \file
- * SdFile and SdVolume classes
- */
-//#include <avr/pgmspace.h>
-#include "Sd2Card.h"
-#include "FatStructs.h"
-#include "Print.h"
-//------------------------------------------------------------------------------
-/**
- * Allow use of deprecated functions if non-zero
- */
-#define ALLOW_DEPRECATED_FUNCTIONS 1
-//------------------------------------------------------------------------------
-// forward declaration since SdVolume is used in SdFile
-class SdVolume;
-//==============================================================================
-// SdFile class
-
-// flags for ls()
-/** ls() flag to print modify date */
-uint8_t const LS_DATE = 1;
-/** ls() flag to print file size */
-uint8_t const LS_SIZE = 2;
-/** ls() flag for recursive list of subdirectories */
-uint8_t const LS_R = 4;
-
-// use the gnu style oflag in open()
-/** open() oflag for reading */
-uint8_t const O_READ = 0X01;
-/** open() oflag - same as O_READ */
-uint8_t const O_RDONLY = O_READ;
-/** open() oflag for write */
-uint8_t const O_WRITE = 0X02;
-/** open() oflag - same as O_WRITE */
-uint8_t const O_WRONLY = O_WRITE;
-/** open() oflag for reading and writing */
-uint8_t const O_RDWR = (O_READ | O_WRITE);
-/** open() oflag mask for access modes */
-uint8_t const O_ACCMODE = (O_READ | O_WRITE);
-/** The file offset shall be set to the end of the file prior to each write. */
-uint8_t const O_APPEND = 0X04;
-/** synchronous writes - call sync() after each write */
-uint8_t const O_SYNC = 0X08;
-/** create the file if nonexistent */
-uint8_t const O_CREAT = 0X10;
-/** If O_CREAT and O_EXCL are set, open() shall fail if the file exists */
-uint8_t const O_EXCL = 0X20;
-/** truncate the file to zero length */
-uint8_t const O_TRUNC = 0X40;
-
-// flags for timestamp
-/** set the file's last access date */
-uint8_t const T_ACCESS = 1;
-/** set the file's creation date and time */
-uint8_t const T_CREATE = 2;
-/** Set the file's write date and time */
-uint8_t const T_WRITE = 4;
-// values for type_
-/** This SdFile has not been opened. */
-uint8_t const FAT_FILE_TYPE_CLOSED = 0;
-/** SdFile for a file */
-uint8_t const FAT_FILE_TYPE_NORMAL = 1;
-/** SdFile for a FAT16 root directory */
-uint8_t const FAT_FILE_TYPE_ROOT16 = 2;
-/** SdFile for a FAT32 root directory */
-uint8_t const FAT_FILE_TYPE_ROOT32 = 3;
-/** SdFile for a subdirectory */
-uint8_t const FAT_FILE_TYPE_SUBDIR = 4;
-/** Test value for directory type */
-uint8_t const FAT_FILE_TYPE_MIN_DIR = FAT_FILE_TYPE_ROOT16;
-
-/** date field for FAT directory entry */
-static inline uint16_t FAT_DATE(uint16_t year, uint8_t month, uint8_t day) {
- return (year - 1980) << 9 | month << 5 | day;
-}
-/** year part of FAT directory date field */
-static inline uint16_t FAT_YEAR(uint16_t fatDate) {
- return 1980 + (fatDate >> 9);
-}
-/** month part of FAT directory date field */
-static inline uint8_t FAT_MONTH(uint16_t fatDate) {
- return (fatDate >> 5) & 0XF;
-}
-/** day part of FAT directory date field */
-static inline uint8_t FAT_DAY(uint16_t fatDate) {
- return fatDate & 0X1F;
-}
-/** time field for FAT directory entry */
-static inline uint16_t FAT_TIME(uint8_t hour, uint8_t minute, uint8_t second) {
- return hour << 11 | minute << 5 | second >> 1;
-}
-/** hour part of FAT directory time field */
-static inline uint8_t FAT_HOUR(uint16_t fatTime) {
- return fatTime >> 11;
-}
-/** minute part of FAT directory time field */
-static inline uint8_t FAT_MINUTE(uint16_t fatTime) {
- return(fatTime >> 5) & 0X3F;
-}
-/** second part of FAT directory time field */
-static inline uint8_t FAT_SECOND(uint16_t fatTime) {
- return 2*(fatTime & 0X1F);
-}
-/** Default date for file timestamps is 1 Jan 2000 */
-uint16_t const FAT_DEFAULT_DATE = ((2000 - 1980) << 9) | (1 << 5) | 1;
-/** Default time for file timestamp is 1 am */
-uint16_t const FAT_DEFAULT_TIME = (1 << 11);
-//------------------------------------------------------------------------------
-/**
- * \class SdFile
- * \brief Access FAT16 and FAT32 files on SD and SDHC cards.
- */
-class SdFile : public Print {
- public:
- /** Create an instance of SdFile. */
- SdFile(void) : type_(FAT_FILE_TYPE_CLOSED) {}
- /**
- * writeError is set to true if an error occurs during a write().
- * Set writeError to false before calling print() and/or write() and check
- * for true after calls to print() and/or write().
- */
- bool writeError;
- /**
- * Cancel unbuffered reads for this file.
- * See setUnbufferedRead()
- */
- void clearUnbufferedRead(void) {
- flags_ &= ~F_FILE_UNBUFFERED_READ;
- }
- uint8_t close(void);
- uint8_t contiguousRange(uint32_t* bgnBlock, uint32_t* endBlock);
- uint8_t createContiguous(SdFile* dirFile,
- const char* fileName, uint32_t size);
- /** \return The current cluster number for a file or directory. */
- uint32_t curCluster(void) const {return curCluster_;}
- /** \return The current position for a file or directory. */
- uint32_t curPosition(void) const {return curPosition_;}
- /**
- * Set the date/time callback function
- *
- * \param[in] dateTime The user's call back function. The callback
- * function is of the form:
- *
- * \code
- * void dateTime(uint16_t* date, uint16_t* time) {
- * uint16_t year;
- * uint8_t month, day, hour, minute, second;
- *
- * // User gets date and time from GPS or real-time clock here
- *
- * // return date using FAT_DATE macro to format fields
- * *date = FAT_DATE(year, month, day);
- *
- * // return time using FAT_TIME macro to format fields
- * *time = FAT_TIME(hour, minute, second);
- * }
- * \endcode
- *
- * Sets the function that is called when a file is created or when
- * a file's directory entry is modified by sync(). All timestamps,
- * access, creation, and modify, are set when a file is created.
- * sync() maintains the last access date and last modify date/time.
- *
- * See the timestamp() function.
- */
- static void dateTimeCallback(
- void (*dateTime)(uint16_t* date, uint16_t* time)) {
- dateTime_ = dateTime;
- }
- /**
- * Cancel the date/time callback function.
- */
- static void dateTimeCallbackCancel(void) {
- // use explicit zero since NULL is not defined for Sanguino
- dateTime_ = 0;
- }
- /** \return Address of the block that contains this file's directory. */
- uint32_t dirBlock(void) const {return dirBlock_;}
- uint8_t dirEntry(dir_t* dir);
- /** \return Index of this file's directory in the block dirBlock. */
- uint8_t dirIndex(void) const {return dirIndex_;}
- static void dirName(const dir_t& dir, char* name);
- /** \return The total number of bytes in a file or directory. */
- uint32_t fileSize(void) const {return fileSize_;}
- /** \return The first cluster number for a file or directory. */
- uint32_t firstCluster(void) const {return firstCluster_;}
- /** \return True if this is a SdFile for a directory else false. */
- uint8_t isDir(void) const {return type_ >= FAT_FILE_TYPE_MIN_DIR;}
- /** \return True if this is a SdFile for a file else false. */
- uint8_t isFile(void) const {return type_ == FAT_FILE_TYPE_NORMAL;}
- /** \return True if this is a SdFile for an open file/directory else false. */
- uint8_t isOpen(void) const {return type_ != FAT_FILE_TYPE_CLOSED;}
- /** \return True if this is a SdFile for a subdirectory else false. */
- uint8_t isSubDir(void) const {return type_ == FAT_FILE_TYPE_SUBDIR;}
- /** \return True if this is a SdFile for the root directory. */
- uint8_t isRoot(void) const {
- return type_ == FAT_FILE_TYPE_ROOT16 || type_ == FAT_FILE_TYPE_ROOT32;
- }
- void ls(uint8_t flags = 0, uint8_t indent = 0);
- uint8_t makeDir(SdFile* dir, const char* dirName);
- uint8_t open(SdFile* dirFile, uint16_t index, uint8_t oflag);
- uint8_t open(SdFile* dirFile, const char* fileName, uint8_t oflag);
-
- uint8_t openRoot(SdVolume* vol);
- static void printDirName(const dir_t& dir, uint8_t width);
- static void printFatDate(uint16_t fatDate);
- static void printFatTime(uint16_t fatTime);
- static void printTwoDigits(uint8_t v);
- /**
- * Read the next byte from a file.
- *
- * \return For success read returns the next byte in the file as an int.
- * If an error occurs or end of file is reached -1 is returned.
- */
- int16_t read(void) {
- uint8_t b;
- return read(&b, 1) == 1 ? b : -1;
- }
- int16_t read(void* buf, uint16_t nbyte);
- int8_t readDir(dir_t* dir);
- static uint8_t remove(SdFile* dirFile, const char* fileName);
- uint8_t remove(void);
- /** Set the file's current position to zero. */
- void rewind(void) {
- curPosition_ = curCluster_ = 0;
- }
- uint8_t rmDir(void);
- uint8_t rmRfStar(void);
- /** Set the files position to current position + \a pos. See seekSet(). */
- uint8_t seekCur(uint32_t pos) {
- return seekSet(curPosition_ + pos);
- }
- /**
- * Set the files current position to end of file. Useful to position
- * a file for append. See seekSet().
- */
- uint8_t seekEnd(void) {return seekSet(fileSize_);}
- uint8_t seekSet(uint32_t pos);
- /**
- * Use unbuffered reads to access this file. Used with Wave
- * Shield ISR. Used with Sd2Card::partialBlockRead() in WaveRP.
- *
- * Not recommended for normal applications.
- */
- void setUnbufferedRead(void) {
- if (isFile()) flags_ |= F_FILE_UNBUFFERED_READ;
- }
- uint8_t timestamp(uint8_t flag, uint16_t year, uint8_t month, uint8_t day,
- uint8_t hour, uint8_t minute, uint8_t second);
- uint8_t sync(void);
- /** Type of this SdFile. You should use isFile() or isDir() instead of type()
- * if possible.
- *
- * \return The file or directory type.
- */
- uint8_t type(void) const {return type_;}
- uint8_t truncate(uint32_t size);
- /** \return Unbuffered read flag. */
- uint8_t unbufferedRead(void) const {
- return flags_ & F_FILE_UNBUFFERED_READ;
- }
- /** \return SdVolume that contains this file. */
- SdVolume* volume(void) const {return vol_;}
- void write(uint8_t b);
- int16_t write(const void* buf, uint16_t nbyte);
- void write(const char* str);
-// void write_P(PGM_P str);
-// void writeln_P(PGM_P str);
-//------------------------------------------------------------------------------
-#if ALLOW_DEPRECATED_FUNCTIONS
-// Deprecated functions - suppress cpplint warnings with NOLINT comment
- /** \deprecated Use:
- * uint8_t SdFile::contiguousRange(uint32_t* bgnBlock, uint32_t* endBlock);
- */
- uint8_t contiguousRange(uint32_t& bgnBlock, uint32_t& endBlock) { // NOLINT
- return contiguousRange(&bgnBlock, &endBlock);
- }
- /** \deprecated Use:
- * uint8_t SdFile::createContiguous(SdFile* dirFile,
- * const char* fileName, uint32_t size)
- */
- uint8_t createContiguous(SdFile& dirFile, // NOLINT
- const char* fileName, uint32_t size) {
- return createContiguous(&dirFile, fileName, size);
- }
-
- /**
- * \deprecated Use:
- * static void SdFile::dateTimeCallback(
- * void (*dateTime)(uint16_t* date, uint16_t* time));
- */
- static void dateTimeCallback(
- void (*dateTime)(uint16_t& date, uint16_t& time)) { // NOLINT
- oldDateTime_ = dateTime;
- dateTime_ = dateTime ? oldToNew : 0;
- }
- /** \deprecated Use: uint8_t SdFile::dirEntry(dir_t* dir); */
- uint8_t dirEntry(dir_t& dir) {return dirEntry(&dir);} // NOLINT
- /** \deprecated Use:
- * uint8_t SdFile::makeDir(SdFile* dir, const char* dirName);
- */
- uint8_t makeDir(SdFile& dir, const char* dirName) { // NOLINT
- return makeDir(&dir, dirName);
- }
- /** \deprecated Use:
- * uint8_t SdFile::open(SdFile* dirFile, const char* fileName, uint8_t oflag);
- */
- uint8_t open(SdFile& dirFile, // NOLINT
- const char* fileName, uint8_t oflag) {
- return open(&dirFile, fileName, oflag);
- }
- /** \deprecated Do not use in new apps */
- uint8_t open(SdFile& dirFile, const char* fileName) { // NOLINT
- return open(dirFile, fileName, O_RDWR);
- }
- /** \deprecated Use:
- * uint8_t SdFile::open(SdFile* dirFile, uint16_t index, uint8_t oflag);
- */
- uint8_t open(SdFile& dirFile, uint16_t index, uint8_t oflag) { // NOLINT
- return open(&dirFile, index, oflag);
- }
- /** \deprecated Use: uint8_t SdFile::openRoot(SdVolume* vol); */
- uint8_t openRoot(SdVolume& vol) {return openRoot(&vol);} // NOLINT
-
- /** \deprecated Use: int8_t SdFile::readDir(dir_t* dir); */
- int8_t readDir(dir_t& dir) {return readDir(&dir);} // NOLINT
- /** \deprecated Use:
- * static uint8_t SdFile::remove(SdFile* dirFile, const char* fileName);
- */
- static uint8_t remove(SdFile& dirFile, const char* fileName) { // NOLINT
- return remove(&dirFile, fileName);
- }
-//------------------------------------------------------------------------------
-// rest are private
- private:
- static void (*oldDateTime_)(uint16_t& date, uint16_t& time); // NOLINT
- static void oldToNew(uint16_t* date, uint16_t* time) {
- uint16_t d;
- uint16_t t;
- oldDateTime_(d, t);
- *date = d;
- *time = t;
- }
-#endif // ALLOW_DEPRECATED_FUNCTIONS
- private:
- // bits defined in flags_
- // should be 0XF
- static uint8_t const F_OFLAG = (O_ACCMODE | O_APPEND | O_SYNC);
- // available bits
- static uint8_t const F_UNUSED = 0X30;
- // use unbuffered SD read
- static uint8_t const F_FILE_UNBUFFERED_READ = 0X40;
- // sync of directory entry required
- static uint8_t const F_FILE_DIR_DIRTY = 0X80;
-
-// make sure F_OFLAG is ok
-#if ((F_UNUSED | F_FILE_UNBUFFERED_READ | F_FILE_DIR_DIRTY) & F_OFLAG)
-#error flags_ bits conflict
-#endif // flags_ bits
-
- // private data
- uint8_t flags_; // See above for definition of flags_ bits
- uint8_t type_; // type of file see above for values
- uint32_t curCluster_; // cluster for current file position
- uint32_t curPosition_; // current file position in bytes from beginning
- uint32_t dirBlock_; // SD block that contains directory entry for file
- uint8_t dirIndex_; // index of entry in dirBlock 0 <= dirIndex_ <= 0XF
- uint32_t fileSize_; // file size in bytes
- uint32_t firstCluster_; // first cluster of file
- SdVolume* vol_; // volume where file is located
-
- // private functions
- uint8_t addCluster(void);
- uint8_t addDirCluster(void);
- dir_t* cacheDirEntry(uint8_t action);
- static void (*dateTime_)(uint16_t* date, uint16_t* time);
- static uint8_t make83Name(const char* str, uint8_t* name);
- uint8_t openCachedEntry(uint8_t cacheIndex, uint8_t oflags);
- dir_t* readDirCache(void);
-};
-//==============================================================================
-// SdVolume class
-/**
- * \brief Cache for an SD data block
- */
-union cache_t {
- /** Used to access cached file data blocks. */
- uint8_t data[512];
- /** Used to access cached FAT16 entries. */
- uint16_t fat16[256];
- /** Used to access cached FAT32 entries. */
- uint32_t fat32[128];
- /** Used to access cached directory entries. */
- dir_t dir[16];
- /** Used to access a cached MasterBoot Record. */
- mbr_t mbr;
- /** Used to access to a cached FAT boot sector. */
- fbs_t fbs;
-};
-//------------------------------------------------------------------------------
-/**
- * \class SdVolume
- * \brief Access FAT16 and FAT32 volumes on SD and SDHC cards.
- */
-class SdVolume {
- public:
- /** Create an instance of SdVolume */
- SdVolume(void) :allocSearchStart_(2), fatType_(0) {}
- /** Clear the cache and returns a pointer to the cache. Used by the WaveRP
- * recorder to do raw write to the SD card. Not for normal apps.
- */
- static uint8_t* cacheClear(void) {
- cacheFlush();
- cacheBlockNumber_ = 0XFFFFFFFF;
- return cacheBuffer_.data;
- }
- /**
- * Initialize a FAT volume. Try partition one first then try super
- * floppy format.
- *
- * \param[in] dev The Sd2Card where the volume is located.
- *
- * \return The value one, true, is returned for success and
- * the value zero, false, is returned for failure. Reasons for
- * failure include not finding a valid partition, not finding a valid
- * FAT file system or an I/O error.
- */
- uint8_t init(Sd2Card* dev) { return init(dev, 1) ? true : init(dev, 0);}
- uint8_t init(Sd2Card* dev, uint8_t part);
-
- // inline functions that return volume info
- /** \return The volume's cluster size in blocks. */
- uint8_t blocksPerCluster(void) const {return blocksPerCluster_;}
- /** \return The number of blocks in one FAT. */
- uint32_t blocksPerFat(void) const {return blocksPerFat_;}
- /** \return The total number of clusters in the volume. */
- uint32_t clusterCount(void) const {return clusterCount_;}
- /** \return The shift count required to multiply by blocksPerCluster. */
- uint8_t clusterSizeShift(void) const {return clusterSizeShift_;}
- /** \return The logical block number for the start of file data. */
- uint32_t dataStartBlock(void) const {return dataStartBlock_;}
- /** \return The number of FAT structures on the volume. */
- uint8_t fatCount(void) const {return fatCount_;}
- /** \return The logical block number for the start of the first FAT. */
- uint32_t fatStartBlock(void) const {return fatStartBlock_;}
- /** \return The FAT type of the volume. Values are 12, 16 or 32. */
- uint8_t fatType(void) const {return fatType_;}
- /** \return The number of entries in the root directory for FAT16 volumes. */
- uint32_t rootDirEntryCount(void) const {return rootDirEntryCount_;}
- /** \return The logical block number for the start of the root directory
- on FAT16 volumes or the first cluster number on FAT32 volumes. */
- uint32_t rootDirStart(void) const {return rootDirStart_;}
- /** return a pointer to the Sd2Card object for this volume */
- static Sd2Card* sdCard(void) {return sdCard_;}
-//------------------------------------------------------------------------------
-#if ALLOW_DEPRECATED_FUNCTIONS
- // Deprecated functions - suppress cpplint warnings with NOLINT comment
- /** \deprecated Use: uint8_t SdVolume::init(Sd2Card* dev); */
- uint8_t init(Sd2Card& dev) {return init(&dev);} // NOLINT
-
- /** \deprecated Use: uint8_t SdVolume::init(Sd2Card* dev, uint8_t vol); */
- uint8_t init(Sd2Card& dev, uint8_t part) { // NOLINT
- return init(&dev, part);
- }
-#endif // ALLOW_DEPRECATED_FUNCTIONS
-//------------------------------------------------------------------------------
- private:
- // Allow SdFile access to SdVolume private data.
- friend class SdFile;
-
- // value for action argument in cacheRawBlock to indicate read from cache
- static uint8_t const CACHE_FOR_READ = 0;
- // value for action argument in cacheRawBlock to indicate cache dirty
- static uint8_t const CACHE_FOR_WRITE = 1;
-
- static cache_t cacheBuffer_; // 512 byte cache for device blocks
- static uint32_t cacheBlockNumber_; // Logical number of block in the cache
- static Sd2Card* sdCard_; // Sd2Card object for cache
- static uint8_t cacheDirty_; // cacheFlush() will write block if true
- static uint32_t cacheMirrorBlock_; // block number for mirror FAT
-//
- uint32_t allocSearchStart_; // start cluster for alloc search
- uint8_t blocksPerCluster_; // cluster size in blocks
- uint32_t blocksPerFat_; // FAT size in blocks
- uint32_t clusterCount_; // clusters in one FAT
- uint8_t clusterSizeShift_; // shift to convert cluster count to block count
- uint32_t dataStartBlock_; // first data block number
- uint8_t fatCount_; // number of FATs on volume
- uint32_t fatStartBlock_; // start block for first FAT
- uint8_t fatType_; // volume type (12, 16, OR 32)
- uint16_t rootDirEntryCount_; // number of entries in FAT16 root dir
- uint32_t rootDirStart_; // root start block for FAT16, cluster for FAT32
- //----------------------------------------------------------------------------
- uint8_t allocContiguous(uint32_t count, uint32_t* curCluster);
- uint8_t blockOfCluster(uint32_t position) const {
- return (position >> 9) & (blocksPerCluster_ - 1);}
- uint32_t clusterStartBlock(uint32_t cluster) const {
- return dataStartBlock_ + ((cluster - 2) << clusterSizeShift_);}
- uint32_t blockNumber(uint32_t cluster, uint32_t position) const {
- return clusterStartBlock(cluster) + blockOfCluster(position);}
- static uint8_t cacheFlush(void);
- static uint8_t cacheRawBlock(uint32_t blockNumber, uint8_t action);
- static void cacheSetDirty(void) {cacheDirty_ |= CACHE_FOR_WRITE;}
- static uint8_t cacheZeroBlock(uint32_t blockNumber);
- uint8_t chainSize(uint32_t beginCluster, uint32_t* size) const;
- uint8_t fatGet(uint32_t cluster, uint32_t* value) const;
- uint8_t fatPut(uint32_t cluster, uint32_t value);
- uint8_t fatPutEOC(uint32_t cluster) {
- return fatPut(cluster, 0x0FFFFFFF);
- }
- uint8_t freeChain(uint32_t cluster);
- uint8_t isEOC(uint32_t cluster) const {
- return cluster >= (fatType_ == 16 ? FAT16EOC_MIN : FAT32EOC_MIN);
- }
- uint8_t readBlock(uint32_t block, uint8_t* dst) {
- return sdCard_->readBlock(block, dst);}
- uint8_t readData(uint32_t block, uint16_t offset,
- uint16_t count, uint8_t* dst) {
- return sdCard_->readData(block, offset, count, dst);
- }
- uint8_t writeBlock(uint32_t block, const uint8_t* dst) {
- return sdCard_->writeBlock(block, dst);
- }
-};
-#endif // SdFat_h
diff --git a/dumblogger/libraries/SDfat/.svn/text-base/SdFatUtil.h.svn-base b/dumblogger/libraries/SDfat/.svn/text-base/SdFatUtil.h.svn-base deleted file mode 100644 index 59b886a..0000000 --- a/dumblogger/libraries/SDfat/.svn/text-base/SdFatUtil.h.svn-base +++ /dev/null @@ -1,70 +0,0 @@ -/* Arduino SdFat Library
- * Copyright (C) 2008 by William Greiman
- *
- * This file is part of the Arduino SdFat Library
- *
- * This Library is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This Library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with the Arduino SdFat Library. If not, see
- * <http://www.gnu.org/licenses/>.
- */
-#ifndef SdFatUtil_h
-#define SdFatUtil_h
-/**
- * \file
- * Useful utility functions.
- */
-#include <WProgram.h>
-//#include <avr/pgmspace.h>
-/** Store and print a string in flash memory.*/
-#define PgmPrint(x) SerialPrint_P(PSTR(x))
-/** Store and print a string in flash memory followed by a CR/LF.*/
-#define PgmPrintln(x) SerialPrintln_P(PSTR(x))
-/** Defined so doxygen works for function definitions. */
-#define NOINLINE __attribute__((noinline))
-//------------------------------------------------------------------------------
-/** Return the number of bytes currently free in RAM. */
-static int FreeRam(void) {
- extern int __bss_end;
- extern int* __brkval;
- int free_memory;
- if (reinterpret_cast<int>(__brkval) == 0) {
- // if no heap use from end of bss section
- free_memory = reinterpret_cast<int>(&free_memory)
- - reinterpret_cast<int>(&__bss_end);
- } else {
- // use from top of stack to heap
- free_memory = reinterpret_cast<int>(&free_memory)
- - reinterpret_cast<int>(__brkval);
- }
- return free_memory;
-}
-//------------------------------------------------------------------------------
-/**
- * %Print a string in flash memory to the serial port.
- *
- * \param[in] str Pointer to string stored in flash memory.
- */
-static NOINLINE void SerialPrint_P(PGM_P str) {
- for (uint8_t c; (c = pgm_read_byte(str)); str++) Serial.print(c);
-}
-//------------------------------------------------------------------------------
-/**
- * %Print a string in flash memory followed by a CR/LF.
- *
- * \param[in] str Pointer to string stored in flash memory.
- */
-static NOINLINE void SerialPrintln_P(PGM_P str) {
- SerialPrint_P(str);
- Serial.println();
-}
-#endif // #define SdFatUtil_h
diff --git a/dumblogger/libraries/SDfat/.svn/text-base/SdFatmainpage.h.svn-base b/dumblogger/libraries/SDfat/.svn/text-base/SdFatmainpage.h.svn-base deleted file mode 100644 index 73b3b63..0000000 --- a/dumblogger/libraries/SDfat/.svn/text-base/SdFatmainpage.h.svn-base +++ /dev/null @@ -1,202 +0,0 @@ -/* Arduino SdFat Library
- * Copyright (C) 2009 by William Greiman
- *
- * This file is part of the Arduino SdFat Library
- *
- * This Library is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This Library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Arduino SdFat Library. If not, see
- * <http://www.gnu.org/licenses/>.
- */
-
-/**
-\mainpage Arduino SdFat Library
-<CENTER>Copyright © 2009 by William Greiman
-</CENTER>
-
-\section Intro Introduction
-The Arduino SdFat Library is a minimal implementation of FAT16 and FAT32
-file systems on SD flash memory cards. Standard SD and high capacity
-SDHC cards are supported.
-
-The SdFat only supports short 8.3 names.
-
-The main classes in SdFat are Sd2Card, SdVolume, and SdFile.
-
-The Sd2Card class supports access to standard SD cards and SDHC cards. Most
-applications will only need to call the Sd2Card::init() member function.
-
-The SdVolume class supports FAT16 and FAT32 partitions. Most applications
-will only need to call the SdVolume::init() member function.
-
-The SdFile class provides file access functions such as open(), read(),
-remove(), write(), close() and sync(). This class supports access to the root
-directory and subdirectories.
-
-A number of example are provided in the SdFat/examples folder. These were
-developed to test SdFat and illustrate its use.
-
-SdFat was developed for high speed data recording. SdFat was used to implement
-an audio record/play class, WaveRP, for the Adafruit Wave Shield. This
-application uses special Sd2Card calls to write to contiguous files in raw mode.
-These functions reduce write latency so that audio can be recorded with the
-small amount of RAM in the Arduino.
-
-\section SDcard SD\SDHC Cards
-
-Arduinos access SD cards using the cards SPI protocol. PCs, Macs, and
-most consumer devices use the 4-bit parallel SD protocol. A card that
-functions well on A PC or Mac may not work well on the Arduino.
-
-Most cards have good SPI read performance but cards vary widely in SPI
-write performance. Write performance is limited by how efficiently the
-card manages internal erase/remapping operations. The Arduino cannot
-optimize writes to reduce erase operations because of its limit RAM.
-
-SanDisk cards generally have good write performance. They seem to have
-more internal RAM buffering than other cards and therefore can limit
-the number of flash erase operations that the Arduino forces due to its
-limited RAM.
-
-\section Hardware Hardware Configuration
-
-SdFat was developed using an
-<A HREF = "http://www.adafruit.com/"> Adafruit Industries</A>
-<A HREF = "http://www.ladyada.net/make/waveshield/"> Wave Shield</A>.
-
-The hardware interface to the SD card should not use a resistor based level
-shifter. SdFat sets the SPI bus frequency to 8 MHz which results in signal
-rise times that are too slow for the edge detectors in many newer SD card
-controllers when resistor voltage dividers are used.
-
-The 5 to 3.3 V level shifter for 5 V Arduinos should be IC based like the
-74HC4050N based circuit shown in the file SdLevel.png. The Adafruit Wave Shield
-uses a 74AHC125N. Gravitech sells SD and MicroSD Card Adapters based on the
-74LCX245.
-
-If you are using a resistor based level shifter and are having problems try
-setting the SPI bus frequency to 4 MHz. This can be done by using
-card.init(SPI_HALF_SPEED) to initialize the SD card.
-
-\section comment Bugs and Comments
-
-If you wish to report bugs or have comments, send email to fat16lib@sbcglobal.net.
-
-\section SdFatClass SdFat Usage
-
-SdFat uses a slightly restricted form of short names.
-Only printable ASCII characters are supported. No characters with code point
-values greater than 127 are allowed. Space is not allowed even though space
-was allowed in the API of early versions of DOS.
-
-Short names are limited to 8 characters followed by an optional period (.)
-and extension of up to 3 characters. The characters may be any combination
-of letters and digits. The following special characters are also allowed:
-
-$ % ' - _ @ ~ ` ! ( ) { } ^ # &
-
-Short names are always converted to upper case and their original case
-value is lost.
-
-\note
- The Arduino Print class uses character
-at a time writes so it was necessary to use a \link SdFile::sync() sync() \endlink
-function to control when data is written to the SD card.
-
-\par
-An application which writes to a file using \link Print::print() print()\endlink,
-\link Print::println() println() \endlink
-or \link SdFile::write write() \endlink must call \link SdFile::sync() sync() \endlink
-at the appropriate time to force data and directory information to be written
-to the SD Card. Data and directory information are also written to the SD card
-when \link SdFile::close() close() \endlink is called.
-
-\par
-Applications must use care calling \link SdFile::sync() sync() \endlink
-since 2048 bytes of I/O is required to update file and
-directory information. This includes writing the current data block, reading
-the block that contains the directory entry for update, writing the directory
-block back and reading back the current data block.
-
-It is possible to open a file with two or more instances of SdFile. A file may
-be corrupted if data is written to the file by more than one instance of SdFile.
-
-\section HowTo How to format SD Cards as FAT Volumes
-
-You should use a freshly formatted SD card for best performance. FAT
-file systems become slower if many files have been created and deleted.
-This is because the directory entry for a deleted file is marked as deleted,
-but is not deleted. When a new file is created, these entries must be scanned
-before creating the file, a flaw in the FAT design. Also files can become
-fragmented which causes reads and writes to be slower.
-
-Microsoft operating systems support removable media formatted with a
-Master Boot Record, MBR, or formatted as a super floppy with a FAT Boot Sector
-in block zero.
-
-Microsoft operating systems expect MBR formatted removable media
-to have only one partition. The first partition should be used.
-
-Microsoft operating systems do not support partitioning SD flash cards.
-If you erase an SD card with a program like KillDisk, Most versions of
-Windows will format the card as a super floppy.
-
-The best way to restore an SD card's format is to use SDFormatter
-which can be downloaded from:
-
-http://www.sdcard.org/consumers/formatter/
-
-SDFormatter aligns flash erase boundaries with file
-system structures which reduces write latency and file system overhead.
-
-SDFormatter does not have an option for FAT type so it may format
-small cards as FAT12.
-
-After the MBR is restored by SDFormatter you may need to reformat small
-cards that have been formatted FAT12 to force the volume type to be FAT16.
-
-If you reformat the SD card with an OS utility, choose a cluster size that
-will result in:
-
-4084 < CountOfClusters && CountOfClusters < 65525
-
-The volume will then be FAT16.
-
-If you are formatting an SD card on OS X or Linux, be sure to use the first
-partition. Format this partition with a cluster count in above range.
-
-\section References References
-
-Adafruit Industries:
-
-http://www.adafruit.com/
-
-http://www.ladyada.net/make/waveshield/
-
-The Arduino site:
-
-http://www.arduino.cc/
-
-For more information about FAT file systems see:
-
-http://www.microsoft.com/whdc/system/platform/firmware/fatgen.mspx
-
-For information about using SD cards as SPI devices see:
-
-http://www.sdcard.org/developers/tech/sdcard/pls/Simplified_Physical_Layer_Spec.pdf
-
-The ATmega328 datasheet:
-
-http://www.atmel.com/dyn/resources/prod_documents/doc8161.pdf
-
-
- */
diff --git a/dumblogger/libraries/SDfat/.svn/text-base/SdFile.cpp.svn-base b/dumblogger/libraries/SDfat/.svn/text-base/SdFile.cpp.svn-base deleted file mode 100644 index 9eeadae..0000000 --- a/dumblogger/libraries/SDfat/.svn/text-base/SdFile.cpp.svn-base +++ /dev/null @@ -1,1261 +0,0 @@ -/* Arduino SdFat Library
- * Copyright (C) 2009 by William Greiman
- *
- * This file is part of the Arduino SdFat Library
- *
- * This Library is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This Library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Arduino SdFat Library. If not, see
- * <http://www.gnu.org/licenses/>.
- */
-#include "SdFat.h"
-//#include <avr/pgmspace.h>
-#include <WProgram.h>
-#include "HardwareSPI.h"
-#include <string.h>
-
-//------------------------------------------------------------------------------
-// callback function for date/time
-void (*SdFile::dateTime_)(uint16_t* date, uint16_t* time) = NULL;
-
-#if ALLOW_DEPRECATED_FUNCTIONS
-// suppress cpplint warnings with NOLINT comment
-void (*SdFile::oldDateTime_)(uint16_t& date, uint16_t& time) = NULL; // NOLINT
-#endif // ALLOW_DEPRECATED_FUNCTIONS
-//------------------------------------------------------------------------------
-// add a cluster to a file
-uint8_t SdFile::addCluster() {
- if (!vol_->allocContiguous(1, &curCluster_)) return false;
-
- // if first cluster of file link to directory entry
- if (firstCluster_ == 0) {
- firstCluster_ = curCluster_;
- flags_ |= F_FILE_DIR_DIRTY;
- }
- return true;
-}
-//------------------------------------------------------------------------------
-// Add a cluster to a directory file and zero the cluster.
-// return with first block of cluster in the cache
-uint8_t SdFile::addDirCluster(void) {
- if (!addCluster()) return false;
-
- // zero data in cluster insure first cluster is in cache
- uint32_t block = vol_->clusterStartBlock(curCluster_);
- for (uint8_t i = vol_->blocksPerCluster_; i != 0; i--) {
- if (!SdVolume::cacheZeroBlock(block + i - 1)) return false;
- }
- // Increase directory file size by cluster size
- fileSize_ += 512UL << vol_->clusterSizeShift_;
- return true;
-}
-//------------------------------------------------------------------------------
-// cache a file's directory entry
-// return pointer to cached entry or null for failure
-dir_t* SdFile::cacheDirEntry(uint8_t action) {
- if (!SdVolume::cacheRawBlock(dirBlock_, action)) return NULL;
- return SdVolume::cacheBuffer_.dir + dirIndex_;
-}
-//------------------------------------------------------------------------------
-/**
- * Close a file and force cached data and directory information
- * to be written to the storage device.
- *
- * \return The value one, true, is returned for success and
- * the value zero, false, is returned for failure.
- * Reasons for failure include no file is open or an I/O error.
- */
-uint8_t SdFile::close(void) {
- if (!sync())return false;
- type_ = FAT_FILE_TYPE_CLOSED;
- return true;
-}
-//------------------------------------------------------------------------------
-/**
- * Check for contiguous file and return its raw block range.
- *
- * \param[out] bgnBlock the first block address for the file.
- * \param[out] endBlock the last block address for the file.
- *
- * \return The value one, true, is returned for success and
- * the value zero, false, is returned for failure.
- * Reasons for failure include file is not contiguous, file has zero length
- * or an I/O error occurred.
- */
-uint8_t SdFile::contiguousRange(uint32_t* bgnBlock, uint32_t* endBlock) {
- // error if no blocks
- if (firstCluster_ == 0) return false;
-
- for (uint32_t c = firstCluster_; ; c++) {
- uint32_t next;
- if (!vol_->fatGet(c, &next)) return false;
-
- // check for contiguous
- if (next != (c + 1)) {
- // error if not end of chain
- if (!vol_->isEOC(next)) return false;
- *bgnBlock = vol_->clusterStartBlock(firstCluster_);
- *endBlock = vol_->clusterStartBlock(c)
- + vol_->blocksPerCluster_ - 1;
- return true;
- }
- }
-}
-//------------------------------------------------------------------------------
-/**
- * Create and open a new contiguous file of a specified size.
- *
- * \note This function only supports short DOS 8.3 names.
- * See open() for more information.
- *
- * \param[in] dirFile The directory where the file will be created.
- * \param[in] fileName A valid DOS 8.3 file name.
- * \param[in] size The desired file size.
- *
- * \return The value one, true, is returned for success and
- * the value zero, false, is returned for failure.
- * Reasons for failure include \a fileName contains
- * an invalid DOS 8.3 file name, the FAT volume has not been initialized,
- * a file is already open, the file already exists, the root
- * directory is full or an I/O error.
- *
- */
-uint8_t SdFile::createContiguous(SdFile* dirFile,
- const char* fileName, uint32_t size) {
- // don't allow zero length file
- if (size == 0) return false;
- if (!open(dirFile, fileName, O_CREAT | O_EXCL | O_RDWR)) return false;
-
- // calculate number of clusters needed
- uint32_t count = ((size - 1) >> (vol_->clusterSizeShift_ + 9)) + 1;
-
- // allocate clusters
- if (!vol_->allocContiguous(count, &firstCluster_)) {
- remove();
- return false;
- }
- fileSize_ = size;
-
- // insure sync() will update dir entry
- flags_ |= F_FILE_DIR_DIRTY;
- return sync();
-}
-//------------------------------------------------------------------------------
-/**
- * Return a files directory entry
- *
- * \param[out] dir Location for return of the files directory entry.
- *
- * \return The value one, true, is returned for success and
- * the value zero, false, is returned for failure.
- */
-uint8_t SdFile::dirEntry(dir_t* dir) {
- // make sure fields on SD are correct
- if (!sync()) return false;
-
- // read entry
- dir_t* p = cacheDirEntry(SdVolume::CACHE_FOR_READ);
- if (!p) return false;
-
- // copy to caller's struct
- memcpy(dir, p, sizeof(dir_t));
- return true;
-}
-//------------------------------------------------------------------------------
-/**
- * Format the name field of \a dir into the 13 byte array
- * \a name in standard 8.3 short name format.
- *
- * \param[in] dir The directory structure containing the name.
- * \param[out] name A 13 byte char array for the formatted name.
- */
-void SdFile::dirName(const dir_t& dir, char* name) {
- uint8_t j = 0;
- for (uint8_t i = 0; i < 11; i++) {
- if (dir.name[i] == ' ')continue;
- if (i == 8) name[j++] = '.';
- name[j++] = dir.name[i];
- }
- name[j] = 0;
-}
-//------------------------------------------------------------------------------
-/** List directory contents to Serial.
- *
- * \param[in] flags The inclusive OR of
- *
- * LS_DATE - %Print file modification date
- *
- * LS_SIZE - %Print file size.
- *
- * LS_R - Recursive list of subdirectories.
- *
- * \param[in] indent Amount of space before file name. Used for recursive
- * list to indicate subdirectory level.
- */
-void SdFile::ls(uint8_t flags, uint8_t indent) {
- dir_t* p;
-
- rewind();
- while ((p = readDirCache())) {
- // done if past last used entry
- if (p->name[0] == DIR_NAME_FREE) break;
-
- // skip deleted entry and entries for . and ..
- if (p->name[0] == DIR_NAME_DELETED || p->name[0] == '.') continue;
-
- // only list subdirectories and files
- if (!DIR_IS_FILE_OR_SUBDIR(p)) continue;
-
- // print any indent spaces
- for (int8_t i = 0; i < indent; i++) SerialUSB.print(' ');
-
- // print file name with possible blank fill
- printDirName(*p, flags & (LS_DATE | LS_SIZE) ? 14 : 0);
-
- // print modify date/time if requested
- if (flags & LS_DATE) {
- printFatDate(p->lastWriteDate);
- SerialUSB.print(' ');
- printFatTime(p->lastWriteTime);
- }
- // print size if requested
- if (!DIR_IS_SUBDIR(p) && (flags & LS_SIZE)) {
- SerialUSB.print(' ');
- SerialUSB.print(p->fileSize);
- }
- SerialUSB.println();
-
- // list subdirectory content if requested
- if ((flags & LS_R) && DIR_IS_SUBDIR(p)) {
- uint16_t index = curPosition()/32 - 1;
- SdFile s;
- if (s.open(this, index, O_READ)) s.ls(flags, indent + 2);
- seekSet(32 * (index + 1));
- }
- }
-}
-//------------------------------------------------------------------------------
-// format directory name field from a 8.3 name string
-uint8_t SdFile::make83Name(const char* str, uint8_t* name) {
- uint8_t c;
- uint8_t n = 7; // max index for part before dot
- uint8_t i = 0;
- // blank fill name and extension
- while (i < 11) name[i++] = ' ';
- i = 0;
- while ((c = *str++) != '\0') {
- if (c == '.') {
- if (n == 10) return false; // only one dot allowed
- n = 10; // max index for full 8.3 name
- i = 8; // place for extension
- } else {
- // illegal FAT characters
-// PGM_P p = PSTR("|<>^+=?/[];,*\"\\");
- char p[17] = {"|<>^+=?/[];,*\"\\"};
- char *ptr = p;
- uint8_t b;
- while ((b = *(ptr++)))
- if (b == c)
- return false;
- // check size and only allow ASCII printable characters
- if (i > n || c < 0X21 || c > 0X7E)return false;
- // only upper case allowed in 8.3 names - convert lower to upper
- name[i++] = c < 'a' || c > 'z' ? c : c + ('A' - 'a');
- }
- }
- // must have a file name, extension is optional
- return name[0] != ' ';
-}
-//------------------------------------------------------------------------------
-/** Make a new directory.
- *
- * \param[in] dir An open SdFat instance for the directory that will containing
- * the new directory.
- *
- * \param[in] dirName A valid 8.3 DOS name for the new directory.
- *
- * \return The value one, true, is returned for success and
- * the value zero, false, is returned for failure.
- * Reasons for failure include this SdFile is already open, \a dir is not a
- * directory, \a dirName is invalid or already exists in \a dir.
- */
-uint8_t SdFile::makeDir(SdFile* dir, const char* dirName) {
- dir_t d;
-
- // create a normal file
- if (!open(dir, dirName, O_CREAT | O_EXCL | O_RDWR)) return false;
-
- // convert SdFile to directory
- flags_ = O_READ;
- type_ = FAT_FILE_TYPE_SUBDIR;
-
- // allocate and zero first cluster
- if (!addDirCluster())return false;
-
- // force entry to SD
- if (!sync()) return false;
-
- // cache entry - should already be in cache due to sync() call
- dir_t* p = cacheDirEntry(SdVolume::CACHE_FOR_WRITE);
- if (!p) return false;
-
- // change directory entry attribute
- p->attributes = DIR_ATT_DIRECTORY;
-
- // make entry for '.'
- memcpy(&d, p, sizeof(d));
- for (uint8_t i = 1; i < 11; i++) d.name[i] = ' ';
- d.name[0] = '.';
-
- // cache block for '.' and '..'
- uint32_t block = vol_->clusterStartBlock(firstCluster_);
- if (!SdVolume::cacheRawBlock(block, SdVolume::CACHE_FOR_WRITE)) return false;
-
- // copy '.' to block
- memcpy(&SdVolume::cacheBuffer_.dir[0], &d, sizeof(d));
-
- // make entry for '..'
- d.name[1] = '.';
- if (dir->isRoot()) {
- d.firstClusterLow = 0;
- d.firstClusterHigh = 0;
- } else {
- d.firstClusterLow = dir->firstCluster_ & 0XFFFF;
- d.firstClusterHigh = dir->firstCluster_ >> 16;
- }
- // copy '..' to block
- memcpy(&SdVolume::cacheBuffer_.dir[1], &d, sizeof(d));
-
- // set position after '..'
- curPosition_ = 2 * sizeof(d);
-
- // write first block
- return SdVolume::cacheFlush();
-}
-//------------------------------------------------------------------------------
-/**
- * Open a file or directory by name.
- *
- * \param[in] dirFile An open SdFat instance for the directory containing the
- * file to be opened.
- *
- * \param[in] fileName A valid 8.3 DOS name for a file to be opened.
- *
- * \param[in] oflag Values for \a oflag are constructed by a bitwise-inclusive
- * OR of flags from the following list
- *
- * O_READ - Open for reading.
- *
- * O_RDONLY - Same as O_READ.
- *
- * O_WRITE - Open for writing.
- *
- * O_WRONLY - Same as O_WRITE.
- *
- * O_RDWR - Open for reading and writing.
- *
- * O_APPEND - If set, the file offset shall be set to the end of the
- * file prior to each write.
- *
- * O_CREAT - If the file exists, this flag has no effect except as noted
- * under O_EXCL below. Otherwise, the file shall be created
- *
- * O_EXCL - If O_CREAT and O_EXCL are set, open() shall fail if the file exists.
- *
- * O_SYNC - Call sync() after each write. This flag should not be used with
- * write(uint8_t), write_P(PGM_P), writeln_P(PGM_P), or the Arduino Print class.
- * These functions do character at a time writes so sync() will be called
- * after each byte.
- *
- * O_TRUNC - If the file exists and is a regular file, and the file is
- * successfully opened and is not read only, its length shall be truncated to 0.
- *
- * \note Directory files must be opened read only. Write and truncation is
- * not allowed for directory files.
- *
- * \return The value one, true, is returned for success and
- * the value zero, false, is returned for failure.
- * Reasons for failure include this SdFile is already open, \a difFile is not
- * a directory, \a fileName is invalid, the file does not exist
- * or can't be opened in the access mode specified by oflag.
- */
-uint8_t SdFile::open(SdFile* dirFile, const char* fileName, uint8_t oflag) {
- uint8_t dname[11];
- dir_t* p;
-
- // error if already open
- if (isOpen())return false;
-
- if (!make83Name(fileName, dname)) return false;
- vol_ = dirFile->vol_;
- dirFile->rewind();
-
- // bool for empty entry found
- uint8_t emptyFound = false;
-
- // search for file
- while (dirFile->curPosition_ < dirFile->fileSize_) {
- uint8_t index = 0XF & (dirFile->curPosition_ >> 5);
- p = dirFile->readDirCache();
- if (p == NULL) return false;
-
- if (p->name[0] == DIR_NAME_FREE || p->name[0] == DIR_NAME_DELETED) {
- // remember first empty slot
- if (!emptyFound) {
- emptyFound = true;
- dirIndex_ = index;
- dirBlock_ = SdVolume::cacheBlockNumber_;
- }
- // done if no entries follow
- if (p->name[0] == DIR_NAME_FREE) break;
- } else if (!memcmp(dname, p->name, 11)) {
- // don't open existing file if O_CREAT and O_EXCL
- if ((oflag & (O_CREAT | O_EXCL)) == (O_CREAT | O_EXCL)) return false;
-
- // open found file
- return openCachedEntry(0XF & index, oflag);
- }
- }
- // only create file if O_CREAT and O_WRITE
- if ((oflag & (O_CREAT | O_WRITE)) != (O_CREAT | O_WRITE)) return false;
-
- // cache found slot or add cluster if end of file
- if (emptyFound) {
- p = cacheDirEntry(SdVolume::CACHE_FOR_WRITE);
- if (!p) return false;
- } else {
- if (dirFile->type_ == FAT_FILE_TYPE_ROOT16) return false;
-
- // add and zero cluster for dirFile - first cluster is in cache for write
- if (!dirFile->addDirCluster()) return false;
-
- // use first entry in cluster
- dirIndex_ = 0;
- p = SdVolume::cacheBuffer_.dir;
- }
- // initialize as empty file
- memset(p, 0, sizeof(dir_t));
- memcpy(p->name, dname, 11);
-
- // set timestamps
- if (dateTime_) {
- // call user function
- dateTime_(&p->creationDate, &p->creationTime);
- } else {
- // use default date/time
- p->creationDate = FAT_DEFAULT_DATE;
- p->creationTime = FAT_DEFAULT_TIME;
- }
- p->lastAccessDate = p->creationDate;
- p->lastWriteDate = p->creationDate;
- p->lastWriteTime = p->creationTime;
-
- // force write of entry to SD
- if (!SdVolume::cacheFlush()) return false;
-
- // open entry in cache
- return openCachedEntry(dirIndex_, oflag);
-}
-//------------------------------------------------------------------------------
-/**
- * Open a file by index.
- *
- * \param[in] dirFile An open SdFat instance for the directory.
- *
- * \param[in] index The \a index of the directory entry for the file to be
- * opened. The value for \a index is (directory file position)/32.
- *
- * \param[in] oflag Values for \a oflag are constructed by a bitwise-inclusive
- * OR of flags O_READ, O_WRITE, O_TRUNC, and O_SYNC.
- *
- * See open() by fileName for definition of flags and return values.
- *
- */
-uint8_t SdFile::open(SdFile* dirFile, uint16_t index, uint8_t oflag) {
- // error if already open
- if (isOpen())return false;
-
- // don't open existing file if O_CREAT and O_EXCL - user call error
- if ((oflag & (O_CREAT | O_EXCL)) == (O_CREAT | O_EXCL)) return false;
-
- vol_ = dirFile->vol_;
-
- // seek to location of entry
- if (!dirFile->seekSet(32 * index)) return false;
-
- // read entry into cache
- dir_t* p = dirFile->readDirCache();
- if (p == NULL) return false;
-
- // error if empty slot or '.' or '..'
- if (p->name[0] == DIR_NAME_FREE ||
- p->name[0] == DIR_NAME_DELETED || p->name[0] == '.') {
- return false;
- }
- // open cached entry
- return openCachedEntry(index & 0XF, oflag);
-}
-//------------------------------------------------------------------------------
-// open a cached directory entry. Assumes vol_ is initializes
-uint8_t SdFile::openCachedEntry(uint8_t dirIndex, uint8_t oflag) {
- // location of entry in cache
- dir_t* p = SdVolume::cacheBuffer_.dir + dirIndex;
-
- // write or truncate is an error for a directory or read-only file
- if (p->attributes & (DIR_ATT_READ_ONLY | DIR_ATT_DIRECTORY)) {
- if (oflag & (O_WRITE | O_TRUNC)) return false;
- }
- // remember location of directory entry on SD
- dirIndex_ = dirIndex;
- dirBlock_ = SdVolume::cacheBlockNumber_;
-
- // copy first cluster number for directory fields
- firstCluster_ = (uint32_t)p->firstClusterHigh << 16;
- firstCluster_ |= p->firstClusterLow;
-
- // make sure it is a normal file or subdirectory
- if (DIR_IS_FILE(p)) {
- fileSize_ = p->fileSize;
- type_ = FAT_FILE_TYPE_NORMAL;
- } else if (DIR_IS_SUBDIR(p)) {
- if (!vol_->chainSize(firstCluster_, &fileSize_)) return false;
- type_ = FAT_FILE_TYPE_SUBDIR;
- } else {
- return false;
- }
- // save open flags for read/write
- flags_ = oflag & (O_ACCMODE | O_SYNC | O_APPEND);
-
- // set to start of file
- curCluster_ = 0;
- curPosition_ = 0;
-
- // truncate file to zero length if requested
- if (oflag & O_TRUNC) return truncate(0);
- return true;
-}
-//------------------------------------------------------------------------------
-/**
- * Open a volume's root directory.
- *
- * \param[in] vol The FAT volume containing the root directory to be opened.
- *
- * \return The value one, true, is returned for success and
- * the value zero, false, is returned for failure.
- * Reasons for failure include the FAT volume has not been initialized
- * or it a FAT12 volume.
- */
-uint8_t SdFile::openRoot(SdVolume* vol) {
- // error if file is already open
- if (isOpen()) return false;
-
- if (vol->fatType() == 16) {
- type_ = FAT_FILE_TYPE_ROOT16;
- firstCluster_ = 0;
- fileSize_ = 32 * vol->rootDirEntryCount();
- } else if (vol->fatType() == 32) {
- type_ = FAT_FILE_TYPE_ROOT32;
- firstCluster_ = vol->rootDirStart();
- if (!vol->chainSize(firstCluster_, &fileSize_)) return false;
- } else {
- // volume is not initialized or FAT12
- return false;
- }
- vol_ = vol;
- // read only
- flags_ = O_READ;
-
- // set to start of file
- curCluster_ = 0;
- curPosition_ = 0;
-
- // root has no directory entry
- dirBlock_ = 0;
- dirIndex_ = 0;
- return true;
-}
-//------------------------------------------------------------------------------
-/** %Print the name field of a directory entry in 8.3 format to Serial.
- *
- * \param[in] dir The directory structure containing the name.
- * \param[in] width Blank fill name if length is less than \a width.
- */
-void SdFile::printDirName(const dir_t& dir, uint8_t width) {
- uint8_t w = 0;
- for (uint8_t i = 0; i < 11; i++) {
- if (dir.name[i] == ' ')continue;
- if (i == 8) {
- SerialUSB.print('.');
- w++;
- }
- SerialUSB.print(dir.name[i]);
- w++;
- }
- if (DIR_IS_SUBDIR(&dir)) {
- SerialUSB.print('/');
- w++;
- }
- while (w < width) {
- SerialUSB.print(' ');
- w++;
- }
-}
-//------------------------------------------------------------------------------
-/** %Print a directory date field to Serial.
- *
- * Format is yyyy-mm-dd.
- *
- * \param[in] fatDate The date field from a directory entry.
- */
-void SdFile::printFatDate(uint16_t fatDate) {
- SerialUSB.print(FAT_YEAR(fatDate));
- SerialUSB.print('-');
- printTwoDigits(FAT_MONTH(fatDate));
- SerialUSB.print('-');
- printTwoDigits(FAT_DAY(fatDate));
-}
-//------------------------------------------------------------------------------
-/** %Print a directory time field to Serial.
- *
- * Format is hh:mm:ss.
- *
- * \param[in] fatTime The time field from a directory entry.
- */
-void SdFile::printFatTime(uint16_t fatTime) {
- printTwoDigits(FAT_HOUR(fatTime));
- SerialUSB.print(':');
- printTwoDigits(FAT_MINUTE(fatTime));
- SerialUSB.print(':');
- printTwoDigits(FAT_SECOND(fatTime));
-}
-//------------------------------------------------------------------------------
-/** %Print a value as two digits to Serial.
- *
- * \param[in] v Value to be printed, 0 <= \a v <= 99
- */
-void SdFile::printTwoDigits(uint8_t v) {
- char str[3];
- str[0] = '0' + v/10;
- str[1] = '0' + v % 10;
- str[2] = 0;
- SerialUSB.print(str);
-}
-//------------------------------------------------------------------------------
-/**
- * Read data from a file starting at the current position.
- *
- * \param[out] buf Pointer to the location that will receive the data.
- *
- * \param[in] nbyte Maximum number of bytes to read.
- *
- * \return For success read() returns the number of bytes read.
- * A value less than \a nbyte, including zero, will be returned
- * if end of file is reached.
- * If an error occurs, read() returns -1. Possible errors include
- * read() called before a file has been opened, corrupt file system
- * or an I/O error occurred.
- */
-int16_t SdFile::read(void* buf, uint16_t nbyte) {
- uint8_t* dst = reinterpret_cast<uint8_t*>(buf);
-
- // error if not open or write only
- if (!isOpen() || !(flags_ & O_READ)) return -1;
-
- // max bytes left in file
- if (nbyte > (fileSize_ - curPosition_)) nbyte = fileSize_ - curPosition_;
-
- // amount left to read
- uint16_t toRead = nbyte;
- while (toRead > 0) {
- uint32_t block; // raw device block number
- uint16_t offset = curPosition_ & 0X1FF; // offset in block
- if (type_ == FAT_FILE_TYPE_ROOT16) {
- block = vol_->rootDirStart() + (curPosition_ >> 9);
- } else {
- uint8_t blockOfCluster = vol_->blockOfCluster(curPosition_);
- if (offset == 0 && blockOfCluster == 0) {
- // start of new cluster
- if (curPosition_ == 0) {
- // use first cluster in file
- curCluster_ = firstCluster_;
- } else {
- // get next cluster from FAT
- if (!vol_->fatGet(curCluster_, &curCluster_)) return -1;
- }
- }
- block = vol_->clusterStartBlock(curCluster_) + blockOfCluster;
- }
- uint16_t n = toRead;
-
- // amount to be read from current block
- if (n > (512 - offset)) n = 512 - offset;
-
- // no buffering needed if n == 512 or user requests no buffering
- if ((unbufferedRead() || n == 512) &&
- block != SdVolume::cacheBlockNumber_) {
- if (!vol_->readData(block, offset, n, dst)) return -1;
- dst += n;
- } else {
- // read block to cache and copy data to caller
- if (!SdVolume::cacheRawBlock(block, SdVolume::CACHE_FOR_READ)) return -1;
- uint8_t* src = SdVolume::cacheBuffer_.data + offset;
- uint8_t* end = src + n;
- while (src != end) *dst++ = *src++;
- }
- curPosition_ += n;
- toRead -= n;
- }
- return nbyte;
-}
-//------------------------------------------------------------------------------
-/**
- * Read the next directory entry from a directory file.
- *
- * \param[out] dir The dir_t struct that will receive the data.
- *
- * \return For success readDir() returns the number of bytes read.
- * A value of zero will be returned if end of file is reached.
- * If an error occurs, readDir() returns -1. Possible errors include
- * readDir() called before a directory has been opened, this is not
- * a directory file or an I/O error occurred.
- */
-int8_t SdFile::readDir(dir_t* dir) {
- int8_t n;
- // if not a directory file or miss-positioned return an error
- if (!isDir() || (0X1F & curPosition_)) return -1;
-
- while ((n = read(dir, sizeof(dir_t))) == sizeof(dir_t)) {
- // last entry if DIR_NAME_FREE
- if (dir->name[0] == DIR_NAME_FREE) break;
- // skip empty entries and entry for . and ..
- if (dir->name[0] == DIR_NAME_DELETED || dir->name[0] == '.') continue;
- // return if normal file or subdirectory
- if (DIR_IS_FILE_OR_SUBDIR(dir)) return n;
- }
- // error, end of file, or past last entry
- return n < 0 ? -1 : 0;
-}
-//------------------------------------------------------------------------------
-// Read next directory entry into the cache
-// Assumes file is correctly positioned
-dir_t* SdFile::readDirCache(void) {
- // error if not directory
- if (!isDir()) return NULL;
-
- // index of entry in cache
- uint8_t i = (curPosition_ >> 5) & 0XF;
-
- // use read to locate and cache block
- if (read() < 0) return NULL;
-
- // advance to next entry
- curPosition_ += 31;
-
- // return pointer to entry
- return (SdVolume::cacheBuffer_.dir + i);
-}
-//------------------------------------------------------------------------------
-/**
- * Remove a file.
- *
- * The directory entry and all data for the file are deleted.
- *
- * \note This function should not be used to delete the 8.3 version of a
- * file that has a long name. For example if a file has the long name
- * "New Text Document.txt" you should not delete the 8.3 name "NEWTEX~1.TXT".
- *
- * \return The value one, true, is returned for success and
- * the value zero, false, is returned for failure.
- * Reasons for failure include the file read-only, is a directory,
- * or an I/O error occurred.
- */
-uint8_t SdFile::remove(void) {
- // free any clusters - will fail if read-only or directory
- if (!truncate(0)) return false;
-
- // cache directory entry
- dir_t* d = cacheDirEntry(SdVolume::CACHE_FOR_WRITE);
- if (!d) return false;
-
- // mark entry deleted
- d->name[0] = DIR_NAME_DELETED;
-
- // set this SdFile closed
- type_ = FAT_FILE_TYPE_CLOSED;
-
- // write entry to SD
- return SdVolume::cacheFlush();
-}
-//------------------------------------------------------------------------------
-/**
- * Remove a file.
- *
- * The directory entry and all data for the file are deleted.
- *
- * \param[in] dirFile The directory that contains the file.
- * \param[in] fileName The name of the file to be removed.
- *
- * \note This function should not be used to delete the 8.3 version of a
- * file that has a long name. For example if a file has the long name
- * "New Text Document.txt" you should not delete the 8.3 name "NEWTEX~1.TXT".
- *
- * \return The value one, true, is returned for success and
- * the value zero, false, is returned for failure.
- * Reasons for failure include the file is a directory, is read only,
- * \a dirFile is not a directory, \a fileName is not found
- * or an I/O error occurred.
- */
-uint8_t SdFile::remove(SdFile* dirFile, const char* fileName) {
- SdFile file;
- if (!file.open(dirFile, fileName, O_WRITE)) return false;
- return file.remove();
-}
-//------------------------------------------------------------------------------
-/** Remove a directory file.
- *
- * The directory file will be removed only if it is empty and is not the
- * root directory. rmDir() follows DOS and Windows and ignores the
- * read-only attribute for the directory.
- *
- * \note This function should not be used to delete the 8.3 version of a
- * directory that has a long name. For example if a directory has the
- * long name "New folder" you should not delete the 8.3 name "NEWFOL~1".
- *
- * \return The value one, true, is returned for success and
- * the value zero, false, is returned for failure.
- * Reasons for failure include the file is not a directory, is the root
- * directory, is not empty, or an I/O error occurred.
- */
-uint8_t SdFile::rmDir(void) {
- // must be open subdirectory
- if (!isSubDir()) return false;
-
- rewind();
-
- // make sure directory is empty
- while (curPosition_ < fileSize_) {
- dir_t* p = readDirCache();
- if (p == NULL) return false;
- // done if past last used entry
- if (p->name[0] == DIR_NAME_FREE) break;
- // skip empty slot or '.' or '..'
- if (p->name[0] == DIR_NAME_DELETED || p->name[0] == '.') continue;
- // error not empty
- if (DIR_IS_FILE_OR_SUBDIR(p)) return false;
- }
- // convert empty directory to normal file for remove
- type_ = FAT_FILE_TYPE_NORMAL;
- flags_ |= O_WRITE;
- return remove();
-}
-//------------------------------------------------------------------------------
-/** Recursively delete a directory and all contained files.
- *
- * This is like the Unix/Linux 'rm -rf *' if called with the root directory
- * hence the name.
- *
- * Warning - This will remove all contents of the directory including
- * subdirectories. The directory will then be removed if it is not root.
- * The read-only attribute for files will be ignored.
- *
- * \note This function should not be used to delete the 8.3 version of
- * a directory that has a long name. See remove() and rmDir().
- *
- * \return The value one, true, is returned for success and
- * the value zero, false, is returned for failure.
- */
-uint8_t SdFile::rmRfStar(void) {
- rewind();
- while (curPosition_ < fileSize_) {
- SdFile f;
-
- // remember position
- uint16_t index = curPosition_/32;
-
- dir_t* p = readDirCache();
- if (!p) return false;
-
- // done if past last entry
- if (p->name[0] == DIR_NAME_FREE) break;
-
- // skip empty slot or '.' or '..'
- if (p->name[0] == DIR_NAME_DELETED || p->name[0] == '.') continue;
-
- // skip if part of long file name or volume label in root
- if (!DIR_IS_FILE_OR_SUBDIR(p)) continue;
-
- if (!f.open(this, index, O_READ)) return false;
- if (f.isSubDir()) {
- // recursively delete
- if (!f.rmRfStar()) return false;
- } else {
- // ignore read-only
- f.flags_ |= O_WRITE;
- if (!f.remove()) return false;
- }
- // position to next entry if required
- if (curPosition_ != (32*(index + 1))) {
- if (!seekSet(32*(index + 1))) return false;
- }
- }
- // don't try to delete root
- if (isRoot()) return true;
- return rmDir();
-}
-//------------------------------------------------------------------------------
-/**
- * Sets a file's position.
- *
- * \param[in] pos The new position in bytes from the beginning of the file.
- *
- * \return The value one, true, is returned for success and
- * the value zero, false, is returned for failure.
- */
-uint8_t SdFile::seekSet(uint32_t pos) {
- // error if file not open or seek past end of file
- if (!isOpen() || pos > fileSize_) return false;
-
- if (type_ == FAT_FILE_TYPE_ROOT16) {
- curPosition_ = pos;
- return true;
- }
- if (pos == 0) {
- // set position to start of file
- curCluster_ = 0;
- curPosition_ = 0;
- return true;
- }
- // calculate cluster index for cur and new position
- uint32_t nCur = (curPosition_ - 1) >> (vol_->clusterSizeShift_ + 9);
- uint32_t nNew = (pos - 1) >> (vol_->clusterSizeShift_ + 9);
-
- if (nNew < nCur || curPosition_ == 0) {
- // must follow chain from first cluster
- curCluster_ = firstCluster_;
- } else {
- // advance from curPosition
- nNew -= nCur;
- }
- while (nNew--) {
- if (!vol_->fatGet(curCluster_, &curCluster_)) return false;
- }
- curPosition_ = pos;
- return true;
-}
-//------------------------------------------------------------------------------
-/**
- * The sync() call causes all modified data and directory fields
- * to be written to the storage device.
- *
- * \return The value one, true, is returned for success and
- * the value zero, false, is returned for failure.
- * Reasons for failure include a call to sync() before a file has been
- * opened or an I/O error.
- */
-uint8_t SdFile::sync(void) {
- // only allow open files and directories
- if (!isOpen()) return false;
-
- if (flags_ & F_FILE_DIR_DIRTY) {
- dir_t* d = cacheDirEntry(SdVolume::CACHE_FOR_WRITE);
- if (!d) return false;
-
- // do not set filesize for dir files
- if (!isDir()) d->fileSize = fileSize_;
-
- // update first cluster fields
- d->firstClusterLow = firstCluster_ & 0XFFFF;
- d->firstClusterHigh = firstCluster_ >> 16;
-
- // set modify time if user supplied a callback date/time function
- if (dateTime_) {
- dateTime_(&d->lastWriteDate, &d->lastWriteTime);
- d->lastAccessDate = d->lastWriteDate;
- }
- // clear directory dirty
- flags_ &= ~F_FILE_DIR_DIRTY;
- }
- return SdVolume::cacheFlush();
-}
-//------------------------------------------------------------------------------
-/**
- * Set a file's timestamps in its directory entry.
- *
- * \param[in] flags Values for \a flags are constructed by a bitwise-inclusive
- * OR of flags from the following list
- *
- * T_ACCESS - Set the file's last access date.
- *
- * T_CREATE - Set the file's creation date and time.
- *
- * T_WRITE - Set the file's last write/modification date and time.
- *
- * \param[in] year Valid range 1980 - 2107 inclusive.
- *
- * \param[in] month Valid range 1 - 12 inclusive.
- *
- * \param[in] day Valid range 1 - 31 inclusive.
- *
- * \param[in] hour Valid range 0 - 23 inclusive.
- *
- * \param[in] minute Valid range 0 - 59 inclusive.
- *
- * \param[in] second Valid range 0 - 59 inclusive
- *
- * \note It is possible to set an invalid date since there is no check for
- * the number of days in a month.
- *
- * \note
- * Modify and access timestamps may be overwritten if a date time callback
- * function has been set by dateTimeCallback().
- *
- * \return The value one, true, is returned for success and
- * the value zero, false, is returned for failure.
- */
-uint8_t SdFile::timestamp(uint8_t flags, uint16_t year, uint8_t month,
- uint8_t day, uint8_t hour, uint8_t minute, uint8_t second) {
- if (!isOpen()
- || year < 1980
- || year > 2107
- || month < 1
- || month > 12
- || day < 1
- || day > 31
- || hour > 23
- || minute > 59
- || second > 59) {
- return false;
- }
- dir_t* d = cacheDirEntry(SdVolume::CACHE_FOR_WRITE);
- if (!d) return false;
-
- uint16_t dirDate = FAT_DATE(year, month, day);
- uint16_t dirTime = FAT_TIME(hour, minute, second);
- if (flags & T_ACCESS) {
- d->lastAccessDate = dirDate;
- }
- if (flags & T_CREATE) {
- d->creationDate = dirDate;
- d->creationTime = dirTime;
- // seems to be units of 1/100 second not 1/10 as Microsoft states
- d->creationTimeTenths = second & 1 ? 100 : 0;
- }
- if (flags & T_WRITE) {
- d->lastWriteDate = dirDate;
- d->lastWriteTime = dirTime;
- }
- SdVolume::cacheSetDirty();
- return sync();
-}
-//------------------------------------------------------------------------------
-/**
- * Truncate a file to a specified length. The current file position
- * will be maintained if it is less than or equal to \a length otherwise
- * it will be set to end of file.
- *
- * \param[in] length The desired length for the file.
- *
- * \return The value one, true, is returned for success and
- * the value zero, false, is returned for failure.
- * Reasons for failure include file is read only, file is a directory,
- * \a length is greater than the current file size or an I/O error occurs.
- */
-uint8_t SdFile::truncate(uint32_t length) {
-// error if not a normal file or read-only
- if (!isFile() || !(flags_ & O_WRITE)) return false;
-
- // error if length is greater than current size
- if (length > fileSize_) return false;
-
- // fileSize and length are zero - nothing to do
- if (fileSize_ == 0) return true;
-
- // remember position for seek after truncation
- uint32_t newPos = curPosition_ > length ? length : curPosition_;
-
- // position to last cluster in truncated file
- if (!seekSet(length)) return false;
-
- if (length == 0) {
- // free all clusters
- if (!vol_->freeChain(firstCluster_)) return false;
- firstCluster_ = 0;
- } else {
- uint32_t toFree;
- if (!vol_->fatGet(curCluster_, &toFree)) return false;
-
- if (!vol_->isEOC(toFree)) {
- // free extra clusters
- if (!vol_->freeChain(toFree)) return false;
-
- // current cluster is end of chain
- if (!vol_->fatPutEOC(curCluster_)) return false;
- }
- }
- fileSize_ = length;
-
- // need to update directory entry
- flags_ |= F_FILE_DIR_DIRTY;
-
- if (!sync()) return false;
-
- // set file to correct position
- return seekSet(newPos);
-}
-//------------------------------------------------------------------------------
-/**
- * Write data to an open file.
- *
- * \note Data is moved to the cache but may not be written to the
- * storage device until sync() is called.
- *
- * \param[in] buf Pointer to the location of the data to be written.
- *
- * \param[in] nbyte Number of bytes to write.
- *
- * \return For success write() returns the number of bytes written, always
- * \a nbyte. If an error occurs, write() returns -1. Possible errors
- * include write() is called before a file has been opened, write is called
- * for a read-only file, device is full, a corrupt file system or an I/O error.
- *
- */
-int16_t SdFile::write(const void* buf, uint16_t nbyte) {
- // convert void* to uint8_t* - must be before goto statements
- const uint8_t* src = reinterpret_cast<const uint8_t*>(buf);
-
- // number of bytes left to write - must be before goto statements
- uint16_t nToWrite = nbyte;
-
- // error if not a normal file or is read-only
- if (!isFile() || !(flags_ & O_WRITE)) goto writeErrorReturn;
-
- // seek to end of file if append flag
- if ((flags_ & O_APPEND) && curPosition_ != fileSize_) {
- if (!seekEnd()) goto writeErrorReturn;
- }
-
- while (nToWrite > 0) {
- uint8_t blockOfCluster = vol_->blockOfCluster(curPosition_);
- uint16_t blockOffset = curPosition_ & 0X1FF;
- if (blockOfCluster == 0 && blockOffset == 0) {
- // start of new cluster
- if (curCluster_ == 0) {
- if (firstCluster_ == 0) {
- // allocate first cluster of file
- if (!addCluster()) goto writeErrorReturn;
- } else {
- curCluster_ = firstCluster_;
- }
- } else {
- uint32_t next;
- if (!vol_->fatGet(curCluster_, &next)) return false;
- if (vol_->isEOC(next)) {
- // add cluster if at end of chain
- if (!addCluster()) goto writeErrorReturn;
- } else {
- curCluster_ = next;
- }
- }
- }
- // max space in block
- uint16_t n = 512 - blockOffset;
-
- // lesser of space and amount to write
- if (n > nToWrite) n = nToWrite;
-
- // block for data write
- uint32_t block = vol_->clusterStartBlock(curCluster_) + blockOfCluster;
- if (n == 512) {
- // full block - don't need to use cache
- // invalidate cache if block is in cache
- if (SdVolume::cacheBlockNumber_ == block) {
- SdVolume::cacheBlockNumber_ = 0XFFFFFFFF;
- }
- if (!vol_->writeBlock(block, src)) goto writeErrorReturn;
- src += 512;
- } else {
- if (blockOffset == 0 && curPosition_ >= fileSize_) {
- // start of new block don't need to read into cache
- if (!SdVolume::cacheFlush()) goto writeErrorReturn;
- SdVolume::cacheBlockNumber_ = block;
- SdVolume::cacheSetDirty();
- } else {
- // rewrite part of block
- if (!SdVolume::cacheRawBlock(block, SdVolume::CACHE_FOR_WRITE)) {
- goto writeErrorReturn;
- }
- }
- uint8_t* dst = SdVolume::cacheBuffer_.data + blockOffset;
- uint8_t* end = dst + n;
- while (dst != end) *dst++ = *src++;
- }
- nToWrite -= n;
- curPosition_ += n;
- }
- if (curPosition_ > fileSize_) {
- // update fileSize and insure sync will update dir entry
- fileSize_ = curPosition_;
- flags_ |= F_FILE_DIR_DIRTY;
- } else if (dateTime_ && nbyte) {
- // insure sync will update modified date and time
- flags_ |= F_FILE_DIR_DIRTY;
- }
-
- if (flags_ & O_SYNC) {
- if (!sync()) goto writeErrorReturn;
- }
- return nbyte;
-
- writeErrorReturn:
- // return for write error
- writeError = true;
- return -1;
-}
-//------------------------------------------------------------------------------
-/**
- * Write a byte to a file. Required by the Arduino Print class.
- *
- * Use SdFile::writeError to check for errors.
- */
-void SdFile::write(uint8_t b) {
- write(&b, 1);
-}
-//------------------------------------------------------------------------------
-/**
- * Write a string to a file. Used by the Arduino Print class.
- *
- * Use SdFile::writeError to check for errors.
- */
-void SdFile::write(const char* str) {
- write(str, strlen(str));
-}
-//------------------------------------------------------------------------------
-/**
- * Write a PROGMEM string to a file.
- *
- * Use SdFile::writeError to check for errors.
-
-void SdFile::write_P(PGM_P str) {
- for (uint8_t c; (c = pgm_read_byte(str)); str++) write(c);
-}
-*/
-//------------------------------------------------------------------------------
-/**
- * Write a PROGMEM string followed by CR/LF to a file.
- *
- * Use SdFile::writeError to check for errors.
-
-void SdFile::writeln_P(PGM_P str) {
- write_P(str);
- println();
-}
-*/
\ No newline at end of file diff --git a/dumblogger/libraries/SDfat/.svn/text-base/SdInfo.h.svn-base b/dumblogger/libraries/SDfat/.svn/text-base/SdInfo.h.svn-base deleted file mode 100644 index acde74d..0000000 --- a/dumblogger/libraries/SDfat/.svn/text-base/SdInfo.h.svn-base +++ /dev/null @@ -1,232 +0,0 @@ -/* Arduino Sd2Card Library
- * Copyright (C) 2009 by William Greiman
- *
- * This file is part of the Arduino Sd2Card Library
- *
- * This Library is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This Library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Arduino Sd2Card Library. If not, see
- * <http://www.gnu.org/licenses/>.
- */
-#ifndef SdInfo_h
-#define SdInfo_h
-#include <stdint.h>
-// Based on the document:
-//
-// SD Specifications
-// Part 1
-// Physical Layer
-// Simplified Specification
-// Version 2.00
-// September 25, 2006
-//
-// www.sdcard.org/developers/tech/sdcard/pls/Simplified_Physical_Layer_Spec.pdf
-//------------------------------------------------------------------------------
-// SD card commands
-/** GO_IDLE_STATE - init card in spi mode if CS low */
-uint8_t const CMD0 = 0X00;
-/** SEND_IF_COND - verify SD Memory Card interface operating condition.*/
-uint8_t const CMD8 = 0X08;
-/** SEND_CSD - read the Card Specific Data (CSD register) */
-uint8_t const CMD9 = 0X09;
-/** SEND_CID - read the card identification information (CID register) */
-uint8_t const CMD10 = 0X0A;
-/** SEND_STATUS - read the card status register */
-uint8_t const CMD13 = 0X0D;
-/** READ_BLOCK - read a single data block from the card */
-uint8_t const CMD17 = 0X11;
-/** WRITE_BLOCK - write a single data block to the card */
-uint8_t const CMD24 = 0X18;
-/** WRITE_MULTIPLE_BLOCK - write blocks of data until a STOP_TRANSMISSION */
-uint8_t const CMD25 = 0X19;
-/** ERASE_WR_BLK_START - sets the address of the first block to be erased */
-uint8_t const CMD32 = 0X20;
-/** ERASE_WR_BLK_END - sets the address of the last block of the continuous
- range to be erased*/
-uint8_t const CMD33 = 0X21;
-/** ERASE - erase all previously selected blocks */
-uint8_t const CMD38 = 0X26;
-/** APP_CMD - escape for application specific command */
-uint8_t const CMD55 = 0X37;
-/** READ_OCR - read the OCR register of a card */
-uint8_t const CMD58 = 0X3A;
-/** SET_WR_BLK_ERASE_COUNT - Set the number of write blocks to be
- pre-erased before writing */
-uint8_t const ACMD23 = 0X17;
-/** SD_SEND_OP_COMD - Sends host capacity support information and
- activates the card's initialization process */
-uint8_t const ACMD41 = 0X29;
-//------------------------------------------------------------------------------
-/** status for card in the ready state */
-uint8_t const R1_READY_STATE = 0X00;
-/** status for card in the idle state */
-uint8_t const R1_IDLE_STATE = 0X01;
-/** status bit for illegal command */
-uint8_t const R1_ILLEGAL_COMMAND = 0X04;
-/** start data token for read or write single block*/
-uint8_t const DATA_START_BLOCK = 0XFE;
-/** stop token for write multiple blocks*/
-uint8_t const STOP_TRAN_TOKEN = 0XFD;
-/** start data token for write multiple blocks*/
-uint8_t const WRITE_MULTIPLE_TOKEN = 0XFC;
-/** mask for data response tokens after a write block operation */
-uint8_t const DATA_RES_MASK = 0X1F;
-/** write data accepted token */
-uint8_t const DATA_RES_ACCEPTED = 0X05;
-//------------------------------------------------------------------------------
-typedef struct CID {
- // byte 0
- uint8_t mid; // Manufacturer ID
- // byte 1-2
- char oid[2]; // OEM/Application ID
- // byte 3-7
- char pnm[5]; // Product name
- // byte 8
- unsigned prv_m : 4; // Product revision n.m
- unsigned prv_n : 4;
- // byte 9-12
- uint32_t psn; // Product serial number
- // byte 13
- unsigned mdt_year_high : 4; // Manufacturing date
- unsigned reserved : 4;
- // byte 14
- unsigned mdt_month : 4;
- unsigned mdt_year_low :4;
- // byte 15
- unsigned always1 : 1;
- unsigned crc : 7;
-}cid_t;
-//------------------------------------------------------------------------------
-// CSD for version 1.00 cards
-typedef struct CSDV1 {
- // byte 0
- unsigned reserved1 : 6;
- unsigned csd_ver : 2;
- // byte 1
- uint8_t taac;
- // byte 2
- uint8_t nsac;
- // byte 3
- uint8_t tran_speed;
- // byte 4
- uint8_t ccc_high;
- // byte 5
- unsigned read_bl_len : 4;
- unsigned ccc_low : 4;
- // byte 6
- unsigned c_size_high : 2;
- unsigned reserved2 : 2;
- unsigned dsr_imp : 1;
- unsigned read_blk_misalign :1;
- unsigned write_blk_misalign : 1;
- unsigned read_bl_partial : 1;
- // byte 7
- uint8_t c_size_mid;
- // byte 8
- unsigned vdd_r_curr_max : 3;
- unsigned vdd_r_curr_min : 3;
- unsigned c_size_low :2;
- // byte 9
- unsigned c_size_mult_high : 2;
- unsigned vdd_w_cur_max : 3;
- unsigned vdd_w_curr_min : 3;
- // byte 10
- unsigned sector_size_high : 6;
- unsigned erase_blk_en : 1;
- unsigned c_size_mult_low : 1;
- // byte 11
- unsigned wp_grp_size : 7;
- unsigned sector_size_low : 1;
- // byte 12
- unsigned write_bl_len_high : 2;
- unsigned r2w_factor : 3;
- unsigned reserved3 : 2;
- unsigned wp_grp_enable : 1;
- // byte 13
- unsigned reserved4 : 5;
- unsigned write_partial : 1;
- unsigned write_bl_len_low : 2;
- // byte 14
- unsigned reserved5: 2;
- unsigned file_format : 2;
- unsigned tmp_write_protect : 1;
- unsigned perm_write_protect : 1;
- unsigned copy : 1;
- unsigned file_format_grp : 1;
- // byte 15
- unsigned always1 : 1;
- unsigned crc : 7;
-}csd1_t;
-//------------------------------------------------------------------------------
-// CSD for version 2.00 cards
-typedef struct CSDV2 {
- // byte 0
- unsigned reserved1 : 6;
- unsigned csd_ver : 2;
- // byte 1
- uint8_t taac;
- // byte 2
- uint8_t nsac;
- // byte 3
- uint8_t tran_speed;
- // byte 4
- uint8_t ccc_high;
- // byte 5
- unsigned read_bl_len : 4;
- unsigned ccc_low : 4;
- // byte 6
- unsigned reserved2 : 4;
- unsigned dsr_imp : 1;
- unsigned read_blk_misalign :1;
- unsigned write_blk_misalign : 1;
- unsigned read_bl_partial : 1;
- // byte 7
- unsigned reserved3 : 2;
- unsigned c_size_high : 6;
- // byte 8
- uint8_t c_size_mid;
- // byte 9
- uint8_t c_size_low;
- // byte 10
- unsigned sector_size_high : 6;
- unsigned erase_blk_en : 1;
- unsigned reserved4 : 1;
- // byte 11
- unsigned wp_grp_size : 7;
- unsigned sector_size_low : 1;
- // byte 12
- unsigned write_bl_len_high : 2;
- unsigned r2w_factor : 3;
- unsigned reserved5 : 2;
- unsigned wp_grp_enable : 1;
- // byte 13
- unsigned reserved6 : 5;
- unsigned write_partial : 1;
- unsigned write_bl_len_low : 2;
- // byte 14
- unsigned reserved7: 2;
- unsigned file_format : 2;
- unsigned tmp_write_protect : 1;
- unsigned perm_write_protect : 1;
- unsigned copy : 1;
- unsigned file_format_grp : 1;
- // byte 15
- unsigned always1 : 1;
- unsigned crc : 7;
-}csd2_t;
-//------------------------------------------------------------------------------
-// union of old and new style CSD register
-union csd_t {
- csd1_t v1;
- csd2_t v2;
-};
-#endif // SdInfo_h
diff --git a/dumblogger/libraries/SDfat/.svn/text-base/SdVolume.cpp.svn-base b/dumblogger/libraries/SDfat/.svn/text-base/SdVolume.cpp.svn-base deleted file mode 100644 index 505bcd8..0000000 --- a/dumblogger/libraries/SDfat/.svn/text-base/SdVolume.cpp.svn-base +++ /dev/null @@ -1,371 +0,0 @@ -/* Arduino SdFat Library
- * Copyright (C) 2009 by William Greiman
- *
- * This file is part of the Arduino SdFat Library
- *
- * This Library is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This Library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with the Arduino SdFat Library. If not, see
- * <http://www.gnu.org/licenses/>.
- */
-#include "SdFat.h"
-#include <usb_serial.h>
-
-//------------------------------------------------------------------------------
-// raw block cache
-// init cacheBlockNumber_to invalid SD block number
-uint32_t SdVolume::cacheBlockNumber_ = 0XFFFFFFFF;
-cache_t SdVolume::cacheBuffer_; // 512 byte cache for Sd2Card
-Sd2Card* SdVolume::sdCard_; // pointer to SD card object
-uint8_t SdVolume::cacheDirty_ = 0; // cacheFlush() will write block if true
-uint32_t SdVolume::cacheMirrorBlock_ = 0; // mirror block for second FAT
-//------------------------------------------------------------------------------
-// find a contiguous group of clusters
-uint8_t SdVolume::allocContiguous(uint32_t count, uint32_t* curCluster)
-{
- // start of group
- uint32_t bgnCluster;
-
- // flag to save place to start next search
- uint8_t setStart;
-
- // set search start cluster
- if (*curCluster)
- {
- // try to make file contiguous
- bgnCluster = *curCluster + 1;
-
- // don't save new start location
- setStart = false;
- }
- else
- {
- // start at likely place for free cluster
- bgnCluster = allocSearchStart_;
-
- // save next search start if one cluster
- setStart = 1 == count;
- }
- // end of group
- uint32_t endCluster = bgnCluster;
-
- // last cluster of FAT
- uint32_t fatEnd = clusterCount_ + 1;
-
- // search the FAT for free clusters
- for (uint32_t n = 0;; n++, endCluster++)
- {
- // can't find space checked all clusters
- if (n >= clusterCount_) return false;
-
- // past end - start from beginning of FAT
- if (endCluster > fatEnd)
- {
- bgnCluster = endCluster = 2;
- }
- uint32_t f;
- if (!fatGet(endCluster, &f)) return false;
-
- if (f != 0)
- {
- // cluster in use try next cluster as bgnCluster
- bgnCluster = endCluster + 1;
- }
- else if ((endCluster - bgnCluster + 1) == count)
- {
- // done - found space
- break;
- }
- }
- // mark end of chain
- if (!fatPutEOC(endCluster))
- return false;
-
- // link clusters
- while (endCluster > bgnCluster)
- {
- if (!fatPut(endCluster - 1, endCluster))
- return false;
- endCluster--;
- }
- if (*curCluster != 0)
- {
- // connect chains
- if (!fatPut(*curCluster, bgnCluster))
- return false;
- }
- // return first cluster number to caller
- *curCluster = bgnCluster;
-
- // remember possible next free cluster
- if (setStart)
- allocSearchStart_ = bgnCluster + 1;
-
- return true;
-}
-//------------------------------------------------------------------------------
-uint8_t SdVolume::cacheFlush(void) {
- if (cacheDirty_)
- {
- if (!sdCard_->writeBlock(cacheBlockNumber_, cacheBuffer_.data))
- {
- return false;
- }
- // mirror FAT tables
- if (cacheMirrorBlock_)
- {
- if (!sdCard_->writeBlock(cacheMirrorBlock_, cacheBuffer_.data))
- {
- return false;
- }
- cacheMirrorBlock_ = 0;
- }
- cacheDirty_ = 0;
- }
- return true;
-}
-//------------------------------------------------------------------------------
-uint8_t SdVolume::cacheRawBlock(uint32_t blockNumber, uint8_t action)
-{
- if (cacheBlockNumber_ != blockNumber)
- {
- if (!cacheFlush())
- return false;
- if (!sdCard_->readBlock(blockNumber, cacheBuffer_.data))
- return false;
- cacheBlockNumber_ = blockNumber;
- }
- cacheDirty_ |= action;
- return true;
-}
-//------------------------------------------------------------------------------
-// cache a zero block for blockNumber
-uint8_t SdVolume::cacheZeroBlock(uint32_t blockNumber)
-{
- if (!cacheFlush()) return false;
-
- // loop take less flash than memset(cacheBuffer_.data, 0, 512);
- for (uint16_t i = 0; i < 512; i++)
- {
- cacheBuffer_.data[i] = 0;
- }
- cacheBlockNumber_ = blockNumber;
- cacheSetDirty();
- return true;
-}
-//------------------------------------------------------------------------------
-// return the size in bytes of a cluster chain
-uint8_t SdVolume::chainSize(uint32_t cluster, uint32_t* size) const
-{
- uint32_t s = 0;
- do
- {
- if (!fatGet(cluster, &cluster)) return false;
- s += 512UL << clusterSizeShift_;
- } while (!isEOC(cluster));
- *size = s;
- return true;
-}
-//------------------------------------------------------------------------------
-// Fetch a FAT entry
-uint8_t SdVolume::fatGet(uint32_t cluster, uint32_t* value) const
-{
- if (cluster > (clusterCount_ + 1)) return false;
- uint32_t lba = fatStartBlock_;
- lba += fatType_ == 16 ? cluster >> 8 : cluster >> 7;
- if (lba != cacheBlockNumber_)
- {
- if (!cacheRawBlock(lba, CACHE_FOR_READ)) return false;
- }
- if (fatType_ == 16)
- {
- *value = cacheBuffer_.fat16[cluster & 0XFF];
- }
- else
- {
- *value = cacheBuffer_.fat32[cluster & 0X7F] & FAT32MASK;
- }
- return true;
-}
-//------------------------------------------------------------------------------
-// Store a FAT entry
-uint8_t SdVolume::fatPut(uint32_t cluster, uint32_t value) {
- // error if reserved cluster
- if (cluster < 2)
- return false;
-
- // error if not in FAT
- if (cluster > (clusterCount_ + 1))
- return false;
-
- // calculate block address for entry
- uint32_t lba = fatStartBlock_;
- lba += fatType_ == 16 ? cluster >> 8 : cluster >> 7;
-
- if (lba != cacheBlockNumber_)
- {
- if (!cacheRawBlock(lba, CACHE_FOR_READ)) return false;
- }
- // store entry
- if (fatType_ == 16)
- {
- cacheBuffer_.fat16[cluster & 0XFF] = value;
- }
- else
- {
- cacheBuffer_.fat32[cluster & 0X7F] = value;
- }
- cacheSetDirty();
-
- // mirror second FAT
- if (fatCount_ > 1)
- cacheMirrorBlock_ = lba + blocksPerFat_;
- return true;
-}
-//------------------------------------------------------------------------------
-// free a cluster chain
-uint8_t SdVolume::freeChain(uint32_t cluster)
-{
- // clear free cluster location
- allocSearchStart_ = 2;
-
- do
- {
- uint32_t next;
- if (!fatGet(cluster, &next)) return false;
-
- // free cluster
- if (!fatPut(cluster, 0)) return false;
-
- cluster = next;
- } while (!isEOC(cluster));
-
- return true;
-}
-//------------------------------------------------------------------------------
-/**
- * Initialize a FAT volume.
- *
- * \param[in] dev The SD card where the volume is located.
- *
- * \param[in] part The partition to be used. Legal values for \a part are
- * 1-4 to use the corresponding partition on a device formatted with
- * a MBR, Master Boot Record, or zero if the device is formatted as
- * a super floppy with the FAT boot sector in block zero.
- *
- * \return The value one, true, is returned for success and
- * the value zero, false, is returned for failure. Reasons for
- * failure include not finding a valid partition, not finding a valid
- * FAT file system in the specified partition or an I/O error.
- */
-uint8_t SdVolume::init(Sd2Card* dev, uint8_t part)
-{
- uint32_t volumeStartBlock = 0;
- sdCard_ = dev;
- // if part == 0 assume super floppy with FAT boot sector in block zero
- // if part > 0 assume mbr volume with partition table
- if (part)
- {
- if (part > 4)
- {
- SerialUSB.println("Error: SdVolume::init() MBR");
- return false;
- }
-
- if (!cacheRawBlock(volumeStartBlock, CACHE_FOR_READ))
- {
- SerialUSB.println("Error: SdVolume::init() Cache for read");
- return false;
- }
-
- part_t* p = &cacheBuffer_.mbr.part[part-1];
-
- if ((p->boot & 0X7F) !=0 ||
- p->totalSectors < 100 ||
- p->firstSector == 0)
- {
- // not a valid partition
-
- SerialUSB.println("Error: SdVolume::init() Invalid partition");
- return false;
- }
- volumeStartBlock = p->firstSector;
- }
- if (!cacheRawBlock(volumeStartBlock, CACHE_FOR_READ))
- {
- SerialUSB.println("Error: SdVolume::init() Cache for read2");
- return false;
- }
-
- bpb_t* bpb = &cacheBuffer_.fbs.bpb;
- if (bpb->bytesPerSector != 512 ||
- bpb->fatCount == 0 ||
- bpb->reservedSectorCount == 0 ||
- bpb->sectorsPerCluster == 0)
- {
- // not valid FAT volume
- SerialUSB.println("Error: SdVolume::init() invalid FAT volume");
- return false;
- }
- fatCount_ = bpb->fatCount;
- blocksPerCluster_ = bpb->sectorsPerCluster;
-
- // determine shift that is same as multiply by blocksPerCluster_
- clusterSizeShift_ = 0;
- while (blocksPerCluster_ != (1 << clusterSizeShift_))
- {
- // error if not power of 2
- if (clusterSizeShift_++ > 7)
- {
- return false;
- SerialUSB.println("Error: SdVolume::init() not power of 2");
- }
- }
- blocksPerFat_ = bpb->sectorsPerFat16 ?
- bpb->sectorsPerFat16 : bpb->sectorsPerFat32;
-
- fatStartBlock_ = volumeStartBlock + bpb->reservedSectorCount;
-
- // count for FAT16 zero for FAT32
- rootDirEntryCount_ = bpb->rootDirEntryCount;
-
- // directory start for FAT16 dataStart for FAT32
- rootDirStart_ = fatStartBlock_ + bpb->fatCount * blocksPerFat_;
-
- // data start for FAT16 and FAT32
- dataStartBlock_ = rootDirStart_ + ((32 * bpb->rootDirEntryCount + 511)/512);
-
- // total blocks for FAT16 or FAT32
- uint32_t totalBlocks = bpb->totalSectors16 ?
- bpb->totalSectors16 : bpb->totalSectors32;
- // total data blocks
- clusterCount_ = totalBlocks - (dataStartBlock_ - volumeStartBlock);
-
- // divide by cluster size to get cluster count
- clusterCount_ >>= clusterSizeShift_;
-
- // FAT type is determined by cluster count
- if (clusterCount_ < 4085)
- {
- fatType_ = 12;
- }
- else if (clusterCount_ < 65525)
- {
- fatType_ = 16;
- }
- else
- {
- rootDirStart_ = bpb->fat32RootCluster;
- fatType_ = 32;
- }
- return true;
-}
diff --git a/dumblogger/libraries/SDfat/.svn/text-base/rules.mk.svn-base b/dumblogger/libraries/SDfat/.svn/text-base/rules.mk.svn-base deleted file mode 100644 index f8606d2..0000000 --- a/dumblogger/libraries/SDfat/.svn/text-base/rules.mk.svn-base +++ /dev/null @@ -1,30 +0,0 @@ -# Standard things -sp := $(sp).x -dirstack_$(sp) := $(d) -d := $(dir) -BUILDDIRS += $(BUILD_PATH)/$(d) - -# Local flags -CFLAGS_$(d) := $(WIRISH_INCLUDES) $(LIBMAPLE_INCLUDES) - -# Local rules and targets -cSRCS_$(d) := - -cppSRCS_$(d) := Sd2Card.cpp SdFile.cpp SdVolume.cpp - - -cFILES_$(d) := $(cSRCS_$(d):%=$(d)/%) -cppFILES_$(d) := $(cppSRCS_$(d):%=$(d)/%) - -OBJS_$(d) := $(cFILES_$(d):%.c=$(BUILD_PATH)/%.o) \ - $(cppFILES_$(d):%.cpp=$(BUILD_PATH)/%.o) -DEPS_$(d) := $(OBJS_$(d):%.o=%.d) - -$(OBJS_$(d)): TGT_CFLAGS := $(CFLAGS_$(d)) - -TGT_BIN += $(OBJS_$(d)) - -# Standard things --include $(DEPS_$(d)) -d := $(dirstack_$(sp)) -sp := $(basename $(sp)) diff --git a/dumblogger/libraries/SDfat/Sd2Card.cpp b/dumblogger/libraries/SDfat/Sd2Card.cpp index 594092b..52272aa 100644 --- a/dumblogger/libraries/SDfat/Sd2Card.cpp +++ b/dumblogger/libraries/SDfat/Sd2Card.cpp @@ -21,30 +21,10 @@ * Patched by Donald Delmar Davis <don@suspectdevices.com> fixing issues #1-3
*
*/
-#include <WProgram.h>
+#include <wirish/WProgram.h>
#include "Sd2Card.h"
-#include "HardwareSPI.h"
-#include "spi.h"
-
-//pointer to spi object
-HardwareSPI *SPIn;
-
-//------------------------------------------------------------------------------
-// functions for hardware SPI
-/** Send a byte to the card */
-static void spiSend(uint8_t b)
-{
- SPIn->send(b);
- //while(SPIn->busy())
- //{
- //}
-}
-/** Receive a byte from the card */
-static uint8_t spiRec(void)
-{
- return SPIn->send(0XFF);
-// return SPIn->read();
-}
+#include <wirish/HardwareSPI.h>
+#include <libmaple/spi.h>
//------------------------------------------------------------------------------
// send command and return error code. Return zero for OK
@@ -59,20 +39,20 @@ uint8_t Sd2Card::cardCommand(uint8_t cmd, uint32_t arg) { waitNotBusy(300);
// send command
- spiSend(cmd | 0x40);
+ SPIn.send(cmd | 0x40);
// send argument
- for (int8_t s = 24; s >= 0; s -= 8)
- spiSend(arg >> s);
+ for (int8_t s = 24; s >= 0; s -= 8)
+ SPIn.send(arg >> s);
// send CRC
uint8_t crc = 0XFF;
if (cmd == CMD0) crc = 0X95; // correct crc for CMD0 with arg 0
if (cmd == CMD8) crc = 0X87; // correct crc for CMD8 with arg 0X1AA
- spiSend(crc);
+ SPIn.send(crc);
// wait for response
- for (uint8_t i = 0; ((status_ = spiRec()) & 0X80) && i != 0XFF; i++);
+ for (uint8_t i = 0; ((status_ = SPIn.send(0XFF)) & 0X80) && i != 0XFF; i++);
return status_;
}
//------------------------------------------------------------------------------
@@ -102,15 +82,13 @@ uint32_t Sd2Card::cardSize(void) { }
}
//------------------------------------------------------------------------------
-void Sd2Card::chipSelectHigh(void)
-{
- digitalWrite(SPIn->nssPin(), HIGH);
+void Sd2Card::chipSelectHigh(void) {
+ digitalWrite(CSpin, HIGH);
}
//------------------------------------------------------------------------------
-void Sd2Card::chipSelectLow(void)
-{
- digitalWrite(SPIn->nssPin(), LOW);
+void Sd2Card::chipSelectLow(void) {
+ digitalWrite(CSpin, LOW);
}
//------------------------------------------------------------------------------
@@ -127,32 +105,27 @@ void Sd2Card::chipSelectLow(void) * \return The value one, true, is returned for success and
* the value zero, false, is returned for failure.
*/
-uint8_t Sd2Card::erase(uint32_t firstBlock, uint32_t lastBlock)
-{
- if (!eraseSingleBlockEnable())
- {
+uint8_t Sd2Card::erase(uint32_t firstBlock, uint32_t lastBlock) {
+ if (!eraseSingleBlockEnable()) {
error(SD_CARD_ERROR_ERASE_SINGLE_BLOCK);
- SerialUSB.println("Error: Erase Single Block");
+ SerialUSB.println("Error: Erase Single Block");
goto fail;
}
- if (type_ != SD_CARD_TYPE_SDHC)
- {
+ if (type_ != SD_CARD_TYPE_SDHC) {
firstBlock <<= 9;
lastBlock <<= 9;
}
if (cardCommand(CMD32, firstBlock)
|| cardCommand(CMD33, lastBlock)
- || cardCommand(CMD38, 0))
- {
+ || cardCommand(CMD38, 0)) {
error(SD_CARD_ERROR_ERASE);
- SerialUSB.println("Error: Erase");
- goto fail;
+ SerialUSB.println("Error: Erase");
+ goto fail;
}
- if (!waitNotBusy(SD_ERASE_TIMEOUT))
- {
+ if (!waitNotBusy(SD_ERASE_TIMEOUT)) {
error(SD_CARD_ERROR_ERASE_TIMEOUT);
- SerialUSB.println("Error: Erase timeout");
- goto fail;
+ SerialUSB.println("Error: Erase timeout");
+ goto fail;
}
chipSelectHigh();
return true;
@@ -168,12 +141,21 @@ uint8_t Sd2Card::erase(uint32_t firstBlock, uint32_t lastBlock) * \return The value one, true, is returned if single block erase is supported.
* The value zero, false, is returned if single block erase is not supported.
*/
-uint8_t Sd2Card::eraseSingleBlockEnable(void)
+uint8_t Sd2Card::eraseSingleBlockEnable(void)
{
csd_t csd;
return readCSD(&csd) ? csd.v1.erase_blk_en : 0;
}
//------------------------------------------------------------------------------
+Sd2Card::Sd2Card(HardwareSPI &s, bool autoSetup) : SPIn(s) {
+ errorCode_ = 0;
+ inBlock_ = 0;
+ partialBlockRead_ = 0;
+ type_ = 0;
+ setup = autoSetup;
+}
+
+//------------------------------------------------------------------------------
/**
* Initialize an SD flash memory card.
*
@@ -184,93 +166,76 @@ uint8_t Sd2Card::eraseSingleBlockEnable(void) * the value zero, false, is returned for failure. The reason for failure
* can be determined by calling errorCode() and errorData().
*/
-uint8_t Sd2Card::init(HardwareSPI *s)
-{
+uint8_t Sd2Card::init(SPIFrequency sckRateID, int8_t chipSelectPin) {
errorCode_ = inBlock_ = partialBlockRead_ = type_ = 0;
// 16-bit init start time allows over a minute
uint16_t t0 = (uint16_t)millis();
uint32_t arg;
- SPIn = s;
-
- pinMode(SPIn->nssPin(),OUTPUT);
- // set pin modes
-/* pinMode(chipSelectPin_, OUTPUT);
- chipSelectHigh();
- pinMode(SPI_MISO_PIN, INPUT);
- pinMode(SPI_MOSI_PIN, OUTPUT);
- pinMode(SPI_SCK_PIN, OUTPUT);
-*/
-
- // SS must be in output mode even it is not chip select
-// pinMode(SS_PIN, OUTPUT);
- // Enable SPI, Master, clock rate f_osc/128
-// SPCR = (1 << SPE) | (1 << MSTR) | (1 << SPR1) | (1 << SPR0);
- // clear double speed
-// SPSR &= ~(1 << SPI2X);
+ if (setup == true) {
+ SPIn.end();
+ SPIn.begin(sckRateID, MSBFIRST, 0);
+ }
+ if (chipSelectPin == USE_NSS_PIN) {
+ chipSelectPin = SPIn.nssPin();
+ }
+ CSpin = chipSelectPin;
+ pinMode(CSpin, OUTPUT);
// must supply min of 74 clock cycles with CS high.
-
+
chipSelectHigh();
- for (uint8_t i = 0; i < 10; i++) spiSend(0XFF);
+ for (uint8_t i = 0; i < 10; i++)
+ SPIn.send(0XFF);
chipSelectLow();
// command to go idle in SPI mode
- while ((status_ = cardCommand(CMD0, 0)) != R1_IDLE_STATE)
- {
- if (((uint16_t)millis() - t0) > SD_INIT_TIMEOUT)
- {
- SerialUSB.println("Error: CMD0");
- error(SD_CARD_ERROR_CMD0);
- goto fail;
+ while ((status_ = cardCommand(CMD0, 0)) != R1_IDLE_STATE) {
+ if (((uint16_t)millis() - t0) > SD_INIT_TIMEOUT) {
+ SerialUSB.println("Error: CMD0");
+ error(SD_CARD_ERROR_CMD0);
+ goto fail;
}
}
// check SD version
- if ((cardCommand(CMD8, 0x1AA) & R1_ILLEGAL_COMMAND))
- {
+ if ((cardCommand(CMD8, 0x1AA) & R1_ILLEGAL_COMMAND)) {
type(SD_CARD_TYPE_SD1);
- }
- else
- {
+ }
+ else {
// only need last byte of r7 response
- for (uint8_t i = 0; i < 4; i++)
- status_ = spiRec();
- if (status_ != 0XAA)
- {
+ for (uint8_t i = 0; i < 4; i++)
+ status_ = SPIn.send(0XFF);
+ if (status_ != 0XAA) {
error(SD_CARD_ERROR_CMD8);
- SerialUSB.println("Error: CMD8");
- goto fail;
+ SerialUSB.println("Error: CMD8");
+ goto fail;
}
type(SD_CARD_TYPE_SD2);
}
// initialize card and send host supports SDHC if SD2
arg = (type() == SD_CARD_TYPE_SD2) ? 0X40000000 : 0;
- while ((status_ = cardAcmd(ACMD41, arg)) != R1_READY_STATE)
- {
+ while ((status_ = cardAcmd(ACMD41, arg)) != R1_READY_STATE) {
// check for timeout
- if (((uint16_t)millis() - t0) > SD_INIT_TIMEOUT)
- {
- SerialUSB.println("Error: ACMD41");
- error(SD_CARD_ERROR_ACMD41);
- goto fail;
+ if (((uint16_t)millis() - t0) > SD_INIT_TIMEOUT) {
+ SerialUSB.println("Error: ACMD41");
+ error(SD_CARD_ERROR_ACMD41);
+ goto fail;
}
}
// if SD2 read OCR register to check for SDHC card
- if (type() == SD_CARD_TYPE_SD2)
- {
- if (cardCommand(CMD58, 0))
- {
- SerialUSB.println("Error: CMD58");
- error(SD_CARD_ERROR_CMD58);
- goto fail;
+ if (type() == SD_CARD_TYPE_SD2) {
+ if (cardCommand(CMD58, 0)) {
+ SerialUSB.println("Error: CMD58");
+ error(SD_CARD_ERROR_CMD58);
+ goto fail;
}
- if ((spiRec() & 0XC0) == 0XC0)
- type(SD_CARD_TYPE_SDHC);
+ if ((SPIn.send(0XFF) & 0XC0) == 0XC0)
+ type(SD_CARD_TYPE_SDHC);
// discard rest of ocr - contains allowed voltage range
- for (uint8_t i = 0; i < 3; i++)
- spiRec();
+ for (uint8_t i = 0; i < 3; i++)
+ SPIn.send(0XFF);
}
chipSelectHigh();
@@ -296,8 +261,7 @@ uint8_t Sd2Card::init(HardwareSPI *s) *
* \param[in] value The value TRUE (non-zero) or FALSE (zero).)
*/
-void Sd2Card::partialBlockRead(uint8_t value)
-{
+void Sd2Card::partialBlockRead(uint8_t value) {
readEnd();
partialBlockRead_ = value;
}
@@ -311,8 +275,7 @@ void Sd2Card::partialBlockRead(uint8_t value) * \return The value one, true, is returned for success and
* the value zero, false, is returned for failure.
*/
-uint8_t Sd2Card::readBlock(uint32_t block, uint8_t* dst)
-{
+uint8_t Sd2Card::readBlock(uint32_t block, uint8_t* dst) {
return readData(block, 0, 512, dst);
}
//------------------------------------------------------------------------------
@@ -327,72 +290,40 @@ uint8_t Sd2Card::readBlock(uint32_t block, uint8_t* dst) * the value zero, false, is returned for failure.
*/
uint8_t Sd2Card::readData(uint32_t block,
- uint16_t offset, uint16_t count, uint8_t* dst)
-{
- uint16_t n;
- if (count == 0) return true;
- if ((count + offset) > 512)
- {
+ uint16_t offset, uint16_t count, uint8_t* dst) {
+ if (count == 0)
+ return true;
+ if ((count + offset) > 512) {
goto fail;
}
- if (!inBlock_ || block != block_ || offset < offset_)
- {
+ if (!inBlock_ || block != block_ || offset < offset_) {
block_ = block;
// use address if not SDHC card
- if (type()!= SD_CARD_TYPE_SDHC)
- block <<= 9;
- if (cardCommand(CMD17, block))
- {
+ if (type()!= SD_CARD_TYPE_SDHC)
+ block <<= 9;
+ if (cardCommand(CMD17, block)) {
error(SD_CARD_ERROR_CMD17);
- SerialUSB.println("Error: CMD17");
+ SerialUSB.println("Error: CMD17");
goto fail;
}
- if (!waitStartBlock())
- {
+ if (!waitStartBlock()) {
goto fail;
}
offset_ = 0;
inBlock_ = 1;
}
-#ifdef OPTIMIZE_HARDWARE_SPI
-/* // start first spi transfer
- SPDR = 0XFF;
-
// skip data before offset
for (;offset_ < offset; offset_++) {
- while (!(SPSR & (1 << SPIF)));
- SPDR = 0XFF;
+ SPIn.send(0XFF);
}
// transfer data
- n = count - 1;
- for (uint16_t i = 0; i < n; i++) {
- while (!(SPSR & (1 << SPIF)));
- dst[i] = SPDR;
- SPDR = 0XFF;
+ for (uint16_t i = 0; i < count; i++) {
+ dst[i] = SPIn.send(0XFF);
}
- // wait for last byte
- while (!(SPSR & (1 << SPIF)));
- dst[n] = SPDR;
-*/
-#else // OPTIMIZE_HARDWARE_SPI
-
- // skip data before offset
- for (;offset_ < offset; offset_++)
- {
- spiRec();
- }
- // transfer data
- for (uint16_t i = 0; i < count; i++)
- {
- dst[i] = spiRec();
- }
-
-#endif // OPTIMIZE_HARDWARE_SPI
offset_ += count;
- if (!partialBlockRead_ || offset_ >= 512)
- {
+ if (!partialBlockRead_ || offset_ >= 512) {
// read rest of data, checksum and set chip select high
readEnd();
}
@@ -405,47 +336,32 @@ uint8_t Sd2Card::readData(uint32_t block, }
//------------------------------------------------------------------------------
/** Skip remaining data in a block when in partial block read mode. */
-void Sd2Card::readEnd(void)
-{
- if (inBlock_)
- {
+void Sd2Card::readEnd(void) {
+ if (inBlock_) {
// skip data and crc
-#ifdef OPTIMIZE_HARDWARE_SPI
- // optimize skip for hardware
-/* SPDR = 0XFF;
- while (offset_++ < 513) {
- while (!(SPSR & (1 << SPIF)));
- SPDR = 0XFF;
- }
- // wait for last crc byte
- while (!(SPSR & (1 << SPIF)));
-*/
-#else // OPTIMIZE_HARDWARE_SPI
- while (offset_++ < 514)
- spiRec();
-#endif // OPTIMIZE_HARDWARE_SPI
+ while (offset_++ < 514)
+ SPIn.send(0XFF);
chipSelectHigh();
inBlock_ = 0;
}
}
//------------------------------------------------------------------------------
/** read CID or CSR register */
-uint8_t Sd2Card::readRegister(uint8_t cmd, void* buf)
+uint8_t Sd2Card::readRegister(uint8_t cmd, void* buf)
{
uint8_t* dst = reinterpret_cast<uint8_t*>(buf);
- if (cardCommand(cmd, 0))
- {
- error(SD_CARD_ERROR_READ_REG);
- SerialUSB.println("Error: Read reg");
- goto fail;
+ if (cardCommand(cmd, 0)) {
+ error(SD_CARD_ERROR_READ_REG);
+ SerialUSB.println("Error: Read reg");
+ goto fail;
}
- if (!waitStartBlock())
- goto fail;
+ if (!waitStartBlock())
+ goto fail;
// transfer data
- for (uint16_t i = 0; i < 16; i++)
- dst[i] = spiRec();
- spiRec(); // get first crc byte
- spiRec(); // get second crc byte
+ for (uint16_t i = 0; i < 16; i++)
+ dst[i] = SPIn.send(0XFF);
+ SPIn.send(0XFF); // get first crc byte
+ SPIn.send(0XFF); // get second crc byte
chipSelectHigh();
return true;
@@ -468,53 +384,33 @@ uint8_t Sd2Card::readRegister(uint8_t cmd, void* buf) * false, is returned for an invalid value of \a sckRateID.
*/
uint8_t Sd2Card::setSckRate(uint8_t sckRateID) {
-/* if (sckRateID > 6) {
- error(SD_CARD_ERROR_SCK_RATE);
- return false;
- }
- // see avr processor datasheet for SPI register bit definitions
- if ((sckRateID & 1) || sckRateID == 6) {
- SPSR &= ~(1 << SPI2X);
- } else {
- SPSR |= (1 << SPI2X);
- }
- SPCR &= ~((1 <<SPR1) | (1 << SPR0));
- SPCR |= (sckRateID & 4 ? (1 << SPR1) : 0)
- | (sckRateID & 2 ? (1 << SPR0) : 0);
-*/
- return true;
+
+ return true;
}
//------------------------------------------------------------------------------
// wait for card to go not busy
-uint8_t Sd2Card::waitNotBusy(uint16_t timeoutMillis)
-{
+uint8_t Sd2Card::waitNotBusy(uint16_t timeoutMillis) {
uint16_t t0 = millis();
- do
- {
- if (spiRec() == 0XFF)
- return true;
- }
- while (((uint16_t)millis() - t0) < timeoutMillis);
+ do {
+ if (SPIn.send(0XFF) == 0XFF)
+ return true;
+ } while (((uint16_t)millis() - t0) < timeoutMillis);
return false;
}
//------------------------------------------------------------------------------
/** Wait for start block token */
-uint8_t Sd2Card::waitStartBlock(void)
-{
+uint8_t Sd2Card::waitStartBlock(void) {
uint16_t t0 = millis();
- while ((status_ = spiRec()) == 0XFF)
- {
- if (((uint16_t)millis() - t0) > SD_READ_TIMEOUT)
- {
+ while ((status_ = SPIn.send(0XFF)) == 0XFF) {
+ if (((uint16_t)millis() - t0) > SD_READ_TIMEOUT) {
error(SD_CARD_ERROR_READ_TIMEOUT);
- SerialUSB.println("Error: Read timeout");
+ SerialUSB.println("Error: Read timeout");
goto fail;
}
}
- if (status_ != DATA_START_BLOCK)
- {
+ if (status_ != DATA_START_BLOCK) {
error(SD_CARD_ERROR_READ);
- SerialUSB.println("Error: Read");
+ SerialUSB.println("Error: Read");
goto fail;
}
return true;
@@ -533,12 +429,10 @@ uint8_t Sd2Card::waitStartBlock(void) * \return The value one, true, is returned for success and
* the value zero, false, is returned for failure.
*/
-uint8_t Sd2Card::writeBlock(uint32_t blockNumber, const uint8_t* src)
-{
+uint8_t Sd2Card::writeBlock(uint32_t blockNumber, const uint8_t* src) {
#if SD_PROTECT_BLOCK_ZERO
// don't allow write to first block
- if (blockNumber == 0)
- {
+ if (blockNumber == 0) {
error(SD_CARD_ERROR_WRITE_BLOCK_ZERO);
SerialUSB.println("Error: Write block zero");
goto fail;
@@ -546,27 +440,24 @@ uint8_t Sd2Card::writeBlock(uint32_t blockNumber, const uint8_t* src) #endif // SD_PROTECT_BLOCK_ZERO
// use address if not SDHC card
- if (type() != SD_CARD_TYPE_SDHC)
- blockNumber <<= 9;
- if (cardCommand(CMD24, blockNumber))
- {
- SerialUSB.println("Error: CMD42");
- error(SD_CARD_ERROR_CMD24);
- goto fail;
+ if (type() != SD_CARD_TYPE_SDHC)
+ blockNumber <<= 9;
+ if (cardCommand(CMD24, blockNumber)) {
+ SerialUSB.println("Error: CMD42");
+ error(SD_CARD_ERROR_CMD24);
+ goto fail;
}
- if (!writeData(DATA_START_BLOCK, src))
- goto fail;
+ if (!writeData(DATA_START_BLOCK, src))
+ goto fail;
// wait for flash programming to complete
- if (!waitNotBusy(SD_WRITE_TIMEOUT))
- {
+ if (!waitNotBusy(SD_WRITE_TIMEOUT)) {
error(SD_CARD_ERROR_WRITE_TIMEOUT);
SerialUSB.println("Error: Write timeout");
goto fail;
}
// response is r2 so get and check two bytes for nonzero
- if (cardCommand(CMD13, 0) || spiRec())
- {
+ if (cardCommand(CMD13, 0) || SPIn.send(0XFF)) {
error(SD_CARD_ERROR_WRITE_PROGRAMMING);
SerialUSB.println("Error: Write programming");
goto fail;
@@ -581,13 +472,11 @@ uint8_t Sd2Card::writeBlock(uint32_t blockNumber, const uint8_t* src) }
//------------------------------------------------------------------------------
/** Write one data block in a multiple block write sequence */
-uint8_t Sd2Card::writeData(const uint8_t* src)
-{
+uint8_t Sd2Card::writeData(const uint8_t* src) {
// wait for previous write to finish
- if (!waitNotBusy(SD_WRITE_TIMEOUT))
- {
+ if (!waitNotBusy(SD_WRITE_TIMEOUT)) {
error(SD_CARD_ERROR_WRITE_MULTIPLE);
- SerialUSB.println("Error: writeData");
+ SerialUSB.println("Error: writeData");
chipSelectHigh();
return false;
}
@@ -596,38 +485,18 @@ uint8_t Sd2Card::writeData(const uint8_t* src) //------------------------------------------------------------------------------
// send one block of data for write block or write multiple blocks
uint8_t Sd2Card::writeData(uint8_t token, const uint8_t* src) {
-#ifdef OPTIMIZE_HARDWARE_SPI
-/*
- // send data - optimized loop
- SPDR = token;
-
- // send two byte per iteration
- for (uint16_t i = 0; i < 512; i += 2) {
- while (!(SPSR & (1 << SPIF)));
- SPDR = src[i];
- while (!(SPSR & (1 << SPIF)));
- SPDR = src[i+1];
+ SPIn.send(token);
+ for (uint16_t i = 0; i < 512; i++) {
+ SPIn.send(src[i]);
}
+ SPIn.send(0xff); // dummy crc
+ SPIn.send(0xff); // dummy crc
- // wait for last data byte
- while (!(SPSR & (1 << SPIF)));
-*/
-#else // OPTIMIZE_HARDWARE_SPI
- spiSend(token);
- for (uint16_t i = 0; i < 512; i++)
- {
- spiSend(src[i]);
- }
-#endif // OPTIMIZE_HARDWARE_SPI
- spiSend(0xff); // dummy crc
- spiSend(0xff); // dummy crc
-
- status_ = spiRec();
- if ((status_ & DATA_RES_MASK) != DATA_RES_ACCEPTED)
- {
+ status_ = SPIn.send(0XFF);
+ if ((status_ & DATA_RES_MASK) != DATA_RES_ACCEPTED) {
error(SD_CARD_ERROR_WRITE);
chipSelectHigh();
- SerialUSB.println("Error: Write");
+ SerialUSB.println("Error: Write");
SerialUSB.println("Error: Sd2Card::writeData()");
return false;
}
@@ -645,31 +514,27 @@ uint8_t Sd2Card::writeData(uint8_t token, const uint8_t* src) { * \return The value one, true, is returned for success and
* the value zero, false, is returned for failure.
*/
-uint8_t Sd2Card::writeStart(uint32_t blockNumber, uint32_t eraseCount)
-{
+uint8_t Sd2Card::writeStart(uint32_t blockNumber, uint32_t eraseCount) {
#if SD_PROTECT_BLOCK_ZERO
// don't allow write to first block
- if (blockNumber == 0)
- {
+ if (blockNumber == 0) {
error(SD_CARD_ERROR_WRITE_BLOCK_ZERO);
- SerialUSB.println("Error: Write block zero");
+ SerialUSB.println("Error: Write block zero");
goto fail;
}
#endif // SD_PROTECT_BLOCK_ZERO
// send pre-erase count
- if (cardAcmd(ACMD23, eraseCount))
- {
- SerialUSB.println("Error: ACMD23");
+ if (cardAcmd(ACMD23, eraseCount)) {
+ SerialUSB.println("Error: ACMD23");
error(SD_CARD_ERROR_ACMD23);
goto fail;
}
// use address if not SDHC card
- if (type() != SD_CARD_TYPE_SDHC)
- blockNumber <<= 9;
- if (cardCommand(CMD25, blockNumber))
- {
+ if (type() != SD_CARD_TYPE_SDHC)
+ blockNumber <<= 9;
+ if (cardCommand(CMD25, blockNumber)) {
error(SD_CARD_ERROR_CMD25);
- SerialUSB.println("Error: CMD25");
+ SerialUSB.println("Error: CMD25");
goto fail;
}
return true;
@@ -685,13 +550,12 @@ uint8_t Sd2Card::writeStart(uint32_t blockNumber, uint32_t eraseCount) * \return The value one, true, is returned for success and
* the value zero, false, is returned for failure.
*/
-uint8_t Sd2Card::writeStop(void)
-{
- if (!waitNotBusy(SD_WRITE_TIMEOUT))
- goto fail;
- spiSend(STOP_TRAN_TOKEN);
- if (!waitNotBusy(SD_WRITE_TIMEOUT))
- goto fail;
+uint8_t Sd2Card::writeStop(void) {
+ if (!waitNotBusy(SD_WRITE_TIMEOUT))
+ goto fail;
+ SPIn.send(STOP_TRAN_TOKEN);
+ if (!waitNotBusy(SD_WRITE_TIMEOUT))
+ goto fail;
chipSelectHigh();
return true;
diff --git a/dumblogger/libraries/SDfat/Sd2Card.h b/dumblogger/libraries/SDfat/Sd2Card.h index 40adb68..053f872 100644 --- a/dumblogger/libraries/SDfat/Sd2Card.h +++ b/dumblogger/libraries/SDfat/Sd2Card.h @@ -25,14 +25,21 @@ */
#include "Sd2PinMap.h"
#include "SdInfo.h"
-#include "HardwareSPI.h"
+#include <wirish/HardwareSPI.h>
/** Set SCK to max rate of F_CPU/2. See Sd2Card::setSckRate(). */
-uint8_t const SPI_FULL_SPEED = 0;
+SPIFrequency const SPI_FULL_SPEED = SPI_18MHZ;
/** Set SCK rate to F_CPU/4. See Sd2Card::setSckRate(). */
-uint8_t const SPI_HALF_SPEED = 1;
+SPIFrequency const SPI_HALF_SPEED = SPI_9MHZ;
/** Set SCK rate to F_CPU/8. Sd2Card::setSckRate(). */
-uint8_t const SPI_QUARTER_SPEED = 2;
+SPIFrequency const SPI_QUARTER_SPEED = SPI_4_5MHZ;
+
+/* Set SCK to max rate of F_CPU/2. See Sd2Card::setSckRate().
+uint8_t const SPI_FULL_SPEED = 0;
+ Set SCK rate to F_CPU/4. See Sd2Card::setSckRate().
+uint8_t const SPI_HALF_SPEED = 1;
+ Set SCK rate to F_CPU/8. Sd2Card::setSckRate().
+uint8_t const SPI_QUARTER_SPEED = 2;*/
//------------------------------------------------------------------------------
/** Protect block zero from write if nonzero */
#define SD_PROTECT_BLOCK_ZERO 1
@@ -99,6 +106,8 @@ uint8_t const SD_CARD_TYPE_SD2 = 2; /** High Capacity SD card */
uint8_t const SD_CARD_TYPE_SDHC = 3;
//------------------------------------------------------------------------------
+int8_t const USE_NSS_PIN = -1;
+
/**
* \class Sd2Card
* \brief Raw access to SD and SDHC flash memory cards.
@@ -106,7 +115,7 @@ uint8_t const SD_CARD_TYPE_SDHC = 3; class Sd2Card {
public:
/** Construct an instance of Sd2Card. */
- Sd2Card(void) : errorCode_(0), inBlock_(0), partialBlockRead_(0), type_(0) {}
+ Sd2Card(HardwareSPI &s, bool autoSetup = false);
uint32_t cardSize(void);
uint8_t erase(uint32_t firstBlock, uint32_t lastBlock);
uint8_t eraseSingleBlockEnable(void);
@@ -116,26 +125,14 @@ class Sd2Card { uint8_t errorCode(void) const {return errorCode_;}
/** \return error data for last error. */
uint8_t errorData(void) const {return status_;}
- /**
- * Initialize an SD flash memory card with default clock rate and chip
- * select pin. See sd2Card::init(uint8_t sckRateID, uint8_t chipSelectPin).
- */
- uint8_t init(void) {
-// return init(SPI_FULL_SPEED, SD_CHIP_SELECT_PIN);
- return false;
- }
/**
* Initialize an SD flash memory card with the selected SPI clock rate
* and the default SD chip select pin.
* See sd2Card::init(uint8_t sckRateID, uint8_t chipSelectPin).
*/
- uint8_t init(uint8_t sckRateID) {
-// return init(sckRateID, SD_CHIP_SELECT_PIN);
- return false;
- }
+ uint8_t init(SPIFrequency sckRateID = SPI_QUARTER_SPEED, int8_t chipSelectPin = USE_NSS_PIN);
- uint8_t init(HardwareSPI *);
void partialBlockRead(uint8_t value);
/** Returns the current value, true or false, for partial block read. */
uint8_t partialBlockRead(void) const {return partialBlockRead_;}
@@ -164,6 +161,10 @@ class Sd2Card { uint8_t writeStart(uint32_t blockNumber, uint32_t eraseCount);
uint8_t writeStop(void);
private:
+ //pointer to spi object
+ HardwareSPI &SPIn;
+ uint8_t CSpin;
+ bool setup;
uint32_t block_;
uint8_t chipSelectPin_;
uint8_t errorCode_;
diff --git a/dumblogger/libraries/SDfat/Sd2PinMap.h b/dumblogger/libraries/SDfat/Sd2PinMap.h index f23e969..6febff9 100644 --- a/dumblogger/libraries/SDfat/Sd2PinMap.h +++ b/dumblogger/libraries/SDfat/Sd2PinMap.h @@ -32,326 +32,5 @@ struct pin_map_t volatile uint8_t* port;
uint8_t bit;
};
-/*
-//------------------------------------------------------------------------------
-#if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
-// Mega
-
-// Two Wire (aka I2C) ports
-uint8_t const SDA_PIN = 20;
-uint8_t const SCL_PIN = 21;
-
-// SPI port
-uint8_t const SS_PIN = 53;
-uint8_t const MOSI_PIN = 51;
-uint8_t const MISO_PIN = 50;
-uint8_t const SCK_PIN = 52;
-
-static const pin_map_t digitalPinMap[] = {
- {&DDRE, &PINE, &PORTE, 0}, // E0 0
- {&DDRE, &PINE, &PORTE, 1}, // E1 1
- {&DDRE, &PINE, &PORTE, 4}, // E4 2
- {&DDRE, &PINE, &PORTE, 5}, // E5 3
- {&DDRG, &PING, &PORTG, 5}, // G5 4
- {&DDRE, &PINE, &PORTE, 3}, // E3 5
- {&DDRH, &PINH, &PORTH, 3}, // H3 6
- {&DDRH, &PINH, &PORTH, 4}, // H4 7
- {&DDRH, &PINH, &PORTH, 5}, // H5 8
- {&DDRH, &PINH, &PORTH, 6}, // H6 9
- {&DDRB, &PINB, &PORTB, 4}, // B4 10
- {&DDRB, &PINB, &PORTB, 5}, // B5 11
- {&DDRB, &PINB, &PORTB, 6}, // B6 12
- {&DDRB, &PINB, &PORTB, 7}, // B7 13
- {&DDRJ, &PINJ, &PORTJ, 1}, // J1 14
- {&DDRJ, &PINJ, &PORTJ, 0}, // J0 15
- {&DDRH, &PINH, &PORTH, 1}, // H1 16
- {&DDRH, &PINH, &PORTH, 0}, // H0 17
- {&DDRD, &PIND, &PORTD, 3}, // D3 18
- {&DDRD, &PIND, &PORTD, 2}, // D2 19
- {&DDRD, &PIND, &PORTD, 1}, // D1 20
- {&DDRD, &PIND, &PORTD, 0}, // D0 21
- {&DDRA, &PINA, &PORTA, 0}, // A0 22
- {&DDRA, &PINA, &PORTA, 1}, // A1 23
- {&DDRA, &PINA, &PORTA, 2}, // A2 24
- {&DDRA, &PINA, &PORTA, 3}, // A3 25
- {&DDRA, &PINA, &PORTA, 4}, // A4 26
- {&DDRA, &PINA, &PORTA, 5}, // A5 27
- {&DDRA, &PINA, &PORTA, 6}, // A6 28
- {&DDRA, &PINA, &PORTA, 7}, // A7 29
- {&DDRC, &PINC, &PORTC, 7}, // C7 30
- {&DDRC, &PINC, &PORTC, 6}, // C6 31
- {&DDRC, &PINC, &PORTC, 5}, // C5 32
- {&DDRC, &PINC, &PORTC, 4}, // C4 33
- {&DDRC, &PINC, &PORTC, 3}, // C3 34
- {&DDRC, &PINC, &PORTC, 2}, // C2 35
- {&DDRC, &PINC, &PORTC, 1}, // C1 36
- {&DDRC, &PINC, &PORTC, 0}, // C0 37
- {&DDRD, &PIND, &PORTD, 7}, // D7 38
- {&DDRG, &PING, &PORTG, 2}, // G2 39
- {&DDRG, &PING, &PORTG, 1}, // G1 40
- {&DDRG, &PING, &PORTG, 0}, // G0 41
- {&DDRL, &PINL, &PORTL, 7}, // L7 42
- {&DDRL, &PINL, &PORTL, 6}, // L6 43
- {&DDRL, &PINL, &PORTL, 5}, // L5 44
- {&DDRL, &PINL, &PORTL, 4}, // L4 45
- {&DDRL, &PINL, &PORTL, 3}, // L3 46
- {&DDRL, &PINL, &PORTL, 2}, // L2 47
- {&DDRL, &PINL, &PORTL, 1}, // L1 48
- {&DDRL, &PINL, &PORTL, 0}, // L0 49
- {&DDRB, &PINB, &PORTB, 3}, // B3 50
- {&DDRB, &PINB, &PORTB, 2}, // B2 51
- {&DDRB, &PINB, &PORTB, 1}, // B1 52
- {&DDRB, &PINB, &PORTB, 0}, // B0 53
- {&DDRF, &PINF, &PORTF, 0}, // F0 54
- {&DDRF, &PINF, &PORTF, 1}, // F1 55
- {&DDRF, &PINF, &PORTF, 2}, // F2 56
- {&DDRF, &PINF, &PORTF, 3}, // F3 57
- {&DDRF, &PINF, &PORTF, 4}, // F4 58
- {&DDRF, &PINF, &PORTF, 5}, // F5 59
- {&DDRF, &PINF, &PORTF, 6}, // F6 60
- {&DDRF, &PINF, &PORTF, 7}, // F7 61
- {&DDRK, &PINK, &PORTK, 0}, // K0 62
- {&DDRK, &PINK, &PORTK, 1}, // K1 63
- {&DDRK, &PINK, &PORTK, 2}, // K2 64
- {&DDRK, &PINK, &PORTK, 3}, // K3 65
- {&DDRK, &PINK, &PORTK, 4}, // K4 66
- {&DDRK, &PINK, &PORTK, 5}, // K5 67
- {&DDRK, &PINK, &PORTK, 6}, // K6 68
- {&DDRK, &PINK, &PORTK, 7} // K7 69
-};
-//------------------------------------------------------------------------------
-#elif defined(__AVR_ATmega644P__) || defined(__AVR_ATmega644__)
-// Sanguino
-
-// Two Wire (aka I2C) ports
-uint8_t const SDA_PIN = 17;
-uint8_t const SCL_PIN = 18;
-
-// SPI port
-uint8_t const SS_PIN = 4;
-uint8_t const MOSI_PIN = 5;
-uint8_t const MISO_PIN = 6;
-uint8_t const SCK_PIN = 7;
-
-static const pin_map_t digitalPinMap[] = {
- {&DDRB, &PINB, &PORTB, 0}, // B0 0
- {&DDRB, &PINB, &PORTB, 1}, // B1 1
- {&DDRB, &PINB, &PORTB, 2}, // B2 2
- {&DDRB, &PINB, &PORTB, 3}, // B3 3
- {&DDRB, &PINB, &PORTB, 4}, // B4 4
- {&DDRB, &PINB, &PORTB, 5}, // B5 5
- {&DDRB, &PINB, &PORTB, 6}, // B6 6
- {&DDRB, &PINB, &PORTB, 7}, // B7 7
- {&DDRD, &PIND, &PORTD, 0}, // D0 8
- {&DDRD, &PIND, &PORTD, 1}, // D1 9
- {&DDRD, &PIND, &PORTD, 2}, // D2 10
- {&DDRD, &PIND, &PORTD, 3}, // D3 11
- {&DDRD, &PIND, &PORTD, 4}, // D4 12
- {&DDRD, &PIND, &PORTD, 5}, // D5 13
- {&DDRD, &PIND, &PORTD, 6}, // D6 14
- {&DDRD, &PIND, &PORTD, 7}, // D7 15
- {&DDRC, &PINC, &PORTC, 0}, // C0 16
- {&DDRC, &PINC, &PORTC, 1}, // C1 17
- {&DDRC, &PINC, &PORTC, 2}, // C2 18
- {&DDRC, &PINC, &PORTC, 3}, // C3 19
- {&DDRC, &PINC, &PORTC, 4}, // C4 20
- {&DDRC, &PINC, &PORTC, 5}, // C5 21
- {&DDRC, &PINC, &PORTC, 6}, // C6 22
- {&DDRC, &PINC, &PORTC, 7}, // C7 23
- {&DDRA, &PINA, &PORTA, 7}, // A7 24
- {&DDRA, &PINA, &PORTA, 6}, // A6 25
- {&DDRA, &PINA, &PORTA, 5}, // A5 26
- {&DDRA, &PINA, &PORTA, 4}, // A4 27
- {&DDRA, &PINA, &PORTA, 3}, // A3 28
- {&DDRA, &PINA, &PORTA, 2}, // A2 29
- {&DDRA, &PINA, &PORTA, 1}, // A1 30
- {&DDRA, &PINA, &PORTA, 0} // A0 31
-};
-//------------------------------------------------------------------------------
-#elif defined(__AVR_ATmega32U4__)
-// Teensy 2.0
-
-// Two Wire (aka I2C) ports
-uint8_t const SDA_PIN = 6;
-uint8_t const SCL_PIN = 5;
-
-// SPI port
-uint8_t const SS_PIN = 0;
-uint8_t const MOSI_PIN = 2;
-uint8_t const MISO_PIN = 3;
-uint8_t const SCK_PIN = 1;
-
-static const pin_map_t digitalPinMap[] = {
- {&DDRB, &PINB, &PORTB, 0}, // B0 0
- {&DDRB, &PINB, &PORTB, 1}, // B1 1
- {&DDRB, &PINB, &PORTB, 2}, // B2 2
- {&DDRB, &PINB, &PORTB, 3}, // B3 3
- {&DDRB, &PINB, &PORTB, 7}, // B7 4
- {&DDRD, &PIND, &PORTD, 0}, // D0 5
- {&DDRD, &PIND, &PORTD, 1}, // D1 6
- {&DDRD, &PIND, &PORTD, 2}, // D2 7
- {&DDRD, &PIND, &PORTD, 3}, // D3 8
- {&DDRC, &PINC, &PORTC, 6}, // C6 9
- {&DDRC, &PINC, &PORTC, 7}, // C7 10
- {&DDRD, &PIND, &PORTD, 6}, // D6 11
- {&DDRD, &PIND, &PORTD, 7}, // D7 12
- {&DDRB, &PINB, &PORTB, 4}, // B4 13
- {&DDRB, &PINB, &PORTB, 5}, // B5 14
- {&DDRB, &PINB, &PORTB, 6}, // B6 15
- {&DDRF, &PINF, &PORTF, 7}, // F7 16
- {&DDRF, &PINF, &PORTF, 6}, // F6 17
- {&DDRF, &PINF, &PORTF, 5}, // F5 18
- {&DDRF, &PINF, &PORTF, 4}, // F4 19
- {&DDRF, &PINF, &PORTF, 1}, // F1 20
- {&DDRF, &PINF, &PORTF, 0}, // F0 21
- {&DDRD, &PIND, &PORTD, 4}, // D4 22
- {&DDRD, &PIND, &PORTD, 5}, // D5 23
- {&DDRE, &PINE, &PORTE, 6} // E6 24
-};
-//------------------------------------------------------------------------------
-#elif defined(__AVR_AT90USB646__) || defined(__AVR_AT90USB1286__)
-// Teensy++ 1.0 & 2.0
-
-// Two Wire (aka I2C) ports
-uint8_t const SDA_PIN = 1;
-uint8_t const SCL_PIN = 0;
-
-// SPI port
-uint8_t const SS_PIN = 20;
-uint8_t const MOSI_PIN = 22;
-uint8_t const MISO_PIN = 23;
-uint8_t const SCK_PIN = 21;
-
-static const pin_map_t digitalPinMap[] = {
- {&DDRD, &PIND, &PORTD, 0}, // D0 0
- {&DDRD, &PIND, &PORTD, 1}, // D1 1
- {&DDRD, &PIND, &PORTD, 2}, // D2 2
- {&DDRD, &PIND, &PORTD, 3}, // D3 3
- {&DDRD, &PIND, &PORTD, 4}, // D4 4
- {&DDRD, &PIND, &PORTD, 5}, // D5 5
- {&DDRD, &PIND, &PORTD, 6}, // D6 6
- {&DDRD, &PIND, &PORTD, 7}, // D7 7
- {&DDRE, &PINE, &PORTE, 0}, // E0 8
- {&DDRE, &PINE, &PORTE, 1}, // E1 9
- {&DDRC, &PINC, &PORTC, 0}, // C0 10
- {&DDRC, &PINC, &PORTC, 1}, // C1 11
- {&DDRC, &PINC, &PORTC, 2}, // C2 12
- {&DDRC, &PINC, &PORTC, 3}, // C3 13
- {&DDRC, &PINC, &PORTC, 4}, // C4 14
- {&DDRC, &PINC, &PORTC, 5}, // C5 15
- {&DDRC, &PINC, &PORTC, 6}, // C6 16
- {&DDRC, &PINC, &PORTC, 7}, // C7 17
- {&DDRE, &PINE, &PORTE, 6}, // E6 18
- {&DDRE, &PINE, &PORTE, 7}, // E7 19
- {&DDRB, &PINB, &PORTB, 0}, // B0 20
- {&DDRB, &PINB, &PORTB, 1}, // B1 21
- {&DDRB, &PINB, &PORTB, 2}, // B2 22
- {&DDRB, &PINB, &PORTB, 3}, // B3 23
- {&DDRB, &PINB, &PORTB, 4}, // B4 24
- {&DDRB, &PINB, &PORTB, 5}, // B5 25
- {&DDRB, &PINB, &PORTB, 6}, // B6 26
- {&DDRB, &PINB, &PORTB, 7}, // B7 27
- {&DDRA, &PINA, &PORTA, 0}, // A0 28
- {&DDRA, &PINA, &PORTA, 1}, // A1 29
- {&DDRA, &PINA, &PORTA, 2}, // A2 30
- {&DDRA, &PINA, &PORTA, 3}, // A3 31
- {&DDRA, &PINA, &PORTA, 4}, // A4 32
- {&DDRA, &PINA, &PORTA, 5}, // A5 33
- {&DDRA, &PINA, &PORTA, 6}, // A6 34
- {&DDRA, &PINA, &PORTA, 7}, // A7 35
- {&DDRE, &PINE, &PORTE, 4}, // E4 36
- {&DDRE, &PINE, &PORTE, 5}, // E5 37
- {&DDRF, &PINF, &PORTF, 0}, // F0 38
- {&DDRF, &PINF, &PORTF, 1}, // F1 39
- {&DDRF, &PINF, &PORTF, 2}, // F2 40
- {&DDRF, &PINF, &PORTF, 3}, // F3 41
- {&DDRF, &PINF, &PORTF, 4}, // F4 42
- {&DDRF, &PINF, &PORTF, 5}, // F5 43
- {&DDRF, &PINF, &PORTF, 6}, // F6 44
- {&DDRF, &PINF, &PORTF, 7} // F7 45
-};
-//------------------------------------------------------------------------------
-#else // defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
-// 168 and 328 Arduinos
-
-// Two Wire (aka I2C) ports
-uint8_t const SDA_PIN = 18;
-uint8_t const SCL_PIN = 19;
-
-// SPI port
-uint8_t const SS_PIN = 10;
-uint8_t const MOSI_PIN = 11;
-uint8_t const MISO_PIN = 12;
-uint8_t const SCK_PIN = 13;
-
-static const pin_map_t digitalPinMap[] = {
- {&DDRD, &PIND, &PORTD, 0}, // D0 0
- {&DDRD, &PIND, &PORTD, 1}, // D1 1
- {&DDRD, &PIND, &PORTD, 2}, // D2 2
- {&DDRD, &PIND, &PORTD, 3}, // D3 3
- {&DDRD, &PIND, &PORTD, 4}, // D4 4
- {&DDRD, &PIND, &PORTD, 5}, // D5 5
- {&DDRD, &PIND, &PORTD, 6}, // D6 6
- {&DDRD, &PIND, &PORTD, 7}, // D7 7
- {&DDRB, &PINB, &PORTB, 0}, // B0 8
- {&DDRB, &PINB, &PORTB, 1}, // B1 9
- {&DDRB, &PINB, &PORTB, 2}, // B2 10
- {&DDRB, &PINB, &PORTB, 3}, // B3 11
- {&DDRB, &PINB, &PORTB, 4}, // B4 12
- {&DDRB, &PINB, &PORTB, 5}, // B5 13
- {&DDRC, &PINC, &PORTC, 0}, // C0 14
- {&DDRC, &PINC, &PORTC, 1}, // C1 15
- {&DDRC, &PINC, &PORTC, 2}, // C2 16
- {&DDRC, &PINC, &PORTC, 3}, // C3 17
- {&DDRC, &PINC, &PORTC, 4}, // C4 18
- {&DDRC, &PINC, &PORTC, 5} // C5 19
-};
-#endif // defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
-//------------------------------------------------------------------------------
-static const uint8_t digitalPinCount = sizeof(digitalPinMap)/sizeof(pin_map_t);
-
-uint8_t badPinNumber(void)
- __attribute__((error("Pin number is too large or not a constant")));
-static inline __attribute__((always_inline))
- uint8_t getPinMode(uint8_t pin) {
- if (__builtin_constant_p(pin) && pin < digitalPinCount) {
- return (*digitalPinMap[pin].ddr >> digitalPinMap[pin].bit) & 1;
- } else {
- return badPinNumber();
- }
-}
-static inline __attribute__((always_inline))
- void setPinMode(uint8_t pin, uint8_t mode) {
- if (__builtin_constant_p(pin) && pin < digitalPinCount) {
- if (mode) {
- *digitalPinMap[pin].ddr |= 1 << digitalPinMap[pin].bit;
- } else {
- *digitalPinMap[pin].ddr &= ~(1 << digitalPinMap[pin].bit);
- }
- } else {
- badPinNumber();
- }
-}
-static inline __attribute__((always_inline))
- uint8_t fastDigitalRead(uint8_t pin) {
- if (__builtin_constant_p(pin) && pin < digitalPinCount) {
- return (*digitalPinMap[pin].pin >> digitalPinMap[pin].bit) & 1;
- } else {
- return badPinNumber();
- }
-}
-static inline __attribute__((always_inline))
- void fastDigitalWrite(uint8_t pin, uint8_t value) {
- if (__builtin_constant_p(pin) && pin < digitalPinCount) {
- if (value) {
- *digitalPinMap[pin].port |= 1 << digitalPinMap[pin].bit;
- } else {
- *digitalPinMap[pin].port &= ~(1 << digitalPinMap[pin].bit);
- }
- } else {
- badPinNumber();
- }
-}
-*/
#endif // Sd2PinMap_h
diff --git a/dumblogger/libraries/SDfat/SdFat.h b/dumblogger/libraries/SDfat/SdFat.h index 7914fc5..7f2ae34 100644 --- a/dumblogger/libraries/SDfat/SdFat.h +++ b/dumblogger/libraries/SDfat/SdFat.h @@ -24,9 +24,10 @@ * SdFile and SdVolume classes
*/
//#include <avr/pgmspace.h>
+#include <wirish/Print.h>
#include "Sd2Card.h"
#include "FatStructs.h"
-#include "Print.h"
+
//------------------------------------------------------------------------------
/**
* Allow use of deprecated functions if non-zero
diff --git a/dumblogger/libraries/SDfat/SdFatUtil.h b/dumblogger/libraries/SDfat/SdFatUtil.h index 59b886a..29b5262 100644 --- a/dumblogger/libraries/SDfat/SdFatUtil.h +++ b/dumblogger/libraries/SDfat/SdFatUtil.h @@ -23,7 +23,7 @@ * \file
* Useful utility functions.
*/
-#include <WProgram.h>
+#include <wirish/WProgram.h>
//#include <avr/pgmspace.h>
/** Store and print a string in flash memory.*/
#define PgmPrint(x) SerialPrint_P(PSTR(x))
diff --git a/dumblogger/libraries/SDfat/SdFile.cpp b/dumblogger/libraries/SDfat/SdFile.cpp index 9eeadae..ea1fff2 100644 --- a/dumblogger/libraries/SDfat/SdFile.cpp +++ b/dumblogger/libraries/SDfat/SdFile.cpp @@ -19,8 +19,8 @@ */
#include "SdFat.h"
//#include <avr/pgmspace.h>
-#include <WProgram.h>
-#include "HardwareSPI.h"
+#include <wirish/WProgram.h>
+#include <wirish/HardwareSPI.h>
#include <string.h>
//------------------------------------------------------------------------------
diff --git a/dumblogger/libraries/SDfat/SdVolume.cpp b/dumblogger/libraries/SDfat/SdVolume.cpp index 505bcd8..4ff4875 100644 --- a/dumblogger/libraries/SDfat/SdVolume.cpp +++ b/dumblogger/libraries/SDfat/SdVolume.cpp @@ -18,7 +18,10 @@ * <http://www.gnu.org/licenses/>.
*/
#include "SdFat.h"
-#include <usb_serial.h>
+
+#ifdef ASSUME_SERIAL_DEBUGGING
+#include <libmaple/usb_serial.h>
+#endif
//------------------------------------------------------------------------------
// raw block cache
@@ -277,13 +280,17 @@ uint8_t SdVolume::init(Sd2Card* dev, uint8_t part) {
if (part > 4)
{
+#ifdef ASSUME_SERIAL_DEBUGGING
SerialUSB.println("Error: SdVolume::init() MBR");
+#endif
return false;
}
if (!cacheRawBlock(volumeStartBlock, CACHE_FOR_READ))
{
+#ifdef ASSUME_SERIAL_DEBUGGING
SerialUSB.println("Error: SdVolume::init() Cache for read");
+#endif
return false;
}
@@ -294,15 +301,18 @@ uint8_t SdVolume::init(Sd2Card* dev, uint8_t part) p->firstSector == 0)
{
// not a valid partition
-
+#ifdef ASSUME_SERIAL_DEBUGGING
SerialUSB.println("Error: SdVolume::init() Invalid partition");
- return false;
+#endif
+ return false;
}
volumeStartBlock = p->firstSector;
}
if (!cacheRawBlock(volumeStartBlock, CACHE_FOR_READ))
{
+#ifdef ASSUME_SERIAL_DEBUGGING
SerialUSB.println("Error: SdVolume::init() Cache for read2");
+#endif
return false;
}
@@ -313,7 +323,9 @@ uint8_t SdVolume::init(Sd2Card* dev, uint8_t part) bpb->sectorsPerCluster == 0)
{
// not valid FAT volume
+#ifdef ASSUME_SERIAL_DEBUGGING
SerialUSB.println("Error: SdVolume::init() invalid FAT volume");
+#endif
return false;
}
fatCount_ = bpb->fatCount;
@@ -327,7 +339,9 @@ uint8_t SdVolume::init(Sd2Card* dev, uint8_t part) if (clusterSizeShift_++ > 7)
{
return false;
- SerialUSB.println("Error: SdVolume::init() not power of 2");
+#ifdef ASSUME_SERIAL_DEBUGGING
+ SerialUSB.println("Error: SdVolume::init() not power of 2");
+#endif
}
}
blocksPerFat_ = bpb->sectorsPerFat16 ?
diff --git a/dumblogger/libraries/SDfat/examples/.svn/all-wcprops b/dumblogger/libraries/SDfat/examples/.svn/all-wcprops deleted file mode 100644 index d3d144d..0000000 --- a/dumblogger/libraries/SDfat/examples/.svn/all-wcprops +++ /dev/null @@ -1,11 +0,0 @@ -K 25 -svn:wc:ra_dav:version-url -V 42 -/svn/!svn/ver/8/trunk/maple-sdfat/examples -END -clean.bat -K 25 -svn:wc:ra_dav:version-url -V 52 -/svn/!svn/ver/6/trunk/maple-sdfat/examples/clean.bat -END diff --git a/dumblogger/libraries/SDfat/examples/.svn/entries b/dumblogger/libraries/SDfat/examples/.svn/entries deleted file mode 100644 index 1925d16..0000000 --- a/dumblogger/libraries/SDfat/examples/.svn/entries +++ /dev/null @@ -1,68 +0,0 @@ -10 - -dir -8 -https://maple-sdfat.googlecode.com/svn/trunk/maple-sdfat/examples -https://maple-sdfat.googlecode.com/svn - - - -2011-05-15T20:43:48.488246Z -8 -Jason.Vreeland@gmail.com - - - - - - - - - - - - - - -1c6c76e6-65e3-e54d-cebe-539f9b1c8f54 - -Arduino Examples -dir - -clean.bat -file - - - - -2012-07-19T00:13:14.000000Z -8f633495f79e124e18847e45c9c6d566 -2011-05-14T18:03:04.855990Z -2 -Jason.Vreeland@gmail.com - - - - - - - - - - - - - - - - - - - - - -21 - -FileSys -dir - diff --git a/dumblogger/libraries/SDfat/examples/.svn/text-base/clean.bat.svn-base b/dumblogger/libraries/SDfat/examples/.svn/text-base/clean.bat.svn-base deleted file mode 100644 index 782a498..0000000 --- a/dumblogger/libraries/SDfat/examples/.svn/text-base/clean.bat.svn-base +++ /dev/null @@ -1,2 +0,0 @@ -rm -r */applet
-pause
\ No newline at end of file diff --git a/dumblogger/libraries/SDfat/examples/Arduino Examples/.svn/all-wcprops b/dumblogger/libraries/SDfat/examples/Arduino Examples/.svn/all-wcprops deleted file mode 100644 index 8d5ab33..0000000 --- a/dumblogger/libraries/SDfat/examples/Arduino Examples/.svn/all-wcprops +++ /dev/null @@ -1,5 +0,0 @@ -K 25 -svn:wc:ra_dav:version-url -V 61 -/svn/!svn/ver/6/trunk/maple-sdfat/examples/Arduino%20Examples -END diff --git a/dumblogger/libraries/SDfat/examples/Arduino Examples/.svn/entries b/dumblogger/libraries/SDfat/examples/Arduino Examples/.svn/entries deleted file mode 100644 index c69abe6..0000000 --- a/dumblogger/libraries/SDfat/examples/Arduino Examples/.svn/entries +++ /dev/null @@ -1,85 +0,0 @@ -10 - -dir -8 -https://maple-sdfat.googlecode.com/svn/trunk/maple-sdfat/examples/Arduino%20Examples -https://maple-sdfat.googlecode.com/svn - - - -2011-05-14T18:03:04.855990Z -2 -Jason.Vreeland@gmail.com - - - - - - - - - - - - - - -1c6c76e6-65e3-e54d-cebe-539f9b1c8f54 - -SdFatRemove -dir - -SdFatGPS_CSVSensorLogger -dir - -SdFatAnalogLogger -dir - -SdFatGPSLogger_v3 -dir - -SdFatTimestamp -dir - -SdFatRawWrite -dir - -SdFatAppend -dir - -SdFatCopy -dir - -SdFatRead -dir - -SdFatMakeDir -dir - -SdFatRmDir -dir - -SdFatLs -dir - -SdFatBench -dir - -SdFatRewrite -dir - -SdFatTruncate -dir - -SdFatTail -dir - -SdFatWrite -dir - -SdFatInfo -dir - -SdFatPrint -dir - diff --git a/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatAnalogLogger/.svn/all-wcprops b/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatAnalogLogger/.svn/all-wcprops deleted file mode 100644 index 337e0d1..0000000 --- a/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatAnalogLogger/.svn/all-wcprops +++ /dev/null @@ -1,11 +0,0 @@ -K 25 -svn:wc:ra_dav:version-url -V 79 -/svn/!svn/ver/6/trunk/maple-sdfat/examples/Arduino%20Examples/SdFatAnalogLogger -END -SdFatAnalogLogger.pde -K 25 -svn:wc:ra_dav:version-url -V 101 -/svn/!svn/ver/6/trunk/maple-sdfat/examples/Arduino%20Examples/SdFatAnalogLogger/SdFatAnalogLogger.pde -END diff --git a/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatAnalogLogger/.svn/entries b/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatAnalogLogger/.svn/entries deleted file mode 100644 index 6addd1f..0000000 --- a/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatAnalogLogger/.svn/entries +++ /dev/null @@ -1,62 +0,0 @@ -10 - -dir -8 -https://maple-sdfat.googlecode.com/svn/trunk/maple-sdfat/examples/Arduino%20Examples/SdFatAnalogLogger -https://maple-sdfat.googlecode.com/svn - - - -2011-05-14T18:03:04.855990Z -2 -Jason.Vreeland@gmail.com - - - - - - - - - - - - - - -1c6c76e6-65e3-e54d-cebe-539f9b1c8f54 - -SdFatAnalogLogger.pde -file - - - - -2012-07-19T00:13:14.000000Z -2eb39c5e08c184e7b60e3b997c6b1506 -2011-05-14T18:03:04.855990Z -2 -Jason.Vreeland@gmail.com - - - - - - - - - - - - - - - - - - - - - -3220 - diff --git a/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatAnalogLogger/.svn/text-base/SdFatAnalogLogger.pde.svn-base b/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatAnalogLogger/.svn/text-base/SdFatAnalogLogger.pde.svn-base deleted file mode 100644 index bc2190c..0000000 --- a/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatAnalogLogger/.svn/text-base/SdFatAnalogLogger.pde.svn-base +++ /dev/null @@ -1,122 +0,0 @@ -// A simple data logger for the Arduino analog pins
-#define LOG_INTERVAL 1000 // mills between entries
-#define SENSOR_COUNT 3 // number of analog pins to log
-#define ECHO_TO_SERIAL 1 // echo data to serial port
-#define WAIT_TO_START 1 // Wait for serial input in setup()
-#define SYNC_INTERVAL 1000 // mills between calls to sync()
-uint32_t syncTime = 0; // time of last sync()
-
-#include <SdFat.h>
-#include <SdFatUtil.h>
-
-Sd2Card card;
-SdVolume volume;
-SdFile root;
-SdFile file;
-
-// store error strings in flash to save RAM
-#define error(s) error_P(PSTR(s))
-
-void error_P(const char* str) {
- PgmPrint("error: ");
- SerialPrintln_P(str);
- if (card.errorCode()) {
- PgmPrint("SD error: ");
- Serial.print(card.errorCode(), HEX);
- Serial.print(',');
- Serial.println(card.errorData(), HEX);
- }
- while(1);
-}
-
-void setup(void) {
- Serial.begin(9600);
- Serial.println();
-
-#if WAIT_TO_START
- Serial.println("Type any character to start");
- while (!Serial.available());
-#endif //WAIT_TO_START
-
- // initialize the SD card at SPI_HALF_SPEED to avoid bus errors with
- // breadboards. use SPI_FULL_SPEED for better performance.
- if (!card.init(SPI_HALF_SPEED)) error("card.init failed");
-
- // initialize a FAT volume
- if (!volume.init(&card)) error("volume.init failed");
-
- // open root directory
- if (!root.openRoot(&volume)) error("openRoot failed");
-
- // create a new file
- char name[] = "LOGGER00.CSV";
- for (uint8_t i = 0; i < 100; i++) {
- name[6] = i/10 + '0';
- name[7] = i%10 + '0';
- if (file.open(&root, name, O_CREAT | O_EXCL | O_WRITE)) break;
- }
- if (!file.isOpen()) error ("file.create");
- Serial.print("Logging to: ");
- Serial.println(name);
-
- // write header
- file.writeError = 0;
- file.print("millis");
-#if ECHO_TO_SERIAL
- Serial.print("millis");
-#endif //ECHO_TO_SERIAL
-
-#if SENSOR_COUNT > 6
-#error SENSOR_COUNT too large
-#endif //SENSOR_COUNT
-
- for (uint8_t i = 0; i < SENSOR_COUNT; i++) {
- file.print(",sens");file.print(i, DEC);
-#if ECHO_TO_SERIAL
- Serial.print(",sens");Serial.print(i, DEC);
-#endif //ECHO_TO_SERIAL
- }
- file.println();
-#if ECHO_TO_SERIAL
- Serial.println();
-#endif //ECHO_TO_SERIAL
-
- if (file.writeError || !file.sync()) {
- error("write header failed");
- }
-}
-
-void loop(void) {
- // clear print error
- file.writeError = 0;
- delay((LOG_INTERVAL -1) - (millis() % LOG_INTERVAL));
-
- // log time
- uint32_t m = millis();
- file.print(m);
-#if ECHO_TO_SERIAL
- Serial.print(m);
-#endif //ECHO_TO_SERIAL
-
- // add sensor data
- for (uint8_t ia = 0; ia < SENSOR_COUNT; ia++) {
- uint16_t data = analogRead(ia);
- file.print(',');
- file.print(data);
-#if ECHO_TO_SERIAL
- Serial.print(',');
- Serial.print(data);
-#endif //ECHO_TO_SERIAL
- }
- file.println();
-#if ECHO_TO_SERIAL
- Serial.println();
-#endif //ECHO_TO_SERIAL
-
- if (file.writeError) error("write data failed");
-
- //don't sync too often - requires 2048 bytes of I/O to SD card
- if ((millis() - syncTime) < SYNC_INTERVAL) return;
- syncTime = millis();
- if (!file.sync()) error("sync failed");
-}
diff --git a/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatAppend/.svn/all-wcprops b/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatAppend/.svn/all-wcprops deleted file mode 100644 index c98e6c8..0000000 --- a/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatAppend/.svn/all-wcprops +++ /dev/null @@ -1,11 +0,0 @@ -K 25 -svn:wc:ra_dav:version-url -V 73 -/svn/!svn/ver/6/trunk/maple-sdfat/examples/Arduino%20Examples/SdFatAppend -END -SdFatAppend.pde -K 25 -svn:wc:ra_dav:version-url -V 89 -/svn/!svn/ver/6/trunk/maple-sdfat/examples/Arduino%20Examples/SdFatAppend/SdFatAppend.pde -END diff --git a/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatAppend/.svn/entries b/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatAppend/.svn/entries deleted file mode 100644 index fc1dd8d..0000000 --- a/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatAppend/.svn/entries +++ /dev/null @@ -1,62 +0,0 @@ -10 - -dir -8 -https://maple-sdfat.googlecode.com/svn/trunk/maple-sdfat/examples/Arduino%20Examples/SdFatAppend -https://maple-sdfat.googlecode.com/svn - - - -2011-05-14T18:03:04.855990Z -2 -Jason.Vreeland@gmail.com - - - - - - - - - - - - - - -1c6c76e6-65e3-e54d-cebe-539f9b1c8f54 - -SdFatAppend.pde -file - - - - -2012-07-19T00:13:14.000000Z -4d1b7c06c510c73ff709c64f3e1c278a -2011-05-14T18:03:04.855990Z -2 -Jason.Vreeland@gmail.com - - - - - - - - - - - - - - - - - - - - - -2107 - diff --git a/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatAppend/.svn/text-base/SdFatAppend.pde.svn-base b/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatAppend/.svn/text-base/SdFatAppend.pde.svn-base deleted file mode 100644 index ce22264..0000000 --- a/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatAppend/.svn/text-base/SdFatAppend.pde.svn-base +++ /dev/null @@ -1,77 +0,0 @@ -/*
- * Append Example
- *
- * This sketch shows how to use open for append and the Arduino Print class
- * with SdFat.
- */
-#include <SdFat.h>
-#include <SdFatUtil.h> // use functions to print strings from flash memory
-
-Sd2Card card;
-SdVolume volume;
-SdFile root;
-SdFile file;
-
-// store error strings in flash to save RAM
-#define error(s) error_P(PSTR(s))
-
-void error_P(const char* str) {
- PgmPrint("error: ");
- SerialPrintln_P(str);
- if (card.errorCode()) {
- PgmPrint("SD error: ");
- Serial.print(card.errorCode(), HEX);
- Serial.print(',');
- Serial.println(card.errorData(), HEX);
- }
- while(1);
-}
-
-void setup(void) {
- Serial.begin(9600);
- Serial.println();
- PgmPrintln("Type any character to start");
- while (!Serial.available());
-
- // initialize the SD card at SPI_HALF_SPEED to avoid bus errors with
- // breadboards. use SPI_FULL_SPEED for better performance.
- if (!card.init(SPI_HALF_SPEED)) error("card.init failed");
-
- // initialize a FAT volume
- if (!volume.init(&card)) error("volume.init failed");
-
- // open the root directory
- if (!root.openRoot(&volume)) error("openRoot failed");
-
- char name[] = "APPEND.TXT";
- PgmPrint("Appending to: ");
- Serial.println(name);
-
- // clear write error
- file.writeError = false;
-
- for (uint8_t i = 0; i < 100; i++) {
- // O_CREAT - create the file if it does not exist
- // O_APPEND - seek to the end of the file prior to each write
- // O_WRITE - open for write
- if (!file.open(&root, name, O_CREAT | O_APPEND | O_WRITE)) {
- error("open failed");
- }
- // print 100 lines to file
- for (uint8_t j = 0; j < 100; j++) {
- file.print("line ");
- file.print(j, DEC);
- file.print(" of pass ");
- file.print(i, DEC);
- file.print(" millis = ");
- file.println(millis());
- }
- if (file.writeError) error("write failed");
- if (!file.close()) error("close failed");
- if (i > 0 && i%25 == 0)Serial.println();
- Serial.print('.');
- }
- Serial.println();
- Serial.println("Done");
-}
-void loop(void){}
diff --git a/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatBench/.svn/all-wcprops b/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatBench/.svn/all-wcprops deleted file mode 100644 index be9fc00..0000000 --- a/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatBench/.svn/all-wcprops +++ /dev/null @@ -1,11 +0,0 @@ -K 25 -svn:wc:ra_dav:version-url -V 72 -/svn/!svn/ver/6/trunk/maple-sdfat/examples/Arduino%20Examples/SdFatBench -END -SdFatBench.pde -K 25 -svn:wc:ra_dav:version-url -V 87 -/svn/!svn/ver/6/trunk/maple-sdfat/examples/Arduino%20Examples/SdFatBench/SdFatBench.pde -END diff --git a/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatBench/.svn/entries b/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatBench/.svn/entries deleted file mode 100644 index e2ad2b3..0000000 --- a/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatBench/.svn/entries +++ /dev/null @@ -1,62 +0,0 @@ -10 - -dir -8 -https://maple-sdfat.googlecode.com/svn/trunk/maple-sdfat/examples/Arduino%20Examples/SdFatBench -https://maple-sdfat.googlecode.com/svn - - - -2011-05-14T18:03:04.855990Z -2 -Jason.Vreeland@gmail.com - - - - - - - - - - - - - - -1c6c76e6-65e3-e54d-cebe-539f9b1c8f54 - -SdFatBench.pde -file - - - - -2012-07-19T00:13:14.000000Z -1855435d4379537fac6048f207e74a29 -2011-05-14T18:03:04.855990Z -2 -Jason.Vreeland@gmail.com - - - - - - - - - - - - - - - - - - - - - -2526 - diff --git a/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatBench/.svn/text-base/SdFatBench.pde.svn-base b/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatBench/.svn/text-base/SdFatBench.pde.svn-base deleted file mode 100644 index 4fd98f4..0000000 --- a/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatBench/.svn/text-base/SdFatBench.pde.svn-base +++ /dev/null @@ -1,104 +0,0 @@ -/*
- * This sketch is a simple write/read benchmark.
- */
-#include <SdFat.h>
-#include <SdFatUtil.h>
-
-#define FILE_SIZE_MB 5
-#define FILE_SIZE (1000000UL*FILE_SIZE_MB)
-#define BUF_SIZE 100
-
-uint8_t buf[BUF_SIZE];
-
-Sd2Card card;
-SdVolume volume;
-SdFile root;
-SdFile file;
-
-// store error strings in flash to save RAM
-#define error(s) error_P(PSTR(s))
-
-void error_P(const char* str)
-{
- PgmPrint("error: ");
- SerialPrintln_P(str);
- if (card.errorCode()) {
- PgmPrint("SD error: ");
- Serial.print(card.errorCode(), HEX);
- Serial.print(',');
- Serial.println(card.errorData(), HEX);
- }
- while(1);
-}
-
-void setup() {
- Serial.begin(9600);
- PgmPrintln("Type any character to start");
- while (!Serial.available());
-
- PgmPrint("Free RAM: ");
- Serial.println(FreeRam());
-
- // initialize the SD card at SPI_FULL_SPEED for best performance.
- // try SPI_HALF_SPEED if bus errors occur.
- if (!card.init(SPI_FULL_SPEED)) error("card.init failed");
-
- // initialize a FAT volume
- if (!volume.init(&card)) error("volume.init failed!");
-
- PgmPrint("Type is FAT");
- Serial.println(volume.fatType(), DEC);
-
- if (!root.openRoot(&volume)) error("openRoot failed");
-
- // open or create file - truncate existing file.
- if (!file.open(&root, "BENCH.DAT", O_CREAT | O_TRUNC | O_RDWR)) {
- error("open failed");
- }
-
- // fill buf with known data
- for (uint16_t i = 0; i < (BUF_SIZE-2); i++) {
- buf[i] = 'A' + (i % 26);
- }
- buf[BUF_SIZE-2] = '\r';
- buf[BUF_SIZE-1] = '\n';
-
- PgmPrint("File size ");
- Serial.print(FILE_SIZE_MB);
- PgmPrintln(" MB");
- PgmPrintln("Starting write test. Please wait up to a minute");
-
- // do write test
- uint32_t n = FILE_SIZE/sizeof(buf);
- uint32_t t = millis();
- for (uint32_t i = 0; i < n; i++) {
- if (file.write(buf, sizeof(buf)) != sizeof(buf)) {
- error("write failed");
- }
- }
- t = millis() - t;
- file.sync();
- double r = (double)file.fileSize()/t;
- PgmPrint("Write ");
- Serial.print(r);
- PgmPrintln(" KB/sec");
- Serial.println();
- PgmPrintln("Starting read test. Please wait up to a minute");
-
- // do read test
- file.rewind();
- t = millis();
- for (uint32_t i = 0; i < n; i++) {
- if (file.read(buf, sizeof(buf)) != sizeof(buf)) {
- error("read failed");
- }
- }
- t = millis() - t;
- r = (double)file.fileSize()/t;
- PgmPrint("Read ");
- Serial.print(r);
- PgmPrintln(" KB/sec");
- PgmPrintln("Done");
-}
-
-void loop() { }
diff --git a/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatCopy/.svn/all-wcprops b/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatCopy/.svn/all-wcprops deleted file mode 100644 index f5f3784..0000000 --- a/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatCopy/.svn/all-wcprops +++ /dev/null @@ -1,11 +0,0 @@ -K 25 -svn:wc:ra_dav:version-url -V 71 -/svn/!svn/ver/6/trunk/maple-sdfat/examples/Arduino%20Examples/SdFatCopy -END -SdFatCopy.pde -K 25 -svn:wc:ra_dav:version-url -V 85 -/svn/!svn/ver/6/trunk/maple-sdfat/examples/Arduino%20Examples/SdFatCopy/SdFatCopy.pde -END diff --git a/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatCopy/.svn/entries b/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatCopy/.svn/entries deleted file mode 100644 index b760a19..0000000 --- a/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatCopy/.svn/entries +++ /dev/null @@ -1,62 +0,0 @@ -10 - -dir -8 -https://maple-sdfat.googlecode.com/svn/trunk/maple-sdfat/examples/Arduino%20Examples/SdFatCopy -https://maple-sdfat.googlecode.com/svn - - - -2011-05-14T18:03:04.855990Z -2 -Jason.Vreeland@gmail.com - - - - - - - - - - - - - - -1c6c76e6-65e3-e54d-cebe-539f9b1c8f54 - -SdFatCopy.pde -file - - - - -2012-07-19T00:13:14.000000Z -adb216f2cd48f281a077b8f95ac967ea -2011-05-14T18:03:04.855990Z -2 -Jason.Vreeland@gmail.com - - - - - - - - - - - - - - - - - - - - - -2359 - diff --git a/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatCopy/.svn/text-base/SdFatCopy.pde.svn-base b/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatCopy/.svn/text-base/SdFatCopy.pde.svn-base deleted file mode 100644 index 356340a..0000000 --- a/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatCopy/.svn/text-base/SdFatCopy.pde.svn-base +++ /dev/null @@ -1,82 +0,0 @@ -/*
- * Copy Example - only runs on chips with 2K or more RAM
- *
- * This sketch copies the file APPEND.TXT, created by the
- * SdFatAppend.pde example, to the file ACOPY.TXT.
- */
-#include <SdFat.h>
-#include <SdFatUtil.h> // use functions to print strings from flash memory
-
-Sd2Card card;
-SdVolume volume;
-SdFile root;
-SdFile from; // read file
-SdFile copy; // write file
-
-// large buffer to test for bugs. 512 bytes runs much faster.
-char buf[600];
-
-// store error strings in flash to save RAM
-#define error(s) error_P(PSTR(s))
-
-void error_P(const char* str) {
- PgmPrint("error: ");
- SerialPrintln_P(str);
- if (card.errorCode()) {
- PgmPrint("SD error: ");
- Serial.print(card.errorCode(), HEX);
- Serial.print(',');
- Serial.println(card.errorData(), HEX);
- }
- while(1);
-}
-
-void setup(void) {
- Serial.begin(9600);
- Serial.println();
- PgmPrintln("Type any character to start");
- while (!Serial.available());
-
- PgmPrint("FreeRam: ");
- Serial.println(FreeRam());
-
- // initialize the SD card at SPI_HALF_SPEED to avoid bus errors with
- // breadboards. use SPI_FULL_SPEED for better performance.
- if (!card.init(SPI_HALF_SPEED)) error("card.init failed");
-
- // initialize a FAT volume
- if (!volume.init(&card)) error("volume.init failed");
-
- // open the root directory
- if (!root.openRoot(&volume)) error("openRoot failed");
-
- strcpy_P(buf, PSTR("APPEND.TXT"));
- // open for read
- if (!from.open(&root, buf, O_READ)) {
- PgmPrint("Can't open ");
- Serial.println(buf);
- PgmPrintln("Run the append example to create the file.");
- error("from.open failed");
- }
- strcpy_P(buf, PSTR("ACOPY.TXT"));
- // create if needed, truncate to zero length, open for write
- if (!copy.open(&root, buf, O_CREAT | O_TRUNC | O_WRITE)) {
- error("copy.open failed");
- }
- // count for printing periods
- uint16_t p = 0;
- int16_t n;
- while ((n = from.read(buf, sizeof(buf))) > 0) {
- if (copy.write(buf, n) != n) error("write failed");
- // print progress periods
- if (!(p++ % 25)) Serial.print('.');
- if (!(p % 500)) Serial.println();
- }
- Serial.println();
- if (n != 0) error ("read");
- // force write of directory entry and last data
- if (!copy.close()) error("copy.close failed");
- PgmPrintln("Copy done.");
-}
-
-void loop(void) {}
diff --git a/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatGPSLogger_v3/.svn/all-wcprops b/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatGPSLogger_v3/.svn/all-wcprops deleted file mode 100644 index 7da3bef..0000000 --- a/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatGPSLogger_v3/.svn/all-wcprops +++ /dev/null @@ -1,11 +0,0 @@ -K 25 -svn:wc:ra_dav:version-url -V 79 -/svn/!svn/ver/6/trunk/maple-sdfat/examples/Arduino%20Examples/SdFatGPSLogger_v3 -END -SdFatGPSLogger_v3.pde -K 25 -svn:wc:ra_dav:version-url -V 101 -/svn/!svn/ver/6/trunk/maple-sdfat/examples/Arduino%20Examples/SdFatGPSLogger_v3/SdFatGPSLogger_v3.pde -END diff --git a/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatGPSLogger_v3/.svn/entries b/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatGPSLogger_v3/.svn/entries deleted file mode 100644 index fdd4ff1..0000000 --- a/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatGPSLogger_v3/.svn/entries +++ /dev/null @@ -1,62 +0,0 @@ -10 - -dir -8 -https://maple-sdfat.googlecode.com/svn/trunk/maple-sdfat/examples/Arduino%20Examples/SdFatGPSLogger_v3 -https://maple-sdfat.googlecode.com/svn - - - -2011-05-14T18:03:04.855990Z -2 -Jason.Vreeland@gmail.com - - - - - - - - - - - - - - -1c6c76e6-65e3-e54d-cebe-539f9b1c8f54 - -SdFatGPSLogger_v3.pde -file - - - - -2012-07-19T00:13:14.000000Z -e6cd37cd38032827f75881dc4bd2d20d -2011-05-14T18:03:04.855990Z -2 -Jason.Vreeland@gmail.com - - - - - - - - - - - - - - - - - - - - - -8289 - diff --git a/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatGPSLogger_v3/.svn/text-base/SdFatGPSLogger_v3.pde.svn-base b/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatGPSLogger_v3/.svn/text-base/SdFatGPSLogger_v3.pde.svn-base deleted file mode 100644 index ea3a312..0000000 --- a/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatGPSLogger_v3/.svn/text-base/SdFatGPSLogger_v3.pde.svn-base +++ /dev/null @@ -1,340 +0,0 @@ -// Ladyada's logger modified by Bill Greiman to use the SdFat library
-
-// this is a generic logger that does checksum testing so the data written should be always good
-// Assumes a sirf III chipset logger attached to pin 0 and 1
-
-#include <SdFat.h>
-#include <SdFatUtil.h>
-#include <avr/sleep.h>
-
-// macros to use PSTR
-#define putstring(str) SerialPrint_P(PSTR(str))
-#define putstring_nl(str) SerialPrintln_P(PSTR(str))
-
-// power saving modes
-#define SLEEPDELAY 0
-#define TURNOFFGPS 0
-#define LOG_RMC_FIXONLY 1
-
-Sd2Card card;
-SdVolume volume;
-SdFile root;
-SdFile f;
-
-#define led1Pin 4
-#define led2Pin 3
-#define powerPin 2
-
-#define BUFFSIZE 75
-char buffer[BUFFSIZE];
-uint8_t bufferidx = 0;
-uint8_t fix = 0; // current fix data
-uint8_t i;
-
-/* EXAMPLE
-
-$PSRF103,<msg>,<mode>,<rate>,<cksumEnable>*CKSUM<CR><LF>
-
-<msg> 00=GGA,01=GLL,02=GSA,03=GSV,04=RMC,05=VTG
-<mode> 00=SetRate,01=Query
-<rate> Output every <rate>seconds, off=00,max=255
-<cksumEnable> 00=disable Checksum,01=Enable checksum for specified message
-Note: checksum is required
-
-Example 1: Query the GGA message with checksum enabled
-$PSRF103,00,01,00,01*25
-
-Example 2: Enable VTG message for a 1Hz constant output with checksum enabled
-$PSRF103,05,00,01,01*20
-
-Example 3: Disable VTG message
-$PSRF103,05,00,00,01*21
-
-*/
-
-#define SERIAL_SET "$PSRF100,01,4800,08,01,00*0E\r\n"
-
-// GGA-Global Positioning System Fixed Data, message 103,00
-#define LOG_GGA 0
-#define GGA_ON "$PSRF103,00,00,01,01*25\r\n"
-#define GGA_OFF "$PSRF103,00,00,00,01*24\r\n"
-
-// GLL-Geographic Position-Latitude/Longitude, message 103,01
-#define LOG_GLL 0
-#define GLL_ON "$PSRF103,01,00,01,01*26\r\n"
-#define GLL_OFF "$PSRF103,01,00,00,01*27\r\n"
-
-// GSA-GNSS DOP and Active Satellites, message 103,02
-#define LOG_GSA 0
-#define GSA_ON "$PSRF103,02,00,01,01*27\r\n"
-#define GSA_OFF "$PSRF103,02,00,00,01*26\r\n"
-
-// GSV-GNSS Satellites in View, message 103,03
-#define LOG_GSV 0
-#define GSV_ON "$PSRF103,03,00,01,01*26\r\n"
-#define GSV_OFF "$PSRF103,03,00,00,01*27\r\n"
-
-// RMC-Recommended Minimum Specific GNSS Data, message 103,04
-#define LOG_RMC 1
-#define RMC_ON "$PSRF103,04,00,01,01*21\r\n"
-#define RMC_OFF "$PSRF103,04,00,00,01*20\r\n"
-
-// VTG-Course Over Ground and Ground Speed, message 103,05
-#define LOG_VTG 0
-#define VTG_ON "$PSRF103,05,00,01,01*20\r\n"
-#define VTG_OFF "$PSRF103,05,00,00,01*21\r\n"
-
-// Switch Development Data Messages On/Off, message 105
-#define LOG_DDM 1
-#define DDM_ON "$PSRF105,01*3E\r\n"
-#define DDM_OFF "$PSRF105,00*3F\r\n"
-
-#define USE_WAAS 0 // useful in US, but slower fix
-#define WAAS_ON "$PSRF151,01*3F\r\n" // the command for turning on WAAS
-#define WAAS_OFF "$PSRF151,00*3E\r\n" // the command for turning off WAAS
-
-// read a Hex value and return the decimal equivalent
-uint8_t parseHex(char c) {
- if (c < '0')
- return 0;
- if (c <= '9')
- return c - '0';
- if (c < 'A')
- return 0;
- if (c <= 'F')
- return (c - 'A')+10;
-}
-
-// blink out an error code
-void error(uint8_t errno) {
- if (card.errorCode()) {
- putstring("SD error: ");
- Serial.print(card.errorCode(), HEX);
- Serial.print(',');
- Serial.println(card.errorData(), HEX);
- }
- while(1) {
- for (i=0; i<errno; i++) {
- digitalWrite(led1Pin, HIGH);
- digitalWrite(led2Pin, HIGH);
- delay(100);
- digitalWrite(led1Pin, LOW);
- digitalWrite(led2Pin, LOW);
- delay(100);
- }
- for (; i<10; i++) {
- delay(200);
- }
- }
-}
-
-void setup() {
- WDTCSR |= (1 << WDCE) | (1 << WDE);
- WDTCSR = 0;
- Serial.begin(4800);
- putstring_nl("\r\nGPSlogger");
- pinMode(led1Pin, OUTPUT);
- pinMode(led2Pin, OUTPUT);
- pinMode(powerPin, OUTPUT);
- digitalWrite(powerPin, LOW);
-
- // initialize the SD card at SPI_HALF_SPEED to avoid bus errors with
- // breadboards. use SPI_FULL_SPEED for better performance.
- if (!card.init(SPI_HALF_SPEED)) {
- putstring_nl("Card init. failed!");
- error(1);
- }
- if (!volume.init(&card)) {
- putstring_nl("No partition!");
- error(2);
- }
- if(!root.openRoot(&volume)) {
- putstring_nl("Can't! open root dir");
- error(3);
- }
- strcpy(buffer, "GPSLOG00.TXT");
- for (i = 0; i < 100; i++) {
- buffer[6] = '0' + i/10;
- buffer[7] = '0' + i%10;
- // create if does not exist, do not open existing, write, sync after write
- if (f.open(&root, buffer, O_CREAT | O_EXCL | O_WRITE | O_SYNC)) break;
- }
-
- if(!f.isOpen()) {
- putstring("couldnt create "); Serial.println(buffer);
- error(3);
- }
- putstring("writing to "); Serial.println(buffer);
- putstring_nl("ready!");
-
- putstring(SERIAL_SET);
- delay(250);
-
- if (LOG_DDM)
- putstring(DDM_ON);
- else
- putstring(DDM_OFF);
- delay(250);
-
- if (LOG_GGA)
- putstring(GGA_ON);
- else
- putstring(GGA_OFF);
- delay(250);
-
- if (LOG_GLL)
- putstring(GLL_ON);
- else
- putstring(GLL_OFF);
- delay(250);
-
- if (LOG_GSA)
- putstring(GSA_ON);
- else
- putstring(GSA_OFF);
- delay(250);
-
- if (LOG_GSV)
- putstring(GSV_ON);
- else
- putstring(GSV_OFF);
- delay(250);
-
- if (LOG_RMC)
- putstring(RMC_ON);
- else
- putstring(RMC_OFF);
- delay(250);
-
- if (LOG_VTG)
- putstring(VTG_ON);
- else
- putstring(VTG_OFF);
- delay(250);
-
- if (USE_WAAS)
- putstring(WAAS_ON);
- else
- putstring(WAAS_OFF);
-}
-
-void loop() {
- //Serial.println(Serial.available(), DEC);
- char c;
- uint8_t sum;
-
- // read one 'line'
- if (Serial.available()) {
- c = Serial.read();
- //Serial.print(c, BYTE);
- if (bufferidx == 0) {
- while (c != '$')
- c = Serial.read(); // wait till we get a $
- }
- buffer[bufferidx] = c;
-
- //Serial.print(c, BYTE);
- if (c == '\n') {
- //putstring_nl("EOL");
- //Serial.print(buffer);
- buffer[bufferidx+1] = 0; // terminate it
-
- if (buffer[bufferidx-4] != '*') {
- // no checksum?
- Serial.print('*', BYTE);
- bufferidx = 0;
- return;
- }
- // get checksum
- sum = parseHex(buffer[bufferidx-3]) * 16;
- sum += parseHex(buffer[bufferidx-2]);
-
- // check checksum
- for (i=1; i < (bufferidx-4); i++) {
- sum ^= buffer[i];
- }
- if (sum != 0) {
- //putstring_nl("Cxsum mismatch");
- Serial.print('~', BYTE);
- bufferidx = 0;
- return;
- }
- // got good data!
-
- if (strstr(buffer, "GPRMC")) {
- // find out if we got a fix
- char *p = buffer;
- p = strchr(p, ',')+1;
- p = strchr(p, ',')+1; // skip to 3rd item
-
- if (p[0] == 'V') {
- digitalWrite(led1Pin, LOW);
- fix = 0;
- } else {
- digitalWrite(led1Pin, HIGH);
- fix = 1;
- }
- }
- if (LOG_RMC_FIXONLY) {
- if (!fix) {
- Serial.print('_', BYTE);
- bufferidx = 0;
- return;
- }
- }
- // rad. lets log it!
- Serial.print(buffer);
- Serial.print('#', BYTE);
- digitalWrite(led2Pin, HIGH); // sets the digital pin as output
-
- // Bill Greiman - need to write bufferidx + 1 bytes to getCR/LF
- bufferidx++;
-
- if(f.write((uint8_t *) buffer, bufferidx) != bufferidx) {
- putstring_nl("can't write!");
- error(4);
- }
-
- digitalWrite(led2Pin, LOW);
-
- bufferidx = 0;
-
- // turn off GPS module?
- if (TURNOFFGPS) {
- digitalWrite(powerPin, HIGH);
- }
-
- sleep_sec(SLEEPDELAY);
- digitalWrite(powerPin, LOW);
- return;
- }
- bufferidx++;
- if (bufferidx == BUFFSIZE-1) {
- Serial.print('!', BYTE);
- bufferidx = 0;
- }
- } else {
-
- }
-
-}
-
-void sleep_sec(uint8_t x) {
- while (x--) {
- // set the WDT to wake us up!
- WDTCSR |= (1 << WDCE) | (1 << WDE); // enable watchdog & enable changing it
- WDTCSR = (1<< WDE) | (1 <<WDP2) | (1 << WDP1);
- WDTCSR |= (1<< WDIE);
- set_sleep_mode(SLEEP_MODE_PWR_DOWN);
- sleep_enable();
- sleep_mode();
- sleep_disable();
- }
-}
-
-SIGNAL(WDT_vect) {
- WDTCSR |= (1 << WDCE) | (1 << WDE);
- WDTCSR = 0;
-}
-
-/* End code */
diff --git a/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatGPS_CSVSensorLogger/.svn/all-wcprops b/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatGPS_CSVSensorLogger/.svn/all-wcprops deleted file mode 100644 index b0802da..0000000 --- a/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatGPS_CSVSensorLogger/.svn/all-wcprops +++ /dev/null @@ -1,11 +0,0 @@ -K 25 -svn:wc:ra_dav:version-url -V 86 -/svn/!svn/ver/6/trunk/maple-sdfat/examples/Arduino%20Examples/SdFatGPS_CSVSensorLogger -END -SdFatGPS_CSVSensorLogger.pde -K 25 -svn:wc:ra_dav:version-url -V 115 -/svn/!svn/ver/6/trunk/maple-sdfat/examples/Arduino%20Examples/SdFatGPS_CSVSensorLogger/SdFatGPS_CSVSensorLogger.pde -END diff --git a/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatGPS_CSVSensorLogger/.svn/entries b/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatGPS_CSVSensorLogger/.svn/entries deleted file mode 100644 index 38affb7..0000000 --- a/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatGPS_CSVSensorLogger/.svn/entries +++ /dev/null @@ -1,62 +0,0 @@ -10 - -dir -8 -https://maple-sdfat.googlecode.com/svn/trunk/maple-sdfat/examples/Arduino%20Examples/SdFatGPS_CSVSensorLogger -https://maple-sdfat.googlecode.com/svn - - - -2011-05-14T18:03:04.855990Z -2 -Jason.Vreeland@gmail.com - - - - - - - - - - - - - - -1c6c76e6-65e3-e54d-cebe-539f9b1c8f54 - -SdFatGPS_CSVSensorLogger.pde -file - - - - -2012-07-19T00:13:14.000000Z -58377c8a2f30a6ef1ae3f6ffa3c542c2 -2011-05-14T18:03:04.855990Z -2 -Jason.Vreeland@gmail.com - - - - - - - - - - - - - - - - - - - - - -10659 - diff --git a/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatGPS_CSVSensorLogger/.svn/text-base/SdFatGPS_CSVSensorLogger.pde.svn-base b/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatGPS_CSVSensorLogger/.svn/text-base/SdFatGPS_CSVSensorLogger.pde.svn-base deleted file mode 100644 index 6c585a5..0000000 --- a/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatGPS_CSVSensorLogger/.svn/text-base/SdFatGPS_CSVSensorLogger.pde.svn-base +++ /dev/null @@ -1,387 +0,0 @@ -// Ladyada's logger modified by Bill Greiman to use the SdFat library
-// this is a generic logger that does checksum testing so the data written should be always good
-// Assumes a sirf III chipset logger attached to pin 0 and 1
-
-uint8_t sensorCount = 3; //number of analog pins to log
-
-#include <SdFat.h>
-#include <SdFatUtil.h>
-#include <avr/pgmspace.h>
-
-#define isdigit(x) ( x >= '0' && x <= '9')
-
-//extern uint16_t _end;
-
-Sd2Card card;
-SdVolume volume;
-SdFile root;
-SdFile f;
-
-#define led1Pin 4 // LED1 connected to digital pin 4
-#define led2Pin 3 // LED2 connected to digital pin 3
-#define powerpin 2 // GPS power control
-
-// set the RX_BUFFER_SIZE to 32!
-#define BUFFSIZE 73 // we buffer one NMEA sentence at a time, 83 bytes is longer than the max length
-char buffer[BUFFSIZE]; // this is the double buffer
-char buffer2[12];
-
-uint8_t bufferidx = 0;
-uint32_t tmp;
-#define LOG_RMC 1 // essential location data
-#define RMC_ON "$PSRF103,4,0,1,1*21\r\n" // the command we send to turn RMC on (1 hz rate)
-#define RMC_OFF "$PSRF103,4,0,0,1*20\r\n" // the command we send to turn RMC off
-
-#define LOG_GGA 0 // contains fix, hdop & vdop data
-#define GGA_ON "$PSRF103,0,0,1,1*25\r\n" // the command we send to turn GGA on (1 hz rate)
-#define GGA_OFF "$PSRF103,0,0,0,1*24\r\n" // the command we send to turn GGA off
-
-#define LOG_GSA 0 // satellite data
-#define GSA_ON "$PSRF103,2,0,1,1*27\r\n" // the command we send to turn GSA on (1 hz rate)
-#define GSA_OFF "$PSRF103,2,0,0,1*26\r\n" // the command we send to turn GSA off
-
-#define LOG_GSV 0 // detailed satellite data
-#define GSV_ON "$PSRF103,3,0,1,1*26\r\n" // the command we send to turn GSV on (1 hz rate)
-#define GSV_OFF "$PSRF103,3,0,0,1*27\r\n" // the command we send to turn GSV off
-
-#define LOG_GLL 0 // Loran-compatibility data
-// this isnt output by default
-
-#define USE_WAAS 1 // useful in US, but slower fix
-#define WAAS_ON "$PSRF151,1*3F\r\n" // the command for turning on WAAS
-#define WAAS_OFF "$PSRF151,0*3E\r\n" // the command for turning off WAAS
-
-#define LOG_RMC_FIXONLY 1 // log only when we get RMC's with fix?
-uint8_t fix = 0; // current fix data
-
-// macros to use PSTR
-#define putstring(str) SerialPrint_P(PSTR(str))
-#define putstring_nl(str) SerialPrintln_P(PSTR(str))
-
-// read a Hex value and return the decimal equivalent
-uint8_t parseHex(char c) {
- if (c < '0')
- return 0;
- if (c <= '9')
- return c - '0';
- if (c < 'A')
- return 0;
- if (c <= 'F')
- return (c - 'A')+10;
-}
-
-uint8_t i;
-
-// blink out an error code
-void error(uint8_t errno) {
- if (card.errorCode()) {
- putstring("SD error: ");
- Serial.print(card.errorCode(), HEX);
- Serial.print(',');
- Serial.println(card.errorData(), HEX);
- }
- while(1) {
- for (i=0; i<errno; i++) {
- digitalWrite(led1Pin, HIGH);
- digitalWrite(led2Pin, HIGH);
- delay(100);
- digitalWrite(led1Pin, LOW);
- digitalWrite(led2Pin, LOW);
- delay(100);
- }
- for (; i<10; i++) {
- delay(200);
- }
- }
-}
-
-void setup() { // run once, when the sketch starts
- Serial.begin(4800);
- putstring_nl("GPSlogger");
- pinMode(led1Pin, OUTPUT); // sets the digital pin as output
- pinMode(led2Pin, OUTPUT); // sets the digital pin as output
- pinMode(powerpin, OUTPUT);
- digitalWrite(powerpin, LOW);
-
- // initialize the SD card at SPI_HALF_SPEED to avoid bus errors with
- // breadboards. use SPI_FULL_SPEED for better performance.
- if (!card.init(SPI_HALF_SPEED)) {
- putstring_nl("Card init. failed!");
- error(1);
- }
- if (!volume.init(&card)) {
- putstring_nl("No partition!");
- error(2);
- }
- if (!root.openRoot(&volume)) {
- putstring_nl("Can't open root dir");
- error(3);
- }
- strcpy(buffer, "GPSLOG00.CSV");
- for (i = 0; i < 100; i++) {
- buffer[6] = '0' + i/10;
- buffer[7] = '0' + i%10;
- if (f.open(&root, buffer, O_CREAT | O_EXCL | O_WRITE)) break;
- }
-
- if(!f.isOpen()) {
- putstring("couldnt create "); Serial.println(buffer);
- error(3);
- }
- putstring("writing to "); Serial.println(buffer);
- putstring_nl("ready!");
-
- // write header
- if (sensorCount > 6) sensorCount = 6;
- strncpy_P(buffer, PSTR("time,lat,long,speed,date,sens0,sens1,sens2,sens3,sens4,sens5"), 24 + 6*sensorCount);
- Serial.println(buffer);
- // clear print error
- f.writeError = 0;
- f.println(buffer);
- if (f.writeError || !f.sync()) {
- putstring_nl("can't write header!");
- error(5);
- }
-
- delay(1000);
-
- putstring("\r\n");
-#if USE_WAAS == 1
- putstring(WAAS_ON); // turn on WAAS
-#else
- putstring(WAAS_OFF); // turn on WAAS
-#endif
-
-#if LOG_RMC == 1
- putstring(RMC_ON); // turn on RMC
-#else
- putstring(RMC_OFF); // turn off RMC
-#endif
-
-#if LOG_GSV == 1
- putstring(GSV_ON); // turn on GSV
-#else
- putstring(GSV_OFF); // turn off GSV
-#endif
-
-#if LOG_GSA == 1
- putstring(GSA_ON); // turn on GSA
-#else
- putstring(GSA_OFF); // turn off GSA
-#endif
-
-#if LOG_GGA == 1
- putstring(GGA_ON); // turn on GGA
-#else
- putstring(GGA_OFF); // turn off GGA
-#endif
-}
-
-void loop() { // run over and over again
-
- //Serial.println(Serial.available(), DEC);
- char c;
- uint8_t sum;
-
- // read one 'line'
- if (Serial.available()) {
- c = Serial.read();
- //Serial.print(c, BYTE);
- if (bufferidx == 0) {
- while (c != '$')
- c = Serial.read(); // wait till we get a $
- }
- buffer[bufferidx] = c;
-
- //Serial.print(c, BYTE);
- if (c == '\n') {
- //putstring_nl("EOL");
- //Serial.print(buffer);
- buffer[bufferidx+1] = 0; // terminate it
-
- if (buffer[bufferidx-4] != '*') {
- // no checksum?
- Serial.print('*', BYTE);
- bufferidx = 0;
- return;
- }
- // get checksum
- sum = parseHex(buffer[bufferidx-3]) * 16;
- sum += parseHex(buffer[bufferidx-2]);
-
- // check checksum
- for (i=1; i < (bufferidx-4); i++) {
- sum ^= buffer[i];
- }
- if (sum != 0) {
- //putstring_nl("Cxsum mismatch");
- Serial.print('~', BYTE);
- bufferidx = 0;
- return;
- }
- // got good data!
-
- if (strstr(buffer, "GPRMC")) {
- // find out if we got a fix
- char *p = buffer;
- p = strchr(p, ',')+1;
- p = strchr(p, ',')+1; // skip to 3rd item
-
- if (p[0] == 'V') {
- digitalWrite(led1Pin, LOW);
- fix = 0;
- } else {
- digitalWrite(led1Pin, HIGH);
- fix = 1;
- }
- } else {
- // not GPRMC
- bufferidx = 0;
- return;
- }
-#if LOG_RMC_FIXONLY
- if (!fix) {
- Serial.print('_', BYTE);
- bufferidx = 0;
- return;
- }
-#endif
- // rad. lets print it!
-
- Serial.print(buffer);
-
- // time to clean up the string
- // find time
- char *p = buffer;
- p = strchr(p, ',')+1;
- buffer[0] = p[0];
- buffer[1] = p[1];
- buffer[2] = ':';
- buffer[3] = p[2];
- buffer[4] = p[3];
- buffer[5] = ':';
- buffer[6] = p[4];
- buffer[7] = p[5];
- // we ignore milliseconds
- buffer[8] = ',';
-
- p = strchr(buffer+8, ',')+1;
- // skip past 'active' flag
- p = strchr(p, ',')+1;
- // find lat
- p = strchr(p, ',')+1;
-
- buffer[9] = '+';
- buffer[10] = p[0];
- buffer[11] = p[1];
- buffer[12] = ' ';
- strncpy(buffer+13, p+2, 7);
- buffer[20] = ',';
-
- p = strchr(buffer+21, ',')+1;
- if (p[0] == 'S')
- buffer[9] = '-';
-
- // find long
- p = strchr(p, ',')+1;
- buffer[21] = '+';
- buffer[22] = p[0];
- buffer[23] = p[1];
- buffer[24] = p[2];
- buffer[25] = ' ';
- strncpy(buffer+26, p+3, 7);
- buffer[33] = ',';
-
- p = strchr(buffer+34, ',')+1;
- if (p[0] == 'W')
- buffer[21] = '-';
-
- // find speed
- p = strchr(p, ',')+1;
- tmp = 0;
- if (p[0] != ',') {
- // ok there is some sort of speed
- while (p[0] != '.' && p[0] != ',') {
- tmp *= 10;
- tmp += p[0] - '0';
- p++;
- }
- tmp *= 10;
- if (isdigit(p[1]))
- tmp += p[1] - '0'; // tenths
- tmp *= 10;
- if (isdigit(p[2]))
- tmp += p[2] - '0'; // hundredths
-
- // tmp is knots * 100
- // convert to mph (1.15 mph = 1 knot)
- tmp *= 115;
- // -OR- convert km/h
- // tmp *= 185
- }
- tmp /= 100;
-
- buffer[34] = (tmp / 10000) + '0';
- tmp %= 10000;
- buffer[35] = (tmp / 1000) + '0';
- tmp %= 1000;
- buffer[36] = (tmp / 100) + '0';
- tmp %= 100;
- buffer[37] = '.';
- buffer[38] = (tmp / 10) + '0';
- tmp %= 10;
- buffer[39] = tmp + '0';
-
- buffer[40] = ',';
- p = strchr(p, ',')+1;
- // skip past bearing
- p = strchr(p, ',')+1;
- //mod for bug when speed,bearing are missing (bill greiman)
- uint8_t date[6];
- for (uint8_t id = 0; id < 6; id++) date[id] = p[id];
- // get date into 2001-01-31 style
- buffer[41] = '2';
- buffer[42] = '0';
- buffer[43] = date[4];
- buffer[44] = date[5];
- buffer[45] = '-';
- buffer[46] = date[2];
- buffer[47] = date[3];
- buffer[48] = '-';
- buffer[49] = date[0];
- buffer[50] = date[1];
- buffer[51] = 0;
- digitalWrite(led2Pin, HIGH);
- if(f.write((uint8_t *) buffer, 51) != 51) {
- putstring_nl("can't write fix!");
- return;
- }
- Serial.print(buffer);
- // clear print error
- f.writeError = 0;
- // add sensor data
- for (uint8_t ia = 0; ia < sensorCount; ia++) {
- Serial.print(',');
- f.print(',');
- uint16_t data = analogRead(ia);
- Serial.print(data);
- f.print(data);
- }
- Serial.println();
- f.println();
- if (f.writeError || !f.sync()) {
- putstring_nl("can't write data!");
- error(4);
- }
- digitalWrite(led2Pin, LOW);
- bufferidx = 0;
- return;
- }
- bufferidx++;
- if (bufferidx == BUFFSIZE-1) {
- Serial.print('!', BYTE);
- bufferidx = 0;
- }
- }
-}
-
diff --git a/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatInfo/.svn/all-wcprops b/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatInfo/.svn/all-wcprops deleted file mode 100644 index e94f6a2..0000000 --- a/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatInfo/.svn/all-wcprops +++ /dev/null @@ -1,11 +0,0 @@ -K 25 -svn:wc:ra_dav:version-url -V 71 -/svn/!svn/ver/6/trunk/maple-sdfat/examples/Arduino%20Examples/SdFatInfo -END -SdFatInfo.pde -K 25 -svn:wc:ra_dav:version-url -V 85 -/svn/!svn/ver/6/trunk/maple-sdfat/examples/Arduino%20Examples/SdFatInfo/SdFatInfo.pde -END diff --git a/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatInfo/.svn/entries b/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatInfo/.svn/entries deleted file mode 100644 index 3dcc043..0000000 --- a/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatInfo/.svn/entries +++ /dev/null @@ -1,62 +0,0 @@ -10 - -dir -8 -https://maple-sdfat.googlecode.com/svn/trunk/maple-sdfat/examples/Arduino%20Examples/SdFatInfo -https://maple-sdfat.googlecode.com/svn - - - -2011-05-14T18:03:04.855990Z -2 -Jason.Vreeland@gmail.com - - - - - - - - - - - - - - -1c6c76e6-65e3-e54d-cebe-539f9b1c8f54 - -SdFatInfo.pde -file - - - - -2012-07-19T00:13:14.000000Z -8ec1611ae8477dcee1a1ce9b5ba05c1d -2011-05-14T18:03:04.855990Z -2 -Jason.Vreeland@gmail.com - - - - - - - - - - - - - - - - - - - - - -4598 - diff --git a/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatInfo/.svn/text-base/SdFatInfo.pde.svn-base b/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatInfo/.svn/text-base/SdFatInfo.pde.svn-base deleted file mode 100644 index a48280f..0000000 --- a/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatInfo/.svn/text-base/SdFatInfo.pde.svn-base +++ /dev/null @@ -1,180 +0,0 @@ -/*
- * This sketch attempts to initialize a SD card and analyze its structure.
- */
-#include <SdFat.h>
-#include <SdFatUtil.h>
-
-// offset to partition table
-#define PART_OFFSET (512-64-2)
-
-Sd2Card card;
-SdVolume vol;
-
-//global for card erase sector size
-uint32_t sectorSize;
-
-void sdError(void) {
- PgmPrintln("SD error");
- PgmPrint("errorCode: ");
- Serial.println(card.errorCode(), HEX);
- PgmPrint("errorData: ");
- Serial.println(card.errorData(), HEX);
- return;
-}
-
-uint8_t cidDmp(void) {
- cid_t cid;
- if (!card.readCID(&cid)) {
- PgmPrint("readCID failed");
- sdError();
- return false;
- }
- PgmPrint("\nManufacturer ID: ");
- Serial.println(cid.mid, HEX);
- PgmPrint("OEM ID: ");
- Serial.print(cid.oid[0]);
- Serial.println(cid.oid[1]);
- PgmPrint("Product: ");
- for (uint8_t i = 0; i < 5; i++) {
- Serial.print(cid.pnm[i]);
- }
- PgmPrint("\nVersion: ");
- Serial.print(cid.prv_n, DEC);
- Serial.print('.');
- Serial.println(cid.prv_m, DEC);
- PgmPrint("Serial number: ");
- Serial.println(cid.psn);
- PgmPrint("Manufacturing date: ");
- Serial.print(cid.mdt_month);
- Serial.print('/');
- Serial.println(2000 + cid.mdt_year_low + (cid.mdt_year_high <<4));
- Serial.println();
- return true;
-}
-
-uint8_t csdDmp(void) {
- csd_t csd;
- uint8_t eraseSingleBlock;
- uint32_t cardSize = card.cardSize();
- if (cardSize == 0 || !card.readCSD(&csd)) {
- PgmPrintln("readCSD failed");
- sdError();
- return false;
- }
- if (csd.v1.csd_ver == 0) {
- eraseSingleBlock = csd.v1.erase_blk_en;
- sectorSize = (csd.v1.sector_size_high << 1) | csd.v1.sector_size_low;
- }
- else if (csd.v2.csd_ver == 1) {
- eraseSingleBlock = csd.v2.erase_blk_en;
- sectorSize = (csd.v2.sector_size_high << 1) | csd.v2.sector_size_low;
- }
- else {
- PgmPrintln("csd version error");
- return false;
- }
- sectorSize++;
- PgmPrint("cardSize: ");
- Serial.print(cardSize);
- PgmPrintln(" (512 byte blocks)");
- PgmPrint("flashEraseSize: ");
- Serial.print(sectorSize, DEC);
- PgmPrintln(" blocks");
- PgmPrint("eraseSingleBlock: ");
- if (eraseSingleBlock) {
- PgmPrintln("true");
- }
- else {
- PgmPrintln("false");
- }
- return true;
-}
-// print partition table
-uint8_t partDmp(void) {
- part_t pt;
- PgmPrintln("\npart,boot,type,start,length");
- for (uint8_t ip = 1; ip < 5; ip++) {
- if (!card.readData(0, PART_OFFSET + 16*(ip-1), 16, (uint8_t *)&pt)) {
- PgmPrint("read partition table failed");
- sdError();
- return false;
- }
- Serial.print(ip, DEC);
- Serial.print(',');
- Serial.print(pt.boot,HEX);
- Serial.print(',');
- Serial.print(pt.type, HEX);
- Serial.print(',');
- Serial.print(pt.firstSector);
- Serial.print(',');
- Serial.println(pt.totalSectors);
- }
- return true;
-}
-
-void volDmp(void) {
- PgmPrint("\nVolume is FAT");
- Serial.println(vol.fatType(), DEC);
- PgmPrint("blocksPerCluster: ");
- Serial.println(vol.blocksPerCluster(), DEC);
- PgmPrint("clusterCount: ");
- Serial.println(vol.clusterCount());
- PgmPrint("fatStartBlock: ");
- Serial.println(vol.fatStartBlock());
- PgmPrint("fatCount: ");
- Serial.println(vol.fatCount(), DEC);
- PgmPrint("blocksPerFat: ");
- Serial.println(vol.blocksPerFat());
- PgmPrint("rootDirStart: ");
- Serial.println(vol.rootDirStart());
- PgmPrint("dataStartBlock: ");
- Serial.println(vol.dataStartBlock());
- if (vol.dataStartBlock()%sectorSize) {
- PgmPrintln("Data area is not aligned on flash erase boundaries!");
- }
-}
-
-void setup() {
- Serial.begin(9600);
-}
-
-void loop() {
- PgmPrintln("\ntype any character to start");
- while (!Serial.available());
- Serial.flush();
- uint32_t t = millis();
- // initialize the SD card at SPI_HALF_SPEED to avoid bus errors with
- // breadboards. use SPI_FULL_SPEED for better performance.
- uint8_t r = card.init(SPI_HALF_SPEED);
- t = millis() - t;
- if (!r) {
- PgmPrintln("\ncard.init failed");
- sdError();
- return;
- }
- PgmPrint("\ninit time: ");
- Serial.println(t);
- PgmPrint("\nCard type: ");
- switch(card.type()) {
- case SD_CARD_TYPE_SD1:
- PgmPrintln("SD1");
- break;
- case SD_CARD_TYPE_SD2:
- PgmPrintln("SD2");
- break;
- case SD_CARD_TYPE_SDHC:
- PgmPrintln("SDHC");
- break;
- default:
- PgmPrintln("Unknown");
- }
- if(!cidDmp()) return;
- if(!csdDmp()) return;
- if(!partDmp()) return;
- if (!vol.init(&card)) {
- PgmPrintln("\nvol.init failed");
- sdError();
- return;
- }
- volDmp();
-}
diff --git a/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatLs/.svn/all-wcprops b/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatLs/.svn/all-wcprops deleted file mode 100644 index 586072d..0000000 --- a/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatLs/.svn/all-wcprops +++ /dev/null @@ -1,11 +0,0 @@ -K 25 -svn:wc:ra_dav:version-url -V 69 -/svn/!svn/ver/6/trunk/maple-sdfat/examples/Arduino%20Examples/SdFatLs -END -SdFatLs.pde -K 25 -svn:wc:ra_dav:version-url -V 81 -/svn/!svn/ver/6/trunk/maple-sdfat/examples/Arduino%20Examples/SdFatLs/SdFatLs.pde -END diff --git a/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatLs/.svn/entries b/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatLs/.svn/entries deleted file mode 100644 index 4e6edf8..0000000 --- a/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatLs/.svn/entries +++ /dev/null @@ -1,62 +0,0 @@ -10 - -dir -8 -https://maple-sdfat.googlecode.com/svn/trunk/maple-sdfat/examples/Arduino%20Examples/SdFatLs -https://maple-sdfat.googlecode.com/svn - - - -2011-05-14T18:03:04.855990Z -2 -Jason.Vreeland@gmail.com - - - - - - - - - - - - - - -1c6c76e6-65e3-e54d-cebe-539f9b1c8f54 - -SdFatLs.pde -file - - - - -2012-07-19T00:13:14.000000Z -0563761625b16099f556df81c7d340f6 -2011-05-14T18:03:04.855990Z -2 -Jason.Vreeland@gmail.com - - - - - - - - - - - - - - - - - - - - - -1528 - diff --git a/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatLs/.svn/text-base/SdFatLs.pde.svn-base b/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatLs/.svn/text-base/SdFatLs.pde.svn-base deleted file mode 100644 index dc14234..0000000 --- a/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatLs/.svn/text-base/SdFatLs.pde.svn-base +++ /dev/null @@ -1,63 +0,0 @@ -/*
- * This sketch will list all files in the root directory and
- * then do a recursive list of all directories on the SD card.
- *
- */
-
-#include <SdFat.h>
-#include <SdFatUtil.h>
-
-Sd2Card card;
-SdVolume volume;
-SdFile root;
-
-// store error strings in flash to save RAM
-#define error(s) error_P(PSTR(s))
-
-void error_P(const char* str) {
- PgmPrint("error: ");
- SerialPrintln_P(str);
- if (card.errorCode()) {
- PgmPrint("SD error: ");
- Serial.print(card.errorCode(), HEX);
- Serial.print(',');
- Serial.println(card.errorData(), HEX);
- }
- while(1);
-}
-
-void setup() {
- Serial.begin(9600);
- PgmPrintln("Type any character to start");
- while (!Serial.available());
-
- PgmPrint("Free RAM: ");
- Serial.println(FreeRam());
-
- // initialize the SD card at SPI_HALF_SPEED to avoid bus errors with
- // breadboards. use SPI_FULL_SPEED for better performance.
- if (!card.init(SPI_HALF_SPEED)) error("card.init failed!");
-
- // initialize a FAT volume
- if (!volume.init(&card)) error("vol.init failed!");
-
- PgmPrint("Volume is FAT");
- Serial.println(volume.fatType(),DEC);
- Serial.println();
-
- if (!root.openRoot(&volume)) error("openRoot failed");
-
- // list file in root with date and size
- PgmPrintln("Files found in root:");
- root.ls(LS_DATE | LS_SIZE);
- Serial.println();
-
- // Recursive list of all directories
- PgmPrintln("Files found in all dirs:");
- root.ls(LS_R);
-
- Serial.println();
- PgmPrintln("Done");
-}
-
-void loop() { }
diff --git a/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatMakeDir/.svn/all-wcprops b/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatMakeDir/.svn/all-wcprops deleted file mode 100644 index c831721..0000000 --- a/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatMakeDir/.svn/all-wcprops +++ /dev/null @@ -1,11 +0,0 @@ -K 25 -svn:wc:ra_dav:version-url -V 74 -/svn/!svn/ver/6/trunk/maple-sdfat/examples/Arduino%20Examples/SdFatMakeDir -END -SdFatMakeDir.pde -K 25 -svn:wc:ra_dav:version-url -V 91 -/svn/!svn/ver/6/trunk/maple-sdfat/examples/Arduino%20Examples/SdFatMakeDir/SdFatMakeDir.pde -END diff --git a/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatMakeDir/.svn/entries b/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatMakeDir/.svn/entries deleted file mode 100644 index 44a2556..0000000 --- a/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatMakeDir/.svn/entries +++ /dev/null @@ -1,62 +0,0 @@ -10 - -dir -8 -https://maple-sdfat.googlecode.com/svn/trunk/maple-sdfat/examples/Arduino%20Examples/SdFatMakeDir -https://maple-sdfat.googlecode.com/svn - - - -2011-05-14T18:03:04.855990Z -2 -Jason.Vreeland@gmail.com - - - - - - - - - - - - - - -1c6c76e6-65e3-e54d-cebe-539f9b1c8f54 - -SdFatMakeDir.pde -file - - - - -2012-07-19T00:13:14.000000Z -b19cc4fd4334c615f3bedd465c6d1d79 -2011-05-14T18:03:04.855990Z -2 -Jason.Vreeland@gmail.com - - - - - - - - - - - - - - - - - - - - - -3875 - diff --git a/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatMakeDir/.svn/text-base/SdFatMakeDir.pde.svn-base b/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatMakeDir/.svn/text-base/SdFatMakeDir.pde.svn-base deleted file mode 100644 index a6c4cfe..0000000 --- a/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatMakeDir/.svn/text-base/SdFatMakeDir.pde.svn-base +++ /dev/null @@ -1,150 +0,0 @@ -/*
- * This sketch is a test of subdirectory and file creation.
- * It also tests allocation of clusters to directories.
- *
- * It will create two subdirectories and create enough files
- * to force the allocation of a cluster to each directory.
- *
- * More than 3000 files may be created on a FAT32 volume.
- *
- * Note: Some cards may 'stutter' others just get slow due
- * to the number of flash erases this program causes.
- */
-#include <SdFat.h>
-#include <SdFatUtil.h>
-
-Sd2Card card;
-SdVolume volume;
-SdFile root;
-
-// store error strings in flash to save RAM
-#define error(s) error_P(PSTR(s))
-
-void error_P(const char* str) {
- PgmPrint("error: ");
- SerialPrintln_P(str);
- if (card.errorCode()) {
- PgmPrint("SD error: ");
- Serial.print(card.errorCode(), HEX);
- Serial.print(',');
- Serial.println(card.errorData(), HEX);
- }
- while(1);
-}
-/*
- * create enough files to force a cluster to be allocated to dir.
- */
-void dirAllocTest(SdFile &dir) {
- char buf[13], name[13];
- SdFile file;
- uint16_t n;
- uint32_t size = dir.fileSize();
-
- // create files and write name to file
- for (n = 0; ; n++){
- // make file name
- sprintf(name, "%u.TXT", n);
-
- // open start time
- uint32_t t0 = millis();
- if (!file.open(&dir, name, O_WRITE | O_CREAT | O_EXCL)) {
- error("open for write failed");
- }
-
- // open end time and write start time
- uint32_t t1 = millis();
- // write file name to file
- file.print(name);
- if (!file.close()) error("close write");
-
- // write end time
- uint32_t t2 = millis();
- PgmPrint("WR ");
- Serial.print(n);
- Serial.print(' ');
-
- // print time to create file
- Serial.print(t1 - t0);
- Serial.print(' ');
-
- // print time to write file
- Serial.println(t2 - t1);
-
- // directory size will change when a cluster is added
- if (dir.fileSize() != size) break;
- }
-
- // read files and check content
- for (uint16_t i = 0; i <= n; i++) {
- sprintf(name, "%u.TXT", i);
-
- // open start time
- uint32_t t0 = millis();
- if (!file.open(&dir, name, O_READ)) {
- error("open for read failed");
- }
-
- // open end time and read start time
- uint32_t t1 = millis();
- int16_t nr = file.read(buf, 13);
- if (nr < 5) error("file.read failed");
-
- // read end time
- uint32_t t2 = millis();
-
- // check file content
- if (strlen(name) != nr || strncmp(name, buf, nr)) {
- error("content compare failed");
- }
- if (!file.close()) error("close read failed");
-
- PgmPrint("RD ");
- Serial.print(i);
- Serial.print(' ');
-
- // print open time
- Serial.print(t1 - t0);
- Serial.print(' ');
-
- // print read time
- Serial.println(t2 - t1);
- }
-}
-
-void setup() {
- Serial.begin(9600);
- PgmPrintln("Type any character to start");
- while (!Serial.available());
-
- // initialize the SD card at SPI_FULL_SPEED for best performance.
- // try SPI_HALF_SPEED if bus errors occur.
- if (!card.init(SPI_FULL_SPEED)) error("card.init failed");
-
- // initialize a FAT volume
- if (!volume.init(&card)) error("volume.init failed");
-
- // open the root directory
- if (!root.openRoot(&volume)) error("openRoot failed");
-
- // write files to root if FAT32
- if (volume.fatType() == 32) {
- PgmPrintln("Writing files to root");
- dirAllocTest(root);
- }
-
- // create sub1 and write files
- SdFile sub1;
- if (!sub1.makeDir(&root, "SUB1")) error("makdeDir SUB1 failed");
- PgmPrintln("Writing files to SUB1");
- dirAllocTest(sub1);
-
- // create sub2 and write files
- SdFile sub2;
- if (!sub2.makeDir(&sub1, "SUB2")) error("makeDir SUB2 failed");
- PgmPrintln("Writing files to SUB2");
- dirAllocTest(sub2);
-
- PgmPrintln("Done");
-}
-
-void loop() { }
diff --git a/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatPrint/.svn/all-wcprops b/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatPrint/.svn/all-wcprops deleted file mode 100644 index c535b4d..0000000 --- a/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatPrint/.svn/all-wcprops +++ /dev/null @@ -1,11 +0,0 @@ -K 25 -svn:wc:ra_dav:version-url -V 72 -/svn/!svn/ver/6/trunk/maple-sdfat/examples/Arduino%20Examples/SdFatPrint -END -SdFatPrint.pde -K 25 -svn:wc:ra_dav:version-url -V 87 -/svn/!svn/ver/6/trunk/maple-sdfat/examples/Arduino%20Examples/SdFatPrint/SdFatPrint.pde -END diff --git a/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatPrint/.svn/entries b/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatPrint/.svn/entries deleted file mode 100644 index 55f13b2..0000000 --- a/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatPrint/.svn/entries +++ /dev/null @@ -1,62 +0,0 @@ -10 - -dir -8 -https://maple-sdfat.googlecode.com/svn/trunk/maple-sdfat/examples/Arduino%20Examples/SdFatPrint -https://maple-sdfat.googlecode.com/svn - - - -2011-05-14T18:03:04.855990Z -2 -Jason.Vreeland@gmail.com - - - - - - - - - - - - - - -1c6c76e6-65e3-e54d-cebe-539f9b1c8f54 - -SdFatPrint.pde -file - - - - -2012-07-19T00:13:14.000000Z -bbd68875dd1aa0d781018de851d44411 -2011-05-14T18:03:04.855990Z -2 -Jason.Vreeland@gmail.com - - - - - - - - - - - - - - - - - - - - - -1903 - diff --git a/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatPrint/.svn/text-base/SdFatPrint.pde.svn-base b/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatPrint/.svn/text-base/SdFatPrint.pde.svn-base deleted file mode 100644 index e01c49c..0000000 --- a/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatPrint/.svn/text-base/SdFatPrint.pde.svn-base +++ /dev/null @@ -1,71 +0,0 @@ -/*
- * Print Example
- *
- * This sketch shows how to use the Arduino Print class with SdFat.
- */
-#include <SdFat.h>
-#include <SdFatUtil.h> // use functions to print strings from flash memory
-
-Sd2Card card;
-SdVolume volume;
-SdFile root;
-SdFile file;
-
-// store error strings in flash to save RAM
-#define error(s) error_P(PSTR(s))
-
-void error_P(const char* str) {
- PgmPrint("error: ");
- SerialPrintln_P(str);
- if (card.errorCode()) {
- PgmPrint("SD error: ");
- Serial.print(card.errorCode(), HEX);
- Serial.print(',');
- Serial.println(card.errorData(), HEX);
- }
- while(1);
-}
-
-void setup(void) {
- Serial.begin(9600);
- Serial.println();
- PgmPrintln("Type any character to start");
- while (!Serial.available());
-
- // initialize the SD card at SPI_HALF_SPEED to avoid bus errors with
- // breadboards. use SPI_FULL_SPEED for better performance.
- if (!card.init(SPI_HALF_SPEED)) error("card.init failed");
-
- // initialize a FAT volume
- if (!volume.init(&card)) error("volume.init failed");
-
- // open the root directory
- if (!root.openRoot(&volume)) error("openRoot failed");
-
- // create a new file
- char name[] = "PRINT00.TXT";
- for (uint8_t i = 0; i < 100; i++) {
- name[5] = i/10 + '0';
- name[6] = i%10 + '0';
- // only create new file for write
- if (file.open(&root, name, O_CREAT | O_EXCL | O_WRITE)) break;
- }
- if (!file.isOpen()) error ("file.create");
- PgmPrintln("Printing to: ");
- Serial.println(name);
-
- // clear print error
- file.writeError = 0;
-
- // print 100 line to file
- for (uint8_t i = 0; i < 100; i++) {
- file.print("line ");
- file.print(i, DEC);
- file.print(" millis = ");
- file.println(millis());
- }
- // force write of all data to the SD card
- if (file.writeError || !file.sync()) error ("print or sync");
- PgmPrintln("Done");
-}
-void loop(void){}
diff --git a/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatRawWrite/.svn/all-wcprops b/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatRawWrite/.svn/all-wcprops deleted file mode 100644 index 5506554..0000000 --- a/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatRawWrite/.svn/all-wcprops +++ /dev/null @@ -1,11 +0,0 @@ -K 25 -svn:wc:ra_dav:version-url -V 75 -/svn/!svn/ver/6/trunk/maple-sdfat/examples/Arduino%20Examples/SdFatRawWrite -END -SdFatRawWrite.pde -K 25 -svn:wc:ra_dav:version-url -V 93 -/svn/!svn/ver/6/trunk/maple-sdfat/examples/Arduino%20Examples/SdFatRawWrite/SdFatRawWrite.pde -END diff --git a/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatRawWrite/.svn/entries b/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatRawWrite/.svn/entries deleted file mode 100644 index 19e2dcb..0000000 --- a/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatRawWrite/.svn/entries +++ /dev/null @@ -1,62 +0,0 @@ -10 - -dir -8 -https://maple-sdfat.googlecode.com/svn/trunk/maple-sdfat/examples/Arduino%20Examples/SdFatRawWrite -https://maple-sdfat.googlecode.com/svn - - - -2011-05-14T18:03:04.855990Z -2 -Jason.Vreeland@gmail.com - - - - - - - - - - - - - - -1c6c76e6-65e3-e54d-cebe-539f9b1c8f54 - -SdFatRawWrite.pde -file - - - - -2012-07-19T00:13:14.000000Z -f2f8c1f5e6c6f060a01bc94557dc273c -2011-05-14T18:03:04.855990Z -2 -Jason.Vreeland@gmail.com - - - - - - - - - - - - - - - - - - - - - -5198 - diff --git a/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatRawWrite/.svn/text-base/SdFatRawWrite.pde.svn-base b/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatRawWrite/.svn/text-base/SdFatRawWrite.pde.svn-base deleted file mode 100644 index f2db00e..0000000 --- a/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatRawWrite/.svn/text-base/SdFatRawWrite.pde.svn-base +++ /dev/null @@ -1,186 +0,0 @@ -/*
- * This sketch illustrates raw write functions in SdFat that
- * can be used for high speed data logging. These functions
- * are used in the WaveRP library to record audio with the
- * Adafruit Wave Shield using the built-in Arduino ADC.
- *
- * The WaveRP library captures data from the ADC in an ISR
- * that is driven driven by timer one. Data is collected in
- * two 512 byte buffers and written to the SD card.
- *
- * This sketch simulates logging from a source that produces
- * data at a constant rate of one block every MILLIS_PER_BLOCK.
- *
- * If a high quality SanDisk card is used with this sketch
- * no overruns occur and the maximum block write time is
- * 2 millis.
- *
- * Note: WaveRP creates a very large file then truncates it
- * to the length that is used for a recording. It only takes
- * a few seconds to erase a 500 MB file since the card only
- * marks the blocks as erased; no data transfer is required.
- */
-
-#include <SdFat.h>
-#include <SdFatUtil.h>
-
-// number of blocks in the contiguous file
-#define BLOCK_COUNT 10000UL
-
-// time to produce a block of data
-#define MILLIS_PER_BLOCK 10
-
-Sd2Card card;
-SdVolume volume;
-SdFile root;
-SdFile file;
-
-uint32_t bgnBlock, endBlock;
-
-// store error strings in flash to save RAM
-#define error(s) error_P(PSTR(s))
-
-void error_P(const char* str) {
- PgmPrint("error: ");
- SerialPrintln_P(str);
- if (card.errorCode()) {
- PgmPrint("SD error: ");
- Serial.print(card.errorCode(), HEX);
- Serial.print(',');
- Serial.println(card.errorData(), HEX);
- }
- while(1);
-}
-
-void setup(void) {
- Serial.begin(9600);
-}
-
-void loop(void) {
- Serial.flush();
- PgmPrintln("Type any character to start");
- while (!Serial.available());
-
- // initialize the SD card
- uint32_t t = millis();
-
- // initialize the SD card at SPI_FULL_SPEED for best performance.
- // try SPI_HALF_SPEED if bus errors occur.
- if (!card.init(SPI_FULL_SPEED)) error("card.init failed");
-
- t = millis() - t;
-
- PgmPrint("Card init time: ");
- Serial.print(t);
- PgmPrintln(" millis");
-
- // initialize a FAT volume
- if (!volume.init(&card)) error("volume.init failed");
-
- // open the root directory
- if (!root.openRoot(&volume)) error("openRoot failed");
-
- // delete possible existing file
- SdFile::remove(&root, "RAW.TXT");
-
- // create a contiguous file
- if (!file.createContiguous(&root, "RAW.TXT", 512UL*BLOCK_COUNT)) {
- error("createContiguous failed");
- }
- // get the location of the file's blocks
- if (!file.contiguousRange(&bgnBlock, &endBlock)) {
- error("contiguousRange failed");
- }
- //*********************NOTE**************************************
- // NO SdFile calls are allowed while cache is used for raw writes
- //***************************************************************
-
- // clear the cache and use it as a 512 byte buffer
- uint8_t* pCache = volume.cacheClear();
-
- // fill cache with eight lines of 64 bytes each
- memset(pCache, ' ', 512);
- for (uint16_t i = 0; i < 512; i += 64) {
- // put line number at end of line then CR/LF
- pCache[i + 61] = '0' + (i/64);
- pCache[i + 62] = '\r';
- pCache[i + 63] = '\n';
- }
-
- PgmPrint("Start raw write of ");
- Serial.print(file.fileSize());
- PgmPrintln(" bytes at");
-
- Serial.print(512000UL/MILLIS_PER_BLOCK);
- PgmPrintln(" bytes per second");
-
- PgmPrint("Please wait ");
- Serial.print((BLOCK_COUNT*MILLIS_PER_BLOCK)/1000UL);
- PgmPrintln(" seconds");
-
- // tell card to setup for multiple block write with pre-erase
- if (!card.erase(bgnBlock, endBlock)) error("card.erase failed");
- if (!card.writeStart(bgnBlock, BLOCK_COUNT)) {
- error("writeStart failed");
- }
- // init stats
- uint16_t overruns = 0;
- uint16_t maxWriteTime = 0;
- t = millis();
- uint32_t tNext = t;
-
- // write data
- for (uint32_t b = 0; b < BLOCK_COUNT; b++) {
- // write must be done by this time
- tNext += MILLIS_PER_BLOCK;
-
- // put block number at start of first line in block
- uint32_t n = b;
- for (int8_t d = 5; d >= 0; d--){
- pCache[d] = n || d == 5 ? n % 10 + '0' : ' ';
- n /= 10;
- }
- // write a 512 byte block
- uint32_t tw = micros();
- if (!card.writeData(pCache)) error("writeData failed");
- tw = micros() - tw;
-
- // check for max write time
- if (tw > maxWriteTime) {
- maxWriteTime = tw;
- }
- // check for overrun
- if (millis() > tNext) {
- overruns++;
- // advance time to reflect overrun
- tNext = millis();
- }
- else {
- // wait for time to write next block
- while(millis() < tNext);
- }
- }
- // total write time
- t = millis() - t;
-
- // end multiple block write mode
- if (!card.writeStop()) error("writeStop failed");
-
- PgmPrintln("Done");
-
- PgmPrint("Overruns: ");
- Serial.println(overruns);
-
- PgmPrint("Elapsed time: ");
- Serial.print(t);
- PgmPrintln(" millis");
-
- PgmPrint("Max write time: ");
- Serial.print(maxWriteTime);
- PgmPrintln(" micros");
-
- // close files for next pass of loop
- root.close();
- file.close();
- Serial.println();
-}
diff --git a/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatRead/.svn/all-wcprops b/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatRead/.svn/all-wcprops deleted file mode 100644 index 6e51625..0000000 --- a/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatRead/.svn/all-wcprops +++ /dev/null @@ -1,11 +0,0 @@ -K 25 -svn:wc:ra_dav:version-url -V 71 -/svn/!svn/ver/6/trunk/maple-sdfat/examples/Arduino%20Examples/SdFatRead -END -SdFatRead.c -K 25 -svn:wc:ra_dav:version-url -V 83 -/svn/!svn/ver/6/trunk/maple-sdfat/examples/Arduino%20Examples/SdFatRead/SdFatRead.c -END diff --git a/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatRead/.svn/entries b/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatRead/.svn/entries deleted file mode 100644 index 0490e17..0000000 --- a/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatRead/.svn/entries +++ /dev/null @@ -1,62 +0,0 @@ -10 - -dir -8 -https://maple-sdfat.googlecode.com/svn/trunk/maple-sdfat/examples/Arduino%20Examples/SdFatRead -https://maple-sdfat.googlecode.com/svn - - - -2011-05-14T18:03:04.855990Z -2 -Jason.Vreeland@gmail.com - - - - - - - - - - - - - - -1c6c76e6-65e3-e54d-cebe-539f9b1c8f54 - -SdFatRead.c -file - - - - -2012-07-19T00:13:14.000000Z -24f52ada63cbe8db7e6b3b4d8c5419c3 -2011-05-14T18:03:04.855990Z -2 -Jason.Vreeland@gmail.com - - - - - - - - - - - - - - - - - - - - - -1823 - diff --git a/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatRead/.svn/text-base/SdFatRead.c.svn-base b/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatRead/.svn/text-base/SdFatRead.c.svn-base deleted file mode 100644 index 81d325b..0000000 --- a/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatRead/.svn/text-base/SdFatRead.c.svn-base +++ /dev/null @@ -1,71 +0,0 @@ -/*
- * This sketch reads and prints the file
- * PRINT00.TXT created by SdFatPrint.pde or
- * WRITE00.TXT created by SdFatWrite.pde
- */
-#include <SdFat.h>
-#include <SdFatUtil.h>
-
-Sd2Card card;
-SdVolume volume;
-SdFile root;
-SdFile file;
-
-// store error strings in flash to save RAM
-#define error(s) error_P(PSTR(s))
-
-void error_P(const char* str) {
- PgmPrint("error: ");
- SerialPrintln_P(str);
- if (card.errorCode()) {
- PgmPrint("SD error: ");
- Serial.print(card.errorCode(), HEX);
- Serial.print(',');
- Serial.println(card.errorData(), HEX);
- }
- while(1);
-}
-
-void setup(void) {
- Serial.begin(9600);
- Serial.println();
- Serial.println("type any character to start");
- while (!Serial.available());
- Serial.println();
-
- // initialize the SD card at SPI_HALF_SPEED to avoid bus errors with
- // breadboards. use SPI_FULL_SPEED for better performance.
- if (!card.init(SPI_HALF_SPEED)) error("card.init failed");
-
- // initialize a FAT volume
- if (!volume.init(&card)) error("volume.init failed");
-
- // open the root directory
- if (!root.openRoot(&volume)) error("openRoot failed");
-
- // open a file
- if (file.open(&root, "PRINT00.TXT", O_READ)) {
- Serial.println("Opened PRINT00.TXT");
- }
- else if (file.open(&root, "WRITE00.TXT", O_READ)) {
- Serial.println("Opened WRITE00.TXT");
- }
- else{
- error("file.open failed");
- }
- Serial.println();
-
- // copy file to serial port
- int16_t n;
- uint8_t buf[7];// nothing special about 7, just a lucky number.
- while ((n = file.read(buf, sizeof(buf))) > 0) {
- for (uint8_t i = 0; i < n; i++) Serial.print(buf[i]);
- }
- /* easier way
- int16_t c;
- while ((c = file.read()) > 0) Serial.print((char)c);
- */
- Serial.println("\nDone");
-}
-
-void loop(void) {}
diff --git a/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatRemove/.svn/all-wcprops b/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatRemove/.svn/all-wcprops deleted file mode 100644 index 9c872d3..0000000 --- a/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatRemove/.svn/all-wcprops +++ /dev/null @@ -1,11 +0,0 @@ -K 25 -svn:wc:ra_dav:version-url -V 73 -/svn/!svn/ver/6/trunk/maple-sdfat/examples/Arduino%20Examples/SdFatRemove -END -SdFatRemove.pde -K 25 -svn:wc:ra_dav:version-url -V 89 -/svn/!svn/ver/6/trunk/maple-sdfat/examples/Arduino%20Examples/SdFatRemove/SdFatRemove.pde -END diff --git a/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatRemove/.svn/entries b/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatRemove/.svn/entries deleted file mode 100644 index 9af6fbc..0000000 --- a/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatRemove/.svn/entries +++ /dev/null @@ -1,62 +0,0 @@ -10 - -dir -8 -https://maple-sdfat.googlecode.com/svn/trunk/maple-sdfat/examples/Arduino%20Examples/SdFatRemove -https://maple-sdfat.googlecode.com/svn - - - -2011-05-14T18:03:04.855990Z -2 -Jason.Vreeland@gmail.com - - - - - - - - - - - - - - -1c6c76e6-65e3-e54d-cebe-539f9b1c8f54 - -SdFatRemove.pde -file - - - - -2012-07-19T00:13:14.000000Z -9f37511621353aff60564022bda2bf1c -2011-05-14T18:03:04.855990Z -2 -Jason.Vreeland@gmail.com - - - - - - - - - - - - - - - - - - - - - -1539 - diff --git a/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatRemove/.svn/text-base/SdFatRemove.pde.svn-base b/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatRemove/.svn/text-base/SdFatRemove.pde.svn-base deleted file mode 100644 index 88183e6..0000000 --- a/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatRemove/.svn/text-base/SdFatRemove.pde.svn-base +++ /dev/null @@ -1,58 +0,0 @@ -/*
- * Remove Example
- *
- * This sketch shows how to use remove() to delete
- * the file created by the SdFatAppend.pde example.
- */
-#include <SdFat.h>
-#include <SdFatUtil.h> // use functions to print strings from flash memory
-
-Sd2Card card;
-SdVolume volume;
-SdFile root;
-SdFile file;
-
-// store error strings in flash to save RAM
-#define error(s) error_P(PSTR(s))
-
-void error_P(const char* str) {
- PgmPrint("error: ");
- SerialPrintln_P(str);
- if (card.errorCode()) {
- PgmPrint("SD error: ");
- Serial.print(card.errorCode(), HEX);
- Serial.print(',');
- Serial.println(card.errorData(), HEX);
- }
- while(1);
-}
-
-void setup(void) {
- Serial.begin(9600);
- Serial.println();
- PgmPrintln("Type any character to start");
- while (!Serial.available());
-
- // initialize the SD card at SPI_HALF_SPEED to avoid bus errors with
- // breadboards. use SPI_FULL_SPEED for better performance.
- if (!card.init(SPI_HALF_SPEED)) error("card.init failed");
-
- // initialize a FAT volume
- if (!volume.init(&card)) error("volume.init failed");
-
- // open the root directory
- if (!root.openRoot(&volume)) error("openRoot failed");
-
- char name[] = "APPEND.TXT";
- if (!file.open(&root, name, O_WRITE)) {
- PgmPrint("Can't open ");
- Serial.println(name);
- PgmPrintln("Run the append example to create the file.");
- error("file.open failed");
- }
- if (!file.remove()) error("file.remove failed");
- Serial.print(name);
- PgmPrintln(" deleted.");
-}
-
-void loop(void) {}
diff --git a/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatRewrite/.svn/all-wcprops b/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatRewrite/.svn/all-wcprops deleted file mode 100644 index aaea35f..0000000 --- a/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatRewrite/.svn/all-wcprops +++ /dev/null @@ -1,11 +0,0 @@ -K 25 -svn:wc:ra_dav:version-url -V 74 -/svn/!svn/ver/6/trunk/maple-sdfat/examples/Arduino%20Examples/SdFatRewrite -END -SdFatRewrite.pde -K 25 -svn:wc:ra_dav:version-url -V 91 -/svn/!svn/ver/6/trunk/maple-sdfat/examples/Arduino%20Examples/SdFatRewrite/SdFatRewrite.pde -END diff --git a/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatRewrite/.svn/entries b/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatRewrite/.svn/entries deleted file mode 100644 index 5d99f96..0000000 --- a/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatRewrite/.svn/entries +++ /dev/null @@ -1,62 +0,0 @@ -10 - -dir -8 -https://maple-sdfat.googlecode.com/svn/trunk/maple-sdfat/examples/Arduino%20Examples/SdFatRewrite -https://maple-sdfat.googlecode.com/svn - - - -2011-05-14T18:03:04.855990Z -2 -Jason.Vreeland@gmail.com - - - - - - - - - - - - - - -1c6c76e6-65e3-e54d-cebe-539f9b1c8f54 - -SdFatRewrite.pde -file - - - - -2012-07-19T00:13:14.000000Z -4000a395cbc06372fc8a24c1dbd9b85d -2011-05-14T18:03:04.855990Z -2 -Jason.Vreeland@gmail.com - - - - - - - - - - - - - - - - - - - - - -2099 - diff --git a/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatRewrite/.svn/text-base/SdFatRewrite.pde.svn-base b/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatRewrite/.svn/text-base/SdFatRewrite.pde.svn-base deleted file mode 100644 index 19b836c..0000000 --- a/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatRewrite/.svn/text-base/SdFatRewrite.pde.svn-base +++ /dev/null @@ -1,72 +0,0 @@ -/*
- * Rewrite Example
- *
- * This sketch shows how to rewrite part of a line in the middle
- * of the file created by the SdFatAppend.pde example.
- *
- * Check around line 30 of pass 50 of APPEND.TXT after running this sketch.
- */
-#include <SdFat.h>
-#include <SdFatUtil.h> // use functions to print strings from flash memory
-
-Sd2Card card;
-SdVolume volume;
-SdFile root;
-SdFile file;
-
-// store error strings in flash to save RAM
-#define error(s) error_P(PSTR(s))
-
-void error_P(const char* str) {
- PgmPrint("error: ");
- SerialPrintln_P(str);
- if (card.errorCode()) {
- PgmPrint("SD error: ");
- Serial.print(card.errorCode(), HEX);
- Serial.print(',');
- Serial.println(card.errorData(), HEX);
- }
- while(1);
-}
-
-void setup(void) {
- Serial.begin(9600);
- Serial.println();
- PgmPrintln("Type any character to start");
- while (!Serial.available());
-
- // initialize the SD card at SPI_HALF_SPEED to avoid bus errors with
- // breadboards. use SPI_FULL_SPEED for better performance.
- if (!card.init(SPI_HALF_SPEED)) error("card.init failed");
-
- // initialize a FAT volume
- if (!volume.init(&card)) error("volume.init failed");
-
- // open the root directory
- if (!root.openRoot(&volume)) error("openRoot failed");
-
- char name[] = "APPEND.TXT";
- // open for read and write
- if (!file.open(&root, name, O_RDWR)) {
- PgmPrint("Can't open ");
- Serial.println(name);
- PgmPrintln("Run the append example to create the file.");
- error("file.open failed");
- }
- // seek to middle of file
- if (!file.seekSet(file.fileSize()/2)) error("file.seekSet failed");
- // find end of line
- int16_t c;
- while ((c = file.read()) > 0 && c != '\n');
- if (c < 0) error("file.read failed");
- // clear write error flag
- file.writeError = false;
- // rewrite the begining of the line at the current position
- file.write("**rewrite**");
- if (file.writeError) error("file.write failed");
- if (!file.close()) error("file.close failed");
- Serial.print(name);
- PgmPrintln(" rewrite done.");
-}
-
-void loop(void) {}
diff --git a/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatRmDir/.svn/all-wcprops b/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatRmDir/.svn/all-wcprops deleted file mode 100644 index ce46ed1..0000000 --- a/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatRmDir/.svn/all-wcprops +++ /dev/null @@ -1,11 +0,0 @@ -K 25 -svn:wc:ra_dav:version-url -V 72 -/svn/!svn/ver/6/trunk/maple-sdfat/examples/Arduino%20Examples/SdFatRmDir -END -SdFatRmDir.pde -K 25 -svn:wc:ra_dav:version-url -V 87 -/svn/!svn/ver/6/trunk/maple-sdfat/examples/Arduino%20Examples/SdFatRmDir/SdFatRmDir.pde -END diff --git a/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatRmDir/.svn/entries b/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatRmDir/.svn/entries deleted file mode 100644 index 08c6fe1..0000000 --- a/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatRmDir/.svn/entries +++ /dev/null @@ -1,62 +0,0 @@ -10 - -dir -8 -https://maple-sdfat.googlecode.com/svn/trunk/maple-sdfat/examples/Arduino%20Examples/SdFatRmDir -https://maple-sdfat.googlecode.com/svn - - - -2011-05-14T18:03:04.855990Z -2 -Jason.Vreeland@gmail.com - - - - - - - - - - - - - - -1c6c76e6-65e3-e54d-cebe-539f9b1c8f54 - -SdFatRmDir.pde -file - - - - -2012-07-19T00:13:14.000000Z -797add7988ebf82ee9df2600356aedb9 -2011-05-14T18:03:04.855990Z -2 -Jason.Vreeland@gmail.com - - - - - - - - - - - - - - - - - - - - - -2711 - diff --git a/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatRmDir/.svn/text-base/SdFatRmDir.pde.svn-base b/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatRmDir/.svn/text-base/SdFatRmDir.pde.svn-base deleted file mode 100644 index db88a41..0000000 --- a/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatRmDir/.svn/text-base/SdFatRmDir.pde.svn-base +++ /dev/null @@ -1,111 +0,0 @@ -/*
- * This sketch will remove the files and directories
- * created by the SdFatMakeDir.pde sketch.
- *
- * Performance is erratic due to the large number
- * of flash erase operations caused by many random
- * writes to file structures.
- */
-#include <SdFat.h>
-#include <SdFatUtil.h>
-
-Sd2Card card;
-SdVolume volume;
-SdFile root;
-
-// store error strings in flash to save RAM
-#define error(s) error_P(PSTR(s))
-
-void error_P(const char* str) {
- PgmPrint("error: ");
- SerialPrintln_P(str);
- if (card.errorCode()) {
- PgmPrint("SD error: ");
- Serial.print(card.errorCode(), HEX);
- Serial.print(',');
- Serial.println(card.errorData(), HEX);
- }
- while(1);
-}
-/*
- * remove all files in dir.
- */
-void deleteFiles(SdFile &dir) {
- char name[13];
- SdFile file;
-
- // open and delete files
- for (uint16_t n = 0; ; n++){
- sprintf(name, "%u.TXT", n);
-
- // open start time
- uint32_t t0 = millis();
-
- // assume done if open fails
- if (!file.open(&dir, name, O_WRITE)) return;
-
- // open end time and remove start time
- uint32_t t1 = millis();
- if (!file.remove()) error("file.remove failed");
-
- // remove end time
- uint32_t t2 = millis();
-
- PgmPrint("RM ");
- Serial.print(n);
- Serial.print(' ');
-
- // open time
- Serial.print(t1 - t0);
- Serial.print(' ');
-
- // remove time
- Serial.println(t2 - t1);
- }
-}
-
-void setup() {
- Serial.begin(9600);
- PgmPrintln("Type any character to start");
- while (!Serial.available());
-
- // initialize the SD card at SPI_FULL_SPEED for best performance.
- // try SPI_HALF_SPEED if bus errors occur.
- if (!card.init(SPI_FULL_SPEED)) error("card.init failed");
-
- // initialize a FAT volume
- if (!volume.init(&card)) error("volume.init failed");
-
- // open the root directory
- if (!root.openRoot(&volume)) error("openRoot failed");
-
- // delete files in root if FAT32
- if (volume.fatType() == 32) {
- PgmPrintln("Remove files in root");
- deleteFiles(root);
- }
-
- // open SUB1 and delete files
- SdFile sub1;
- if (!sub1.open(&root, "SUB1", O_READ)) error("open SUB1 failed");
- PgmPrintln("Remove files in SUB1");
- deleteFiles(sub1);
-
- // open SUB2 and delete files
- SdFile sub2;
- if (!sub2.open(&sub1, "SUB2", O_READ)) error("open SUB2 failed");
- PgmPrintln("Remove files in SUB2");
- deleteFiles(sub2);
-
- // remove SUB2
- if (!sub2.rmDir()) error("sub2.rmDir failed");
- PgmPrintln("SUB2 removed");
-
- // remove SUB1
- if (!sub1.rmDir()) error("sub1.rmDir failed");
- PgmPrintln("SUB1 removed");
-
- PgmPrintln("Done");
-}
-
-void loop() { }
diff --git a/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatTail/.svn/all-wcprops b/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatTail/.svn/all-wcprops deleted file mode 100644 index ef620e7..0000000 --- a/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatTail/.svn/all-wcprops +++ /dev/null @@ -1,11 +0,0 @@ -K 25 -svn:wc:ra_dav:version-url -V 71 -/svn/!svn/ver/6/trunk/maple-sdfat/examples/Arduino%20Examples/SdFatTail -END -SdFatTail.pde -K 25 -svn:wc:ra_dav:version-url -V 85 -/svn/!svn/ver/6/trunk/maple-sdfat/examples/Arduino%20Examples/SdFatTail/SdFatTail.pde -END diff --git a/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatTail/.svn/entries b/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatTail/.svn/entries deleted file mode 100644 index 9187e01..0000000 --- a/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatTail/.svn/entries +++ /dev/null @@ -1,62 +0,0 @@ -10 - -dir -8 -https://maple-sdfat.googlecode.com/svn/trunk/maple-sdfat/examples/Arduino%20Examples/SdFatTail -https://maple-sdfat.googlecode.com/svn - - - -2011-05-14T18:03:04.855990Z -2 -Jason.Vreeland@gmail.com - - - - - - - - - - - - - - -1c6c76e6-65e3-e54d-cebe-539f9b1c8f54 - -SdFatTail.pde -file - - - - -2012-07-19T00:13:14.000000Z -e4334a77b244256b11afb86d5cdec294 -2011-05-14T18:03:04.855990Z -2 -Jason.Vreeland@gmail.com - - - - - - - - - - - - - - - - - - - - - -2547 - diff --git a/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatTail/.svn/text-base/SdFatTail.pde.svn-base b/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatTail/.svn/text-base/SdFatTail.pde.svn-base deleted file mode 100644 index 95b84f5..0000000 --- a/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatTail/.svn/text-base/SdFatTail.pde.svn-base +++ /dev/null @@ -1,98 +0,0 @@ -/*
- * This sketch reads and prints the tail of all files
- * created by SdFatAppend.pde, SdFatPrint.pde, and
- * SdFatWrite.pde.
- */
-#include <SdFat.h>
-#include <SdFatUtil.h>
-
-Sd2Card card;
-SdVolume volume;
-SdFile root;
-SdFile file;
-
-// store error strings in flash to save RAM
-#define error(s) error_P(PSTR(s))
-
-void error_P(const char* str) {
- PgmPrint("error: ");
- SerialPrintln_P(str);
- if (card.errorCode()) {
- PgmPrint("SD error: ");
- Serial.print(card.errorCode(), HEX);
- Serial.print(',');
- Serial.println(card.errorData(), HEX);
- }
- while(1);
-}
-
-void setup(void) {
- Serial.begin(9600);
- Serial.println();
- Serial.println("type any character to start");
- while (!Serial.available());
- Serial.println();
-
- // initialize the SD card at SPI_HALF_SPEED to avoid bus errors with
- // breadboards. use SPI_FULL_SPEED for better performance.
- if (!card.init(SPI_HALF_SPEED)) error("card.init failed");
-
- // initialize a FAT volume
- if (!volume.init(&card)) error("volume.init failed");
-
- // open the root directory
- if (!root.openRoot(&volume)) error("openRoot failed");
-}
-
-/*
- * Print tail of all SdFat example files
- */
-void loop(void) {
- dir_t dir;
- char name[13];
-
- // read next directory entry
- if (root.readDir(&dir) != sizeof(dir)) {
- Serial.println("End of Directory");
- while(1);
- }
-
- // check for file name "APPEND.TXT", "PRINT*.TXT"
- // or "WRITE*.TXT"
- // first 8 bytes are blank filled name
- // last three bytes are blank filled extension
- if ((strncmp((char *)dir.name, "APPEND ", 8) &&
- strncmp((char *)dir.name, "PRINT", 5) &&
- strncmp((char *)dir.name, "WRITE", 5)) ||
- strncmp((char *)&dir.name[8], "TXT", 3)) {
- return;
- }
- // format file name
- SdFile::dirName(dir, name);
-
- // remember position in root dir
- uint32_t pos = root.curPosition();
-
- // open file
- if (!file.open(&root, name, O_READ)) error("file.open failed");
-
- // restore root position
- if (!root.seekSet(pos)) error("root.seekSet failed");
-
- // print file name message
- Serial.print("Tail of: ");
- Serial.println(name);
-
- // position to tail of file
- if (file.fileSize() > 100) {
- if (!file.seekSet(file.fileSize() - 100)) error("file.seekSet failed");
- }
- int16_t c;
- // find end of line
- while ((c = file.read()) > 0 && c != '\n');
-
- // print rest of file
- while ((c = file.read()) > 0) Serial.print((char)c);
- file.close();
- Serial.println();
-}
diff --git a/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatTimestamp/.svn/all-wcprops b/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatTimestamp/.svn/all-wcprops deleted file mode 100644 index e8950b5..0000000 --- a/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatTimestamp/.svn/all-wcprops +++ /dev/null @@ -1,11 +0,0 @@ -K 25 -svn:wc:ra_dav:version-url -V 76 -/svn/!svn/ver/6/trunk/maple-sdfat/examples/Arduino%20Examples/SdFatTimestamp -END -SdFatTimestamp.pde -K 25 -svn:wc:ra_dav:version-url -V 95 -/svn/!svn/ver/6/trunk/maple-sdfat/examples/Arduino%20Examples/SdFatTimestamp/SdFatTimestamp.pde -END diff --git a/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatTimestamp/.svn/entries b/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatTimestamp/.svn/entries deleted file mode 100644 index 73335e1..0000000 --- a/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatTimestamp/.svn/entries +++ /dev/null @@ -1,62 +0,0 @@ -10 - -dir -8 -https://maple-sdfat.googlecode.com/svn/trunk/maple-sdfat/examples/Arduino%20Examples/SdFatTimestamp -https://maple-sdfat.googlecode.com/svn - - - -2011-05-14T18:03:04.855990Z -2 -Jason.Vreeland@gmail.com - - - - - - - - - - - - - - -1c6c76e6-65e3-e54d-cebe-539f9b1c8f54 - -SdFatTimestamp.pde -file - - - - -2012-07-19T00:13:14.000000Z -b66dc28f9c12e60c834b53cd4b0ea0c3 -2011-05-14T18:03:04.855990Z -2 -Jason.Vreeland@gmail.com - - - - - - - - - - - - - - - - - - - - - -4682 - diff --git a/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatTimestamp/.svn/text-base/SdFatTimestamp.pde.svn-base b/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatTimestamp/.svn/text-base/SdFatTimestamp.pde.svn-base deleted file mode 100644 index 869bf25..0000000 --- a/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatTimestamp/.svn/text-base/SdFatTimestamp.pde.svn-base +++ /dev/null @@ -1,182 +0,0 @@ -/*
- * This sketch tests the dateTimeCallback() function
- * and the timestamp() function.
- */
-#include <SdFat.h>
-#include <SdFatUtil.h> // use PgmPrint
-/*
- * date/time values for debug
- * normally supplied by a real-time clock or GPS
- */
-// date 2009-10-01 1-Oct-09
-uint16_t year = 2009;
-uint8_t month = 10;
-uint8_t day = 1;
-
-// time 20:30:40
-uint8_t hour = 20;
-uint8_t minute = 30;
-uint8_t second = 40;
-/*
- * User provided date time callback function.
- * See SdFile::dateTimeCallback() for usage.
- */
-void dateTime(uint16_t* date, uint16_t* time) {
- // User gets date and time from GPS or real-time
- // clock in real callback function
-
- // return date using FAT_DATE macro to format fields
- *date = FAT_DATE(year, month, day);
-
- // return time using FAT_TIME macro to format fields
- *time = FAT_TIME(hour, minute, second);
-}
-
-Sd2Card card;
-SdVolume volume;
-SdFile root;
-SdFile file;
-
-// store error strings in flash to save RAM
-#define error(s) error_P(PSTR(s))
-
-void error_P(const char* str) {
- PgmPrint("error: ");
- SerialPrintln_P(str);
- if (card.errorCode()) {
- PgmPrint("SD error: ");
- Serial.print(card.errorCode(), HEX);
- Serial.print(',');
- Serial.println(card.errorData(), HEX);
- }
- while(1);
-}
-/*
- * Function to print all timestamps.
- */
-void printTimestamps(SdFile& f) {
- dir_t d;
- if (!f.dirEntry(&d)) error("f.dirEntry failed");
-
- PgmPrint("Creation: ");
- f.printFatDate(d.creationDate);
- Serial.print(' ');
- f.printFatTime(d.creationTime);
- Serial.println();
-
- PgmPrint("Modify: ");
- f.printFatDate(d.lastWriteDate);
- Serial.print(' ');
- f.printFatTime(d.lastWriteTime);
- Serial.println();
-
- PgmPrint("Access: ");
- f.printFatDate(d.lastAccessDate);
- Serial.println();
-}
-
-void setup(void) {
- Serial.begin(9600);
- Serial.println();
- PgmPrintln("Type any character to start");
- while (!Serial.available());
-
- // initialize the SD card at SPI_HALF_SPEED to avoid bus errors with
- // breadboards. use SPI_FULL_SPEED for better performance.
- if (!card.init(SPI_HALF_SPEED)) error("card.init failed");
-
- // initialize a FAT volume
- if (!volume.init(&card)) error("volume.init failed");
-
- // open the root directory
- if (!root.openRoot(&volume)) error("openRoot failed");
-
- // remove files if they exist
- SdFile::remove(&root, "CALLBACK.TXT");
- SdFile::remove(&root, "DEFAULT.TXT");
- SdFile::remove(&root, "STAMP.TXT");
-
- // create a new file with default timestamps
- if (!file.open(&root, "DEFAULT.TXT", O_CREAT | O_WRITE)) {
- error("open DEFAULT.TXT failed");
- }
- Serial.println();
- PgmPrintln("Open with default times");
- printTimestamps(file);
-
- // close file
- file.close();
- /*
- * Test the date time callback function.
- *
- * dateTimeCallback() sets the function
- * that is called when a file is created
- * or when a file's directory entry is
- * modified by sync().
- *
- * The callback can be disabled by the call
- * SdFile::dateTimeCallbackCancel()
- */
- // set date time callback function
- SdFile::dateTimeCallback(dateTime);
-
- // create a new file with callback timestamps
- if (!file.open(&root, "CALLBACK.TXT", O_CREAT | O_WRITE)) {
- error("open CALLBACK.TXT failed");
- }
- Serial.println();
- PgmPrintln("Open with callback times");
- printTimestamps(file);
-
- // change call back date
- day += 1;
-
- // must add two to see change since FAT second field is 5-bits
- second += 2;
-
- // modify file by writing a byte
- file.write('t');
-
- // force dir update
- file.sync();
-
- Serial.println();
- PgmPrintln("Times after write");
- printTimestamps(file);
-
- // close file
- file.close();
- /*
- * Test timestamp() function
- *
- * Cancel callback so sync will not
- * change access/modify timestamp
- */
- SdFile::dateTimeCallbackCancel();
-
- // create a new file with default timestamps
- if (!file.open(&root, "STAMP.TXT", O_CREAT | O_WRITE)) {
- error("open STAMP.TXT failed");
- }
- // set creation date time
- if (!file.timestamp(T_CREATE, 2009, 11, 10, 1, 2, 3)) {
- error("set create time failed");
- }
- // set write/modification date time
- if (!file.timestamp(T_WRITE, 2009, 11, 11, 4, 5, 6)) {
- error("set write time failed");
- }
- // set access date
- if (!file.timestamp(T_ACCESS, 2009, 11, 12, 7, 8, 9)) {
- error("set access time failed");
- }
- Serial.println();
- PgmPrintln("Times after timestamp() calls");
- printTimestamps(file);
-
- file.close();
- Serial.println();
- PgmPrintln("Done");
-}
-
-void loop(void){}
diff --git a/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatTruncate/.svn/all-wcprops b/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatTruncate/.svn/all-wcprops deleted file mode 100644 index ba297eb..0000000 --- a/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatTruncate/.svn/all-wcprops +++ /dev/null @@ -1,11 +0,0 @@ -K 25 -svn:wc:ra_dav:version-url -V 75 -/svn/!svn/ver/6/trunk/maple-sdfat/examples/Arduino%20Examples/SdFatTruncate -END -SdFatTruncate.pde -K 25 -svn:wc:ra_dav:version-url -V 93 -/svn/!svn/ver/6/trunk/maple-sdfat/examples/Arduino%20Examples/SdFatTruncate/SdFatTruncate.pde -END diff --git a/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatTruncate/.svn/entries b/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatTruncate/.svn/entries deleted file mode 100644 index a313af6..0000000 --- a/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatTruncate/.svn/entries +++ /dev/null @@ -1,62 +0,0 @@ -10 - -dir -8 -https://maple-sdfat.googlecode.com/svn/trunk/maple-sdfat/examples/Arduino%20Examples/SdFatTruncate -https://maple-sdfat.googlecode.com/svn - - - -2011-05-14T18:03:04.855990Z -2 -Jason.Vreeland@gmail.com - - - - - - - - - - - - - - -1c6c76e6-65e3-e54d-cebe-539f9b1c8f54 - -SdFatTruncate.pde -file - - - - -2012-07-19T00:13:14.000000Z -79035cb88bc31fce0eeb17c9161c3cb1 -2011-05-14T18:03:04.855990Z -2 -Jason.Vreeland@gmail.com - - - - - - - - - - - - - - - - - - - - - -1874 - diff --git a/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatTruncate/.svn/text-base/SdFatTruncate.pde.svn-base b/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatTruncate/.svn/text-base/SdFatTruncate.pde.svn-base deleted file mode 100644 index 5faff2c..0000000 --- a/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatTruncate/.svn/text-base/SdFatTruncate.pde.svn-base +++ /dev/null @@ -1,66 +0,0 @@ -/*
- * Truncate Example
- *
- * This sketch shows how to use truncate() to remove the last
- * half of the file created by the SdFatAppend.pde example.
- */
-#include <SdFat.h>
-#include <SdFatUtil.h> // use functions to print strings from flash memory
-
-Sd2Card card;
-SdVolume volume;
-SdFile root;
-SdFile file;
-
-// store error strings in flash to save RAM
-#define error(s) error_P(PSTR(s))
-
-void error_P(const char* str) {
- PgmPrint("error: ");
- SerialPrintln_P(str);
- if (card.errorCode()) {
- PgmPrint("SD error: ");
- Serial.print(card.errorCode(), HEX);
- Serial.print(',');
- Serial.println(card.errorData(), HEX);
- }
- while(1);
-}
-
-void setup(void) {
- Serial.begin(9600);
- Serial.println();
- PgmPrintln("Type any character to start");
- while (!Serial.available());
-
- // initialize the SD card at SPI_HALF_SPEED to avoid bus errors with
- // breadboards. use SPI_FULL_SPEED for better performance.
- if (!card.init(SPI_HALF_SPEED)) error("card.init failed");
-
- // initialize a FAT volume
- if (!volume.init(&card)) error("volume.init failed");
-
- // open the root directory
- if (!root.openRoot(&volume)) error("openRoot failed");
-
- char name[] = "APPEND.TXT";
- // open for read and write
- if (!file.open(&root, name, O_RDWR)) {
- PgmPrint("Can't open ");
- Serial.println(name);
- PgmPrintln("Run the append example to create the file.");
- error("file.open failed");
- }
- // seek to middle of file
- if (!file.seekSet(file.fileSize()/2)) error("file.seekSet failed");
- // find end of line
- int16_t c;
- while ((c = file.read()) > 0 && c != '\n');
- if (c < 0) error("file.read failed");
- // truncate at current position
- if (!file.truncate(file.curPosition())) error("file.truncate failed");
- Serial.print(name);
- PgmPrintln(" truncated.");
-}
-
-void loop(void) {}
diff --git a/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatWrite/.svn/all-wcprops b/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatWrite/.svn/all-wcprops deleted file mode 100644 index 1c3e014..0000000 --- a/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatWrite/.svn/all-wcprops +++ /dev/null @@ -1,11 +0,0 @@ -K 25 -svn:wc:ra_dav:version-url -V 72 -/svn/!svn/ver/6/trunk/maple-sdfat/examples/Arduino%20Examples/SdFatWrite -END -SdFatWrite.pde -K 25 -svn:wc:ra_dav:version-url -V 87 -/svn/!svn/ver/6/trunk/maple-sdfat/examples/Arduino%20Examples/SdFatWrite/SdFatWrite.pde -END diff --git a/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatWrite/.svn/entries b/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatWrite/.svn/entries deleted file mode 100644 index de0eb20..0000000 --- a/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatWrite/.svn/entries +++ /dev/null @@ -1,62 +0,0 @@ -10 - -dir -8 -https://maple-sdfat.googlecode.com/svn/trunk/maple-sdfat/examples/Arduino%20Examples/SdFatWrite -https://maple-sdfat.googlecode.com/svn - - - -2011-05-14T18:03:04.855990Z -2 -Jason.Vreeland@gmail.com - - - - - - - - - - - - - - -1c6c76e6-65e3-e54d-cebe-539f9b1c8f54 - -SdFatWrite.pde -file - - - - -2012-07-19T00:13:14.000000Z -04c63f90c7229a31641e26f28bf51d48 -2011-05-14T18:03:04.855990Z -2 -Jason.Vreeland@gmail.com - - - - - - - - - - - - - - - - - - - - - -2343 - diff --git a/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatWrite/.svn/text-base/SdFatWrite.pde.svn-base b/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatWrite/.svn/text-base/SdFatWrite.pde.svn-base deleted file mode 100644 index 48876db..0000000 --- a/dumblogger/libraries/SDfat/examples/Arduino Examples/SdFatWrite/.svn/text-base/SdFatWrite.pde.svn-base +++ /dev/null @@ -1,98 +0,0 @@ -/*
- * Write Example
- *
- * This sketch creates a new file and writes 100 lines to the file.
- * No error checks on write in this example.
- */
-
-#include <SdFat.h>
-#include <SdFatUtil.h>
-
-Sd2Card card;
-SdVolume volume;
-SdFile root;
-SdFile file;
-
-// store error strings in flash to save RAM
-#define error(s) error_P(PSTR(s))
-
-void error_P(const char* str) {
- PgmPrint("error: ");
- SerialPrintln_P(str);
- if (card.errorCode()) {
- PgmPrint("SD error: ");
- Serial.print(card.errorCode(), HEX);
- Serial.print(',');
- Serial.println(card.errorData(), HEX);
- }
- while(1);
-}
-/*
- * Write CR LF to a file
- */
-void writeCRLF(SdFile& f) {
- f.write((uint8_t*)"\r\n", 2);
-}
-/*
- * Write an unsigned number to a file
- */
-void writeNumber(SdFile& f, uint32_t n) {
- uint8_t buf[10];
- uint8_t i = 0;
- do {
- i++;
- buf[sizeof(buf) - i] = n%10 + '0';
- n /= 10;
- } while (n);
- f.write(&buf[sizeof(buf) - i], i);
-}
-/*
- * Write a string to a file
- */
-void writeString(SdFile& f, char *str) {
- uint8_t n;
- for (n = 0; str[n]; n++);
- f.write((uint8_t *)str, n);
-}
-
-void setup(void) {
- Serial.begin(9600);
- Serial.println();
- Serial.println("Type any character to start");
- while (!Serial.available());
-
- // initialize the SD card at SPI_HALF_SPEED to avoid bus errors with
- // breadboards. use SPI_FULL_SPEED for better performance.
- if (!card.init(SPI_HALF_SPEED)) error("card.init failed");
-
- // initialize a FAT volume
- if (!volume.init(&card)) error("volume.init failed");
-
- // open the root directory
- if (!root.openRoot(&volume)) error("openRoot failed");
-
- // create a new file
- char name[] = "WRITE00.TXT";
- for (uint8_t i = 0; i < 100; i++) {
- name[5] = i/10 + '0';
- name[6] = i%10 + '0';
- if (file.open(&root, name, O_CREAT | O_EXCL | O_WRITE)) break;
- }
- if (!file.isOpen()) error ("file.create");
- Serial.print("Writing to: ");
- Serial.println(name);
-
- // write 100 line to file
- for (uint8_t i = 0; i < 100; i++) {
- writeString(file, "line ");
- writeNumber(file, i);
- writeString(file, " millis = ");
- writeNumber(file, millis());
- writeCRLF(file);
- }
- // close file and force write of all data to the SD card
- file.close();
- Serial.println("Done");
-}
-
-void loop(void) {}
diff --git a/dumblogger/libraries/SDfat/examples/FileSys/.svn/all-wcprops b/dumblogger/libraries/SDfat/examples/FileSys/.svn/all-wcprops deleted file mode 100644 index 27fb288..0000000 --- a/dumblogger/libraries/SDfat/examples/FileSys/.svn/all-wcprops +++ /dev/null @@ -1,11 +0,0 @@ -K 25 -svn:wc:ra_dav:version-url -V 50 -/svn/!svn/ver/8/trunk/maple-sdfat/examples/FileSys -END -FileSys.pde -K 25 -svn:wc:ra_dav:version-url -V 62 -/svn/!svn/ver/8/trunk/maple-sdfat/examples/FileSys/FileSys.pde -END diff --git a/dumblogger/libraries/SDfat/examples/FileSys/.svn/entries b/dumblogger/libraries/SDfat/examples/FileSys/.svn/entries deleted file mode 100644 index 1879a3b..0000000 --- a/dumblogger/libraries/SDfat/examples/FileSys/.svn/entries +++ /dev/null @@ -1,62 +0,0 @@ -10 - -dir -8 -https://maple-sdfat.googlecode.com/svn/trunk/maple-sdfat/examples/FileSys -https://maple-sdfat.googlecode.com/svn - - - -2011-05-15T20:43:48.488246Z -8 -Jason.Vreeland@gmail.com - - - - - - - - - - - - - - -1c6c76e6-65e3-e54d-cebe-539f9b1c8f54 - -FileSys.pde -file - - - - -2012-07-19T00:13:14.000000Z -3b6e1e230aaca1d7d321f2b6d36bc6f0 -2011-05-15T20:43:48.488246Z -8 -Jason.Vreeland@gmail.com - - - - - - - - - - - - - - - - - - - - - -1680 - diff --git a/dumblogger/libraries/SDfat/examples/FileSys/.svn/text-base/FileSys.pde.svn-base b/dumblogger/libraries/SDfat/examples/FileSys/.svn/text-base/FileSys.pde.svn-base deleted file mode 100644 index 40766f8..0000000 --- a/dumblogger/libraries/SDfat/examples/FileSys/.svn/text-base/FileSys.pde.svn-base +++ /dev/null @@ -1,85 +0,0 @@ -/* -#include <FatStructs.h> -#include <Sd2Card.h> -#include <Sd2PinMap.h> -#include <SdFatmainpage.h> -#include <SdFatUtil.h> -#include <SdInfo.h> -*/ - -#include <SdFat.h> -#include <HardwareSPI.h> -#include <stdint.h> - -HardwareSPI spi(1); -Sd2Card card; -SdVolume volume; -SdFile root; -SdFile file; - -void setup() -{ - SerialUSB.begin(); - spi.begin(SPI_281_250KHZ, MSBFIRST, 0); - SerialUSB.println("type any char to start"); - while (!SerialUSB.available()); - SerialUSB.println(); - - if (!card.init(&spi)) - SerialUSB.println("card.init failed"); - else - SerialUSB.println("card.init passed"); -// spi.end(); - -// spi.begin(SPI_9MHZ, MSBFIRST, 0); - spi.begin(SPI_4_5MHZ, MSBFIRST, 0); - - delay(100); - - // initialize a FAT volume - if (!volume.init(&card,1)) - SerialUSB.println("volume.init failed"); - else - SerialUSB.println("volume.init passed"); - - // open the root directory - if (!root.openRoot(&volume)) - SerialUSB.println("openRoot failed"); - else - SerialUSB.println("openRoot passed"); - - // open a file - if (file.open(&root, "Read.txt", O_READ)) - { - SerialUSB.println("Opened Read.txt"); - for(int i=0; i<15; i++) - SerialUSB.print((char)file.read()); - SerialUSB.println(""); - } - else - { - SerialUSB.println("file.open failed"); - } - SerialUSB.println(); - - int16_t n; - uint8_t buf[7];// nothing special about 7, just a lucky number. - while ((n = file.read(buf, sizeof(buf))) > 0) - { - for (uint8_t i = 0; i < n; i++) - SerialUSB.print(buf[i]); - } - /* easier way - int16_t c; - while ((c = file.read()) > 0) Serial.print((char)c); - */ - SerialUSB.println("\nDone"); - spi.end(); - -} - -void loop() -{ -} - -
diff --git a/dumblogger/libraries/SDfat/examples/FileSys/FileSys.pde b/dumblogger/libraries/SDfat/examples/FileSys/FileSys.pde index 40766f8..eba8aa2 100644 --- a/dumblogger/libraries/SDfat/examples/FileSys/FileSys.pde +++ b/dumblogger/libraries/SDfat/examples/FileSys/FileSys.pde @@ -12,74 +12,55 @@ #include <stdint.h> HardwareSPI spi(1); -Sd2Card card; +Sd2Card card(spi, USE_NSS_PIN, true); SdVolume volume; SdFile root; SdFile file; -void setup() -{ +void setup() { SerialUSB.begin(); - spi.begin(SPI_281_250KHZ, MSBFIRST, 0); SerialUSB.println("type any char to start"); while (!SerialUSB.available()); SerialUSB.println(); - if (!card.init(&spi)) + // initialize the SD card + if (!card.init()) SerialUSB.println("card.init failed"); else SerialUSB.println("card.init passed"); -// spi.end(); - -// spi.begin(SPI_9MHZ, MSBFIRST, 0); - spi.begin(SPI_4_5MHZ, MSBFIRST, 0); - + delay(100); - + // initialize a FAT volume - if (!volume.init(&card,1)) + if (!volume.init(&card,1)) SerialUSB.println("volume.init failed"); else SerialUSB.println("volume.init passed"); - + // open the root directory - if (!root.openRoot(&volume)) + if (!root.openRoot(&volume)) SerialUSB.println("openRoot failed"); else SerialUSB.println("openRoot passed"); - + // open a file - if (file.open(&root, "Read.txt", O_READ)) + if (file.open(&root, "Read.txt", O_READ)) { SerialUSB.println("Opened Read.txt"); - for(int i=0; i<15; i++) - SerialUSB.print((char)file.read()); + int16_t c; + while ((c = file.read()) > 0) + SerialUSB.print((char)c); SerialUSB.println(""); } else { SerialUSB.println("file.open failed"); } - SerialUSB.println(); - - int16_t n; - uint8_t buf[7];// nothing special about 7, just a lucky number. - while ((n = file.read(buf, sizeof(buf))) > 0) - { - for (uint8_t i = 0; i < n; i++) - SerialUSB.print(buf[i]); - } - /* easier way - int16_t c; - while ((c = file.read()) > 0) Serial.print((char)c); - */ - SerialUSB.println("\nDone"); - spi.end(); - -} + SerialUSB.println(); -void loop() -{ + SerialUSB.println("Done"); + spi.end(); } -
+void loop() { +}
\ No newline at end of file diff --git a/dumblogger/utilities/ConsoleApp.py b/dumblogger/utilities/ConsoleApp.py index 2bfdbc7..14a62b2 100644 --- a/dumblogger/utilities/ConsoleApp.py +++ b/dumblogger/utilities/ConsoleApp.py @@ -62,7 +62,7 @@ class ConsoleFrame(wx.Frame): self.CMD.Bind(wx.EVT_KILL_FOCUS, self.OnCMDKillFocus) self.OUTPUT = wx.TextCtrl(id=wxID_CONSOLE_FRAMEOUTPUT, name=u'OUTPUT', - parent=self, pos=wx.Point(0, 40), size=wx.Size(100, 22), style=wx.TE_MULTILINE, + parent=self, pos=wx.Point(0, 40), size=wx.Size(100, 22), style=wx.TE_MULTILINE|wx.VSCROLL, value=u'') self.OUTPUT.SetEditable(False) #self.OUTPUT.SetAutoLayout(True) |