diff options
Diffstat (limited to 'demos/modules/gadc')
| -rw-r--r-- | demos/modules/gadc/gwinosc.c | 14 | ||||
| -rw-r--r-- | demos/modules/gadc/main.c | 8 |
2 files changed, 11 insertions, 11 deletions
diff --git a/demos/modules/gadc/gwinosc.c b/demos/modules/gadc/gwinosc.c index f29107bc..e82cd7d8 100644 --- a/demos/modules/gadc/gwinosc.c +++ b/demos/modules/gadc/gwinosc.c @@ -89,10 +89,10 @@ void gwinScopeWaitForTrace(GHandle gh) { GDataBuffer *pd; 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 @@ -116,10 +116,10 @@ void gwinScopeWaitForTrace(GHandle gh) { pc = gs->lastscopetrace+x; pa = (adcsample_t *)(pd+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 @@ -144,7 +144,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) { @@ -157,7 +157,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 { @@ -169,7 +169,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/gadc/main.c b/demos/modules/gadc/main.c index ee54a118..5d07f8eb 100644 --- a/demos/modules/gadc/main.c +++ b/demos/modules/gadc/main.c @@ -154,7 +154,7 @@ int main(void) { GWindowInit wi; gwinClearInit(&wi); - wi.show = TRUE; + wi.show = gTrue; wi.x = wi.y = 0; wi.width = swidth-SCOPE_CX; wi.height = sheight; @@ -166,7 +166,7 @@ int main(void) { /* Start our timer for reading the dial */ gtimerInit(&lsTimer); - gtimerStart(&lsTimer, LowSpeedTimer, ghText, TRUE, MY_LS_DELAY); + gtimerStart(&lsTimer, LowSpeedTimer, ghText, gTrue, MY_LS_DELAY); #endif /** @@ -188,7 +188,7 @@ int main(void) { GWindowInit wi; gwinClearInit(&wi); - wi.show = TRUE; + wi.show = gTrue; wi.x = swidth-SCOPE_CX; wi.y = 0; wi.width = SCOPE_CX; @@ -200,7 +200,7 @@ int main(void) { gwinClear(ghScope); /* Just keep displaying the scope traces */ - while (TRUE) { + while (1) { /** * The function below internally performs a wait thus giving the timer thread a * chance to run. |