brewboard: comparison main/config.h

-:64886971967b
+:31f9d3e4a85f
 * @file config.h
 * @brief The BrewBoard configuration data. These are stored in the
 *        spiffs filesystem in a flash partition.
 */
-#ifndef	_CONFIG_H
+#ifndef	_G_CONFIG_H
-#define	_CONFIG_H
+#define	_G_CONFIG_H
 // Global includes for the project
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdbool.h>
 #include <time.h>
+#include <inttypes.h>
 #include <errno.h>
 #include <sys/unistd.h>
 #include <sys/fcntl.h>
 #include <sys/time.h>
 #include "freertos/FreeRTOS.h"
 #include "freertos/task.h"
 #include "freertos/semphr.h"
 #include "freertos/event_groups.h"
 #include "freertos/queue.h"
+#include "driver/gpio.h"
 #include "driver/i2c.h"
 #include "driver/ledc.h"
 #include "esp_log.h"
 #include "esp_spiffs.h"
+#include "esp_vfs.h"
+#include "esp_system.h"
+#include "esp_chip_info.h"
+#include "esp_netif.h"
+#include "esp_mac.h"
+#include "esp_wifi.h"
+#include "esp_wpa2.h"
 #include "esp_event.h"
-#include "esp_wifi.h"
+#include "esp_timer.h"
-#include "esp_wifi_types.h"
-#include "esp_system.h"
 #include "esp_ota_ops.h"
 #include "esp_http_client.h"
-#include "esp_https_ota.h"
+#include "esp_app_format.h"
+#include "esp_sntp.h"
-#include "esp_vfs.h"
-#include "esp_vfs_fat.h"
-#include "nvs.h"
 #include "nvs_flash.h"
+#include "lwip/sockets.h"
+#include "lwip/dns.h"
+#include "lwip/netdb.h"
+#include <expat.h>
 #include "esp32/rom/crc.h"
-#include "mdns.h"
-#include "lwip/sockets.h"
-#include "lwip/api.h"
-#include "lwip/err.h"
-#include "lwip/netdb.h"
-#include "lwip/dns.h"
-#include "lwip/opt.h"
-#include "lwip/memp.h"
-#include "lwip/ip.h"
-#include "lwip/raw.h"
-#include "lwip/udp.h"
-#include "sdkconfig.h"
-#include "esp_sntp.h"
-#include "expat.h"
 #include "tftspi.h"
 #include "tft.h"
 #include "PID_v1.h"
 #include "websocket_server.h"
 /**
 * @brief Global configuration. File /spiffs/config.conf
 */
-struct strConfig {
+typedef struct {
 uint8_t		Version;			///< Record version number for updates.
 uint8_t		Unit;				///< Celsius or Farenheit (not used yet).
 float		BoilTemperature;		///< The temperature when water boils.
 bool		AskAdd;				///< Ask to add the mash.
 bool		AskRemove;			///< Ask to remove the mash.
 uint16_t		ts_ytop;			///< TS calibration Y top.
 uint16_t		ts_ybottom;			///< TS calibration Y bottom.
 int			RecipeRec;			///< Current recipe record.
 char		uuid[37];			///< Sort of uuid code.
 char		lastSSID[32];			///< Last connected station.
-} config;						///< Config record.
+} my_config_t;
 /**
 * @brief Write configuration to disk.
 */
 void write_config(void);
 #define EQUIPMENT_VERSION	3		///< Equipment file version
 /**
 * @brief Equipment configuration. File /spiffs/equipments.conf
 */
