diff --git a/ATtiny84_LED_PC.c b/ATtiny84_LED_PC.c index 8d0965c..f5c55b4 100644 --- a/ATtiny84_LED_PC.c +++ b/ATtiny84_LED_PC.c @@ -52,27 +52,6 @@ #define NS_PER_CYCLE ( NS_PER_SEC / CYCLES_PER_SEC ) #define NS_TO_CYCLES(n) ( (n) / NS_PER_CYCLE ) -// Simple RGB Colour Correction -const uint8_t PROGMEM gamma8[] = -{ - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, - 2, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 5, 5, 5, - 5, 6, 6, 6, 6, 7, 7, 7, 7, 8, 8, 8, 9, 9, 9, 10, - 10, 10, 11, 11, 11, 12, 12, 13, 13, 13, 14, 14, 15, 15, 16, 16, - 17, 17, 18, 18, 19, 19, 20, 20, 21, 21, 22, 22, 23, 24, 24, 25, - 25, 26, 27, 27, 28, 29, 29, 30, 31, 32, 32, 33, 34, 35, 35, 36, - 37, 38, 39, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 50, - 51, 52, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 66, 67, 68, - 69, 70, 72, 73, 74, 75, 77, 78, 79, 81, 82, 83, 85, 86, 87, 89, - 90, 92, 93, 95, 96, 98, 99, 101, 102, 104, 105, 107, 109, 110, 112, 114, -115, 117, 119, 120, 122, 124, 126, 127, 129, 131, 133, 135, 137, 138, 140, 142, -144, 146, 148, 150, 152, 154, 156, 158, 160, 162, 164, 167, 169, 171, 173, 175, -177, 180, 182, 184, 186, 189, 191, 193, 196, 198, 200, 203, 205, 208, 210, 213, -215, 218, 220, 223, 225, 228, 231, 233, 236, 239, 241, 244, 247, 249, 252, 255 -}; - // ms counter uint64_t ms = 0; @@ -165,26 +144,26 @@ while(1) { if (ms > led_ms_update[0]) { - func_list[func_idx](LED0_COUNT, &led0_idx, colour, 0); led_ms_update[0] = ms + LED0_MS; + func_list[func_idx](LED0_COUNT, &led0_idx, colour, 0); } if (ms > led_ms_update[1]) { - func_list[func_idx](LED1_COUNT, &led1_idx, colour, 1); led_ms_update[1] = ms + LED1_MS; + func_list[func_idx](LED1_COUNT, &led1_idx, colour, 1); } if (ms > led_ms_update[2]) { - func_list[func_idx](LED2_COUNT, &led2_idx, colour, 2); led_ms_update[2] = ms + LED2_MS; + func_list[func_idx](LED2_COUNT, &led2_idx, colour, 2); } if (ms > led_ms_update[0]) { - func_list[func_idx](LED3_COUNT, &led3_idx, colour, 3); led_ms_update[3] = ms + LED3_MS; + func_list[func_idx](LED3_COUNT, &led3_idx, colour, 3); } show_leds(); @@ -247,6 +226,10 @@ while(1) colour_state = STATE_SUN_MOON; break; } + led0_idx = 0; + led1_idx = 0; + led2_idx = 0; + led3_idx = 0; } btn_old_state = current_state; } @@ -433,9 +416,11 @@ inline void send_byte(uint8_t byte, uint8_t led) inline void send_pixel(uint8_t r, uint8_t g, uint8_t b, uint8_t led) { + cli(); send_byte(g, led); send_byte(r, led); send_byte(b, led); + sei(); } void show_leds() @@ -472,18 +457,8 @@ void init() void sun_and_moon(uint8_t count, uint8_t* idx, uint8_t colour, uint8_t led) { uint8_t i; - uint8_t colour1[3] = - { - pgm_read_byte(&gamma8[0xFF]), - pgm_read_byte(&gamma8[0x80]), - pgm_read_byte(&gamma8[0x00]) - }; - uint8_t colour2[3] = - { - pgm_read_byte(&gamma8[0x00]), - pgm_read_byte(&gamma8[0x80]), - pgm_read_byte(&gamma8[0xFF]) - }; + uint8_t colour1[3] = {0xFF, 0x80, 0x00}; + uint8_t colour2[3] = {0x00, 0x80, 0xFF}; if (*idx <= count / 2) { @@ -513,25 +488,16 @@ void sun_and_moon(uint8_t count, uint8_t* idx, uint8_t colour, uint8_t led) } } } - *idx++; - *idx %= count; + (*idx)++; + (*idx) %= count; } void clock_bg(uint8_t count, uint8_t* idx, uint8_t colour, uint8_t led) { uint8_t i; - uint8_t colour1[3] = - { - pgm_read_byte(&gamma8[0xFF]), - pgm_read_byte(&gamma8[0x80]), - pgm_read_byte(&gamma8[0x00]) - }; - uint8_t colour2[3] = - { - pgm_read_byte(&gamma8[0x00]), - pgm_read_byte(&gamma8[0x80]), - pgm_read_byte(&gamma8[0xFF]) - }; + uint8_t colour1[3] = {0xFF, 0x80, 0x00}; + uint8_t colour2[3] = {0x00, 0x80, 0xFF}; + uint8_t* main_colour; uint8_t* bg_colour; @@ -558,31 +524,16 @@ void clock_bg(uint8_t count, uint8_t* idx, uint8_t colour, uint8_t led) } } - *idx++; - *idx %= count; + (*idx)++; + (*idx) %= count; } void clock_no_bg(uint8_t count, uint8_t* idx, uint8_t colour, uint8_t led) { uint8_t i; - uint8_t colour1[3] = - { - pgm_read_byte(&gamma8[0xFF]), - pgm_read_byte(&gamma8[0x80]), - pgm_read_byte(&gamma8[0x00]) - }; - uint8_t colour2[3] = - { - pgm_read_byte(&gamma8[0x00]), - pgm_read_byte(&gamma8[0x80]), - pgm_read_byte(&gamma8[0xFF]) - }; - uint8_t black[3] = - { - pgm_read_byte(&gamma8[0x00]), - pgm_read_byte(&gamma8[0x00]), - pgm_read_byte(&gamma8[0x00]) - }; + uint8_t colour1[3] = {0xFF, 0x80, 0x00}; + uint8_t colour2[3] = {0x00, 0x80, 0xFF}; + uint8_t black[3] = {0x00, 0x00, 0x00}; uint8_t* main_colour; if (0 == colour) @@ -606,25 +557,15 @@ void clock_no_bg(uint8_t count, uint8_t* idx, uint8_t colour, uint8_t led) } } - *idx++; - *idx %= count; + (*idx)++; + (*idx) %= count; } void loading(uint8_t count, uint8_t* idx, uint8_t colour, uint8_t led) { uint8_t i; - uint8_t colour1[3] = - { - pgm_read_byte(&gamma8[0xFF]), - pgm_read_byte(&gamma8[0x80]), - pgm_read_byte(&gamma8[0x00]) - }; - uint8_t colour2[3] = - { - pgm_read_byte(&gamma8[0x00]), - pgm_read_byte(&gamma8[0x80]), - pgm_read_byte(&gamma8[0xFF]) - }; + uint8_t colour1[3] = {0xFF, 0x80, 0x00}; + uint8_t colour2[3] = {0x00, 0x80, 0xFF}; if (*idx < count) { @@ -655,20 +596,15 @@ void loading(uint8_t count, uint8_t* idx, uint8_t colour, uint8_t led) } } - *idx++; - *idx %= count * 2; + (*idx)++; + (*idx) %= count * 2; } void off(uint8_t count, uint8_t* idx, uint8_t colour, uint8_t led) { - uint8_t black[3] = - { - pgm_read_byte(&gamma8[0x00]), - pgm_read_byte(&gamma8[0x00]), - pgm_read_byte(&gamma8[0x00]) - }; + uint8_t black[3] = {0x00, 0x00, 0x00}; - for (int i = 0; i < count; ++i) + for (uint8_t i = 0; i < count; ++i) { send_pixel(black[0], black[1], black[2], led); }