/Designs/Measuring_instruments/AWS01A/SW/PIC16F887/main.c
71,8 → 71,8
setup_adc_ports(NO_ANALOGS|VSS_VDD);
setup_adc(ADC_CLOCK_DIV_2);
setup_timer_0(RTCC_EXT_L_TO_H|RTCC_DIV_1);
// setup_timer_1(T1_EXTERNAL|T1_DIV_BY_1);//|T1_CLK_OUT);
setup_timer_1(T1_INTERNAL|T1_DIV_BY_8);
setup_timer_1(T1_EXTERNAL|T1_DIV_BY_1);//|T1_CLK_OUT);
// setup_timer_1(T1_INTERNAL|T1_DIV_BY_8);
setup_timer_2(T2_DISABLED,0,1);
setup_ccp1(CCP_OFF);
setup_comparator(NC_NC_NC_NC); // This device COMP currently not supported by the PICWizard
110,8 → 110,8
local_temp = ds1820_read()+27315;
sht_rd(SHT_temp,SHT_hum);
SHT_temp = (SHT_temp + 273.15)*100;
//barometer_temperature = (MPL_get_temperature() + 273.15)*100;
//barometer_pressure = MPL_get_pressure() * 10.0; // conversion to hectopascals
barometer_temperature = (MPL_get_temperature() + 273.15)*100;
barometer_pressure = MPL_get_pressure() * 10.0; // conversion to hectopascals
delay_us(SEND_DELAY);
putc('$');