Save brightness to eeprom

[rgblamp.git] / tmr.c

diff --git a/tmr.c b/tmr.c
index 670d0e142398c57313573e21b8e9666bc814ce6e..09e6c2d3cef8dbbb1fe0170442bac3c77175bd8e 100644 (file)
--- a/tmr.c
+++ b/tmr.c
@@ -37,7 +37,7 @@ static tmr_time_t _tmr_elapsed[TMR_COUNT];
 
 void tmr_init()
 {
-  /* Configure Timer0 to overflow every 32 msec.  Adjust with
+  /* Configure Timer0 to overflow every 32 msec.  Adjust for
    * Fosc as set in picinit.[ch].  At 4 MHz, prescale is 1:128.
    * TMR0CS = 0, PSA = 0, PS = 0b110
   */
@@ -108,7 +108,7 @@ void tmr_isr()
     TMR0IF = 0;
     _tmr_ticks++;
     for (tmr_bitno_t t = 0; t < TMR_COUNT; t++) {
-      if (bit_get(_tmr_on, t) && _tmr_ticks - _tmr_t0[t] <= _tmr_elapsed[t]) {
+      if (bit_get(_tmr_on, t) && _tmr_ticks - _tmr_t0[t] >= _tmr_elapsed[t]) {
         bit_set(_tmr_flag, t);
         if (bit_get(_tmr_periodic, t))
           _tmr_t0[t] += _tmr_elapsed[t];
@@ -119,17 +119,8 @@ void tmr_isr()
   }
 }
 
-/* Wait for a specific timer value t */
-#define tmr_wait(t) while (TMR0 != t);
-
 void tmr_uwait(unsigned us)
 {
-  unsigned t0 = TMR0;
-
-  while (us >= 32768) {
-    tmr_wait(t0);
-    us -= 32768;
-  }
   while (us >= 16384) {
     tmr_cwait(128);
     us -= 16384;
@@ -139,12 +130,6 @@ void tmr_uwait(unsigned us)
 
 void tmr_mwait(unsigned ms)
 {
-  unsigned t0 = TMR0;
-
-  while (ms >= 32) {
-    tmr_wait(t0);
-    ms -= 32;
-  }
   while (ms >= 16) {
     tmr_cwait(128);
     ms -= 16;