| 18,14 → 18,14 |
|---|
| #define sht_clk_pin PIN_D1 |
| #include "..\SHT.c" |
| |
| #use i2c(master, sda=PIN_C4, scl=PIN_C3) |
| #use i2c(master, sda=PIN_D6, scl=PIN_D5) |
| #include "..\SHT25.h" |
| |
| #define CSN_SPI PIN_C2 // preassure sensor connection |
| #include "..\MPL115A1.c" |
| |
| unsigned int16 timer0_overflow_count=0; |
| float anemo=0; |
| unsigned int16 timer0_overflow_count; |
| float anemo; |
| |
| int1 barometer_present; |
| |
| 91,11 → 91,19 |
|---|
| |
| restart_wdt(); //---WDT |
| |
| // barometer init |
| barometer_present = MPL_init(); // get correction coefficients from the sensor |
| |
| sht_init(); |
| barometer_present = MPL_init(); // get correction coefficients from the sensor |
| |
| |
| SHT25_soft_reset(); |
| |
| // anemometer init |
| set_timer0(0); |
| set_timer1(0); |
| timer0_overflow_count=0; |
| anemo=0; |
| |
| restart_wdt(); //---WDT |
| |
| while (TRUE) |
| 117,7 → 125,8 |
|---|
| |
| SHT_temp2 = SHT25_get_temp(); |
| SHT_hum2 = SHT25_get_hum(); |
| |
| SHT_temp2 = (SHT_temp2 + 273.15)*100; |
| |
| if (barometer_present == TRUE) |
| { |
| barometer_temperature = (MPL_get_temperature() + 273.15)*100; |