Rev 2782 Rev 2788
Line 27... Line 27...
27 #int_TIMER1 27 #int_TIMER1
28 void TIMER1_isr(void) 28 void TIMER1_isr(void)
29 { 29 {
30 output_toggle(PIN_D1); 30 output_toggle(PIN_D1);
31 anemo = ((timer0_overflow_count * 0xFF) + get_timer0())/(32768.0/0xFFFF); 31 anemo = ((timer0_overflow_count * 0xFF) + get_timer0())/(32768.0/0xFFFF);
-   32 timer0_overflow_count=0;
-   33 set_timer0(0);
32 } 34 }
33   35  
34 #int_TIMER0 36 #int_TIMER0
35 void TIMER0_isr(void) 37 void TIMER0_isr(void)
36 { 38 {
Line 95... Line 97...
95 float barometer_temperature, barometer_pressure; 97 float barometer_temperature, barometer_pressure;
96   98  
97 delay_ms(100); 99 delay_ms(100);
98 { // printf 100 { // printf
99   101  
-   102 // local_temp = ds1820_read()+273.15;
100 sht_rd(SHT_temp,SHT_hum); 103 sht_rd(SHT_temp,SHT_hum);
101 local_temp = ds1820_read()+273.15; -  
102 SHT_temp += 273.15; 104 SHT_temp += 273.15;
103 barometer_temperature = MPL_get_temperature() + 273.15; 105 // barometer_temperature = MPL_get_temperature() + 273.15;
104 barometer_pressure = MPL_get_pressure() * 10.0; // conversion to hectopascals 106 // barometer_pressure = MPL_get_pressure() * 10.0; // conversion to hectopascals
105 107
106 delay_us(SEND_DELAY); 108 delay_us(SEND_DELAY);
107 putc('$'); 109 putc('$');
108 delay_us(SEND_DELAY); 110 delay_us(SEND_DELAY);
109 sprintf(output,"AWS%s \0",VER); 111 sprintf(output,"AWS%s \0",VER);