Tidy ups and makefile update

2023-09-14 09:56:30 +01:00
parent fe212140dd
commit 54711a5971
53 changed files with 1092 additions and 687 deletions
--- a/bitmaps.h
+++ b/bitmaps.h
@@ -28,13 +28,15 @@ extern const uint8_t BITMAP_VOX[18];

 extern const uint8_t BITMAP_TDR[12];

-#ifndef DISABLE_VOICE
+#ifdef ENABLE_VOICE
 	extern const uint8_t BITMAP_VoicePrompt[9];
 #endif

-extern const uint8_t BITMAP_FM[12];
+#ifdef ENABLE_FMRADIO
+	extern const uint8_t BITMAP_FM[12];
+#endif

-#ifndef DISABLE_NOAA
+#ifdef ENABLE_NOAA
 	extern const uint8_t BITMAP_NOAA[12];
 #endif