First working version of the ISR to control the LEDs.

This commit is contained in:
Kai Lauterbach 2011-11-30 20:45:22 +01:00 committed by Aaron Mueller
parent 15c681c7e3
commit 0a316aaed9
3 changed files with 38 additions and 14 deletions

View file

@ -8,10 +8,6 @@
#define FALSE 0 #define FALSE 0
#define TRUE 1 #define TRUE 1
// Definitionen
#define PIXEL_TON 30
#define PIXEL_TOFF 10
#define sleep_nop(cnt) for (uint8_t i = 0; i < cnt; i++) { asm volatile("nop"::); } #define sleep_nop(cnt) for (uint8_t i = 0; i < cnt; i++) { asm volatile("nop"::); }
// Pixelmakros // Pixelmakros

View file

@ -16,6 +16,8 @@ int main(void)
init(); init();
init_usb(); init_usb();
uint8_t anim = 0;
// Hauptschleife // Hauptschleife
//while (1) //while (1)
for (;;) for (;;)
@ -26,6 +28,19 @@ int main(void)
// hier pause einfügen // hier pause einfügen
_delay_ms(50); // beispielsweise 50 ms => muss angepasst werden an usb kommunikation _delay_ms(50); // beispielsweise 50 ms => muss angepasst werden an usb kommunikation
anim++;
if (anim == 40)
{
if (cube == 0xffffffff)
cube = 0x07007007;
else if (cube == 0x07007007)
cube = 0x00000000;
else if (cube == 0x00000000)
cube = 0xffffffff;
anim = 0;
}
} }
} }
@ -36,8 +51,8 @@ void init()
DDRB = 0b11111111; // PB0-PB7: LED 1-8 (Kathoden) DDRB = 0b11111111; // PB0-PB7: LED 1-8 (Kathoden)
PORTB = 0b11111111; // HIGH PORTB = 0b11111111; // HIGH
DDRD = 0b1111000; // PD6: LED 9 (Kathode); PD5-PD3: A-C (Anoden) DDRD = 0b01111000; // PD6: LED 9 (Kathode); PD5-PD3: A-C (Anoden)
PORTD = 0b1000000; PORTD = 0b01000000;
// Timer-Interrupt "TIMER1" vorbereiten // Timer-Interrupt "TIMER1" vorbereiten
//cli(); // //cli(); //
@ -67,17 +82,28 @@ void init()
ISR (TIMER1_COMPA_vect) ISR (TIMER1_COMPA_vect)
{ {
// PORTD = __, 9, C, B, A,D+,D-,__ // PORTD = __, 9, C, B, A,D+,D-,__
PORTD &= 0b11000111; // Reset durch Bitmaske PORTD &= 0b10000111; // 7tes Bit löschen (Leitung 9) und alle Ebenen deaktivieren
PORTD |= ((1 << (cube_level))<< 3); // Level setzen (A=0, B=1, C=2) PORTD |= ((1 << cube_level) << 3); // cube_level setzen (Ebene A=0, B=1, C=2)
uint32_t tmp = cube_level * 9;
uint32_t tmp1 = tmp + 8;
// PORTB = 1..8 // PORTB = 1..8
// 0 = leuchtet, 1 = leuchtet nicht (invertiert!) // 0 = leuchtet, 1 = leuchtet nicht (invertiert!)
PORTB = ~(cube & (0b11111111 << (cube_level*9))); //PORTB = ~((uint32_t)(cube & (0b11111111 << tmp)) >> tmp);
//PORTB = ((uint32_t)(~cube & (uint32_t)(0xff << tmp)) >> tmp);
PORTB = ~((cube >> tmp) & 0xff);
PORTD &= 0b10111111; // 7tes Bit löschen (9) // PORTD &= 0b10111111; // bereits oben erledigt
PORTD |= ~((cube & (1 << (cube_level*9+8))) << 6); //PORTD |= ~(((uint32_t)(cube & (1 << (tmp+8))) >> (tmp+8)) << 6);
//PORTD |= (((~cube & (1 << tmp)) >> tmp) << 6);
if ( (((cube >> tmp) >> 8) & 0x01) == 1 )
PORTD &= ~(1 << 6);
else
PORTD |= (1 << 6);
//PORTD |= (1 << 6); // test to always off
//cube_level++; cube_level++;
//if (cube_level > 2) cube_level = 0; if (cube_level > 2) cube_level = 0;
} }

View file

@ -20,7 +20,9 @@
//#include <avr/wdt.h> //#include <avr/wdt.h>
// Cube-Data // Cube-Data
volatile uint32_t cube = 0x0000000F; // Aktuelle Frame //volatile uint32_t cube = 0x07007007; // Aktuelles Frame
volatile uint32_t cube = 0xffffffff; // Aktuelles Frame
//volatile uint32_t cube = 0x00000000; // Aktuelles Frame
// Bit Offset in Cube-Data // Bit Offset in Cube-Data
volatile uint8_t cube_level = 0; // Ebene volatile uint8_t cube_level = 0; // Ebene