diff --git a/slave/slave/lib/inputOutput.c b/slave/slave/lib/inputOutput.c --- a/slave/slave/lib/inputOutput.c +++ b/slave/slave/lib/inputOutput.c @@ -33,7 +33,7 @@ int8_t moduleID; // Slave Module ID from ADCSRA |= (1 << ADATE); // Enables auto trigger, determined in ADCSRB bits ADTS //ADCSRA |= (1 << ADIF); // //ADCSRA |= (1 << ADIE); // ADC interrupt enable set - ADCSRB &= ~(1 << ADTS2) | (1 << ADTS1) | (1 << ADTS0); // Set ADC auto trigger source to free running mode + ADCSRB &= ~((1 << ADTS2) | (1 << ADTS1) | (1 << ADTS0)); // Set ADC auto trigger source to free running mode ADCSRA |= (1 << ADEN); // Enable ADC ADCSRA |= (1 << ADSC); // Start ADC measurements. ADC should now continuously run conversions, which are stored in ADCH 0x79 diff --git a/slave/slave/lib/sensors.c b/slave/slave/lib/sensors.c --- a/slave/slave/lib/sensors.c +++ b/slave/slave/lib/sensors.c @@ -254,7 +254,7 @@ uint32_t sensors_getLux(void) // Gets l } //possibly uint8_t -int8_t sensors_getBatt(void) // Gets battery voltage from variable +uint8_t sensors_getBatt(void) // Gets battery voltage from variable { return batt; } diff --git a/slave/slave/lib/sensors.h b/slave/slave/lib/sensors.h --- a/slave/slave/lib/sensors.h +++ b/slave/slave/lib/sensors.h @@ -15,7 +15,7 @@ void sensors_readSpiTemp(void); // Read void sensors_readBoardTemp(void); // Reads board temperature void sensors_readPressure(void); // Reads pressure void sensors_readHumid(void); // Reads humidity -void sensors_readLux(void); // Reads lux +void sensors_readLux(void); // Reads lux void sensors_readBatt(void); int16_t sensors_getSpiTemp(void); // Gets spi temperature from variable @@ -24,6 +24,6 @@ int32_t sensors_getPressure(void); // Ge uint16_t sensors_getHumid(void); // Gets humidity from variable uint32_t sensors_getLux(void); // Gets lux from variable int8_t sensors_getBatt(void); // Gets battery voltage from variable -uint32_t sensors_getAltitude(void); // Gets altitude from variable +uint32_t sensors_getAltitude(void); // Gets altitude from variable #endif /* SENSORS_H_ */ \ No newline at end of file