conf.hpp (da4a5dd133b88ebfeb69e89d05b381f81ba70e50) conf.hpp (22c257abd27fd76ed5280ef5c717eef1f28bfca9)
1#pragma once
2
3#include "pid/ec/pid.hpp"
1#pragma once
2
3#include "pid/ec/pid.hpp"
4#include "pid/ec/stepwise.hpp"
4
5#include <map>
6#include <string>
7#include <vector>
8
9/*
10 * General sensor structure used for configuration.
11 */

--- 13 unchanged lines hidden (view full) ---

25/*
26 * Structure for holding the configuration of a PID.
27 */
28struct controller_info
29{
30 std::string type; // fan or margin or temp?
31 std::vector<std::string> inputs; // one or more sensors.
32 float setpoint; // initial setpoint for thermal.
5
6#include <map>
7#include <string>
8#include <vector>
9
10/*
11 * General sensor structure used for configuration.
12 */

--- 13 unchanged lines hidden (view full) ---

26/*
27 * Structure for holding the configuration of a PID.
28 */
29struct controller_info
30{
31 std::string type; // fan or margin or temp?
32 std::vector<std::string> inputs; // one or more sensors.
33 float setpoint; // initial setpoint for thermal.
33 ec::pidinfo info; // pid details
34 union
35 {
36 ec::pidinfo pidInfo; // pid details
37 ec::StepwiseInfo stepwiseInfo;
38 };
34};
35
36/*
37 * General zone structure used for configuration. A zone is a list of PIDs
38 * and a set of configuration settings. This structure gets filled out with
39 * the zone configuration settings and not the PID details.
40 */
41struct zone
42{
43 /* The minimum RPM value we would ever want. */
44 float minthermalrpm;
45
46 /* If the sensors are in fail-safe mode, this is the percentage to use. */
47 float failsafepercent;
48};
49
50using PIDConf = std::map<std::string, struct controller_info>;
39};
40
41/*
42 * General zone structure used for configuration. A zone is a list of PIDs
43 * and a set of configuration settings. This structure gets filled out with
44 * the zone configuration settings and not the PID details.
45 */
46struct zone
47{
48 /* The minimum RPM value we would ever want. */
49 float minthermalrpm;
50
51 /* If the sensors are in fail-safe mode, this is the percentage to use. */
52 float failsafepercent;
53};
54
55using PIDConf = std::map<std::string, struct controller_info>;