diff -r 4387a6b11eb3 -r 37623517e0ef thermferm/thermferm.h --- a/thermferm/thermferm.h Sun May 25 22:37:23 2014 +0200 +++ b/thermferm/thermferm.h Sun May 25 23:29:07 2014 +0200 @@ -72,22 +72,24 @@ typedef struct _sys_config { char *name; /* Configuration name */ - char *mosq_host; /* mosquitto server hostname */ - int mosq_port; /* mosquitto server port */ int my_port; /* my client/server port */ w1_therm *w1therms; /* 1-wire temp sensors */ -#ifdef HAVE_WIRINGPI_H int lcd_cols; /* LCD display columns */ int lcd_rows; /* LCD display rows */ - int rx433; /* 433 MHz receiver pin */ int tx433; /* 433 MHz transmitter pin */ rc_switch *rcswitch; /* 433 MHz RC Power switches */ -#endif + /* ControlSettings: */ + unsigned char cs_mode; /* mode */ + float cs_beerSet; /* beer temperature */ + float cs_fridgeSet; /* fridge temperature */ + float cs_heatEstimator; + float cs_coolEstimator; } sys_config; void killconfig(void); int rdconfig(char *); +int wrconfig(char *); /* lock.c */ @@ -156,7 +158,11 @@ void dht11Read(void); void dht11Init(int, int, int); + PI_THREAD (my_sensors_loop); + +/* server.c */ +void defaultControlSettings(void); PI_THREAD (my_server_loop); #endif