mbsePi-apps: comparison thermferm/thermferm.h

-:9c69d43bfb06
+:1e0192b295b9
 #define MENU_MODE_BEER		213
 #define MENU_BEER_TEMP          2131
 #define MENU_MODE_FRIDGE	214
 #define MENU_FRIDGE_TEMP	2141
 #define MENU_MODE_PROFILE	215
-#define	MENU_PROFILE_SELECT	2151
 #define	MENU_PROFILE_START	2152
 #define	MENU_PROFILE_PAUSE	2153
 #define	MENU_PROFILE_ABORT	2154
 #define	MENU_PROFILE_RESUME	2155
 #define	MENU_PROFILE_GOOFF	2156
 #define MBSE_SS(x) (x)?(x):"(null)"
 /*
+* Fermenting steps
+*/
+typedef struct _prof_step {
+struct _prof_step   *next;
+char                *name;                  /* Description of this step     */
+int                 steptime;               /* Step time to target in hours */
+int                 resttime;               /* Rest time on target in hours */
+float               target_lo;              /* Low Target temperature       */
+float               target_hi;              /* High target temperature      */
+int                 fridge_mode;            /* Fridge or beer mode          */
+} prof_step;
+/*
 * Fermenter units. These units are connected via the 1-wire bus.
 * Each unit can have:
 *  a DS18B20 sensor to measure the air temperature inside the unit.
 *  a DS18B20 sensor(s) to measure the beer temperature.
 *  a DS2408 to turn the cooler, heater and fans on or off. Sense door and PSU state.
 */
 typedef struct _units_list {
 struct _units_list	*next;
-int			version;		/* Record version		*/
 char		*uuid;			/* uid code			*/
 char		*product_uuid;		/* Beer product uuid		*/
 char		*product_code;		/* Beer product code		*/
 char		*product_name;		/* Beer product name		*/
 char		*alias;			/* alias name 'unit1'		*/
 int			mode;			/* Unit mode			*/
 float		beer_set;		/* Beer temperature setting	*/
 float		fridge_set;		/* Fridge temperature setting	*/
 float		temp_set_min;		/* Minimum temperature		*/
 float		temp_set_max;		/* Maximum temperature		*/
-char		*profile;		/* Active profile uuid		*/
+char		*profile_uuid;		/* Profile uuid or NULL		*/
+char		*profile_name;		/* Profile name			*/
+float		profile_inittemp_lo;	/* Profile initial temp low	*/
+float		profile_inittemp_hi;	/* Profile initial temp high	*/
+int			profile_fridge_mode;	/* Profile initial fridge mode	*/
+int			profile_duration;	/* Profile duration in hours	*/
+int			profile_totalsteps;	/* Profile number of steps	*/
+prof_step		*profile_steps;		/* Profile steps                */
 time_t		prof_started;		/* Profile start time		*/
 int			prof_state;		/* Profile OFF|PAUSE|RUN|DONE	*/
 float		prof_target_lo;		/* Profile current target low	*/
 float		prof_target_hi;		/* Profile current target high	*/
 time_t		prof_paused;		/* Profile total pause time	*/
 #define	ALARM_FLAG_DOOR		0x0001		/* Door open			*/
 #define	ALARM_FLAG_PSU		0x0002		/* PSU problem			*/
 #define	ALARM_FLAG_CHILLER	0x0100		/* Chiller too warm		*/
-/*
-* Fermenting steps
-*/
-typedef struct _prof_step {
-struct _prof_step	*next;
-int			version;		/* Version 1			*/
-int			steptime;		/* Step time to target in hours	*/
-int			resttime;		/* Rest time on target in hours	*/
-float		target_lo;		/* Low Target temperature	*/
-float		target_hi;		/* High target temperature	*/
-int			fridge_mode;		/* Fridge or beer mode		*/
-} prof_step;
-/*
-* Fermenting profiles
-*/
-typedef struct _prof_list {
-struct _prof_list	*next;
-int			version;		/* Version 1			*/
-char		*uuid;			/* Profile uuid			*/
-char		*name;			/* Profile name			*/
-int			busy;			/* Profile busy == 1, free == 0	*/
-float		inittemp_lo;		/* Low target before start	*/
-float		inittemp_hi;		/* High target before start	*/
-int			fridge_mode;		/* Fridge or beer mode		*/
-prof_step		*steps;			/* Profile steps		*/
-} profiles_list;
 #define PROFILE_OFF		0		/* Profile not active		*/
 #define	PROFILE_PAUSE		1		/* Profile pause		*/
 #define	PROFILE_RUN		2		/* Profile is running		*/
 #define	PROFILE_DONE		3		/* Profile is finished		*/
 #define	PROFILE_ABORT		4		/* Profile abort		*/
 /*
 * External devices like sensors, relays.
 */
 typedef struct _dev_list {
 struct _dev_list	*next;
-int			version;		/* Version 1			*/
 char		*uuid;			/* UUID of this device		*/
 int			type;			/* Device type			*/
 int			direction;		/* Device direction		*/
 int			value;			/* Device value			*/
 int			offset;			/* Device offset value		*/
 * thermal sensor that measures the air and one that measures the beer.
 * It looks like a normal live setup.
 */
 typedef struct _simulator {
 struct _simulator	*next;
-int			version;		/* Version of this record	*/
 char		*uuid;			/* Simulator uuid		*/
 char		*name;			/* Simulator name		*/
 int			volume_air;		/* Volume air of the frigo	*/
 int			volume_beer;		/* Volume beer inside frigo	*/
 double		room_temperature;	/* Temp outside frigo		*/
 int			lcd_cols;		/* LCD display columns		*/
 int			lcd_rows;		/* LCD display rows		*/
 int			lcd_address;		/* LCD display i2c address	*/
 int			next_unit;		/* Next unit alias name		*/
 units_list		*units;			/* Fermenter units		*/
-profiles_list	*profiles;		/* Ferment profiles		*/
+//    profiles_list	*profiles;		/* Ferment profiles		*/
 devices_list	*devices;		/* Sensors and switches		*/
 #ifdef USE_SIMULATOR
 simulator_list	*simulators;		/* Simulators			*/
 #endif
 char		*mqtt_host;		/* MQTT host to connect to	*/

Mercurial > mbsePi-apps / file comparison

comparison: thermferm/thermferm.h

thermferm/thermferm.h