diff options
| -rw-r--r-- | Demos/Device/ClassDriver/MassStorage/MassStorage.txt | 21 | ||||
| -rw-r--r-- | Demos/Device/LowLevel/MassStorage/MassStorage.txt | 21 | ||||
| -rw-r--r-- | LUFA/Drivers/Board/Dataflash.h | 2 | ||||
| -rw-r--r-- | Projects/TempDataLogger/TempDataLogger.c | 2 | ||||
| -rw-r--r-- | Projects/TempDataLogger/makefile | 1 |
5 files changed, 22 insertions, 25 deletions
diff --git a/Demos/Device/ClassDriver/MassStorage/MassStorage.txt b/Demos/Device/ClassDriver/MassStorage/MassStorage.txt index 3038862b8..e84e58427 100644 --- a/Demos/Device/ClassDriver/MassStorage/MassStorage.txt +++ b/Demos/Device/ClassDriver/MassStorage/MassStorage.txt @@ -47,24 +47,23 @@ * * \section Sec_Description Project Description: * - * Dual LUN Mass Storage demonstration application. This gives a simple - * reference application for implementing a multiple LUN USB Mass Storage - * device using the basic USB UFI drivers in all modern OSes (i.e. no - * special drivers required). + * Mass Storage device demonstration application. This gives a simple + * reference application for implementing a USB Mass Storage device using + * the basic USB UFI drivers in all modern OSes (i.e. no special drivers + * required). * * On start-up the system will automatically enumerate and function as an - * external mass storage device with two LUNs (separate disks) which may - * be formatted and used in the same manner as commercial USB Mass Storage - * devices. + * external mass storage device which may be formatted and used in the same + * manner as commercial USB Mass Storage devices. * - * You will need to format the mass storage drives upon first run of this + * You will need to format the mass storage drive upon first run of this * demonstration - as the device acts only as a data block transport between * the host and the storage media, it does not matter what file system is used, * as the data interpretation is performed by the host and not the USB device. * - * This demo is not restricted to only two LUNs; by changing the TOTAL_LUNS - * value in MassStorageDualLUN.h, any number of LUNs can be used (from 1 to - * 255), with each LUN being allocated an equal portion of the available + * This demo is not restricted to only a single LUN (logical disk); by changing + * the TOTAL_LUNS value in DataflashManager.h, any number of LUNs can be used + * (from 1 to 255), with each LUN being allocated an equal portion of the available * Dataflash memory. * * The USB control endpoint is managed entirely by the library using endpoint diff --git a/Demos/Device/LowLevel/MassStorage/MassStorage.txt b/Demos/Device/LowLevel/MassStorage/MassStorage.txt index 01865a7b0..8d0488265 100644 --- a/Demos/Device/LowLevel/MassStorage/MassStorage.txt +++ b/Demos/Device/LowLevel/MassStorage/MassStorage.txt @@ -47,24 +47,23 @@ * * \section Sec_Description Project Description: * - * Dual LUN Mass Storage demonstration application. This gives a simple - * reference application for implementing a multiple LUN USB Mass Storage - * device using the basic USB UFI drivers in all modern OSes (i.e. no - * special drivers required). + * Mass Storage device demonstration application. This gives a simple + * reference application for implementing a USB Mass Storage device using + * the basic USB UFI drivers in all modern OSes (i.e. no special drivers + * required). * * On start-up the system will automatically enumerate and function as an - * external mass storage device with two LUNs (separate disks) which may - * be formatted and used in the same manner as commercial USB Mass Storage - * devices. + * external mass storage device which may be formatted and used in the same + * manner as commercial USB Mass Storage devices. * - * You will need to format the mass storage drives upon first run of this + * You will need to format the mass storage drive upon first run of this * demonstration - as the device acts only as a data block transport between * the host and the storage media, it does not matter what file system is used, * as the data interpretation is performed by the host and not the USB device. * - * This demo is not restricted to only two LUNs; by changing the TOTAL_LUNS - * value in MassStorageDualLUN.h, any number of LUNs can be used (from 1 to - * 255), with each LUN being allocated an equal portion of the available + * This demo is not restricted to only a single LUN (logical disk); by changing + * the TOTAL_LUNS value in DataflashManager.h, any number of LUNs can be used + * (from 1 to 255), with each LUN being allocated an equal portion of the available * Dataflash memory. * * The USB control endpoint is managed entirely by the library using endpoint diff --git a/LUFA/Drivers/Board/Dataflash.h b/LUFA/Drivers/Board/Dataflash.h index 27be323ef..69ffdcb82 100644 --- a/LUFA/Drivers/Board/Dataflash.h +++ b/LUFA/Drivers/Board/Dataflash.h @@ -234,7 +234,7 @@ /* Includes: */ #if (BOARD == BOARD_NONE) - #error The Board Buttons driver cannot be used if the makefile BOARD option is not set. + #error The Board Dataflash driver cannot be used if the makefile BOARD option is not set. #elif (BOARD == BOARD_USBKEY) #include "USBKEY/Dataflash.h" #elif (BOARD == BOARD_STK525) diff --git a/Projects/TempDataLogger/TempDataLogger.c b/Projects/TempDataLogger/TempDataLogger.c index e23d54e38..ac7b231ae 100644 --- a/Projects/TempDataLogger/TempDataLogger.c +++ b/Projects/TempDataLogger/TempDataLogger.c @@ -122,7 +122,7 @@ ISR(TIMER1_COMPA_vect, ISR_BLOCK) char LineBuffer[100]; uint16_t BytesWritten; - BytesWritten = sprintf(LineBuffer, "%02d/%02d/20%04d, %02d:%02d:%02d, %d Degrees\r\n", + BytesWritten = sprintf(LineBuffer, "%02d/%02d/20%02d, %02d:%02d:%02d, %d Degrees\r\n", Day, Month, Year, Hour, Minute, Second, Temperature_GetTemperature()); f_write(&TempLogFile, LineBuffer, BytesWritten, &BytesWritten); diff --git a/Projects/TempDataLogger/makefile b/Projects/TempDataLogger/makefile index c33e3816b..f6d43621a 100644 --- a/Projects/TempDataLogger/makefile +++ b/Projects/TempDataLogger/makefile @@ -134,7 +134,6 @@ include $(LUFA_PATH)/LUFA/makefile # List C source files here. (C dependencies are automatically generated.) SRC = $(TARGET).c \ Descriptors.c \ - Descriptors.c \ Lib/DataflashManager.c \ Lib/SCSI.c \ Lib/DS1307.c \ |