X-Git-Url: https://oss.titaniummirror.com/gitweb/?a=blobdiff_plain;f=main.c;h=bfc6b1e6d367348390eec8bd17575e71a1d3617c;hb=624881d8aa35bb0d66e1422d3b36ce456af897ca;hp=cb05d747df629781ae1e3a1647440090f9e93ca9;hpb=1eee76670bd725ca44d1574f96ff3a0d773f2995;p=rgblamp.git diff --git a/main.c b/main.c index cb05d74..bfc6b1e 100644 --- a/main.c +++ b/main.c @@ -38,6 +38,7 @@ #include #include "picinit.h" #include "unused.h" +#include "lfsr.h" #include "btn.h" #include "rgb.h" #include "tmr.h" @@ -45,66 +46,175 @@ #include "task.h" #include "adc_random.h" -#if 1 -#define AUTO_OFF_COUNT 1800U /* 1 hr in 2 sec units */ -#define AUTO_ON_COUNT 19800U /* 11 hrs in 2 sec units */ -#else -#define AUTO_OFF_COUNT 9000U /* 5 hrs in 2 sec units */ -#define AUTO_ON_COUNT 34200U /* 19 hrs in 2 sec units */ -#endif -#define leds_set(r,g,b,w) rgb_set((r).value >> 7, (g).value >> 7, \ - (b).value >> 7, 0) -#define dbgpin_init() do { \ - /* Set RA2 as output low */ \ - RA2 = 0; \ - TRISA2 = 0; \ - } while (0) +//#define AUTO_OFF_COUNT 150 /* 5 mins on*/ +//#define AUTO_ON_COUNT 300 /* 10 mins off */ +//#define AUTO_OFF_COUNT 450 /* 15 mins on*/ +//#define AUTO_ON_COUNT 1350 /* 45 mins off */ +//#define AUTO_OFF_COUNT 600 /* 20 mins on*/ +//#define AUTO_ON_COUNT 1200 /* 40 mins off */ +//#define AUTO_OFF_COUNT 450 /* 2 hours on*/ +//#define AUTO_ON_COUNT 1350 /* 22 hours off */ +#define AUTO_OFF_COUNT 9000U /* 5 hrs in 2 sec units */ +#define AUTO_ON_COUNT 34200U /* 19 hrs in 2 sec units */ +#define dbgpin_init() do { \ + /* Set RA2 as output low */ \ + RA2 = 0; \ + TRISA2 = 0; \ + } while (0) #define dbgpin_high() (RA2 = 1) #define dbgpin_low() (RA2 = 0) #define dbgpin_toggle() (RA2 = (LATA2 == 0) ? 1 : 0) +enum { + /* Operating modes */ + MODE_SOLID = 0, /* Cycle through colors[][] before next mode */ + //MODE_CANDLE, + MODE_CYCLE, /* Auto cycle through colors */ + MODE_PARTY, /* Random yet fast incolor and fade */ + MODE_COUNT, + + /* Indexes in colors[][] for LEDs */ + LED_RED = 0, + LED_GRN, + LED_BLU, + LED_WHT, + LED_COUNT, + + HELD_TMR_PERIODS = 1, /* Held timer fires every 32.768 msec */ + HELD_PERIODS = 16, /* Held this long before held events fire */ + COLOR_WHITE = 0, /* Color index for white */ + COLOR_COUNT = 11, + BRIGHT_TOP = 100, /* Bright ramps up to top ... */ + BRIGHT_BOTTOM = -5, /* ... then down to bottom */ + BRIGHT_MAX = 85, /* Bright values are constrained for computations */ + BRIGHT_MIN = 1, /* ... by min and max. */ + BRIGHT_INIT = 42, /* later, get from eeprom */ + STD_FADE = 16, /* Fade time in 32.768 ms units */ + STD_INCOLOR = 29491, /* Time in color when MODE_CYCLE, in 32.768 ms units */ + PARTY_MIN = 8, /* Min party fade and incolor units */ + PARTY_RANGE = 8, /* Party fade/incolor range mask for lfsr_get() */ + /* ... see start_fade() */ + CFG_ADDR = 0, /* EEPROM address of start of configuration */ + CFG_DELAY = 183, /* 6 seconds in 32.768 msec units */ +}; + typedef struct { int value; int increment; signed char remainder; } led_t; -/* The index of all step arrays is the speed variable. min values must be - * at least one. range values are bit-ANDed with rand() to generate a range, so - * ensure they are one less than a power of 2 and at least 1. - */ -const static unsigned min_incolor_steps[4] = { 320, 32, 32, 1 }; -const static unsigned range_incolor_steps[4] = { 32767, 127, 31, 7 }; -const static int min_fade_steps[4] = { 64, 32, 32, 8 }; -const static int range_fade_steps[4] = { 511, 127, 31, 7 }; +/* Available colors, 6 bits per color (no values above 0x3f) */ +const unsigned char colors[COLOR_COUNT][LED_COUNT] = { + { 0x28, 0x00, 0x00, 0x00 }, /* red */ + { 0x30, 0x20, 0x00, 0x00 }, /* orange */ + { 0x2c, 0x2c, 0x00, 0x00 }, /* yellow */ + { 0x20, 0x2c, 0x00, 0x00 }, /* yellow-green */ + { 0x00, 0x30, 0x00, 0x00 }, /* green */ + { 0x00, 0x30, 0x18, 0x00 }, /* green-cyan */ + { 0x00, 0x30, 0x28, 0x00 }, /* cyan */ + { 0x00, 0x18, 0x30, 0x00 }, /* cyan-blue */ + { 0x00, 0x00, 0x30, 0x00 }, /* blue */ + { 0x1c, 0x00, 0x30, 0x00 }, /* magenta */ + { 0x3f, 0x3f, 0x3f, 0x3f }, /* white */ +}; +unsigned char mode = MODE_SOLID; +unsigned char color = COLOR_WHITE; +signed char bright = BRIGHT_INIT; +bit bright_up; led_t red; led_t grn; led_t blu; led_t wht; bit on; -unsigned char speed; int fade_steps; +signed char pbHeldCount; + +void cfg_write() +{ + unsigned char addr = CFG_ADDR; + unsigned char m, c; + signed char b; + + m = eeprom_read(addr++); + c = eeprom_read(addr++); + b = eeprom_read(addr); + if (mode != m || color != c || bright != b) { + addr = CFG_ADDR; + eeprom_write(addr++, mode); + eeprom_write(addr++, color); + eeprom_write(addr, bright); + } +} + +void cfg_read() +{ + unsigned char addr = CFG_ADDR; + unsigned char tmp; + + tmp = eeprom_read(addr++); + if (tmp < MODE_COUNT) + mode = tmp; + + tmp = eeprom_read(addr++); + if (tmp < COLOR_COUNT) + color = tmp; + + tmp = eeprom_read(addr); + if ((signed char)tmp >= BRIGHT_BOTTOM && (signed char)tmp <= BRIGHT_TOP) + bright = tmp; +} + +/* Combine LED color value and brightness level to generate an RGB value. + * bright will be BRIGHT_MIN...BRIGHT_MAX + * + * @param value 0...1023 (6 bit color, left shifted 4 bits, for 10 bits) + * @param b brightness value BRIGHT_MIN...BRIGHT_MAX + * @return An RGB drive value, 0...255 + */ +unsigned char led_get(int value, signed char b) +{ + return (unsigned long)value * b / 4 / BRIGHT_MAX; +} + +/* Set the LEDs using color values and current brightness. */ +void leds_set() +{ + signed char b; + + if (bright > BRIGHT_MAX) + b = BRIGHT_MAX; + else if (bright < BRIGHT_MIN) + b = BRIGHT_MIN; + else + b = bright; + rgb_set(led_get((red).value, b), led_get((grn).value, b), + led_get((blu).value, b), led_get((wht).value, b)); +} void start_fade() { - /* RGB PWM values are 8 bits, but computations are done in 15 - * (leaving room for a sign bit), so leds_set() uses >>7 to convert - * to PWM values. - */ + /* RGB PWM values are 8 bits. Color values are 12 bits. See led_get() + * for the conversion of color values and brightness to RGB values. + */ int newr, newg, newb, neww; - /* New RGB values; all zero is not a valid option */ - do { - newr = rand(); - newg = rand(); - newb = rand(); - neww = rand(); - } while (newr == 0 && newg == 0 && newb == 0 && neww == 0); + /* Select the destination color and fade-to time depending upon mode. */ + fade_steps = STD_FADE; + if (mode == MODE_PARTY) { + color = lfsr_get() % COLOR_COUNT; + fade_steps = PARTY_MIN + (lfsr_get() % PARTY_RANGE); + } else if (mode == MODE_CYCLE) { + if (++color == COLOR_COUNT) + color = 0; + } - /* Random # of steps to reach the new color */ - fade_steps = min_fade_steps[speed & 3] + - (rand() & range_fade_steps[speed & 3]); + /* Retrieve the destination color */ + newr = colors[color][LED_RED] << 4; + newg = colors[color][LED_GRN] << 4; + newb = colors[color][LED_BLU] << 4; + neww = colors[color][LED_WHT] << 4; /* Compute increment per fade step, and remainder, for each led */ red.increment = (newr - red.value) / fade_steps; @@ -125,11 +235,6 @@ void turnOn() { dbgpin_high(); on = 1; - red.value = 0; - grn.value = 0; - blu.value = 0; - wht.value = 0; - leds_set(red, grn, blu, wht); rgb_on(); start_fade(); btn_pben(); @@ -138,24 +243,83 @@ void turnOn() void turnOff() { /* Event on to off, either by switch or auto-off timer */ + tmr_stop(TMR_CFG); tmr_stop(TMR_INCOLOR); tmr_stop(TMR_FADE); rgb_off(); + red.value = grn.value = blu.value = wht.value = 0; + on = 0; dbgpin_low(); SLEEP(); - on = 0; } -void pb_task() +void pb_clicked() { - /* Is this task running nearly continuously? */ if (on) { - if (btn_pb() == BTN_PB_UP) { - speed = (speed + 1) & 3; - start_fade(); + if (mode == MODE_SOLID) { + if (++color == COLOR_COUNT) { + color = 0; + if (++mode == MODE_COUNT) + mode = 0; + } + } else if (++mode == MODE_COUNT) { + mode = 0; + color = 0; } - btn_pben(); + tmr_start(TMR_CFG, CFG_DELAY); + start_fade(); + } +} + +void pb_held() +{ + /* The button has been held. Change the color magnitude. */ + if (bright_up) { + if (bright == BRIGHT_TOP) + bright_up = 0; + else + bright++; + } else { + if (bright == BRIGHT_BOTTOM) + bright_up = 1; + else + bright--; } + tmr_start(TMR_CFG, CFG_DELAY); + leds_set(); +} + +void pb_held_task() +{ + pbHeldCount++; + if (pbHeldCount >= 0) { + pbHeldCount = 0; + pb_held(); + } +} + +void pb_task() +{ + static unsigned char pbPrev = BTN_PB_UP; + unsigned char pb; + + pb = btn_pb(); + if (pbPrev == BTN_PB_UP) { + if (pb == BTN_PB_UP) + pb_clicked(); + else /* (pb == BTN_PB_DOWN) */ { + tmr_startPeriodic(TMR_BTN_PB_HELD, HELD_TMR_PERIODS); + pbHeldCount = -HELD_PERIODS; + } + } else /* if (pbPrev == BTN_PB_DOWN) */ { + if (pb == BTN_PB_UP) { + tmr_stop(TMR_BTN_PB_HELD); + if (pbHeldCount < 0) + pb_clicked(); + } /* nothing to do if button is down */ + } + pbPrev = pb; + btn_pben(); } void rs_task() @@ -190,10 +354,12 @@ void fade_task() blu.value += blu.remainder; wht.value += wht.remainder; tmr_stop(TMR_FADE); - tmr_start(TMR_INCOLOR, min_incolor_steps[speed & 3] + - (rand() & range_incolor_steps[speed & 3])); + if (mode == MODE_CYCLE) + tmr_start(TMR_INCOLOR, STD_INCOLOR); + else if (mode == MODE_PARTY) + tmr_start(TMR_INCOLOR, PARTY_MIN + (lfsr_get() % PARTY_RANGE)); } - leds_set(red, grn, blu, wht); + leds_set(); } void auto_offon_task() @@ -212,7 +378,8 @@ void auto_offon_task() void user_boot() { dbgpin_high(); - srand((adc_random() << 8) + adc_random()); + lfsr_init((adc_random() << 8) + adc_random()); + cfg_read(); rs_task(); } @@ -228,6 +395,9 @@ void user_tasks(unsigned char block) case TASK_BTN_RS: /* rocker switch state change */ rs_task(); break; + case TASK_BTN_PB_HELD: /* pushbutton is being held down */ + pb_held_task(); + break; case TASK_FADE: /* fade timer has fired */ fade_task(); break; @@ -237,6 +407,9 @@ void user_tasks(unsigned char block) case TASK_TMR32: /* auto on/off event */ auto_offon_task(); break; + case TASK_CFG: /* Save config to EEPROM event */ + cfg_write(); + break; } } }