4 files changed, 12 insertions, 12 deletions
diff --git a/demos/modules/gaudio/oscilloscope/gwinosc.c b/demos/modules/gaudio/oscilloscope/gwinosc.c
index fcad648f..38edb35e 100644
--- a/demos/modules/gaudio/oscilloscope/gwinosc.c
+++ b/demos/modules/gaudio/oscilloscope/gwinosc.c
@@ -106,10 +106,10 @@ void gwinScopeWaitForTrace(GHandle gh) {
 	uint8_t			shr;
 
 	#if TRIGGER_METHOD == TRIGGER_POSITIVERAMP
-		bool_t			rdytrigger;
+		gBool			rdytrigger;
 		int				flsamples;
 	#elif TRIGGER_METHOD == TRIGGER_MINVALUE
-		bool_t			rdytrigger;
+		gBool			rdytrigger;
 		int				flsamples;
 		coord_t			scopemin;
 	#endif
@@ -136,10 +136,10 @@ void gwinScopeWaitForTrace(GHandle gh) {
 	pa16 = (uint16_t *)(paud+1);
 
 	#if TRIGGER_METHOD == TRIGGER_POSITIVERAMP
-		rdytrigger = FALSE;
+		rdytrigger = gFalse;
 		flsamples = 0;
 	#elif TRIGGER_METHOD == TRIGGER_MINVALUE
-		rdytrigger = FALSE;
+		rdytrigger = gFalse;
 		flsamples = 0;
 		scopemin = 0;
 	#endif
@@ -167,7 +167,7 @@ void gwinScopeWaitForTrace(GHandle gh) {
 				#if TRIGGER_METHOD == TRIGGER_MINVALUE
 					/* Arm when we reach the sample minimum (y value maximum) of the previous trace */
 					if (!rdytrigger && y >= gs->scopemin)
-						rdytrigger = TRUE;
+						rdytrigger = gTrue;
 				#endif
 
 				if (y == gs->lasty) {
@@ -180,7 +180,7 @@ void gwinScopeWaitForTrace(GHandle gh) {
 					flsamples = 0;
 					#if TRIGGER_METHOD == TRIGGER_POSITIVERAMP
 						/* Arm the trigger when samples fall (y increases) ie. negative slope */
-						rdytrigger = TRUE;
+						rdytrigger = gTrue;
 					#endif
 					continue;
 				} else {
@@ -192,7 +192,7 @@ void gwinScopeWaitForTrace(GHandle gh) {
 				}
 
 				/* Ready for a the next trigger cycle */
-				rdytrigger = FALSE;
+				rdytrigger = gFalse;
 			#endif
 
 			/* Prepare for a scope trace */
diff --git a/demos/modules/gaudio/oscilloscope/main.c b/demos/modules/gaudio/oscilloscope/main.c
index 335b2cee..cd62e1f1 100644
--- a/demos/modules/gaudio/oscilloscope/main.c
+++ b/demos/modules/gaudio/oscilloscope/main.c
@@ -74,7 +74,7 @@ int main(void) {
 		GWindowInit	wi;
 
 		gwinClearInit(&wi);
-		wi.show = TRUE;
+		wi.show = gTrue;
 		wi.x = wi.y = 0;
 		wi.width = swidth; wi.height = sheight;
 		ghScope = gwinScopeCreate(&gScopeWindow, &wi, MY_AUDIO_CHANNEL, MY_AUDIO_FREQUENCY, MY_AUDIO_FORMAT);
@@ -84,7 +84,7 @@ int main(void) {
 	gwinClear(ghScope);
 
 	/* Just keep displaying the scope traces */
-	while (TRUE) {
+	while (1) {
 		gwinScopeWaitForTrace(ghScope);
 	}
 }
diff --git a/demos/modules/gaudio/play-vs1053/main.c b/demos/modules/gaudio/play-vs1053/main.c
index 66ac5f8d..21e28c98 100644
--- a/demos/modules/gaudio/play-vs1053/main.c
+++ b/demos/modules/gaudio/play-vs1053/main.c
@@ -114,6 +114,6 @@ theend:
 	if (errmsg)
 		gdispDrawString(0, gdispGetHeight()/2, errmsg, font, GFX_RED);
 
-	while(TRUE)
+	while(1)
 		gfxSleepMilliseconds(1000);
 }
diff --git a/demos/modules/gaudio/play-wave/main.c b/demos/modules/gaudio/play-wave/main.c
index af3df7d1..4c863fcf 100644
--- a/demos/modules/gaudio/play-wave/main.c
+++ b/demos/modules/gaudio/play-wave/main.c
@@ -139,7 +139,7 @@ repeatplay:
 	len += 20;
 
 	// Read RIFF blocks until we get to the data RIFF block (contains the audio)
-	while(TRUE) {
+	while(1) {
 		if (gfileRead(f, whdr, 8) != 8) {
 			errmsg = "Err: Read block";
 			goto theend;
@@ -196,6 +196,6 @@ theend:
 	if (errmsg)
 		gdispDrawString(0, gdispGetHeight()/2, errmsg, font, GFX_RED);
 
-	while(TRUE)
+	while(1)
 		gfxSleepMilliseconds(1000);
 }