X-Git-Url: https://oss.titaniummirror.com/gitweb?a=blobdiff_plain;f=main.c;h=65cff5565ab684b1d875cdc5e0667a5c10dab461;hb=65079ad3f1ecdbcfc6c8d35040a818994f8af94f;hp=f2987998841d0315f00a47114e7fcaae42d5fdee;hpb=fcf61ef3e7a1012c67f14096d0bbf47279297398;p=rgblamp.git diff --git a/main.c b/main.c index f298799..65cff55 100644 --- a/main.c +++ b/main.c @@ -1,49 +1,85 @@ /* * File: main.c * - * Created on August 16, 2010, 12:09 PM + * PWM test program + * + * PIC resources in use, 18-pin DIP, by pin: + * - ( 1) RA2 - unused + * - ( 2) RA3 - CCP3 PWM for blu LED + * - ( 3) RA4 - CCP4 PWM for wht LED. ICSP pin 6, PGM/LVP. + * - ( 4) RA5 - ICSP pin 1, MCLR#/Vpp + * - ( 5) Vss + * - ( 6) RB0 - pushbutton + * - ( 7) RB1 - unused + * - ( 8) RB2 - unused + * - ( 9) RB3 - CCP1 PWM for red LED + * - (10) RB4 - rocker switch position B (right) + * - (11) RB5 - rocker switch position A (left) + * - (12) RB6 - unused (future crystal) + * - (13) RB7 - unused (future crystal) + * - (14) Vdd + * - (15) RA6 - unused + * - (16) RA7 - CCP2 PWM for grn LED + * - (17) RA0 - unused + * - (18) RA1 - unused + * */ -#define RUNAT32MHZ /* else 16 MHz */ - #include #include #include "picinit.h" +#include "unused.h" #include "buttons.h" #include "rgb.h" +#include "tmr.h" +#include "adc_random.h" -#define STEP_SIZE 32 /* ms */ +#if 0 +#define AUTO_OFF_COUNT 549316UL /* 5 hrs in 32.768 ms units */ +#define AUTO_ON_COUNT 2087402UL /* 19 hrs in 32.768 ms units */ +#else +#define AUTO_OFF_COUNT 1831 /* 1 minute in 32.768 ms units */ +#define AUTO_ON_COUNT 3662 /* 2 minutes in 32.768 ms units */ +#endif #define reset_steps() do { incolor_steps = 1; fade_steps = 0; } \ - while (0) + while (0) #define rand_u8() (rand() & 0xff) #define rand_u16() ((rand() << 8) + rand_u8()) -#define rand_incolor_steps(f) (min_incolor_steps[f] + \ - (rand() % range_incolor_steps[f])) -#define rand_fade_steps(f) (min_fade_steps[f] + \ - (rand() % range_fade_steps[f])) +#define rand_incolor_steps(s) (min_incolor_steps[s & 3] + \ + (rand() % range_incolor_steps[s & 3])) +#define rand_fade_steps(s) (min_fade_steps[s & 3] + \ + (rand() % range_fade_steps[s & 3])) #define leds_set(r,g,b,w) rgb_set((r).value >> 7, \ - (g).value >> 7, \ - (b).value >> 7, 0) -// (w).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 dbgpin_high() (RA2 = 1) +#define dbgpin_low() (RA2 = 0) +#define dbgpin_toggle() (RA2 = (LATA2 == 0) ? 1 : 0) typedef struct { int value; int increment; - char remainder; + signed char remainder; } led_t; #define INIT_LED { 0, 0, 0 } -/* The index of all step arrays is the fast variable, 0=slow, 1=fast. */ -#if 0 -const static unsigned min_incolor_steps[2] = { 320, 32 }; -const static unsigned range_incolor_steps[2] = { 32768, 128 }; -const static int min_fade_steps[2] = { 64, 32 }; -const static int range_fade_steps[2] = { 416, 128 }; -#else -const static unsigned min_incolor_steps[2] = { 64, 64 }; -const static unsigned range_incolor_steps[2] = { 1, 1 }; -const static int min_fade_steps[2] = { 32, 32 }; -const static int range_fade_steps[2] = { 1, 1 }; +/* The index of all step arrays is the speed variable */ +#if 1 +const static unsigned min_incolor_steps[4] = { 320, 32, 32, 1 }; +const static unsigned range_incolor_steps[4] = { 32768, 128, 32, 8 }; +const static int min_fade_steps[4] = { 64, 32, 32, 1 }; +const static int range_fade_steps[4] = { 416, 128, 32, 8 }; +#else /* for debugging */ +const static unsigned min_incolor_steps[4] = { 64, 32, 16, 8 }; +const static unsigned range_incolor_steps[4] = { 1, 1, 1, 1 }; +const static int min_fade_steps[4] = { 64, 32, 16, 8 }; +const static int range_fade_steps[4] = { 1, 1, 1, 1 }; #endif int main(void) @@ -52,28 +88,54 @@ int main(void) led_t grn = INIT_LED; led_t blu = INIT_LED; led_t wht = INIT_LED; - unsigned char fast = 0; + unsigned char speed = 0; unsigned incolor_steps; int fade_steps; + unsigned long auto_off = 0; pic_init(); + unused_init(); buttons_init(); rgb_init(); - reset_steps(); + tmr_init(); + dbgpin_init(); + srand((adc_random() << 8) + adc_random()); + reset_steps(); if (buttons_on()) rgb_on(); + dbgpin_high(); + tmr_startPeriodic(TMR_FADE, 1); /* 32.768 msec */ while (1) { unsigned char buttons = buttons_read(); - if ((buttons & (IN_ROCKERA | IN_ROCKERB))) { - if (buttons & IN_PUSHBTN) { - if (!fast) { - fast = 1; + if ((buttons & IN_ROCKERB) && auto_off == 0) + tmr_startPeriodic(TMR_AUTO_OFFON, AUTO_OFF_COUNT); + + if ((buttons & IN_ROCKERB) && tmr_fired(TMR_AUTO_OFFON) || + (!(buttons & (IN_ROCKERA | IN_ROCKERB)))) { + /* Sleep when auto-off time has expired or if rocker switch is + * turned off. + */ + rgb_off(); + dbgpin_low(); + auto_off = 0; + buttons_sleep(); + dbgpin_high(); + reset_steps(); + rgb_on(); + red.value = 0; + grn.value = 0; + blu.value = 0; + wht.value = 0; + } else { + /* Crappy way to detect rising edges to change state of speed var */ + if (!(speed & 4) && (buttons & IN_PUSHBTN)) + speed |= 4; + else if ((speed & 4) && !(buttons & IN_PUSHBTN)) { + speed = (speed + 1) & ~4; reset_steps(); - } else - fast = 0; } if (fade_steps) { @@ -91,7 +153,7 @@ int main(void) } leds_set(red, grn, blu, wht); } else if (--incolor_steps == 0) { - int newr, newg, newb, neww, tmp; + int newr, newg, newb, neww; /* Next led color. All off is not a valid option. * RGB values are stored and processed as 15-bit non-negative @@ -106,8 +168,8 @@ int main(void) } while (newr == 0 && newg == 0 && newb == 0 && neww == 0); /* Next incolor and fade steps */ - incolor_steps = rand_incolor_steps(fast); - fade_steps = (buttons & IN_ROCKERA) ? 1 : rand_fade_steps(fast); + incolor_steps = rand_incolor_steps(speed); + fade_steps = rand_fade_steps(speed); /* Compute increment and remainder for each led */ red.increment = (newr - red.value) / fade_steps; @@ -119,16 +181,9 @@ int main(void) wht.increment = (neww - wht.value) / fade_steps; wht.remainder = neww - (wht.value + wht.increment * fade_steps); } - __delay_ms(STEP_SIZE); /* step should be start to start... */ - } else { - rgb_off(); - buttons_sleep(); - reset_steps(); - rgb_on(); - red.value = 0; - grn.value = 0; - blu.value = 0; - wht.value = 0; + dbgpin_low(); + while (!tmr_fired(TMR_FADE)); + dbgpin_high(); } } return 0;