aw/pentabug
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rolled back unwanted changes (testcode) to prevoius version in main.c

Browse Source
This commit is contained in:
bigalex 2012-08-27 09:43:42 +02:00
parent 6f200cab7d
commit b46ccc1618
1 changed files with 122 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

163
firmware/main.c
View File

@ -5,7 +5,8 @@
#include <stdlib.h> #include <stdlib.h>
#include "main.h" #include "main.h"
#include "synth.h"
#include "usart.h"
uint16_t sw_v = 0; uint16_t sw_v = 0;
@ -14,64 +15,110 @@ uint16_t darkval = 0;
uint16_t last_darkval = 0; uint16_t last_darkval = 0;
static void init_sampletimer(void)
void __attribute__((noreturn))
main(void)
{ {
/*
* Timer 0
*/
/* here the show begins:*/ /* set timer0 to CTC & prescaler 64 → 125kHz increment */
TCCR0A = (1 << WGM01);
TCCR0B = (1 << CS00) | (1 << CS01);
DDRC = 0b00100011; OCR0A = 6; /* TOP */
PORTC = 0b00000001; TCNT0 = 0;
PORTC = 0b00000000; /*enable interrupt*/
DDRD = 0x00; TIMSK0 |= (1<<OCIE0A);
PORTD = 0b00000011; //enable pullups }
DDRB = 0xFF;
PORTB=0xFF; static inline void init_pwm(void)
{
/* set PB2 as output (buzzer pwm port):*/
DDRB |= (1 << PORTB2);
/* analog value preselection :*/
OCR1B = 0x007F;
/* Top value. Timer overflows here. Thus we have a resulting 8bit pwm */
ICR1 = 0x00FF;
/* only b-chan , fastpwm (mode 14), no prescale */
TCCR1A = (1 << COM1B1) | (1 << WGM11);
TCCR1B = (1 << WGM13 ) | (1 << WGM12) | (1 << CS10);
return;
}
static void init_leds(void)
{
/* enable LED channels as output */
DDRC |= (1 << PORTC0) | (1 << PORTC2) |
(1 << PORTC3) | (1 << PORTC1) ;
/* initially one led is on */
PORTC = 0b00000101;
/*
* Timer 2
*/
/* set timer2 to CTC & prescaler 64 → ???125kHz increment */ /* set timer2 to CTC & prescaler 64 → ???125kHz increment */
TCCR2A = (1 << WGM21); TCCR2A = (1 << WGM21);
TCCR2B = (1 << CS20)|(1 << CS21); TCCR2B = (1 << CS20)|(1 << CS21);
OCR2A = 0x3F; /* TOP */ OCR2A = 255; /* TOP */
TCNT2 = 0; TCNT2 = 0;
/*enable interrupt*/ /*enable interrupt*/
TIMSK2 |= (1<<OCIE2A); TIMSK2 |= (1<<OCIE2A);
return;
}
inline void setleds(uint8_t state)
{
/* set leds according to */
PORTC |= (state | 0b00001111);
PORTC &= ~(state | 0b11110000);
return;
}
static void init_motor(void)
{
/* vibration motor on B1, initially off: */
DDRB |= (1 << PORTB1);
PORTB &= ~( 1<<PORTB1);
return;
}
void __attribute__((noreturn))
main(void)
{
/* hardware initialisation: */
//init_leds();
USART0_Init();
// init_motor();
init_pwm();
init_sampletimer();
/* syntesizer initialisation */
synth_init();
/* here the show begins:*/
sei(); sei();
DDRC = 0b00000011;
PORTC = 0b00000001;
PORTC = 0b00000000;
for(;;) /* ever */ { for(;;) /* ever */ {
//do something //do something
//synth_poll(); synth_poll();
/* if (10 == 1){ if (10 == 1){
uint16_t out = darkval; uint16_t out = darkval;
USART0_put_uint16(out); USART0_put_uint16(out);
USART0_crlf(); USART0_crlf();
//last_darkval=darkval; //last_darkval=darkval;
};*/ };
DDRC |= (1 << PORTC0) | (1 << PORTC2) |
(1 << PORTC3) | (1 << PORTC1) ;
/* initially one led is on */
if ((PIND & 0b00000001)==0){
PORTC |= 0b00000001;
PORTB |= 0b00000010;
} else {
PORTC &= 0b11111110;
//PORTB &= 0b11111101;
};
if ((PIND & 0b00000010)==0){
PORTC |= 0b00000100;
} else {
PORTC &= 0b11111011;
};
//USART0_put_uint16(0xA09F); //USART0_put_uint16(0xA09F);
//USART0_crlf(); //USART0_crlf();
} }
@ -83,8 +130,40 @@ main(void)
ISR(TIMER2_COMPA_vect) ISR(TIMER2_COMPA_vect)
{ {
//invert c5 and b2 darkval++;
PORTB ^=0b00000100; switch(sw_v){
PORTC ^= 0b00100000;
case 0 : // Set PC0 to 1 and PC1 to 0 - charge LED
DDRC = 0b00000011;
PORTC = 0b00000010;
darkness = 0;
sw_v++;
break;
case 10 : // set PC0 to 0 and PC1 as input
DDRC = 0b00000001;
PORTC = 0b00000000;
sw_v++;
break;
case 5000 : sw_v = 0;
//darkval = darkness;
//darkval = 1234;
break;
default : //measure if PC1 falls to LOW
if ((darkness==0) && ((PINC && 0b00000010)==0)){
darkness = sw_v;
};
sw_v++;
}; //end switch
//PORTC ^= 0b00001111; //toggle C0, C1, C2,C3
//PORTC = 0;
} }