diff options
author | inmarket <andrewh@inmarket.com.au> | 2018-06-23 13:02:07 +1000 |
---|---|---|
committer | inmarket <andrewh@inmarket.com.au> | 2018-06-23 13:02:07 +1000 |
commit | 41271d632b74f5cf47c30d3b699eb6b2786f2136 (patch) | |
tree | 78bcb729c6d6177ca598f28908fefd186c50e9b6 /demos/modules/gadc/gwinosc.c | |
parent | 3b97fb798e96514057bcf17263c1e5dbdcd7da26 (diff) | |
download | uGFX-41271d632b74f5cf47c30d3b699eb6b2786f2136.tar.gz uGFX-41271d632b74f5cf47c30d3b699eb6b2786f2136.tar.bz2 uGFX-41271d632b74f5cf47c30d3b699eb6b2786f2136.zip |
Added new type definitions - moving towards V3.0
Diffstat (limited to 'demos/modules/gadc/gwinosc.c')
-rw-r--r-- | demos/modules/gadc/gwinosc.c | 14 |
1 files changed, 7 insertions, 7 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 */ |