Closes #343: Fix IGNORE_OW_DECKS compile flag implementation

bitcraze · Jul 2, 2018 · 7d646a6 · 7d646a6
1 parent 5d0f8d3
commit 7d646a6
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/src/deck/core/deck.c b/src/deck/core/deck.c
@@ -44,7 +44,6 @@ void deckInit()
   deckDriverCount();
   deckInfoInit();
 
-#ifndef IGNORE_OW_DECKS
   int nDecks;
   int i;
 
@@ -65,13 +64,11 @@ void deckInit()
       deck->driver->init(deck);
     }
   }
-#endif
 }
 
 bool deckTest()
 {
   bool pass = true;
-#ifndef IGNORE_OW_DECKS
   int nDecks;
   int i;
 
@@ -89,7 +86,6 @@ bool deckTest()
       }
     }
   }
-#endif
 
   return pass;
 }
diff --git a/src/deck/core/deck_info.c b/src/deck/core/deck_info.c
@@ -92,6 +92,7 @@ DeckInfo * deckInfo(int i)
 // Dummy driver for decks that do not have a driver implemented
 static const DeckDriver dummyDriver;
 
+#ifndef IGNORE_OW_DECKS
 static const DeckDriver * findDriver(DeckInfo *deck)
 {
   char name[30];
@@ -110,6 +111,7 @@ static const DeckDriver * findDriver(DeckInfo *deck)
 
   return driver;
 }
+#endif
 
 void printDeckInfo(DeckInfo *info)
 {
@@ -135,6 +137,7 @@ void printDeckInfo(DeckInfo *info)
   }
 }
 
+#ifndef IGNORE_OW_DECKS
 static bool infoDecode(DeckInfo * info)
 {
   uint8_t crcHeader;
@@ -168,11 +171,11 @@ static bool infoDecode(DeckInfo * info)
 
   return true;
 }
+#endif
 
 static void enumerateDecks(void)
 {
   uint8_t nDecks = 0;
-  int i;
   bool noError = true;
 
   owInit();
@@ -186,7 +189,8 @@ static void enumerateDecks(void)
     nDecks = 0;
   }
 
-  for (i = 0; i < nDecks; i++)
+#ifndef IGNORE_OW_DECKS
+  for (int i = 0; i < nDecks; i++)
   {
     DECK_INFO_DBG_PRINT("Enumerating deck %i\n", i);
     if (owRead(i, 0, sizeof(deckInfos[0].raw), (uint8_t *)&deckInfos[i]))
@@ -214,6 +218,10 @@ static void enumerateDecks(void)
       noError = false;
     }
   }
+#else
+  DEBUG_PRINT("Ignoring all OW decks because of compile flag.\n");
+  nDecks = 0;
+#endif
 
   // Add build-forced driver
   if (strlen(deck_force) > 0) {