ejung/extr
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

adjust code to hardware changes

Browse Source
This commit is contained in:
Eggert Jung
2021-05-25 13:15:10 +02:00
parent 0b2e532675
commit ab8fb924ed
2 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
adc.c
View File

@@ -47,7 +47,24 @@ ISR(ADC_vect)
for(uint8_t i = 0; i < buffer_pos; i++){ for(uint8_t i = 0; i < buffer_pos; i++){
sum += read_buffer[i]; sum += read_buffer[i];
} }
temp_values[current_channel] = sum/buffer_pos;
//convert to temperature
sum /= 3;
switch(current_channel){
case 0:
temp_values[3] = sum/buffer_pos;
break;
case 1:
temp_values[0] = sum/buffer_pos;
break;
case 2:
temp_values[1] = sum/buffer_pos;
break;
case 3:
temp_values[2] = sum/buffer_pos;
break;
}
buffer_pos = 0; buffer_pos = 0;

9
main.c
View File

@@ -49,8 +49,6 @@ void do_buttons(){
else if(buttons & (1 << 1)) else if(buttons & (1 << 1))
set_item(2); set_item(2);
else if(buttons & (1 << 2)) else if(buttons & (1 << 2))
set_item(2);
else if(buttons & (1 << 2))
set_item(3); set_item(3);
else if(buttons & (1 << 3)) else if(buttons & (1 << 3))
set_item(4); set_item(4);
@@ -99,15 +97,14 @@ ISR(TIMER0_OVF_vect) { //this ISR is called 9765.625 times per second
} }
ISR(PCINT2_vect){ ISR(PCINT2_vect){
//TODO good quadrature reading code
if((PIND & (1<<7)) && (menu_state >= 1) && (menu_state <= 3)){ if((PIND & (1<<7)) && (menu_state >= 1) && (menu_state <= 3)){
if(PIND & (1<<6)) if(PIND & (1<<6))
temp_setpoints[menu_state-1]++;
else
temp_setpoints[menu_state-1]--; temp_setpoints[menu_state-1]--;
else
temp_setpoints[menu_state-1]++;
} }
//if(PIND & (1<<7)) //if(PIND & (1<<7))
// if(PIND & (1<<6)){ // if(PIND & (1<<6)){
// if(temp_setpoints[menu_state] > 0) // if(temp_setpoints[menu_state] > 0)