X-Git-Url: http://www.average.org/gitweb/?p=pulsecounter.git;a=blobdiff_plain;f=Pulsecounter-Prog.c;h=317fb7c8a11e0701afeb58c0713e8b717ae47119;hp=107ad32c2aae86362ed29fa7c62628031cbefbb4;hb=1bdd8a835a5eefe1fb6fe631d1de47e0967c5ef5;hpb=7777d9668d46c0c5de8969490ecc0c7917f69f92 diff --git a/Pulsecounter-Prog.c b/Pulsecounter-Prog.c index 107ad32..317fb7c 100644 --- a/Pulsecounter-Prog.c +++ b/Pulsecounter-Prog.c @@ -3,9 +3,10 @@ static void gpioHandler(uint8_t id); static void tickHandler(void); -static bool connected = false; static int32_t cold = 0; static int32_t hot = 0; +static bool connected = false; +static bool updatable = false; void main() { Hal_init(); @@ -20,12 +21,17 @@ static void gpioHandler(uint8_t id) { switch (id) { case 0: - Pulsecounter_accept(true); - Hal_greenLedOn(); - Hal_redLedOn(); - Hal_delay(10); - Hal_greenLedOff(); - Hal_redLedOff(); + /* Pulsecounter_accept(true); */ + updatable = true; + if (connected) { + Pulsecounter_coldTick_indicate(); + Pulsecounter_hotTick_indicate(); + } + Hal_greenLedOn(); + Hal_redLedOn(); + Hal_delay(10); + Hal_greenLedOff(); + Hal_redLedOff(); Hal_tickStart(15000, tickHandler); break; case 1: @@ -71,13 +77,15 @@ static void tickHandler(void) { Hal_delay(50); Hal_greenLedOff(); } - Pulsecounter_accept(false); + updatable = false; + /* Pulsecounter_accept(false); */ } /* -------- SCHEMA CALLBACKS -------- */ void Pulsecounter_connectHandler(void) { connected = true; + Hal_tickStop(); Hal_connected(); Hal_redLedOn(); Hal_delay(100); @@ -89,13 +97,14 @@ void Pulsecounter_connectHandler(void) { void Pulsecounter_disconnectHandler(void) { connected = false; + updatable = false; Hal_greenLedOn(); Hal_delay(100); Hal_greenLedOff(); Hal_redLedOn(); Hal_delay(100); Hal_redLedOff(); - Hal_tickStart(15000, tickHandler); + /* Hal_tickStart(15000, tickHandler); */ Hal_disconnected(); } @@ -108,9 +117,11 @@ void Pulsecounter_hotTick_fetch(Pulsecounter_hotTick_t* const output) { } void Pulsecounter_coldSet_store(Pulsecounter_coldSet_t* const input) { - cold = *input; + if (updatable) + cold = *input; } void Pulsecounter_hotSet_store(Pulsecounter_hotSet_t* const input) { - hot = *input; + if (updatable) + hot = *input; }