Merge pull request #17 from maxgerhardt/master

earlephilhower · web-flow · commit a875f4e03524 · 2021-06-16T08:07:47.000-07:00
Refactor debug header and macro
diff --git a/src/ReciterTabs.h b/src/ReciterTabs.h
@@ -2,8 +2,8 @@
 #define RECITERTABS_H
 
 #include <pgmspace.h>
-#include "debug.h"
-#if debug
+#include "esp8266sam_debug.h"
+#if DEBUG_ESP8266SAM_LIB
   #define PROGMEM
 #endif
 
diff --git a/src/RenderTabs.h b/src/RenderTabs.h
@@ -2,8 +2,8 @@
 #define RENDERTABS_H
 
 #include <pgmspace.h>
-#include "debug.h"
-#if debug
+#include "esp8266sam_debug.h"
+#if DEBUG_ESP8266SAM_LIB
   #define PROGMEM
 #endif
 
diff --git a/src/SamTabs.h b/src/SamTabs.h
@@ -2,8 +2,8 @@
 #define SAMTABS_H
 
 #include <pgmspace.h>
-#include "debug.h"
-#if debug
+#include "esp8266sam_debug.h"
+#if DEBUG_ESP8266SAM_LIB
   #define PROGMEM
 #endif
 
diff --git a/src/esp8266sam_debug.c b/src/esp8266sam_debug.c
diff --git a/src/esp8266sam_debug.h b/src/esp8266sam_debug.h
@@ -1,5 +1,5 @@
-#ifndef DEBUG_H
-#define DEBUG_H
+#ifndef ESP8266SAM_DEBUG_H
+#define ESP8266SAM_DEBUG_H
 
 void PrintPhonemes(unsigned char *phonemeindex, unsigned char *phonemeLength, unsigned char *stress);
 void PrintOutput(
@@ -14,6 +14,6 @@ void PrintOutput(
 
 void PrintRule(int offset);
 
-#define debug 0
+#define DEBUG_ESP8266SAM_LIB 0
 
 #endif
diff --git a/src/reciter.c b/src/reciter.c
@@ -2,7 +2,7 @@
 #include <string.h>
 #include "reciter.h"
 #include "ReciterTabs.h"
-#include "debug.h"
+#include "esp8266sam_debug.h"
 #include "SamData.h"
 
 unsigned char A, X, Y;
@@ -527,7 +527,7 @@ int TextToPhonemes(char *input) // Code36484
 	Y = mem64;
 	mem61 = mem60;
 
-	if (debug)
+	if (DEBUG_ESP8266SAM_LIB)
 		PrintRule(mem62);
 
 pos37461:
diff --git a/src/render.c b/src/render.c
@@ -5,8 +5,7 @@
 #include "render.h"
 #include "RenderTabs.h"
 
-#include "debug.h"
-//extern int debug;
+#include "esp8266sam_debug.h"
 #include <pgmspace.h>
 #include "SamData.h"
 
@@ -445,7 +444,7 @@ do
 	mem44++;
 } while(mem44 != 0);
 yield();
-if (debug)
+if (DEBUG_ESP8266SAM_LIB)
 {
         PrintOutput(sampledConsonantFlag, frequency1, frequency2, frequency3, amplitude1, amplitude2, amplitude3, pitches);
 }
@@ -786,7 +785,7 @@ if (debug)
 	X = A;
 	mem38 = A - (A>>2);     // 3/4*A ???
 yield();
-if (debug)
+if (DEBUG_ESP8266SAM_LIB)
 {
         PrintOutput(sampledConsonantFlag, frequency1, frequency2, frequency3, amplitude1, amplitude2, amplitude3, pitches);
 }
diff --git a/src/sam.c b/src/sam.c

Original file line number	Diff line number	Diff line change
`@@ -5,8 +5,7 @@`
`5`	`5`	`#include "render.h"`
`6`	`6`	`#include "RenderTabs.h"`
`7`	`7`
`8`		`-#include "debug.h"`
`9`		`-//extern int debug;`
	`8`	`+#include "esp8266sam_debug.h"`
`10`	`9`	`#include <pgmspace.h>`
`11`	`10`	`#include "SamData.h"`
`12`	`11`
`@@ -445,7 +444,7 @@ do`
`445`	`444`	`mem44++;`
`446`	`445`	`} while(mem44 != 0);`
`447`	`446`	`yield();`
`448`		`-if (debug)`
	`447`	`+if (DEBUG_ESP8266SAM_LIB)`
`449`	`448`	`{`
`450`	`449`	`PrintOutput(sampledConsonantFlag, frequency1, frequency2, frequency3, amplitude1, amplitude2, amplitude3, pitches);`
`451`	`450`	`}`
`@@ -786,7 +785,7 @@ if (debug)`
`786`	`785`	`X = A;`
`787`	`786`	`mem38 = A - (A>>2); // 3/4*A ???`
`788`	`787`	`yield();`
`789`		`-if (debug)`
	`788`	`+if (DEBUG_ESP8266SAM_LIB)`
`790`	`789`	`{`
`791`	`790`	`PrintOutput(sampledConsonantFlag, frequency1, frequency2, frequency3, amplitude1, amplitude2, amplitude3, pitches);`
`792`	`791`	`}`