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

lighttest integratet to normal operation modes

Browse Source
This commit is contained in:
bigalex 2012-10-08 22:30:01 +02:00
parent 05dbf13916
commit c654c12385
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
firmware/main.c
View File

@ -65,6 +65,7 @@ void do_mode0(void) {
sound_on = true; sound_on = true;
motor_on = true; motor_on = true;
init_mic(); init_mic();
init_leds();
timer_set(&mytimer, 10); timer_set(&mytimer, 10);
}; };
@ -128,6 +129,7 @@ void do_mode1(void) {
ModeChanged = false; ModeChanged = false;
tone = 1000; tone = 1000;
music_setNote(tone, 0); music_setNote(tone, 0);
init_leds();
led_off(LED_L | LED_R); led_off(LED_L | LED_R);
}; };
if (btn_state(BTNST_SUP, BTN_LEFT)) { if (btn_state(BTNST_SUP, BTN_LEFT)) {
@ -158,6 +160,7 @@ void do_mode2(void) {
ModeChanged = false; ModeChanged = false;
music_setNote(NOTE_PAUSE, 4); //mute music_setNote(NOTE_PAUSE, 4); //mute
timer_set(&mytimer, 10); timer_set(&mytimer, 10);
init_leds();
led_off(LED_L | LED_R); led_off(LED_L | LED_R);
set_motor(MOTOR_OFF); set_motor(MOTOR_OFF);
} }
@ -204,6 +207,7 @@ void do_mode3(void) {
static timer_t mytimer; static timer_t mytimer;
static bool blink; static bool blink;
if (ModeChanged) { if (ModeChanged) {
init_leds();
ModeChanged = false; ModeChanged = false;
music_setNote(NOTE_PAUSE, 4); //mute music_setNote(NOTE_PAUSE, 4); //mute
set_motor(MOTOR_OFF); set_motor(MOTOR_OFF);
@ -251,6 +255,7 @@ void do_mode4(void) {
static timer_t mytimer; static timer_t mytimer;
static bool blink; static bool blink;
if (ModeChanged) { if (ModeChanged) {
init_leds();
music_setNote(NOTE_PAUSE, 0); music_setNote(NOTE_PAUSE, 0);
ModeChanged = false; ModeChanged = false;
timer_set(&mytimer, 10); timer_set(&mytimer, 10);
@ -300,6 +305,7 @@ void do_mode5(void) {
if (ModeChanged) { //init after mode change if (ModeChanged) { //init after mode change
ModeChanged = false; ModeChanged = false;
set_motor(MOTOR_OFF);
ADMUX = (1<<REFS0); //use VCC reference ADMUX = (1<<REFS0); //use VCC reference
ADCSRA = (1<<ADPS1) | (1<<ADPS0);// prescaler F_CPU/8 ADCSRA = (1<<ADPS1) | (1<<ADPS0);// prescaler F_CPU/8
ADCSRA |= (1<<ADEN); // ADC enable - turn it on ADCSRA |= (1<<ADEN); // ADC enable - turn it on
@ -336,14 +342,14 @@ void do_mode5(void) {
led2 =ADCW; // read result led2 =ADCW; // read result
// USART0_putc('1');USART0_putc(':');USART0_put_uint16(led1);USART0_crlf(); // USART0_putc('1');USART0_putc(':');USART0_put_uint16(led1);USART0_crlf();
// USART0_putc('2');USART0_putc(':');USART0_put_uint16(led2);USART0_crlf(); // USART0_putc('2');USART0_putc(':');USART0_put_uint16(led2);USART0_crlf();
music_setNote(500+(0x1ff-led1)*10,0); music_setNote(400+((0x1ff-led1)+(0x1ff-led2))*5,0);
discharge = true; discharge = true;
} }
timer_set(&mytimer, 1); timer_set(&mytimer, 2);
}; //end if timer_expired }; //end if timer_expired
} }
@ -371,8 +377,8 @@ main(void) {
for (;;) /* ever */{ for (;;) /* ever */{
//do something //do something
//main polling loop; //main polling loop;
//button_poll(); button_poll();
//modeswitch_poll(); modeswitch_poll();
switch (OpMode) { switch (OpMode) {
case MODE1: case MODE1:
do_mode1(); do_mode1();