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

some cleanup

Browse Source
This commit is contained in:
bigalex 2012-10-01 19:23:36 +02:00
parent c330746b74
commit 2937adc985
1 changed files with 1 additions and 118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

119
firmware/main.c
View File

@ -1,6 +1,7 @@
#include <inttypes.h> #include <inttypes.h>
#include <avr/io.h> #include <avr/io.h>
#include <avr/interrupt.h> #include <avr/interrupt.h>
#define __DELAY_BACKWARD_COMPATIBLE__
#include <util/delay.h> #include <util/delay.h>
#include <stdlib.h> #include <stdlib.h>
@ -10,76 +11,6 @@
#include "lib/bughal.h" #include "lib/bughal.h"
uint16_t sw_v = 0;
uint16_t darkness = 0;
uint16_t darkval = 0;
uint16_t last_darkval = 0;
static void init_sampletimer(void)
{
/*
* Timer 0
*/
/* set timer0 to CTC & prescaler 64 → 125kHz increment */
TCCR0A = (1 << WGM01);
TCCR0B = (1 << CS00) | (1 << CS01);
OCR0A = 6; /* TOP */
TCNT0 = 0;
/*enable interrupt*/
TIMSK0 |= (1<<OCIE0A);
}
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;
}
void click(void){
buzzr_up();
_delay_ms(1);
buzzr_inv();
_delay_ms(1);
buzzr_off();
};
void waitr(int min, int max){
int waitms = (rand() % (max-min)) + min;
for(int i=0; i <= waitms; i++){
_delay_ms(1);
};
return;
};
void ledr(void){
int i = (rand() % 3);
switch(i) {
case 0 : led_on(LED_L); break;
case 1 : led_on(LED_R); break;
default : led_on(LED_L|LED_R);
};
_delay_ms(10);
led_off(LED_L|LED_R);
}
void __attribute__((noreturn)) void __attribute__((noreturn))
main(void) main(void)
@ -89,11 +20,6 @@ main(void)
init_buzzr(); init_buzzr();
//USART0_Init(); //USART0_Init();
// init_motor(); // init_motor();
//init_pwm();
//init_sampletimer();
/* syntesizer initialisation */
//synth_init();
/* here the show begins:*/ /* here the show begins:*/
//sei(); //sei();
@ -101,10 +27,6 @@ main(void)
for(;;) /* ever */ { for(;;) /* ever */ {
//do something //do something
waitr(50,5000);
click();
ledr();
//synth_poll(); //synth_poll();
//USART0_put_uint16(0xA09F); //USART0_put_uint16(0xA09F);
//USART0_crlf(); //USART0_crlf();
@ -115,42 +37,3 @@ main(void)
ISR(TIMER2_COMPA_vect)
{
darkval++;
switch(sw_v){
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;
}