From cada20fe245628f1be7ccc57a3a41e828ec13c66 Mon Sep 17 00:00:00 2001 From: Daniel Friesel Date: Wed, 16 Mar 2016 21:00:03 +0100 Subject: make delay independent from speed, document meaning of both --- src/system.cc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/system.cc') diff --git a/src/system.cc b/src/system.cc index 9e36c0a..7e43966 100644 --- a/src/system.cc +++ b/src/system.cc @@ -83,11 +83,11 @@ void System::loadPattern_buf(uint8_t *pattern) if (active_anim.type == AnimationType::TEXT) { active_anim.speed = 250 - (pattern[2] & 0xf0); - active_anim.delay = (pattern[2] & 0x0f ) << 4; + active_anim.delay = (pattern[2] & 0x0f ); active_anim.direction = pattern[3] >> 4; } else if (active_anim.type == AnimationType::FRAMES) { active_anim.speed = 250 - ((pattern[2] & 0x0f) << 4); - active_anim.delay = (pattern[3] & 0x0f) << 2; + active_anim.delay = (pattern[3] & 0x0f); active_anim.direction = 0; } @@ -288,9 +288,9 @@ void System::shutdown() display.update(); // and some more to debounce the buttons (and finish powerdown animation) - for (i = 0; i < 100; i++) { + for (i = 0; i < 200; i++) { display.update(); - _delay_ms(2); + _delay_ms(1); } // turn off display to indicate we're about to shut down @@ -319,9 +319,9 @@ void System::shutdown() display.update(); // debounce - for (i = 0; i < 50; i++) { + for (i = 0; i < 100; i++) { display.update(); - _delay_ms(2); + _delay_ms(1); } // finally, turn on the modem... -- cgit v1.2.3