Merge branch 'dev' into ui

This commit is contained in:
2020-04-20 21:17:46 +02:00
7 changed files with 200 additions and 3 deletions

View File

@@ -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

View File

@@ -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__ */

View File

@@ -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__ */