From 6ccdeb6cf01d613a91d2827e8bac08c1ec7d611c Mon Sep 17 00:00:00 2001 From: ccppi Date: Thu, 14 Mar 2024 21:25:20 +0000 Subject: [PATCH] Cosmetics --- main.c | 50 ++++++++++++++++++++++++-------------------------- 1 file changed, 24 insertions(+), 26 deletions(-) diff --git a/main.c b/main.c index aa24af7..05a253f 100644 --- a/main.c +++ b/main.c @@ -39,10 +39,10 @@ void count(void) int main (void) { - rgbval pattern[6][PATTERN_COUNT]={ {{0,0,0,10}, {0,0,0,10}, {0,0,0,10}, {0,0,0,10}}, + rgbval pattern[6][PATTERN_COUNT]={ {{0,0,0,10}, {0,0,0,10}, {0,0,0,10}, {0,0,0,10}}, {{1,1,1,10}, {1,1,153,20}, {200,50,39,10}, {204,255,153,20}}, - {{1,1,1,10}, {10,255,0,10}, {1,1,255,20}, {1,200,1,20}}, - {{1,1,5,10}, {1,1,255,10}, {1,1,5,10}, {1,1,255,10}}, + {{1,1,1,10}, {10,255,0,10}, {1,1,255,20}, {1,200,1,20}}, + {{1,1,5,10}, {1,1,255,10}, {1,1,5,10}, {1,1,255,10}}, {{252,102,3,10}, {161,67,47,10}, {118,120,74,10}, {83,120,74,20}}, {{87,119,122,10}, {95,87,122,10}, {52, 69, 56,10}, {83, 84, 72,10}}}; int i=0,i2=0,i3; @@ -51,11 +51,10 @@ int main (void) int input=0; uint16_t pre_delay=0; ms =0; - counts = 0; - + counts = 0; //disable prescaler CLKPR = (1< pattern[i2][i+1].r) {r--;} - if(g < pattern[i2][i+1].g) {g++;} - if(g > pattern[i2][i+1].g) {g--;} - if(b < pattern[i2][i+1].b) {b++;} - if(b > pattern[i2][i+1].b) {b--;} - OCR0A = g;//green - OCR0B = r;//red - OCR1B = b;//blue - // _delay_ms(10); - pre_delay = ms; - while((ms-pre_delay) < pattern[i2][i+1].time_hold){}; - if(r == pattern[i2][i+1].r && g == pattern[i2][i+1].g && b == pattern[i2][i+1].b) break; + } + //Pattern handling + if(r < pattern[i2][i+1].r) {r++;} + if(r > pattern[i2][i+1].r) {r--;} + if(g < pattern[i2][i+1].g) {g++;} + if(g > pattern[i2][i+1].g) {g--;} + if(b < pattern[i2][i+1].b) {b++;} + if(b > pattern[i2][i+1].b) {b--;} + OCR0A = g;//green + OCR0B = r;//red + OCR1B = b;//blue + // _delay_ms(10); + pre_delay = ms; + while((ms-pre_delay) < pattern[i2][i+1].time_hold){}; + if(r == pattern[i2][i+1].r && g == pattern[i2][i+1].g && b == pattern[i2][i+1].b) break; } } }