Compare commits

...

2 Commits

2 changed files with 11 additions and 3 deletions

View File

@ -149,8 +149,16 @@ disassemble: $(target).elf
objcopy: $(target).bin $(target).hex objcopy: $(target).bin $(target).hex
mrproper: clean mrproper: clean
@echo "Purging project files..." ifneq ($(DEBUGBUILD),true)
@echo "Purging RELEASE project files"
else
@echo "Purging DEBUG project files"
endif
$(QUIET)rm -f $(target).pro $(target).creator $(target).files $(target).cflags $(target).cxxflags $(target).includes $(target).config $(QUIET)rm -f $(target).pro $(target).creator $(target).files $(target).cflags $(target).cxxflags $(target).includes $(target).config
ifneq ($(DEBUGBUILD),true)
$(QUIET)$(MAKE) DEBUGBUILD=true mrproper
endif
clean: clean:
@echo -n "Cleaning up derived files for " @echo -n "Cleaning up derived files for "

View File

@ -68,7 +68,7 @@ int temp_converter_convert_resistance_to_temp(float resistance, float *temp_out)
diff_to_low_resistance = resistance - (float)(TEMP_CONVERSION_MIN_RES + TEMP_CONVERSION_RES_STEP * lower_idx); diff_to_low_resistance = resistance - (float)(TEMP_CONVERSION_MIN_RES + TEMP_CONVERSION_RES_STEP * lower_idx);
/* Calculate output temperature */ /* Calculate output temperature */
*temp_out = (diff_to_low_resistance / TEMP_CONVERSION_RES_STEP) * diff_high_low + low; *temp_out = (diff_to_low_resistance * (1.0f / TEMP_CONVERSION_RES_STEP)) * diff_high_low + low;
return_ret_val: return_ret_val:
return ret_val; return ret_val;