fixed style issues, and Makefile build to always include FatFS FileReader

stephenhensley · stephenhensley · commit dfd851cbf048 · 2025-09-11T16:37:32.000-07:00
diff --git a/core/Makefile b/core/Makefile
@@ -169,11 +169,12 @@ FATFS_SOURCES += \
 
 ifeq ($(USE_FATFS),1)
 C_SOURCES += $(FATFS_SOURCES)
-# File I/O Abstract Interface for FatFS:
-C_DEFS += -DFILEIO_ENABLE_FATFS_READER
 endif
 C_INCLUDES += -I$(FATFS_DIR)
 
+# File I/O Abstract Interface for FatFS:
+C_DEFS += -DFILEIO_ENABLE_FATFS_READER
+
 # compile gcc flags
 ASFLAGS = $(MCU) $(AS_DEFS) $(AS_INCLUDES) $(OPT) -Wall -fdata-sections -ffunction-sections
 
diff --git a/src/util/FileReader.h b/src/util/FileReader.h
@@ -9,7 +9,6 @@
 
 namespace daisy
 {
-
 // Abstract reader interface (minimal). Provide concrete implementation for
 // platform.
 class IReader
diff --git a/src/util/FileTable.h b/src/util/FileTable.h
@@ -7,8 +7,6 @@
 
 namespace daisy
 {
-
-
 /** Utility class for creating an index of file names
  *  and lengths from a given directory.
  *
diff --git a/src/util/WavParser.h b/src/util/WavParser.h
@@ -30,7 +30,6 @@
 
 namespace daisy
 {
-
 struct WavFormatInfo
 {
     uint16_t audioFormat   = 0; // 1 = PCM, 3 = IEEE float, 0xFFFE = extensible
diff --git a/src/util/WavPlayer.h b/src/util/WavPlayer.h
@@ -7,7 +7,6 @@
 
 namespace daisy
 {
-
 /**
  * WAV file Streaming Playback
  *

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,6 @@`
`9`	`9`
`10`	`10`	`namespace daisy`
`11`	`11`	`{`
`12`		`-`
`13`	`12`	`// Abstract reader interface (minimal). Provide concrete implementation for`
`14`	`13`	`// platform.`
`15`	`14`	`class IReader`
Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,6 @@`
`7`	`7`
`8`	`8`	`namespace daisy`
`9`	`9`	`{`
`10`		`-`
`11`		`-`
`12`	`10`	`/** Utility class for creating an index of file names`
`13`	`11`	`* and lengths from a given directory.`
`14`	`12`	`*`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,6 @@`
`30`	`30`
`31`	`31`	`namespace daisy`
`32`	`32`	`{`
`33`		`-`
`34`	`33`	`struct WavFormatInfo`
`35`	`34`	`{`
`36`	`35`	`uint16_t audioFormat = 0; // 1 = PCM, 3 = IEEE float, 0xFFFE = extensible`