diff --git a/prosjekt.X/nbproject/configurations.xml b/prosjekt.X/nbproject/configurations.xml index 3cb0be9..b0dae9e 100644 --- a/prosjekt.X/nbproject/configurations.xml +++ b/prosjekt.X/nbproject/configurations.xml @@ -1,180 +1,180 @@ - - - - - eeprom.h - themistor-temp.h - - - Makefile - - - - - main.c - eeprom.c - thermistor-temp.c - - - Makefile - - - - localhost - AVR128DB48 - - - nEdbgTool - XC8 - 2.46 - 2 - - - - - - - - - - - - - - - false - false - - - - - - - false - false - - false - - false - false - false - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + themistor-temp.h + uart.h + + + Makefile + + + + + main.c + thermistor-temp.c + uart.c + + + Makefile + + + + localhost + AVR128DB48 + + + nEdbgTool + XC8 + 2.45 + 2 + + + + + + + + + + + + + + + false + false + + + + + + + false + false + + false + + false + false + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/prosjekt.X/themistor-temp.h b/prosjekt.X/themistor-temp.h index e440f0c..8668c9c 100644 --- a/prosjekt.X/themistor-temp.h +++ b/prosjekt.X/themistor-temp.h @@ -27,8 +27,10 @@ extern "C" { // Calculates the temperature in celcius // Returns the thermistor themperature float calculate_thermistor_temp(float readValue); -// Returns true if temperatur is higher then high_temp int -bool error_message(float thermistor_temp); + + +// Returns true if temperatur is higher than max_temp +bool error_message(float thermistor_temp, uint8_t max_temp); diff --git a/prosjekt.X/thermistor-temp.c b/prosjekt.X/thermistor-temp.c index afba6d5..4d41ea2 100644 --- a/prosjekt.X/thermistor-temp.c +++ b/prosjekt.X/thermistor-temp.c @@ -26,12 +26,11 @@ float calculate_thermistor_temp(float readValue){ return T_therm; } -// returns error message -bool error_message(float thermistor_temp){ - // Max value - int high_temp = 0; +// returns error message if the messured thermistor temp is higher than +// Choosen max_temp +bool error_message(float thermistor_temp, uint8_t max_temp){ // Return true if temp is higher then max value - if (thermistor_temp > high_temp){ + if (thermistor_temp >= max_temp){ printf("Error"); return true; }