-struct hdrEquipment {
+typedef struct {
 uint32_t            version;		///< Structure version.
 uint32_t            hdrsize;		///< Size of this header.
 uint32_t            recsize;		///< Size of a record.
-} equipment_hdr;
+} my_equipment_hdr_t;
-struct strEquipment {
+typedef struct {
 int		MLT_watt;			///< MLT watts.
 int		HLT_watt;			///< HLT watts.
 char	Name[32];			///< Equipment name.
 int		BoilPower;			///< The power percentage needed to keep the wort boiling.
 int		MashPower;			///< The power percentage needed to heat during mash.
 bool	xPID_POn;
 int		SampleTime;			///< PID sample time in seconds.
 bool	Hendi;				///< HendiControl in use.
 int		RampPower;			///< The power percentage to ramp to boil.
 int		Max_watt;			///< MLT plus HLT peak, shut off HLT if higher.
-} equipment;					///< Equipment record.
+} my_equipment_t;				///< Equipment record.
 /**
 * @brief Append equipments record to disk.
 */
 void append_equipment(void);
 /**
 * @brief Records with WiFi stations we have succesfully connected.
 */
-struct strStations {
+typedef struct {
 char	SSID[32];			///< Station SSID
 char	Password[64];			///< Station password
 bool	hide;				///< Hide from AP scan.
-} wifiStation;					///< Station record.
+} my_wifiStation_t;					///< Station record.
 /**
 * @brief Add a new station record.
 * @param SSID The SSID
 * @param Password The password for this SSID
 /**
 * @brief Runtime configuration. File /spiffs/runtime.conf
 */
-struct strRuntime {
+typedef struct {
 uint8_t		Version;			///< Record version number for updates.
 bool		AutoModeStarted;		///< Running automode.
 int			StageResume;			///< Current Resume Stage.
 int			StageTimeLeft;			///< Current Stage Time left.
 uint8_t		HopAddition;			///< Current Hop Addition.
 uint32_t		TimeBrewing;			///< Time we are brewing.
 uint8_t		MashStep;			///< Current mash step.
 bool		MaltAdded;			///< If malt was added.
 TickType_t		MLT_usage;			///< MLT usage counter.
 TickType_t		HLT_usage;			///< HLT usage counter.
-} runtime;						///< Runtime record.
+} my_runtime_t;						///< Runtime record.
 /**
 * @brief Write runtime information to disk.
 */
 } ADDITION_TYPE;
 /**
 * @brief Mash steps
 */
-typedef struct strMashStep {
+typedef struct {
 char                Name[32];                       ///< Step name.
 uint8_t             Type;                           ///< Step Type.
 float               Step_temp;                      ///< Step start temperature.
 uint16_t            Step_time;                      ///< Step rest time.
 uint16_t            Ramp_time;                      ///< Step time to reach temp.
 } mashstep_t;
 /**
 * @brief Hop and other additions
 */
-typedef struct strAddition {
+typedef struct {
 uint16_t		Time;				///< Time for addition.
 uint8_t		Type;				///< Addition type, Hop, Syrop ...
 char		Name[64];			///< Addition name.
 } addition_t;
 /**
 * @brief Recipes database. Starts with a header block for future upgrades,
 *        followed by the actual recpie records.
 */
-struct hdrRecipe {
+typedef struct {
 uint32_t		version;			///< Structure version.
 uint32_t		hdrsize;			///< Size of this header.
 uint32_t		recsize;			///< Size of a record.
 uint8_t		mashmax;			///< Maximum mash steps.
 uint8_t		additionmax;			///< Maximum additions.
-} recipe_hdr;
+} my_recipe_hdr_t;
-struct strRecipe {
+typedef struct {
 char		Name[128];			///< Recipe name.
 char		Code[32];			///< Recipe code.
 uint16_t		BoilTime;			///< Boil time.
 uint8_t		Mashsteps;			///< Number of mashsteps.
 uint8_t		Additions;			///< Number of additions.
 uint16_t		Whirlpool6;			///< Zero or the "Tepid" Whirlpool time 60..66 °
 uint16_t		Whirlpool2;			///< Zero or the Cold Whirlpool time < 30 °
 float		SpargeTemp;			///< Sparge water temperature.
 mashstep_t		MashStep[MASH_MAX];		///< Mash steps.
 addition_t		Addition[ADDITION_MAX];		///< Additions.
-} recipe;						///< Recipe record.
+} my_recipe_t;						///< Recipe record.
 /**
 * @brief Append a recipe record. Create file if it doesn't exist.
 */
 void append_recipe(void);

Mercurial > brewboard / file comparison

comparison: main/config.h

main/config.h