Remove spaces, rearange tabs

main.c

@@ -1,9 +1,13 @@
+//#pragma GCC push_options
+//#pragma GCC optimize ("O0")
 #define F_CPU 8000000UL
 #include <util/delay.h>
 #include <avr/io.h>
 #include <avr/interrupt.h>
+#include <avr/power.h>
 
 #define PATTERN_COUNT 4
+#define attiny45
 
 typedef struct
 {
@@ -12,18 +16,20 @@ typedef struct
 	unsigned char b;
 	int time_hold;
 }rgbval;
-volatile uint16_t ms;
-volatile int  counts;
 
-ISR(TIMER0_OVF_vect)
+volatile uint16_t ms;
-{
+volatile uint16_t counts;
-		count();
+
-}
+void InitTimer0(void);
+void InitTimer1(void);
+void setrgb(unsigned int r,unsigned int g, unsigned int b);
+void InitInterrupts(void);
+
 void count(void)
 {
 	//counts=0;//0..65535 
 	counts++;
-	if(counts>=31)
+	if(counts>3)	//1m	//1ms
 	{
 			counts=0;
 			if(ms<60000)//1 minute
@@ -36,103 +42,117 @@ void count(void)
 			}
 	}
 }
-
+ISR(TIMER0_OVF_vect)
+{
+		count();
+}
 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,100},		{0,0,0,100},	{0,0,0,100},		{0,0,0,100}},
 										{{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,50,50,10},		{10,255,0,10},	{80,200,0,20},		{200,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}}};
+										{{87,119,122,10}, 	{95,87,122,10},	{52, 69, 56,10},	{83, 84, 72,10}}};
-	int i=0,i2=0,i3;
+int i=0,i2=0,i3=0;
-	int r,g,b = 0;
+int r,g,b = 0;
-	int set=0;
+int set=0;
-	int input=0;
+int input=0;
-	uint16_t pre_delay=0;
+uint16_t pre_delay=0;
-	ms =0;
+ms =0;
-	counts = 0;	 
+counts = 0;	 
 //disable prescaler	
-	CLKPR = (1<<CLKPR);
+//	CLKPR = (1<<CLKPR); maybe optimization removes this
-	CLKPR = 0x00;
+//	CLKPR = 0x00;
+clock_prescale_set(clock_div_1);//replaces above 2 lines
 //#######OC0A auf ausgang
