Compare commits

..

6 Commits

Author SHA1 Message Date
37274f93f7 Remove spaces, rearange tabs 2024-03-14 21:38:56 +00:00
32a72c84fc Remove spaces, rearange tabs 2024-03-14 21:37:51 +00:00
b79ebdd39d comlet rework 2024-03-06 20:39:47 +01:00
771f639fa3 comlet rework 2024-03-06 20:33:30 +01:00
a4db90ecf4 changed frequencies, suspect running 8 times slower than thought 2024-03-06 13:05:14 +01:00
0894b6aac5 attiny45 2024-03-06 12:28:34 +01:00
2 changed files with 117 additions and 97 deletions

128
main.c
View File

@ -1,9 +1,13 @@
//#pragma GCC push_options
//#pragma GCC optimize ("O0")
#define F_CPU 8000000UL #define F_CPU 8000000UL
#include <util/delay.h> #include <util/delay.h>
#include <avr/io.h> #include <avr/io.h>
#include <avr/interrupt.h> #include <avr/interrupt.h>
#include <avr/power.h>
#define PATTERN_COUNT 4 #define PATTERN_COUNT 4
#define attiny45
typedef struct typedef struct
{ {
@ -12,18 +16,20 @@ typedef struct
unsigned char b; unsigned char b;
int time_hold; int time_hold;
}rgbval; }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) void count(void)
{ {
//counts=0;//0..65535 //counts=0;//0..65535
counts++; counts++;
if(counts>=31) if(counts>3) //1m //1ms
{ {
counts=0; counts=0;
if(ms<60000)//1 minute if(ms<60000)//1 minute
@ -36,16 +42,19 @@ void count(void)
} }
} }
} }
ISR(TIMER0_OVF_vect)
{
count();
}
int main (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,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}, {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}}, {{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}}, {{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;
@ -53,45 +62,27 @@ int main (void)
ms =0; ms =0;
counts = 0; counts = 0;
//disable prescaler //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 //#######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
GTCCR = (1<<PWM1B)|(1<<COM1B0); //mode + overrun clear, Set on compare match
OCR1C = 255; // clear timer at 255
//######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) while(1)
{ {
for(i=1;i<PATTERN_COUNT;i++) for(i=0;i<PATTERN_COUNT;i++)
{ {
r = pattern[i2][i].r; r = pattern[i2][i].r;
g = pattern[i2][i].g; g = pattern[i2][i].g;
b = pattern[i2][i].b; b = pattern[i2][i].b;
if(i==(PATTERN_COUNT-1)) {i= -1;} if(i==(PATTERN_COUNT-1)) {i= 0;}
//reset timer counter
while(1) while(1)
{ {
//input handling
input=PINB; input=PINB;
if(((input & (1<<PB2)) == 0 && set==0)) if(((input & (1<<PB2)) == 0 && set==0))
{ {
@ -102,37 +93,66 @@ int main (void)
{ {
i2=0; i2=0;
} }
//cycle through and stop pwm at value 0
//Visual feedback "mode change" //Visual feedback "mode change"
for(i3=0;i3<i2;i3++) for(i3=0;i3<i2;i3++)
{ {
OCR0A=1;OCR0B=1;OCR1B=1; setrgb(0,0,0);
_delay_ms(30); pre_delay = ms;
OCR0A=255;OCR0B=255;OCR1B=255; while((ms-pre_delay) < 200);
_delay_ms(30); setrgb(0,200,0);
pre_delay = ms;
while((ms-pre_delay) < 200){};
} }
} }
else if(((input & (1<<PB2)) != 0)) else if(((input & (1<<PB2)) != 0))
{ {
set=0; set=0;
} }
//Pattern handling //iterate throught pattern to the next ones
if(r < pattern[i2][i+1].r) {r++;} if(r < pattern[i2][i+1].r) {r++;}
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(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++;}
if(b > pattern[i2][i+1].b) {b--;} if(b > pattern[i2][i+1].b) {b--;}
OCR0A = g;//green setrgb(r,g,b);
OCR0B = r;//red //read timer evaluate time since read in 1ms steps
OCR1B = b;//blue //pre_delay = ms;
// _delay_ms(10); //while((ms-pre_delay) <1000);
pre_delay = ms; _delay_ms(30);
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; if(r == pattern[i2][i+1].r && g == pattern[i2][i+1].g && b == pattern[i2][i+1].b) break;
} }
} }
} }
return 0; 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

View File

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