Merge branch 'dev' into ui

stm-firmware/Makefile

@@ -55,6 +55,8 @@ CFILES += ui/lcd.c ui/menu.c
 
 CFILES += fatfs/diskio.c fatfs/ff.c fatfs/ffsystem.c fatfs/ffunicode.c fatfs/shimatta_sdio_driver/shimatta_sdio.c
 
+CFILES += pid-controller.c oven-driver.c
+
 DEFINES += -DDEBUGBUILD
 
 ###################################################################################

stm-firmware/include/reflow-controller/adc-meas.h

@@ -107,7 +107,7 @@ void adc_pt1000_get_resistance_calibration(float *offset, float *sensitivity_dev
 /**
  * @brief Get the current reistance value
  *
- * If the reistance calibration is enabled, this function applies the calculations of the raw reistance reading and
+ * If the reistance calibration is enabled, this function applies the calculations of the raw resistance reading and
  * returns the corrected value.
  *
  * If an ADC error is set, the status is negative. The status is 2 during the first measurements with a given filter setting. Technically, the resistance value is

stm-firmware/include/reflow-controller/oven-driver.h

@@ -0,0 +1,24 @@
+/* Reflow Oven Controller
+*
+* Copyright (C) 2020  Mario Hüttel <mario.huettel@gmx.net>
+*
+* This file is part of the Reflow Oven Controller Project.
+*
+* The reflow oven controller is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License version 2 as
+* published by the Free Software Foundation.
+*
+* The Reflow Oven Control Firmware is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with the reflow oven controller project.
+* If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef __OVEN_DRIVER_H__
+#define __OVEN_DRIVER_H__
+
+#endif /* __OVEN_DRIVER_H__ */

stm-firmware/include/reflow-controller/pid-controller.h

@@ -0,0 +1,44 @@
+/* Reflow Oven Controller
+*
+* Copyright (C) 2020  Mario Hüttel <mario.huettel@gmx.net>
+*
+* This file is part of the Reflow Oven Controller Project.
+*
+* The reflow oven controller is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License version 2 as
+* published by the Free Software Foundation.
+*
+* The Reflow Oven Control Firmware is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with the reflow oven controller project.
+* If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef __PID_CONTROLLER_H__
+#define __PID_CONTROLLER_H__
+
+struct pid_controller {
+	float k_deriv;
+	float k_int;
+	float k_p;
+	float output_sat_max;
+	float output_sat_min;
+	float integral_max;
+	volatile float control_output;
+	volatile float last_in;
+	volatile float integral;
+};
+
+void pid_init(struct pid_controller *pid, float k_deriv, float k_int, float k_p, float output_sat_min, float output_sat_max, float integral_max);
+
+void pid_zero(struct pid_controller *pid);
+
+float pid_sample(struct pid_controller *pid, float deviation);
+
+float pid_get_control_output(const struct pid_controller *pid);
+
+#endif /* __PID_CONTROLLER_H__ */

stm-firmware/main.c

@@ -32,7 +32,9 @@
 #include <reflow-controller/systick.h>
 #include <reflow-controller/adc-meas.h>
 #include <reflow-controller/shell.h>
+#include <reflow-controller/pid-controller.h>
 #include <reflow-controller/digio.h>
+#include <reflow-controller/temp-converter.h>
 #include <reflow-controller/rotary-encoder.h>
 #include <stm-periph/stm32-gpio-macros.h>
 #include <stm-periph/clock-enable-manager.h>
@@ -55,8 +57,8 @@ static void setup_nvic_priorities()
 static float pt1000_value;
 static volatile int pt1000_value_status;
 static uint32_t rot;
-
+static volatile float pid_out;
-
+static volatile float current_temperature;
 
 static inline void uart_gpio_config()
 {
@@ -113,6 +115,9 @@ int main()
 	shellmatta_handle_t shell_handle;
 	int uart_receive_status;
 
+	static struct pid_controller pid;
+	uint64_t pid_timestamp = 0;
+
 	setup_nvic_priorities();
 	systick_setup();
 
@@ -134,9 +139,20 @@ int main()
 		f_close(&test_file);
 	}
 
+	pid_init(&pid, 0.1, 0.1, 4.0, 0.0, 100.0, 40.0);
+	pid_zero(&pid);
 
 	while (1) {
 		pt1000_value_status = adc_pt1000_get_current_resistance(&pt1000_value);
+
+		if (pt1000_value_status >= 0) {
+			(void)temp_converter_convert_resistance_to_temp(pt1000_value, (float *)&current_temperature);
+			if ((systick_get_global_tick() - pid_timestamp) >= 250) {
+				pid_out = pid_sample(&pid, 100.0 - current_temperature);
+				pid_timestamp = systick_get_global_tick();
+			}
+		}
+
 		rot = rotary_encoder_get_abs_val();
 		uart_receive_status = uart_receive_data_with_dma(&shell_uart, &uart_input, &uart_input_len);
 		if (uart_receive_status >= 1)

stm-firmware/oven-driver.c

@@ -0,0 +1,21 @@
+/* Reflow Oven Controller
+*
+* Copyright (C) 2020  Mario Hüttel <mario.huettel@gmx.net>
+*
+* This file is part of the Reflow Oven Controller Project.
+*
+* The reflow oven controller is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License version 2 as
+* published by the Free Software Foundation.
+*
+* The Reflow Oven Control Firmware is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with the reflow oven controller project.
+* If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include <reflow-controller/oven-driver.h>

stm-firmware/pid-controller.c

@@ -0,0 +1,90 @@
+/* Reflow Oven Controller
+*
+* Copyright (C) 2020  Mario Hüttel <mario.huettel@gmx.net>
+*
+* This file is part of the Reflow Oven Controller Project.
+*
+* The reflow oven controller is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License version 2 as
+* published by the Free Software Foundation.
+*
+* The Reflow Oven Control Firmware is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with the reflow oven controller project.
+* If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include <reflow-controller/pid-controller.h>
+
+void pid_init(struct pid_controller *pid, float k_deriv, float k_int, float k_p, float output_sat_min, float output_sat_max, float integral_max)
+{
+	if (!pid)
+		return;
+
+	pid->k_p = k_p;
+	pid->k_int = k_int;
+	pid->k_deriv = k_deriv;
+	pid->output_sat_max = output_sat_max;
+	pid->output_sat_min = output_sat_min;
+	pid->control_output = 0;
+	pid->integral_max = integral_max;
+}
+
+void pid_zero(struct pid_controller *pid)
+{
+	pid->control_output = 0.0f;
+	pid->last_in = 0.0f;
+	pid->integral = 0.0f;
+}
+
+static void calculate_integral(struct pid_controller *pid, float deviation)
+{
+	pid->integral += deviation * pid->k_int;
+
+	if (pid->integral > pid->integral_max) {
+		pid->integral = pid->integral_max;
+	} else if (pid->integral < -pid->integral_max) {
+		pid->integral = -pid->integral_max;
+	}
+}
+
+float pid_sample(struct pid_controller *pid, float deviation)
+{
+	float output;
+
+	if (!pid)
+		return 0.0;
+
+	output = deviation * pid->k_p;
+
+	if (!(deviation > 0.0f && pid->control_output > pid->output_sat_max - 0.5) &&
+	    !(deviation < 0.0f && pid->control_output < pid->output_sat_min + 0.5)) {
+		calculate_integral(pid, deviation);
+	}
+
+	output += pid->integral;
+	output -= (deviation - pid->last_in) * pid->k_deriv;
+
+	pid->last_in = deviation;
+
+	if (output > pid->output_sat_max)
+		output = pid->output_sat_max;
+	if (output < pid->output_sat_min)
+		output = pid->output_sat_min;
+
+	pid->control_output = output;
+
+	return output;
+}
+
+float pid_get_control_output(const struct pid_controller *pid)
+{
+	if (!pid)
+		return 0.0f;
+
+	return pid->control_output;
+}