Changeset - 02c66b160d15
[Not reviewed]
default
0 4 0
Ethan Zonca - 7 years ago 2018-02-24 13:13:28
ez@ethanzonca.com
Add actual support for different temp units to tempsense
4 files changed with 19 insertions and 9 deletions:
0 comments (0 inline, 0 general)
.settings/language.settings.xml
Show inline comments
 
@@ -5,7 +5,7 @@
 
			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 
			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 
			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
 
			<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="228329417953433416" id="ilg.gnuarmeclipse.managedbuild.cross.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT GCC Built-in Compiler Settings Cross ARM" parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 
			<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="1032993098067644764" id="ilg.gnuarmeclipse.managedbuild.cross.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT GCC Built-in Compiler Settings Cross ARM" parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 
				<language-scope id="org.eclipse.cdt.core.gcc"/>
 
				<language-scope id="org.eclipse.cdt.core.g++"/>
 
			</provider>
 
@@ -16,7 +16,7 @@
 
			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 
			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 
			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
 
			<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="266793431193090206" id="ilg.gnuarmeclipse.managedbuild.cross.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT GCC Built-in Compiler Settings Cross ARM" parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 
			<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="1087038314662204210" id="ilg.gnuarmeclipse.managedbuild.cross.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT GCC Built-in Compiler Settings Cross ARM" parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 
				<language-scope id="org.eclipse.cdt.core.gcc"/>
 
				<language-scope id="org.eclipse.cdt.core.g++"/>
 
			</provider>
src/main.c
Show inline comments
 
//
 
// Therm Firmware
 
// Copyright 2017 Ethan Zonca
 
// Copyright 2018 Ethan Zonca
 
// Author(s): Ethan Zonca
 
//
 
src/pid.c
Show inline comments
 
@@ -6,10 +6,10 @@
 
#include "flash.h"
 

	
 
// PID implementation
 

	
 
static pid_state_t state;
 

	
 

	
 
// Initialize PID loop
 
void pid_init()
 
{
 
	state.i_state = 0;
 
@@ -17,10 +17,10 @@ void pid_init()
 
	state.last_pid_temp_frac = 0;
 
}
 

	
 

	
 
// Apply PID output values
 
float pid_process(void)
 
{
 

	
 

	
 
//            #ifdef MAX31865_RTD_SENSOR
 
//            max31865_readtemp(spi_get(), &set, &status);
 
//			#else
 
@@ -55,6 +55,8 @@ float pid_process(void)
 
	return ssr_output; //ssr_output;
 
}
 

	
 

	
 
// Calculate new PID values
 
int16_t pid_update(void)
 
{
 
	therm_status_t* status = runtime_status();
src/tempsense.c
Show inline comments
 
@@ -8,6 +8,7 @@
 
#include "max31856/max31856.h"
 

	
 

	
 
// Initialize temperature sensor
 
void tempsense_init(void)
 
{
 
	// TODO: Rework SPI stuff... init the port in a sharedlib then pass ref to display and tempsense
 
@@ -21,7 +22,8 @@ void tempsense_init(void)
 

	
 
}
 

	
 
// Returns the latest reading from the configured temperature sensor
 

	
 
// Request reading from configured temperature sensor
 
void tempsense_readtemp(void)
 
{
 

	
 
@@ -50,8 +52,14 @@ void tempsense_readtemp(void)
 
	// Need to gracefully handle the timeout...
 
}
 

	
 

	
 
// Get latest temperature in requested units
 
float tempsense_gettemp(void)
 
{
 
	return max31856_latest_temp();
 
	float temp_converted = max31856_latest_temp();
 

	
 
	if(flash_getsettings()->val.temp_units == TEMP_UNITS_FAHRENHEIT)
 
		temp_converted = temp_converted * 1.8f + 32.0f;
 

	
 
	return temp_converted;
 
}
 

	
0 comments (0 inline, 0 general)