-	DDRB = (1 << PB0 )|(1<<PB1)|(1<<PB4);
+DDRB = (1 << PB0 )|(1<<PB1)|(1<<PB4);//data directions - output
-	cli();
+PORTB |= (1<<PB2);					//pullups
-//#######Timer0-setup#####			|Phase correct pwm
+cli();								//DISABLE Global Interrupts
-	TCCR0A = (1<<COM0A1)|(1<<COM0B1)|(1<<WGM00)|(1<<WGM00);	//mode
+InitTimer0();
-	TCCR0B = (1<<CS00)|(1<<CS00);				//frequency /256 = 31250Hz , 1 t0 period = 8.192ms 1 increment = 0.032ms strangly prescaler of 1 results in expected results as prescaler was 256
+InitTimer1();
-//	PLLCSR |= (1 << PLLE) | (1 << PCKE);
+InitInterrupts();
-//######Timer1-setup
+sei();								//ENABLE Global Interrupts
-	TCCR1 = (1<<COM1A0)|(1<<COM1A1)|(1<<CTC1)|(1<<CS12)|(1<<CS10);//|(1<<CS11)|(1<<CS13);	//frequencyi //iinverting PWM because 0 dtc not possible
+	while(1)
-	GTCCR = (1<<PWM1B)|(1<<COM1B0);				//mode + overrun clear, Set on compare match
+	{
-	OCR1C = 255;						// clear timer at 255	
+				for(i=0;i<PATTERN_COUNT;i++)
-//######PWM_VALUE$
-//timer 0
-	OCR0A = 1;
-	OCR0B = 1;
-//timer 1
-	OCR1B = 1;
-//######Configure Pullups
-	PORTB |= (1<<PB2);
-//Interupts
-	TIMSK |= (1<<TOIE0);//interrupt on overflow = one timer cycle
-	TIFR |= (1<<TOV0);
-	TCNT0 = 0;
-//enable global interrupts
-	sei();
-   while(1)
-   {
-	   for(i=1;i<PATTERN_COUNT;i++)
-	   {
-			r = pattern[i2][i].r;
-			g = pattern[i2][i].g;
-			b = pattern[i2][i].b;
-			if(i==(PATTERN_COUNT-1)) {i= -1;}
-			//reset timer counter	
-			while(1)
-			{
-			//input handling
-				input=PINB;
-				if(((input & (1<<PB2)) == 0 && set==0))
 				{
-							set=1;
+						r = pattern[i2][i].r;
-							i=0;
+						g = pattern[i2][i].g;
-							i2++;
+						b = pattern[i2][i].b;
-							if(i2==6)
+						if(i==(PATTERN_COUNT-1)) {i= 0;}
+						while(1)
+						{
+							input=PINB;
+							if(((input & (1<<PB2)) == 0 && set==0))
 							{
-									i2=0;
+									set=1;
+									i=0;
+									i2++;
+									if(i2==6)
+									{
+											i2=0;
+									}
+				//Visual feedback "mode change"
+									for(i3=0;i3<i2;i3++)
+									{
+											setrgb(0,0,0);			
+											pre_delay = ms;		
+											while((ms-pre_delay) < 200);
+											setrgb(0,200,0);
+											pre_delay = ms;		
+											while((ms-pre_delay) < 200){};
+									}
 							}
-							//cycle through and stop pwm at value 0
+							else if(((input & (1<<PB2)) != 0))
-							//Visual feedback "mode change"
-							for(i3=0;i3<i2;i3++)
 							{
-										OCR0A=1;OCR0B=1;OCR1B=1;	
+									set=0;
-										_delay_ms(30);
-										OCR0A=255;OCR0B=255;OCR1B=255;
-										_delay_ms(30);
 							}
+				//iterate throught pattern to the next ones
+							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--;}	
+							setrgb(r,g,b);		
+				//read timer evaluate time since read in 1ms steps
+							//pre_delay = ms;		
+							//while((ms-pre_delay) <1000);
+							_delay_ms(30);
+							if(r == pattern[i2][i+1].r && g == pattern[i2][i+1].g && b == pattern[i2][i+1].b) break;
+						}
 				}
-				else if(((input & (1<<PB2)) != 0))
+	} 
-				{
+return 0;                 
-						set=0;
-				
-				}
-			//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;
-			}
-	   }
-   }  
-   return 0;                 
 }
+void InitTimer0(void)
+{
+//#######Timer0-setup#####			|Phase correct pwm
+	TCCR0A = (2<<COM0A0)|(2<<COM0B0)|(1<<WGM00)|(1<<WGM01);	//mode fast pwm (1/Fcpu)*prescaler*(max+1) = 
+			//prescaler /64 gives 0...255 0.002048s = 2.0ms 1mhz-> /8 
+	TCCR0B = (1<<CS01);//|(1<<CS01)/256;
+}	
+void InitTimer1(void)
+{
+//######Timer1-setup
+	PLLCSR &= ~(1<<PCKE);
+	TCCR1 = (1<<COM1A0)|(1<<COM1A1)|(1<<CS12)|(1<<CS10)|(1<<CS11);//(1<<CS10)|(1<<CS12);//|(1<<CS13);	//frequencyi //inverting PWM because 0 dtc not possible
+	GTCCR = (1<<PWM1B)|(1<<COM1B1);	//mode + overrun clear, Set on compare match
+	OCR1C = 255; // clear timer at 255	
+}
+void setrgb(unsigned int r,unsigned int g,unsigned int b)
+{
+		//depends on timer0
+		OCR0A = g;//green
+		OCR0B = r;//red
+		//depends on Timer1
+		OCR1B = b;//blue
+}
+void InitInterrupts(void)
+{
+		TIMSK |= (1<<TOIE0);//interrupt on overflow = one timer cycle
+		TIFR |= (1<<TOV0);
+		TCNT0 = 0;
+}
+//#pragma GCC pop_options

makefile

@@ -5,12 +5,12 @@
 # (GNU make, BSD make, SysV make)
 
 
-MCU = attiny85
+MCU = attiny45
 FORMAT = ihex
 TARGET = main
 SRC = $(TARGET).c
 ASRC = 
-OPT = s
+OPT = 0
 
 # Name of this Makefile (used for "make depend").
 MAKEFILE = Makefile