Compare commits
No commits in common. "80edd095285a6d9955ab2a1aa563e9d64a19db55" and "cc6e922d1bf375eb51fc2e6d5b23a2cc6e024ab0" have entirely different histories.
80edd09528
...
cc6e922d1b
@ -149,16 +149,8 @@ disassemble: $(target).elf
|
|||||||
objcopy: $(target).bin $(target).hex
|
objcopy: $(target).bin $(target).hex
|
||||||
|
|
||||||
mrproper: clean
|
mrproper: clean
|
||||||
ifneq ($(DEBUGBUILD),true)
|
@echo "Purging project files..."
|
||||||
@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 "
|
||||||
|
@ -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 * (1.0f / TEMP_CONVERSION_RES_STEP)) * diff_high_low + low;
|
*temp_out = (diff_to_low_resistance / TEMP_CONVERSION_RES_STEP) * diff_high_low + low;
|
||||||
|
|
||||||
return_ret_val:
|
return_ret_val:
|
||||||
return ret_val;
|
return ret_val;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user