From 46aff556c5ecad832ca3f19e184fd06e765f5641 Mon Sep 17 00:00:00 2001 From: Bill Greiman Date: Fri, 10 Aug 2018 08:43:56 -0700 Subject: [PATCH] Update copyright. Optional C++ ios --- examples/#attic/AnalogLogger/AnalogLogger.ino | 1 + examples/#attic/HelloWorld/HelloWorld.ino | 1 + examples/#attic/append/append.ino | 1 + examples/#attic/average/average.ino | 1 + examples/#attic/bufstream/bufstream.ino | 1 + examples/#attic/cin_cout/cin_cout.ino | 1 + examples/#attic/eventlog/eventlog.ino | 2 +- examples/#attic/fgetsRewrite/fgetsRewrite.ino | 1 + examples/#attic/readlog/readlog.ino | 1 + .../DirectoryFunctions/DirectoryFunctions.ino | 2 +- examples/PrintBenchmark/PrintBenchmark.ino | 1 + examples/QuickStart/QuickStart.ino | 1 + examples/RawWrite/RawWrite.ino | 1 + examples/ReadCsvStream/ReadCsvStream.ino | 1 + examples/SdFormatter/SdFormatter.ino | 1 + examples/SdInfo/SdInfo.ino | 1 + examples/Timestamp/Timestamp.ino | 1 + examples/VolumeFreeSpace/VolumeFreeSpace.ino | 1 + examples/bench/bench.ino | 1 + examples/fgets/fgets.ino | 1 + examples/formatting/formatting.ino | 1 + examples/getline/getline.ino | 1 + examples/rename/rename.ino | 1 + library.properties | 2 +- src/BlockDriver.h | 2 +- src/FatLib/ArduinoFiles.h | 2 +- src/FatLib/ArduinoStream.h | 2 +- src/FatLib/BaseBlockDriver.h | 2 +- src/FatLib/FatApiConstants.h | 2 +- src/FatLib/FatFile.cpp | 2 +- src/FatLib/FatFile.h | 2 +- src/FatLib/FatFileLFN.cpp | 2 +- src/FatLib/FatFilePrint.cpp | 2 +- src/FatLib/FatFileSFN.cpp | 2 +- src/FatLib/FatFileSystem.h | 3 +- src/FatLib/FatLib.h | 4 +-- src/FatLib/FatLibConfig.h | 2 +- src/FatLib/FatStructs.h | 2 +- src/FatLib/FatVolume.cpp | 2 +- src/FatLib/FatVolume.h | 2 +- src/FatLib/FmtNumber.cpp | 2 +- src/FatLib/FmtNumber.h | 2 +- src/FatLib/StdioStream.cpp | 2 +- src/FatLib/StdioStream.h | 2 +- src/FatLib/bufstream.h | 2 +- src/FatLib/fstream.cpp | 2 +- src/FatLib/fstream.h | 2 +- src/FatLib/ios.h | 2 +- src/FatLib/iostream.h | 2 +- src/FatLib/istream.cpp | 2 +- src/FatLib/istream.h | 2 +- src/FatLib/ostream.cpp | 2 +- src/FatLib/ostream.h | 2 +- src/FreeStack.h | 2 +- src/MinimumSerial.cpp | 2 +- src/MinimumSerial.h | 2 +- src/SdCard/SdInfo.h | 2 +- src/SdCard/SdSpiCard.cpp | 2 +- src/SdCard/SdSpiCard.h | 2 +- src/SdCard/SdSpiCardEX.cpp | 2 +- src/SdCard/SdioCard.h | 2 +- src/SdCard/SdioCardEX.cpp | 2 +- src/SdCard/SdioTeensy.cpp | 2 +- src/SdFat.h | 7 ++-- src/SdFatConfig.h | 10 ++++-- src/SpiDriver/DigitalPin.h | 2 +- src/SpiDriver/SdSpiBaseDriver.h | 2 +- src/SpiDriver/SdSpiDriver.h | 2 +- src/SpiDriver/SdSpiESP8266.cpp | 2 +- src/SpiDriver/SdSpiSAM3X.cpp | 2 +- src/SpiDriver/SdSpiSTM32.cpp | 2 +- src/SpiDriver/SdSpiTeensy3.cpp | 2 +- src/SpiDriver/SoftSPI.h | 2 +- src/SysCall.h | 2 +- src/sdios.h | 33 +++++++++++++++++++ 75 files changed, 118 insertions(+), 58 deletions(-) create mode 100644 src/sdios.h diff --git a/examples/#attic/AnalogLogger/AnalogLogger.ino b/examples/#attic/AnalogLogger/AnalogLogger.ino index e846d534..5e1f9654 100644 --- a/examples/#attic/AnalogLogger/AnalogLogger.ino +++ b/examples/#attic/AnalogLogger/AnalogLogger.ino @@ -2,6 +2,7 @@ // uses RTClib from https://github.com/adafruit/RTClib #include #include "SdFat.h" +#include "sdios.h" #include "FreeStack.h" #define SD_CHIP_SELECT SS // SD chip select pin diff --git a/examples/#attic/HelloWorld/HelloWorld.ino b/examples/#attic/HelloWorld/HelloWorld.ino index f0dc22b4..2f168036 100644 --- a/examples/#attic/HelloWorld/HelloWorld.ino +++ b/examples/#attic/HelloWorld/HelloWorld.ino @@ -1,5 +1,6 @@ #include #include "SdFat.h" +#include "sdios.h" // create a serial output stream ArduinoOutStream cout(Serial); diff --git a/examples/#attic/append/append.ino b/examples/#attic/append/append.ino index 6ced4df5..cd2915d9 100644 --- a/examples/#attic/append/append.ino +++ b/examples/#attic/append/append.ino @@ -7,6 +7,7 @@ */ #include #include "SdFat.h" +#include "sdios.h" // SD chip select pin const uint8_t chipSelect = SS; diff --git a/examples/#attic/average/average.ino b/examples/#attic/average/average.ino index 01be276c..22126b46 100644 --- a/examples/#attic/average/average.ino +++ b/examples/#attic/average/average.ino @@ -3,6 +3,7 @@ */ #include #include "SdFat.h" +#include "sdios.h" // SD chip select pin const uint8_t chipSelect = SS; diff --git a/examples/#attic/bufstream/bufstream.ino b/examples/#attic/bufstream/bufstream.ino index 11dc5183..eb029d82 100644 --- a/examples/#attic/bufstream/bufstream.ino +++ b/examples/#attic/bufstream/bufstream.ino @@ -3,6 +3,7 @@ */ #include #include "SdFat.h" +#include "sdios.h" // create a serial output stream ArduinoOutStream cout(Serial); diff --git a/examples/#attic/cin_cout/cin_cout.ino b/examples/#attic/cin_cout/cin_cout.ino index 2cf66781..466895b4 100644 --- a/examples/#attic/cin_cout/cin_cout.ino +++ b/examples/#attic/cin_cout/cin_cout.ino @@ -3,6 +3,7 @@ */ #include #include "SdFat.h" +#include "sdios.h" // create serial output stream ArduinoOutStream cout(Serial); diff --git a/examples/#attic/eventlog/eventlog.ino b/examples/#attic/eventlog/eventlog.ino index 43d701c3..9065f315 100644 --- a/examples/#attic/eventlog/eventlog.ino +++ b/examples/#attic/eventlog/eventlog.ino @@ -3,7 +3,7 @@ */ #include #include "SdFat.h" - +#include "sdios.h" // SD chip select pin const uint8_t chipSelect = SS; diff --git a/examples/#attic/fgetsRewrite/fgetsRewrite.ino b/examples/#attic/fgetsRewrite/fgetsRewrite.ino index 622d1e5b..cf0b729e 100644 --- a/examples/#attic/fgetsRewrite/fgetsRewrite.ino +++ b/examples/#attic/fgetsRewrite/fgetsRewrite.ino @@ -1,6 +1,7 @@ // Demo of rewriting a line read by fgets #include #include "SdFat.h" +#include "sdios.h" // SD card chip select pin const uint8_t chipSelect = SS; diff --git a/examples/#attic/readlog/readlog.ino b/examples/#attic/readlog/readlog.ino index 31e9d06f..b5eb8384 100644 --- a/examples/#attic/readlog/readlog.ino +++ b/examples/#attic/readlog/readlog.ino @@ -4,6 +4,7 @@ */ #include #include "SdFat.h" +#include "sdios.h" // SD chip select pin const uint8_t chipSelect = SS; diff --git a/examples/DirectoryFunctions/DirectoryFunctions.ino b/examples/DirectoryFunctions/DirectoryFunctions.ino index 13ffc7ec..87b68871 100644 --- a/examples/DirectoryFunctions/DirectoryFunctions.ino +++ b/examples/DirectoryFunctions/DirectoryFunctions.ino @@ -3,7 +3,7 @@ */ #include #include "SdFat.h" - +#include "sdios.h" // SD card chip select pin. const uint8_t chipSelect = SS; //------------------------------------------------------------------------------ diff --git a/examples/PrintBenchmark/PrintBenchmark.ino b/examples/PrintBenchmark/PrintBenchmark.ino index 4bd39dd2..9dab3f77 100644 --- a/examples/PrintBenchmark/PrintBenchmark.ino +++ b/examples/PrintBenchmark/PrintBenchmark.ino @@ -3,6 +3,7 @@ */ #include #include "SdFat.h" +#include "sdios.h" #include "FreeStack.h" // SD chip select pin diff --git a/examples/QuickStart/QuickStart.ino b/examples/QuickStart/QuickStart.ino index e295011b..1a413e36 100644 --- a/examples/QuickStart/QuickStart.ino +++ b/examples/QuickStart/QuickStart.ino @@ -2,6 +2,7 @@ // #include #include "SdFat.h" +#include "sdios.h" // // Set DISABLE_CHIP_SELECT to disable a second SPI device. // For example, with the Ethernet shield, set DISABLE_CHIP_SELECT diff --git a/examples/RawWrite/RawWrite.ino b/examples/RawWrite/RawWrite.ino index 97ff9a56..9d57ede3 100644 --- a/examples/RawWrite/RawWrite.ino +++ b/examples/RawWrite/RawWrite.ino @@ -12,6 +12,7 @@ */ #include #include "SdFat.h" +#include "sdios.h" #include "FreeStack.h" // SD chip select pin diff --git a/examples/ReadCsvStream/ReadCsvStream.ino b/examples/ReadCsvStream/ReadCsvStream.ino index a07611e6..47238e59 100644 --- a/examples/ReadCsvStream/ReadCsvStream.ino +++ b/examples/ReadCsvStream/ReadCsvStream.ino @@ -4,6 +4,7 @@ */ #include #include "SdFat.h" +#include "sdios.h" // SD chip select pin const uint8_t chipSelect = SS; diff --git a/examples/SdFormatter/SdFormatter.ino b/examples/SdFormatter/SdFormatter.ino index a0b9ba69..de286fdf 100644 --- a/examples/SdFormatter/SdFormatter.ino +++ b/examples/SdFormatter/SdFormatter.ino @@ -30,6 +30,7 @@ const uint8_t chipSelect = SS; #define DEBUG_PRINT 0 #include #include "SdFat.h" +#include "sdios.h" #if DEBUG_PRINT #include "FreeStack.h" #endif // DEBUG_PRINT diff --git a/examples/SdInfo/SdInfo.ino b/examples/SdInfo/SdInfo.ino index 2b427581..5ce4aa49 100644 --- a/examples/SdInfo/SdInfo.ino +++ b/examples/SdInfo/SdInfo.ino @@ -3,6 +3,7 @@ */ #include #include "SdFat.h" +#include "sdios.h" // Set USE_SDIO to zero for SPI card access. #define USE_SDIO 0 diff --git a/examples/Timestamp/Timestamp.ino b/examples/Timestamp/Timestamp.ino index d0b09d02..f62328e6 100644 --- a/examples/Timestamp/Timestamp.ino +++ b/examples/Timestamp/Timestamp.ino @@ -4,6 +4,7 @@ */ #include #include "SdFat.h" +#include "sdios.h" SdFat sd; diff --git a/examples/VolumeFreeSpace/VolumeFreeSpace.ino b/examples/VolumeFreeSpace/VolumeFreeSpace.ino index 229843c3..b9a43ff9 100644 --- a/examples/VolumeFreeSpace/VolumeFreeSpace.ino +++ b/examples/VolumeFreeSpace/VolumeFreeSpace.ino @@ -3,6 +3,7 @@ */ #include #include "SdFat.h" +#include "sdios.h" /* * SD chip select pin. Common values are: * diff --git a/examples/bench/bench.ino b/examples/bench/bench.ino index 3d0970ef..7134159a 100644 --- a/examples/bench/bench.ino +++ b/examples/bench/bench.ino @@ -3,6 +3,7 @@ */ #include #include "SdFat.h" +#include "sdios.h" #include "FreeStack.h" // Set USE_SDIO to zero for SPI card access. diff --git a/examples/fgets/fgets.ino b/examples/fgets/fgets.ino index 6d3eb9fe..481f47c9 100644 --- a/examples/fgets/fgets.ino +++ b/examples/fgets/fgets.ino @@ -1,6 +1,7 @@ // Demo of fgets function to read lines from a file. #include #include "SdFat.h" +#include "sdios.h" // SD chip select pin const uint8_t chipSelect = SS; diff --git a/examples/formatting/formatting.ino b/examples/formatting/formatting.ino index 8d50c2b1..a2b937ff 100644 --- a/examples/formatting/formatting.ino +++ b/examples/formatting/formatting.ino @@ -4,6 +4,7 @@ */ #include #include "SdFat.h" +#include "sdios.h" // create Serial stream ArduinoOutStream cout(Serial); diff --git a/examples/getline/getline.ino b/examples/getline/getline.ino index e441651f..89ede662 100644 --- a/examples/getline/getline.ino +++ b/examples/getline/getline.ino @@ -8,6 +8,7 @@ */ #include #include "SdFat.h" +#include "sdios.h" // SD chip select pin const uint8_t chipSelect = SS; diff --git a/examples/rename/rename.ino b/examples/rename/rename.ino index 81c5d0ce..9457df70 100644 --- a/examples/rename/rename.ino +++ b/examples/rename/rename.ino @@ -4,6 +4,7 @@ */ #include #include "SdFat.h" +#include "sdios.h" // SD chip select pin const uint8_t chipSelect = SS; diff --git a/library.properties b/library.properties index da79823f..51e326e1 100644 --- a/library.properties +++ b/library.properties @@ -1,5 +1,5 @@ name=SdFat -version=1.0.6 +version=1.0.7 author=Bill Greiman maintainer=Bill Greiman sentence=FAT16/FAT32 file system for SD cards. diff --git a/src/BlockDriver.h b/src/BlockDriver.h index 71acdfd4..1bb65fc5 100644 --- a/src/BlockDriver.h +++ b/src/BlockDriver.h @@ -1,5 +1,5 @@ /** - * Copyright (c) 20011-2017 Bill Greiman + * Copyright (c) 2011-2018 Bill Greiman * This file is part of the SdFat library for SD memory cards. * * MIT License diff --git a/src/FatLib/ArduinoFiles.h b/src/FatLib/ArduinoFiles.h index 0775049e..e0155f54 100644 --- a/src/FatLib/ArduinoFiles.h +++ b/src/FatLib/ArduinoFiles.h @@ -1,5 +1,5 @@ /** - * Copyright (c) 20011-2017 Bill Greiman + * Copyright (c) 2011-2018 Bill Greiman * This file is part of the SdFat library for SD memory cards. * * MIT License diff --git a/src/FatLib/ArduinoStream.h b/src/FatLib/ArduinoStream.h index 8cbb9985..e08d1f30 100644 --- a/src/FatLib/ArduinoStream.h +++ b/src/FatLib/ArduinoStream.h @@ -1,5 +1,5 @@ /** - * Copyright (c) 20011-2017 Bill Greiman + * Copyright (c) 2011-2018 Bill Greiman * This file is part of the SdFat library for SD memory cards. * * MIT License diff --git a/src/FatLib/BaseBlockDriver.h b/src/FatLib/BaseBlockDriver.h index 31221efc..bb4c8208 100644 --- a/src/FatLib/BaseBlockDriver.h +++ b/src/FatLib/BaseBlockDriver.h @@ -1,5 +1,5 @@ /** - * Copyright (c) 20011-2017 Bill Greiman + * Copyright (c) 2011-2018 Bill Greiman * This file is part of the SdFat library for SD memory cards. * * MIT License diff --git a/src/FatLib/FatApiConstants.h b/src/FatLib/FatApiConstants.h index f4080ac1..33e4e64a 100644 --- a/src/FatLib/FatApiConstants.h +++ b/src/FatLib/FatApiConstants.h @@ -1,5 +1,5 @@ /** - * Copyright (c) 20011-2017 Bill Greiman + * Copyright (c) 2011-2018 Bill Greiman * This file is part of the SdFat library for SD memory cards. * * MIT License diff --git a/src/FatLib/FatFile.cpp b/src/FatLib/FatFile.cpp index 4ca38079..667d8be8 100644 --- a/src/FatLib/FatFile.cpp +++ b/src/FatLib/FatFile.cpp @@ -1,5 +1,5 @@ /** - * Copyright (c) 20011-2017 Bill Greiman + * Copyright (c) 2011-2018 Bill Greiman * This file is part of the SdFat library for SD memory cards. * * MIT License diff --git a/src/FatLib/FatFile.h b/src/FatLib/FatFile.h index cc874506..0f16b433 100644 --- a/src/FatLib/FatFile.h +++ b/src/FatLib/FatFile.h @@ -1,5 +1,5 @@ /** - * Copyright (c) 20011-2017 Bill Greiman + * Copyright (c) 2011-2018 Bill Greiman * This file is part of the SdFat library for SD memory cards. * * MIT License diff --git a/src/FatLib/FatFileLFN.cpp b/src/FatLib/FatFileLFN.cpp index 52b97841..9ba66f79 100644 --- a/src/FatLib/FatFileLFN.cpp +++ b/src/FatLib/FatFileLFN.cpp @@ -1,5 +1,5 @@ /** - * Copyright (c) 20011-2017 Bill Greiman + * Copyright (c) 2011-2018 Bill Greiman * This file is part of the SdFat library for SD memory cards. * * MIT License diff --git a/src/FatLib/FatFilePrint.cpp b/src/FatLib/FatFilePrint.cpp index 7ac2c711..53367f43 100644 --- a/src/FatLib/FatFilePrint.cpp +++ b/src/FatLib/FatFilePrint.cpp @@ -1,5 +1,5 @@ /** - * Copyright (c) 20011-2017 Bill Greiman + * Copyright (c) 2011-2018 Bill Greiman * This file is part of the SdFat library for SD memory cards. * * MIT License diff --git a/src/FatLib/FatFileSFN.cpp b/src/FatLib/FatFileSFN.cpp index 0ebcfe44..e475cb39 100644 --- a/src/FatLib/FatFileSFN.cpp +++ b/src/FatLib/FatFileSFN.cpp @@ -1,5 +1,5 @@ /** - * Copyright (c) 20011-2017 Bill Greiman + * Copyright (c) 2011-2018 Bill Greiman * This file is part of the SdFat library for SD memory cards. * * MIT License diff --git a/src/FatLib/FatFileSystem.h b/src/FatLib/FatFileSystem.h index 0f66d355..2e9d759c 100644 --- a/src/FatLib/FatFileSystem.h +++ b/src/FatLib/FatFileSystem.h @@ -1,5 +1,5 @@ /** - * Copyright (c) 20011-2017 Bill Greiman + * Copyright (c) 2011-2018 Bill Greiman * This file is part of the SdFat library for SD memory cards. * * MIT License @@ -26,7 +26,6 @@ #define FatFileSystem_h #include "FatVolume.h" #include "FatFile.h" -#include "ArduinoStream.h" #include "ArduinoFiles.h" /** * \file diff --git a/src/FatLib/FatLib.h b/src/FatLib/FatLib.h index fa45dbeb..f054ea28 100644 --- a/src/FatLib/FatLib.h +++ b/src/FatLib/FatLib.h @@ -1,5 +1,5 @@ /** - * Copyright (c) 20011-2017 Bill Greiman + * Copyright (c) 2011-2018 Bill Greiman * This file is part of the SdFat library for SD memory cards. * * MIT License @@ -25,13 +25,11 @@ #ifndef FatLib_h #define FatLib_h #include "ArduinoFiles.h" -#include "ArduinoStream.h" #include "FatFileSystem.h" #include "FatLibConfig.h" #include "FatVolume.h" #include "FatFile.h" #include "StdioStream.h" -#include "fstream.h" //------------------------------------------------------------------------------ /** FatFileSystem version YYYYMMDD */ #define FAT_LIB_VERSION 20150131 diff --git a/src/FatLib/FatLibConfig.h b/src/FatLib/FatLibConfig.h index 6713a133..8cd52654 100644 --- a/src/FatLib/FatLibConfig.h +++ b/src/FatLib/FatLibConfig.h @@ -1,5 +1,5 @@ /** - * Copyright (c) 20011-2017 Bill Greiman + * Copyright (c) 2011-2018 Bill Greiman * This file is part of the SdFat library for SD memory cards. * * MIT License diff --git a/src/FatLib/FatStructs.h b/src/FatLib/FatStructs.h index 112cbb6e..ab551075 100644 --- a/src/FatLib/FatStructs.h +++ b/src/FatLib/FatStructs.h @@ -1,5 +1,5 @@ /** - * Copyright (c) 20011-2017 Bill Greiman + * Copyright (c) 2011-2018 Bill Greiman * This file is part of the SdFat library for SD memory cards. * * MIT License diff --git a/src/FatLib/FatVolume.cpp b/src/FatLib/FatVolume.cpp index ace0862c..76ed3647 100644 --- a/src/FatLib/FatVolume.cpp +++ b/src/FatLib/FatVolume.cpp @@ -1,5 +1,5 @@ /** - * Copyright (c) 20011-2017 Bill Greiman + * Copyright (c) 2011-2018 Bill Greiman * This file is part of the SdFat library for SD memory cards. * * MIT License diff --git a/src/FatLib/FatVolume.h b/src/FatLib/FatVolume.h index a1fc70d5..9b0227b7 100644 --- a/src/FatLib/FatVolume.h +++ b/src/FatLib/FatVolume.h @@ -1,5 +1,5 @@ /** - * Copyright (c) 20011-2017 Bill Greiman + * Copyright (c) 2011-2018 Bill Greiman * This file is part of the SdFat library for SD memory cards. * * MIT License diff --git a/src/FatLib/FmtNumber.cpp b/src/FatLib/FmtNumber.cpp index e16c47a6..29531452 100644 --- a/src/FatLib/FmtNumber.cpp +++ b/src/FatLib/FmtNumber.cpp @@ -1,5 +1,5 @@ /** - * Copyright (c) 20011-2017 Bill Greiman + * Copyright (c) 2011-2018 Bill Greiman * This file is part of the SdFat library for SD memory cards. * * MIT License diff --git a/src/FatLib/FmtNumber.h b/src/FatLib/FmtNumber.h index c873ce15..7834c8fa 100644 --- a/src/FatLib/FmtNumber.h +++ b/src/FatLib/FmtNumber.h @@ -1,5 +1,5 @@ /** - * Copyright (c) 20011-2017 Bill Greiman + * Copyright (c) 2011-2018 Bill Greiman * This file is part of the SdFat library for SD memory cards. * * MIT License diff --git a/src/FatLib/StdioStream.cpp b/src/FatLib/StdioStream.cpp index 0fbfc182..c275d341 100644 --- a/src/FatLib/StdioStream.cpp +++ b/src/FatLib/StdioStream.cpp @@ -1,5 +1,5 @@ /** - * Copyright (c) 20011-2017 Bill Greiman + * Copyright (c) 2011-2018 Bill Greiman * This file is part of the SdFat library for SD memory cards. * * MIT License diff --git a/src/FatLib/StdioStream.h b/src/FatLib/StdioStream.h index 6d903e7b..3062f33b 100644 --- a/src/FatLib/StdioStream.h +++ b/src/FatLib/StdioStream.h @@ -1,5 +1,5 @@ /** - * Copyright (c) 20011-2017 Bill Greiman + * Copyright (c) 2011-2018 Bill Greiman * This file is part of the SdFat library for SD memory cards. * * MIT License diff --git a/src/FatLib/bufstream.h b/src/FatLib/bufstream.h index b189d30a..f3cb8831 100644 --- a/src/FatLib/bufstream.h +++ b/src/FatLib/bufstream.h @@ -1,5 +1,5 @@ /** - * Copyright (c) 20011-2017 Bill Greiman + * Copyright (c) 2011-2018 Bill Greiman * This file is part of the SdFat library for SD memory cards. * * MIT License diff --git a/src/FatLib/fstream.cpp b/src/FatLib/fstream.cpp index 55053f53..012f28d3 100644 --- a/src/FatLib/fstream.cpp +++ b/src/FatLib/fstream.cpp @@ -1,5 +1,5 @@ /** - * Copyright (c) 20011-2017 Bill Greiman + * Copyright (c) 2011-2018 Bill Greiman * This file is part of the SdFat library for SD memory cards. * * MIT License diff --git a/src/FatLib/fstream.h b/src/FatLib/fstream.h index cfd76c6d..f8d80dd8 100644 --- a/src/FatLib/fstream.h +++ b/src/FatLib/fstream.h @@ -1,5 +1,5 @@ /** - * Copyright (c) 20011-2017 Bill Greiman + * Copyright (c) 2011-2018 Bill Greiman * This file is part of the SdFat library for SD memory cards. * * MIT License diff --git a/src/FatLib/ios.h b/src/FatLib/ios.h index 14451d8f..460718d7 100644 --- a/src/FatLib/ios.h +++ b/src/FatLib/ios.h @@ -1,5 +1,5 @@ /** - * Copyright (c) 20011-2017 Bill Greiman + * Copyright (c) 2011-2018 Bill Greiman * This file is part of the SdFat library for SD memory cards. * * MIT License diff --git a/src/FatLib/iostream.h b/src/FatLib/iostream.h index e09b52c9..6b47419f 100644 --- a/src/FatLib/iostream.h +++ b/src/FatLib/iostream.h @@ -1,5 +1,5 @@ /** - * Copyright (c) 20011-2017 Bill Greiman + * Copyright (c) 2011-2018 Bill Greiman * This file is part of the SdFat library for SD memory cards. * * MIT License diff --git a/src/FatLib/istream.cpp b/src/FatLib/istream.cpp index 8393ba05..74ae2953 100644 --- a/src/FatLib/istream.cpp +++ b/src/FatLib/istream.cpp @@ -1,5 +1,5 @@ /** - * Copyright (c) 20011-2017 Bill Greiman + * Copyright (c) 2011-2018 Bill Greiman * This file is part of the SdFat library for SD memory cards. * * MIT License diff --git a/src/FatLib/istream.h b/src/FatLib/istream.h index d0162f46..5fa81d1b 100644 --- a/src/FatLib/istream.h +++ b/src/FatLib/istream.h @@ -1,5 +1,5 @@ /** - * Copyright (c) 20011-2017 Bill Greiman + * Copyright (c) 2011-2018 Bill Greiman * This file is part of the SdFat library for SD memory cards. * * MIT License diff --git a/src/FatLib/ostream.cpp b/src/FatLib/ostream.cpp index cac95488..5c1a3301 100644 --- a/src/FatLib/ostream.cpp +++ b/src/FatLib/ostream.cpp @@ -1,5 +1,5 @@ /** - * Copyright (c) 20011-2017 Bill Greiman + * Copyright (c) 2011-2018 Bill Greiman * This file is part of the SdFat library for SD memory cards. * * MIT License diff --git a/src/FatLib/ostream.h b/src/FatLib/ostream.h index 84e1db55..106898aa 100644 --- a/src/FatLib/ostream.h +++ b/src/FatLib/ostream.h @@ -1,5 +1,5 @@ /** - * Copyright (c) 20011-2017 Bill Greiman + * Copyright (c) 2011-2018 Bill Greiman * This file is part of the SdFat library for SD memory cards. * * MIT License diff --git a/src/FreeStack.h b/src/FreeStack.h index 1f563e78..c655ef61 100644 --- a/src/FreeStack.h +++ b/src/FreeStack.h @@ -1,5 +1,5 @@ /** - * Copyright (c) 20011-2017 Bill Greiman + * Copyright (c) 2011-2018 Bill Greiman * This file is part of the SdFat library for SD memory cards. * * MIT License diff --git a/src/MinimumSerial.cpp b/src/MinimumSerial.cpp index 42d00733..e0d4fb25 100644 --- a/src/MinimumSerial.cpp +++ b/src/MinimumSerial.cpp @@ -1,5 +1,5 @@ /** - * Copyright (c) 20011-2017 Bill Greiman + * Copyright (c) 2011-2018 Bill Greiman * This file is part of the SdFat library for SD memory cards. * * MIT License diff --git a/src/MinimumSerial.h b/src/MinimumSerial.h index 5a700b89..0a0f667d 100644 --- a/src/MinimumSerial.h +++ b/src/MinimumSerial.h @@ -1,5 +1,5 @@ /** - * Copyright (c) 20011-2017 Bill Greiman + * Copyright (c) 2011-2018 Bill Greiman * This file is part of the SdFat library for SD memory cards. * * MIT License diff --git a/src/SdCard/SdInfo.h b/src/SdCard/SdInfo.h index 86798141..69645a53 100644 --- a/src/SdCard/SdInfo.h +++ b/src/SdCard/SdInfo.h @@ -1,5 +1,5 @@ /** - * Copyright (c) 20011-2017 Bill Greiman + * Copyright (c) 2011-2018 Bill Greiman * This file is part of the SdFat library for SD memory cards. * * MIT License diff --git a/src/SdCard/SdSpiCard.cpp b/src/SdCard/SdSpiCard.cpp index 1b54f27a..520cd0b5 100644 --- a/src/SdCard/SdSpiCard.cpp +++ b/src/SdCard/SdSpiCard.cpp @@ -1,5 +1,5 @@ /** - * Copyright (c) 20011-2017 Bill Greiman + * Copyright (c) 2011-2018 Bill Greiman * This file is part of the SdFat library for SD memory cards. * * MIT License diff --git a/src/SdCard/SdSpiCard.h b/src/SdCard/SdSpiCard.h index 4c2fa08d..d8943656 100644 --- a/src/SdCard/SdSpiCard.h +++ b/src/SdCard/SdSpiCard.h @@ -1,5 +1,5 @@ /** - * Copyright (c) 20011-2017 Bill Greiman + * Copyright (c) 2011-2018 Bill Greiman * This file is part of the SdFat library for SD memory cards. * * MIT License diff --git a/src/SdCard/SdSpiCardEX.cpp b/src/SdCard/SdSpiCardEX.cpp index c276ca51..b5dced49 100644 --- a/src/SdCard/SdSpiCardEX.cpp +++ b/src/SdCard/SdSpiCardEX.cpp @@ -1,5 +1,5 @@ /** - * Copyright (c) 20011-2017 Bill Greiman + * Copyright (c) 2011-2018 Bill Greiman * This file is part of the SdFat library for SD memory cards. * * MIT License diff --git a/src/SdCard/SdioCard.h b/src/SdCard/SdioCard.h index 188b0f76..294327b5 100644 --- a/src/SdCard/SdioCard.h +++ b/src/SdCard/SdioCard.h @@ -1,5 +1,5 @@ /** - * Copyright (c) 20011-2017 Bill Greiman + * Copyright (c) 2011-2018 Bill Greiman * This file is part of the SdFat library for SD memory cards. * * MIT License diff --git a/src/SdCard/SdioCardEX.cpp b/src/SdCard/SdioCardEX.cpp index edbed2b8..ed4981d1 100644 --- a/src/SdCard/SdioCardEX.cpp +++ b/src/SdCard/SdioCardEX.cpp @@ -1,5 +1,5 @@ /** - * Copyright (c) 20011-2017 Bill Greiman + * Copyright (c) 2011-2018 Bill Greiman * This file is part of the SdFat library for SD memory cards. * * MIT License diff --git a/src/SdCard/SdioTeensy.cpp b/src/SdCard/SdioTeensy.cpp index 95ce779c..f812ba3a 100644 --- a/src/SdCard/SdioTeensy.cpp +++ b/src/SdCard/SdioTeensy.cpp @@ -1,5 +1,5 @@ /** - * Copyright (c) 20011-2017 Bill Greiman + * Copyright (c) 2011-2018 Bill Greiman * This file is part of the SdFat library for SD memory cards. * * MIT License diff --git a/src/SdFat.h b/src/SdFat.h index 5e0923d0..7dd75edf 100644 --- a/src/SdFat.h +++ b/src/SdFat.h @@ -1,5 +1,5 @@ /** - * Copyright (c) 20011-2017 Bill Greiman + * Copyright (c) 2011-2018 Bill Greiman * This file is part of the SdFat library for SD memory cards. * * MIT License @@ -32,9 +32,12 @@ #include "BlockDriver.h" #include "FatLib/FatLib.h" #include "SdCard/SdioCard.h" +#if INCLUDE_SDIOS +#include "sdios.h" +#endif // INCLUDE_SDIOS //------------------------------------------------------------------------------ /** SdFat version */ -#define SD_FAT_VERSION "1.0.6" +#define SD_FAT_VERSION "1.0.7" //============================================================================== /** * \class SdBaseFile diff --git a/src/SdFatConfig.h b/src/SdFatConfig.h index 9e7127d9..8c6b92be 100644 --- a/src/SdFatConfig.h +++ b/src/SdFatConfig.h @@ -1,5 +1,5 @@ /** - * Copyright (c) 20011-2017 Bill Greiman + * Copyright (c) 2011-2018 Bill Greiman * This file is part of the SdFat library for SD memory cards. * * MIT License @@ -34,6 +34,12 @@ #include #endif // __AVR__ //------------------------------------------------------------------------------ +/** + * Set INCLUDE_SDIOS nonzero to include sdios.h in SdFat.h. + * sdios.h provides C++ style IO Streams. + */ +#define INCLUDE_SDIOS 1 +//------------------------------------------------------------------------------ /** * Set USE_LONG_FILE_NAMES nonzero to use long file names (LFN). * Long File Name are limited to a maximum length of 255 characters. @@ -184,7 +190,7 @@ /** * Determine the default SPI configuration. */ -#if defined(__STM32F1__) || defined(__STM32F4__) +#if defined(__STM32F1__) || defined(__STM32F4__) // has multiple SPI ports #define SD_HAS_CUSTOM_SPI 2 #elif defined(__AVR__)\ diff --git a/src/SpiDriver/DigitalPin.h b/src/SpiDriver/DigitalPin.h index 83f3d26b..9f8b8e49 100644 --- a/src/SpiDriver/DigitalPin.h +++ b/src/SpiDriver/DigitalPin.h @@ -1,5 +1,5 @@ /** - * Copyright (c) 20011-2017 Bill Greiman + * Copyright (c) 2011-2018 Bill Greiman * This file is part of the SdFat library for SD memory cards. * * MIT License diff --git a/src/SpiDriver/SdSpiBaseDriver.h b/src/SpiDriver/SdSpiBaseDriver.h index 02ba6045..8a33a469 100644 --- a/src/SpiDriver/SdSpiBaseDriver.h +++ b/src/SpiDriver/SdSpiBaseDriver.h @@ -1,5 +1,5 @@ /** - * Copyright (c) 20011-2017 Bill Greiman + * Copyright (c) 2011-2018 Bill Greiman * This file is part of the SdFat library for SD memory cards. * * MIT License diff --git a/src/SpiDriver/SdSpiDriver.h b/src/SpiDriver/SdSpiDriver.h index 2181980f..1c75ed91 100644 --- a/src/SpiDriver/SdSpiDriver.h +++ b/src/SpiDriver/SdSpiDriver.h @@ -1,5 +1,5 @@ /** - * Copyright (c) 20011-2017 Bill Greiman + * Copyright (c) 2011-2018 Bill Greiman * This file is part of the SdFat library for SD memory cards. * * MIT License diff --git a/src/SpiDriver/SdSpiESP8266.cpp b/src/SpiDriver/SdSpiESP8266.cpp index b70867bc..c58c1782 100644 --- a/src/SpiDriver/SdSpiESP8266.cpp +++ b/src/SpiDriver/SdSpiESP8266.cpp @@ -1,5 +1,5 @@ /** - * Copyright (c) 20011-2017 Bill Greiman + * Copyright (c) 2011-2018 Bill Greiman * This file is part of the SdFat library for SD memory cards. * * MIT License diff --git a/src/SpiDriver/SdSpiSAM3X.cpp b/src/SpiDriver/SdSpiSAM3X.cpp index c8d79d93..6f2f2bb8 100644 --- a/src/SpiDriver/SdSpiSAM3X.cpp +++ b/src/SpiDriver/SdSpiSAM3X.cpp @@ -1,5 +1,5 @@ /** - * Copyright (c) 20011-2017 Bill Greiman + * Copyright (c) 2011-2018 Bill Greiman * This file is part of the SdFat library for SD memory cards. * * MIT License diff --git a/src/SpiDriver/SdSpiSTM32.cpp b/src/SpiDriver/SdSpiSTM32.cpp index b7f6d6bf..64e19f4d 100644 --- a/src/SpiDriver/SdSpiSTM32.cpp +++ b/src/SpiDriver/SdSpiSTM32.cpp @@ -1,5 +1,5 @@ /** - * Copyright (c) 20011-2017 Bill Greiman + * Copyright (c) 2011-2018 Bill Greiman * This file is part of the SdFat library for SD memory cards. * * MIT License diff --git a/src/SpiDriver/SdSpiTeensy3.cpp b/src/SpiDriver/SdSpiTeensy3.cpp index 8e13d6ab..02ed2af7 100644 --- a/src/SpiDriver/SdSpiTeensy3.cpp +++ b/src/SpiDriver/SdSpiTeensy3.cpp @@ -1,5 +1,5 @@ /** - * Copyright (c) 20011-2017 Bill Greiman + * Copyright (c) 2011-2018 Bill Greiman * This file is part of the SdFat library for SD memory cards. * * MIT License diff --git a/src/SpiDriver/SoftSPI.h b/src/SpiDriver/SoftSPI.h index 28ffca81..ee21b230 100644 --- a/src/SpiDriver/SoftSPI.h +++ b/src/SpiDriver/SoftSPI.h @@ -1,5 +1,5 @@ /** - * Copyright (c) 20011-2017 Bill Greiman + * Copyright (c) 2011-2018 Bill Greiman * This file is part of the SdFat library for SD memory cards. * * MIT License diff --git a/src/SysCall.h b/src/SysCall.h index 02af4c0c..e990e2af 100644 --- a/src/SysCall.h +++ b/src/SysCall.h @@ -1,5 +1,5 @@ /** - * Copyright (c) 20011-2017 Bill Greiman + * Copyright (c) 2011-2018 Bill Greiman * This file is part of the SdFat library for SD memory cards. * * MIT License diff --git a/src/sdios.h b/src/sdios.h new file mode 100644 index 00000000..0d15fc23 --- /dev/null +++ b/src/sdios.h @@ -0,0 +1,33 @@ +/** + * Copyright (c) 2011-2018 Bill Greiman + * This file is part of the SdFat library for SD memory cards. + * + * MIT License + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included + * in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS + * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + */ +#ifndef sdios_h +#define sdios_h +/** + * \file + * \brief C++ IO Streams features. + */ +#include "FatLib/fstream.h" +#include "FatLib/ArduinoStream.h" +#endif // sdios_h \ No newline at end of file