therm-ng Changeset - 02c66b160d15 · protofusion repositories

Changeset - 02c66b160d15

Parent rev.

Child rev.

[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:

.settings/language.settings.xml

src/main.c

src/pid.c

src/tempsense.c

0 comments (0 inline, 0 general)

.settings/language.settings.xml

➞

Show inline comments

 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <project>
 	<configuration id="ilg.gnuarmeclipse.managedbuild.cross.config.elf.debug.1538442532" name="Debug">
 		<extension point="org.eclipse.cdt.core.LanguageSettingsProvider">
 			<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>
 		</extension>
 	</configuration>
 	<configuration id="ilg.gnuarmeclipse.managedbuild.cross.config.elf.release.1229152259" name="Release">
 		<extension point="org.eclipse.cdt.core.LanguageSettingsProvider">
 			<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>
 		</extension>
 	</configuration>
 </project>

src/main.c

➞

Show inline comments

 //
 // Therm Firmware
-// Copyright 2017 Ethan Zonca
+// Copyright 2018 Ethan Zonca
 // Author(s): Ethan Zonca
 //
 #include "stm32f3xx_hal.h"
 #include "config.h"
 #include "watchdog.h"
 #include "system.h"
 #include "display.h"
 #include "thermostat.h"
 #include "gpio.h"
 #include "tempsense.h"
 #include "pid.h"
 #include "error.h"
 #include "flash.h"
 #include "ssd1306/ssd1306.h"
 #include "pwmout.h"
 int main(void)
+{
 	sysclock_init();
 	hal_init();
 	gpio_init();
 	ssd1306_init();
 	// Startup screen
     display_startup_screen();
     HAL_Delay(2000);
     ssd1306_clearscreen();
 	ssd1306_drawlogo();
     // Default status
 	runtime_status()->temp = 0.0;
 	runtime_status()->state_resume = 0;
 	runtime_status()->state = STATE_IDLE;
 	runtime_status()->setpoint = 70;
 	runtime_status()->pid_enabled = 0;
     pid_init();
     pwmout_init();
     flash_init();
 	watchdog_init();
 	tempsense_init();
 	// Soft timers
     uint32_t last_pid = 0;
     uint32_t last_thermostat = 0;

src/pid.c

➞

Show inline comments

 //
 // PID: proportional/integral/derivative controller
 //
 #include "pid.h"
 #include "flash.h"
 // PID implementation
 static pid_state_t state;
 // Initialize PID loop
 void pid_init()
+{
 	state.i_state = 0;
 	state.last_pid_temp = 0;
 	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
 //			max31855_readtemp(spi_get(), &set, &status); // Read MAX31855
 //			#endif
 	float ssr_output = 0;
 	if(runtime_status()->pid_enabled)
+	{
 		// Get ssr output for next time
 		int16_t power_percent = pid_update();
 		if(flash_getsettings()->val.plant_type == PLANT_COOLER)
 			power_percent *= -1;
 		//power-percent is 0-1000?
 		ssr_output = power_percent; //(((uint32_t)SSR_PERIOD * (uint32_t)10 * (uint32_t)100) * power_percent) / (uint32_t)1000000;
 		// put ssr output on display
 		ssd1306_drawstring("      ", 0, 90); //fixme: this is bad, but I can't get the old digits to clear otherwise
 		char tempstr[8];
 		snprintf(tempstr, 8, "%4.1f%%", ssr_output/10.0);
 		ssd1306_drawstring(tempstr, 0, 85);
+	}
 	else
+	{
 		ssr_output = 0.0;
+	}
 	return ssr_output; //ssr_output;
+}
 // Calculate new PID values
 int16_t pid_update(void)
+{
 	therm_status_t* status = runtime_status();
 	therm_settings_t* set = flash_getsettings();
 	// Convert temperature to fixed point number with 1/10th resolution
 	float temp = status->temp;
 	// Calculate instantaneous error
 	// EMZ FIXME: was regulating to 1 degree below the setpoint! +1 accomadates for this
 	int16_t error = (status->setpoint+1) - temp;
 	// Proportional component
 	int32_t p_term = set->val.k_p * error;
 	// Error accumulator (integrator)
 	state.i_state += error;
 	// to prevent the iTerm getting huge from lots of
 	//  error, we use a "windup guard"
 	// (this happens when the machine is first turned on and
 	// it cant help be cold despite its best efforts)
 	// not necessary, but this makes windup guard values
 	// relative to the current iGain
 	int32_t windup_guard_res = (set->val.windup_guard * 10) / set->val.k_i;
 	// Calculate integral term with windup guard
 	if (state.i_state > windup_guard_res)
 	  state.i_state = windup_guard_res;
 	else if (state.i_state < -windup_guard_res)
 	  state.i_state = -windup_guard_res;
 	// Discard I if we've achieved the setpoint (TODO: add setting disable/enable)
 	if(error <= 0)
 		state.i_state = 0;
 	int32_t i_term = set->val.k_i * state.i_state;
 	// Calculate differential term (slope since last iteration)
 	int32_t d_term = (set->val.k_d * (temp - state.last_pid_temp));
 	// Save temperature for next iteration
 	state.last_pid_temp = temp;
 	int16_t result = (p_term + i_term - d_term) / 10;
 	// Put out tenths of percent, 0-1000.
 	if(result > 1000)

src/tempsense.c

➞

Show inline comments

 //
 // TempSense: read temperature from TC, RTD, or NTC
 //
 #include "tempsense.h"
 #include "flash.h"
 #include "ssd1306/ssd1306.h"
 #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
 	max31856_init(spi_get(), TEMPSENSE_MAX_CS_PORT, TEMPSENSE_MAX_CS_PIN, 0);
 	// Maybe don't perform temp sensor setup in here, but in readtemp?
 	// what happens if the user changes the tempsense type while running?
 	// we need to re-init...
+}
 // Returns the latest reading from the configured temperature sensor
 // Request reading from configured temperature sensor
 void tempsense_readtemp(void)
+{
 	switch(flash_getsettings()->val.sensor_type)
+	{
 		case SENSOR_TC_K:
 		case SENSOR_TC_E:
 		case SENSOR_TC_N:
 		case SENSOR_TC_R:
 		case SENSOR_TC_S:
 		case SENSOR_TC_T:
+		{
 			// Read MAX31856
 			max31856_process();
 		} break;
 		case SENSOR_NTC:
+		{
 			// Read analog value from internal ADC, linearize the reading, etc
 		} break;
+	}
 	// either return latest reading from DMA loop (NTC, etc)
 	// or initiate a blocking read and return it.
 	// 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)