diff options
Diffstat (limited to 'Projects/TempDataLogger')
6 files changed, 16 insertions, 13 deletions
diff --git a/Projects/TempDataLogger/Lib/DataflashManager.h b/Projects/TempDataLogger/Lib/DataflashManager.h index 90236260..784ede47 100644 --- a/Projects/TempDataLogger/Lib/DataflashManager.h +++ b/Projects/TempDataLogger/Lib/DataflashManager.h @@ -53,7 +53,7 @@ #endif /* Defines: */ - /** Total number of bytes of the storage medium, comprised of one or more dataflash ICs. */ + /** Total number of bytes of the storage medium, comprised of one or more Dataflash ICs. */ #define VIRTUAL_MEMORY_BYTES ((uint32_t)DATAFLASH_PAGES * DATAFLASH_PAGE_SIZE * DATAFLASH_TOTALCHIPS) /** Block size of the device. This is kept at 512 to remain compatible with the OS despite the underlying diff --git a/Projects/TempDataLogger/TempDataLogger.c b/Projects/TempDataLogger/TempDataLogger.c index 9ead42ed..eb63bc6a 100644 --- a/Projects/TempDataLogger/TempDataLogger.c +++ b/Projects/TempDataLogger/TempDataLogger.c @@ -227,7 +227,7 @@ void EVENT_USB_Device_Connect(void) { LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING); - /* Close the log file so that the host has exclusive filesystem access */ + /* Close the log file so that the host has exclusive file system access */ CloseLogFile(); } diff --git a/Projects/TempDataLogger/TempLogHostApp/DataLoggerSettings.Designer.cs b/Projects/TempDataLogger/TempLogHostApp/DataLoggerSettings.Designer.cs index 7b4249c4..58fac514 100644 --- a/Projects/TempDataLogger/TempLogHostApp/DataLoggerSettings.Designer.cs +++ b/Projects/TempDataLogger/TempLogHostApp/DataLoggerSettings.Designer.cs @@ -157,7 +157,7 @@ this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "frmDataloggerSettings"; - this.Text = "DataLogger"; + this.Text = "Datalogger"; this.Load += new System.EventHandler(this.frmDataloggerSettings_Load); ((System.ComponentModel.ISupportInitialize)(this.nudLogInterval)).EndInit(); this.ResumeLayout(false); diff --git a/Projects/TempDataLogger/TempLogHostApp/DataLoggerSettings.cs b/Projects/TempDataLogger/TempLogHostApp/DataLoggerSettings.cs index 98e6006f..01e9fb6e 100644 --- a/Projects/TempDataLogger/TempLogHostApp/DataLoggerSettings.cs +++ b/Projects/TempDataLogger/TempLogHostApp/DataLoggerSettings.cs @@ -85,7 +85,7 @@ namespace Project1HostApp if (ConnectionHandle == null) { - MessageBox.Show("Error: Cannot connect to DataLogger device."); + MessageBox.Show("Error: Cannot connect to Datalogger device."); return; } @@ -115,7 +115,7 @@ namespace Project1HostApp if (ConnectionHandle == null) { - MessageBox.Show("Error: Cannot connect to DataLogger device."); + MessageBox.Show("Error: Cannot connect to Datalogger device."); return; } diff --git a/Projects/TempDataLogger/TempLogHostApp/Properties/AssemblyInfo.cs b/Projects/TempDataLogger/TempLogHostApp/Properties/AssemblyInfo.cs index c6fd450c..a4d0ab1d 100644 --- a/Projects/TempDataLogger/TempLogHostApp/Properties/AssemblyInfo.cs +++ b/Projects/TempDataLogger/TempLogHostApp/Properties/AssemblyInfo.cs @@ -9,7 +9,7 @@ using System.Runtime.InteropServices; [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Dean Camera")] -[assembly: AssemblyProduct("Temp DataLogger HostApp")] +[assembly: AssemblyProduct("Temp Datalogger HostApp")] [assembly: AssemblyCopyright("Copyright © Dean Camera 2011")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/Projects/TempDataLogger/makefile b/Projects/TempDataLogger/makefile index 860ff237..40a754a8 100644 --- a/Projects/TempDataLogger/makefile +++ b/Projects/TempDataLogger/makefile @@ -18,7 +18,7 @@ OPTIMIZATION = s TARGET = TempDataLogger SRC = $(TARGET).c Descriptors.c Lib/DataflashManager.c Lib/DS1307.c Lib/SCSI.c Lib/FATFs/diskio.c Lib/FATFs/ff.c \ $(LUFA_SRC_USB) $(LUFA_SRC_USBCLASS) $(LUFA_SRC_SERIAL) $(LUFA_SRC_TWI) $(LUFA_SRC_TEMPERATURE) -LUFA_PATH = ../../LUFA/ +LUFA_PATH = ../../LUFA CC_FLAGS = -DUSE_LUFA_CONFIG_HEADER -IConfig/ LD_FLAGS = @@ -26,9 +26,12 @@ LD_FLAGS = all: # Include LUFA build script makefiles -include $(LUFA_PATH)/Build/lufa.core.in -include $(LUFA_PATH)/Build/lufa.sources.in -include $(LUFA_PATH)/Build/lufa.build.in -include $(LUFA_PATH)/Build/lufa.doxygen.in -include $(LUFA_PATH)/Build/lufa.dfu.in -include $(LUFA_PATH)/Build/lufa.avrdude.in +include $(LUFA_PATH)/Build/lufa_core.mk +include $(LUFA_PATH)/Build/lufa_sources.mk +include $(LUFA_PATH)/Build/lufa_build.mk +include $(LUFA_PATH)/Build/lufa_cppcheck.mk +include $(LUFA_PATH)/Build/lufa_doxygen.mk +include $(LUFA_PATH)/Build/lufa_dfu.mk +include $(LUFA_PATH)/Build/lufa_hid.mk +include $(LUFA_PATH)/Build/lufa_avrdude.mk +include $(LUFA_PATH)/Build/lufa_atprogram.mk |