Sat, 07 Mar 2015 13:36:45 +0100
More device locks in the network server
42
01b96a24ae7c
Corrected missing and obsolete files
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
1 | /***************************************************************************** |
306
97602274eb58
Updated to add support for lights in a fermenter unit and a Power Supply status.
Michiel Broek <mbroek@mbse.eu>
parents:
303
diff
changeset
|
2 | * Copyright (C) 2008-2015 |
42
01b96a24ae7c
Corrected missing and obsolete files
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
3 | * |
01b96a24ae7c
Corrected missing and obsolete files
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
4 | * Michiel Broek <mbroek at mbse dot eu> |
01b96a24ae7c
Corrected missing and obsolete files
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
5 | * |
01b96a24ae7c
Corrected missing and obsolete files
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
6 | * This file is part of the mbsePi-apps |
01b96a24ae7c
Corrected missing and obsolete files
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
7 | * |
01b96a24ae7c
Corrected missing and obsolete files
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
8 | * This is free software; you can redistribute it and/or modify it |
01b96a24ae7c
Corrected missing and obsolete files
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
9 | * under the terms of the GNU General Public License as published by the |
01b96a24ae7c
Corrected missing and obsolete files
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
10 | * Free Software Foundation; either version 2, or (at your option) any |
01b96a24ae7c
Corrected missing and obsolete files
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
11 | * later version. |
01b96a24ae7c
Corrected missing and obsolete files
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
12 | * |
01b96a24ae7c
Corrected missing and obsolete files
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
13 | * mbsePi-apps is distributed in the hope that it will be useful, but |
01b96a24ae7c
Corrected missing and obsolete files
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
14 | * WITHOUT ANY WARRANTY; without even the implied warranty of |
01b96a24ae7c
Corrected missing and obsolete files
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
15 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
01b96a24ae7c
Corrected missing and obsolete files
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
16 | * General Public License for more details. |
01b96a24ae7c
Corrected missing and obsolete files
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
17 | * |
01b96a24ae7c
Corrected missing and obsolete files
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
18 | * You should have received a copy of the GNU General Public License |
213
2317b8d644fa
Code cleanup, streamlined error messages.
Michiel Broek <mbroek@mbse.eu>
parents:
209
diff
changeset
|
19 | * along with ThermFerm; see the file COPYING. If not, write to the Free |
42
01b96a24ae7c
Corrected missing and obsolete files
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
20 | * Software Foundation, 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. |
01b96a24ae7c
Corrected missing and obsolete files
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
21 | *****************************************************************************/ |
01b96a24ae7c
Corrected missing and obsolete files
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
22 | |
106 | 23 | #include "rdconfig.h" |
46
000399c64d3f
More client/server communications
Michiel Broek <mbroek@mbse.eu>
parents:
45
diff
changeset
|
24 | #include "thermferm.h" |
155
0d86f3c0a07b
Unit mode can switch between OFF and NONE.
Michiel Broek <mbroek@mbse.eu>
parents:
140
diff
changeset
|
25 | #include "logger.h" |
184 | 26 | #include "devices.h" |
106 | 27 | #include "server.h" |
245
b01b6238eb67
You can now safely add and remove units on a running system.
Michiel Broek <mbroek@mbse.eu>
parents:
240
diff
changeset
|
28 | #include "lcd-buffer.h" |
106 | 29 | #include "xutil.h" |
42
01b96a24ae7c
Corrected missing and obsolete files
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
30 | |
58
e8e7b46b705b
Fixed compilation without wiringpi
Michiel Broek <mbroek@mbse.eu>
parents:
54
diff
changeset
|
31 | |
75
4b976601737d
Writes a basic xml configuration next to the plain ascii config file
Michiel Broek <mbroek@mbse.eu>
parents:
74
diff
changeset
|
32 | extern int my_shutdown; |
4b976601737d
Writes a basic xml configuration next to the plain ascii config file
Michiel Broek <mbroek@mbse.eu>
parents:
74
diff
changeset
|
33 | extern int debug; |
245
b01b6238eb67
You can now safely add and remove units on a running system.
Michiel Broek <mbroek@mbse.eu>
parents:
240
diff
changeset
|
34 | extern int run_pause; |
b01b6238eb67
You can now safely add and remove units on a running system.
Michiel Broek <mbroek@mbse.eu>
parents:
240
diff
changeset
|
35 | extern int run_hold; |
43 | 36 | extern sys_config Config; |
81 | 37 | extern const char UNITMODE[5][8]; |
101
1302abe92eb1
Made temperature sensors working in the units
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
38 | extern const char TEMPSTATE[3][8]; |
259
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
39 | extern const char DEVTYPE[8][6]; |
174 | 40 | extern const char DEVPRESENT[4][6]; |
41 | extern const char DEVDIR[7][11]; | |
217 | 42 | extern const char PROFSTATE[5][6]; |
174 | 43 | |
42
01b96a24ae7c
Corrected missing and obsolete files
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
44 | |
43 | 45 | int s; /* connected socket */ |
46 | int ls; /* listen socket */ | |
42
01b96a24ae7c
Corrected missing and obsolete files
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
47 | |
43 | 48 | struct sockaddr_in myaddr_in; /* for local socket address */ |
49 | struct sockaddr_in peeraddr_in; /* for peer socket address */ | |
50 | ||
51 | struct hostent *hp; | |
52 | ||
53 | #define SS_BUFSIZE 1024 | |
54 | #define SS_TIMEOUT 300 | |
42
01b96a24ae7c
Corrected missing and obsolete files
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
55 | |
300
4ce46ff3e37d
The LIST LOG command now automatic adjusts the number of output lines and resolution by calculating a reasonable interval between 1 and 60 minutes. Bumped to version 0.2.6
Michiel Broek <mbroek@mbse.eu>
parents:
299
diff
changeset
|
56 | #define MAX_INTERVALS 6 |
4ce46ff3e37d
The LIST LOG command now automatic adjusts the number of output lines and resolution by calculating a reasonable interval between 1 and 60 minutes. Bumped to version 0.2.6
Michiel Broek <mbroek@mbse.eu>
parents:
299
diff
changeset
|
57 | const int GRAPH_INTERVAL[MAX_INTERVALS] = { 0, 1, 5, 15, 30, 60, }; |
4ce46ff3e37d
The LIST LOG command now automatic adjusts the number of output lines and resolution by calculating a reasonable interval between 1 and 60 minutes. Bumped to version 0.2.6
Michiel Broek <mbroek@mbse.eu>
parents:
299
diff
changeset
|
58 | const int GRAPH_DATALINES[MAX_INTERVALS] = { 0, 800, 3200, 12000, 24000, 48000, }; |
46
000399c64d3f
More client/server communications
Michiel Broek <mbroek@mbse.eu>
parents:
45
diff
changeset
|
59 | |
43 | 60 | /* |
61 | * Send message to client | |
62 | */ | |
63 | int srv_send(const char *format, ...) | |
64 | { | |
65 | char out[SS_BUFSIZE]; | |
66 | va_list va_ptr; | |
67 | ||
68 | if (s == -1) | |
69 | return -1; | |
42
01b96a24ae7c
Corrected missing and obsolete files
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
70 | |
43 | 71 | va_start(va_ptr, format); |
72 | vsnprintf(out, SS_BUFSIZE-1, format, va_ptr); | |
73 | va_end(va_ptr); | |
74 | ||
48 | 75 | if (debug) { |
80
81bf78a7618e
Switched to xml configuration
Michiel Broek <mbroek@mbse.eu>
parents:
79
diff
changeset
|
76 | syslog(LOG_NOTICE, "send: \"%s\"", out); |
45
053c4657105f
Mirror LCD display on the webpage works
Michiel Broek <mbroek@mbse.eu>
parents:
44
diff
changeset
|
77 | fprintf(stdout, "send: \"%s\"\n", out); |
48 | 78 | } |
44 | 79 | |
43 | 80 | if (send(s, out, strlen(out), 0) != strlen(out)) { |
268
dda91dfa4aa8
All syslog logging only to LOG_NOTICE
Michiel Broek <mbroek@mbse.eu>
parents:
266
diff
changeset
|
81 | syslog(LOG_NOTICE, "srv_send failed"); |
43 | 82 | return -1; |
83 | } | |
80
81bf78a7618e
Switched to xml configuration
Michiel Broek <mbroek@mbse.eu>
parents:
79
diff
changeset
|
84 | |
43 | 85 | if (send(s, (char *)"\r\n", 2, 0) != 2) { |
268
dda91dfa4aa8
All syslog logging only to LOG_NOTICE
Michiel Broek <mbroek@mbse.eu>
parents:
266
diff
changeset
|
86 | syslog(LOG_NOTICE, "srv_send failed"); |
43 | 87 | return -1; |
88 | } | |
89 | ||
90 | return 0; | |
91 | } | |
92 | ||
93 | ||
42
01b96a24ae7c
Corrected missing and obsolete files
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
94 | |
88 | 95 | /* |
179
417ee898fb02
Added PID implementation and 433 MHz radio control switches. Not reliable yet.
Michiel Broek <mbroek@mbse.eu>
parents:
178
diff
changeset
|
96 | * Update the device inuse counter. |
417ee898fb02
Added PID implementation and 433 MHz radio control switches. Not reliable yet.
Michiel Broek <mbroek@mbse.eu>
parents:
178
diff
changeset
|
97 | */ |
417ee898fb02
Added PID implementation and 433 MHz radio control switches. Not reliable yet.
Michiel Broek <mbroek@mbse.eu>
parents:
178
diff
changeset
|
98 | void device_count(int plus, char *uuid) |
417ee898fb02
Added PID implementation and 433 MHz radio control switches. Not reliable yet.
Michiel Broek <mbroek@mbse.eu>
parents:
178
diff
changeset
|
99 | { |
417ee898fb02
Added PID implementation and 433 MHz radio control switches. Not reliable yet.
Michiel Broek <mbroek@mbse.eu>
parents:
178
diff
changeset
|
100 | devices_list *device; |
417ee898fb02
Added PID implementation and 433 MHz radio control switches. Not reliable yet.
Michiel Broek <mbroek@mbse.eu>
parents:
178
diff
changeset
|
101 | |
417ee898fb02
Added PID implementation and 433 MHz radio control switches. Not reliable yet.
Michiel Broek <mbroek@mbse.eu>
parents:
178
diff
changeset
|
102 | for (device = Config.devices; device; device = device->next) { |
417ee898fb02
Added PID implementation and 433 MHz radio control switches. Not reliable yet.
Michiel Broek <mbroek@mbse.eu>
parents:
178
diff
changeset
|
103 | if (strcmp(device->uuid, uuid) == 0) { |
240
6bdda35b4a13
Added thread locks for device processing
Michiel Broek <mbroek@mbse.eu>
parents:
237
diff
changeset
|
104 | #ifdef HAVE_WIRINGPI_H |
6bdda35b4a13
Added thread locks for device processing
Michiel Broek <mbroek@mbse.eu>
parents:
237
diff
changeset
|
105 | piLock(LOCK_DEVICES); |
6bdda35b4a13
Added thread locks for device processing
Michiel Broek <mbroek@mbse.eu>
parents:
237
diff
changeset
|
106 | #endif |
179
417ee898fb02
Added PID implementation and 433 MHz radio control switches. Not reliable yet.
Michiel Broek <mbroek@mbse.eu>
parents:
178
diff
changeset
|
107 | if (plus == TRUE) { |
417ee898fb02
Added PID implementation and 433 MHz radio control switches. Not reliable yet.
Michiel Broek <mbroek@mbse.eu>
parents:
178
diff
changeset
|
108 | device->inuse++; |
417ee898fb02
Added PID implementation and 433 MHz radio control switches. Not reliable yet.
Michiel Broek <mbroek@mbse.eu>
parents:
178
diff
changeset
|
109 | } else { |
417ee898fb02
Added PID implementation and 433 MHz radio control switches. Not reliable yet.
Michiel Broek <mbroek@mbse.eu>
parents:
178
diff
changeset
|
110 | if (device->inuse) |
417ee898fb02
Added PID implementation and 433 MHz radio control switches. Not reliable yet.
Michiel Broek <mbroek@mbse.eu>
parents:
178
diff
changeset
|
111 | device->inuse--; |
417ee898fb02
Added PID implementation and 433 MHz radio control switches. Not reliable yet.
Michiel Broek <mbroek@mbse.eu>
parents:
178
diff
changeset
|
112 | } |
240
6bdda35b4a13
Added thread locks for device processing
Michiel Broek <mbroek@mbse.eu>
parents:
237
diff
changeset
|
113 | #ifdef HAVE_WIRINGPI_H |
6bdda35b4a13
Added thread locks for device processing
Michiel Broek <mbroek@mbse.eu>
parents:
237
diff
changeset
|
114 | piUnlock(LOCK_DEVICES); |
6bdda35b4a13
Added thread locks for device processing
Michiel Broek <mbroek@mbse.eu>
parents:
237
diff
changeset
|
115 | #endif |
179
417ee898fb02
Added PID implementation and 433 MHz radio control switches. Not reliable yet.
Michiel Broek <mbroek@mbse.eu>
parents:
178
diff
changeset
|
116 | } |
417ee898fb02
Added PID implementation and 433 MHz radio control switches. Not reliable yet.
Michiel Broek <mbroek@mbse.eu>
parents:
178
diff
changeset
|
117 | } |
417ee898fb02
Added PID implementation and 433 MHz radio control switches. Not reliable yet.
Michiel Broek <mbroek@mbse.eu>
parents:
178
diff
changeset
|
118 | } |
417ee898fb02
Added PID implementation and 433 MHz radio control switches. Not reliable yet.
Michiel Broek <mbroek@mbse.eu>
parents:
178
diff
changeset
|
119 | |
417ee898fb02
Added PID implementation and 433 MHz radio control switches. Not reliable yet.
Michiel Broek <mbroek@mbse.eu>
parents:
178
diff
changeset
|
120 | |
417ee898fb02
Added PID implementation and 433 MHz radio control switches. Not reliable yet.
Michiel Broek <mbroek@mbse.eu>
parents:
178
diff
changeset
|
121 | |
191
c74bbc24a1c8
Client/Server communication is now almost final
Michiel Broek <mbroek@mbse.eu>
parents:
189
diff
changeset
|
122 | int delete_Profile(char *uuid) |
138 | 123 | { |
124 | profiles_list *current = Config.profiles; | |
125 | profiles_list *previous = NULL; | |
126 | prof_step *step, *olds; | |
127 | ||
128 | while (current) { | |
129 | if (strcmp(current->uuid, uuid) == 0) { | |
130 | if (previous == NULL) { | |
131 | Config.profiles = current->next; | |
132 | free(current->uuid); | |
133 | current->uuid = NULL; | |
134 | free(current->name); | |
135 | current->name = NULL; | |
136 | if (current->steps) { | |
137 | for (step = current->steps; step; step = olds) { | |
138 | olds = step->next; | |
139 | free(step); | |
140 | } | |
141 | current->steps = NULL; | |
142 | } | |
143 | free(current); | |
191
c74bbc24a1c8
Client/Server communication is now almost final
Michiel Broek <mbroek@mbse.eu>
parents:
189
diff
changeset
|
144 | return 1; |
138 | 145 | } else { |
146 | free(current->uuid); | |
147 | current->uuid = NULL; | |
148 | free(current->name); | |
149 | current->name = NULL; | |
150 | if (current->steps) { | |
151 | for (step = current->steps; step; step = olds) { | |
152 | olds = step->next; | |
153 | free(step); | |
154 | } | |
155 | current->steps = NULL; | |
156 | } | |
157 | previous->next = current->next; | |
158 | free(current); | |
159 | current = previous->next; | |
191
c74bbc24a1c8
Client/Server communication is now almost final
Michiel Broek <mbroek@mbse.eu>
parents:
189
diff
changeset
|
160 | return 1; |
138 | 161 | } |
162 | } else { | |
163 | previous = current; | |
164 | current = current->next; | |
165 | } | |
166 | } | |
167 | ||
191
c74bbc24a1c8
Client/Server communication is now almost final
Michiel Broek <mbroek@mbse.eu>
parents:
189
diff
changeset
|
168 | return 0; |
138 | 169 | } |
170 | ||
171 | ||
172 | ||
174 | 173 | int delete_Device(char *uuid) |
174 | { | |
175 | devices_list *current = Config.devices; | |
176 | devices_list *previous = NULL; | |
177 | ||
178 | while (current) { | |
179 | if (strcmp(current->uuid, uuid) == 0) { | |
180 | if (previous == NULL) { | |
181 | Config.devices = current->next; | |
182 | free(current->uuid); | |
183 | current->uuid = NULL; | |
184 | free(current->address); | |
185 | current->address = NULL; | |
186 | free(current->description); | |
187 | current->description = NULL; | |
188 | free(current->comment); | |
189 | current->comment = NULL; | |
190 | free(current); | |
191 | return 1; | |
192 | } else { | |
193 | free(current->uuid); | |
194 | current->uuid = NULL; | |
195 | free(current->address); | |
196 | current->address = NULL; | |
197 | free(current->description); | |
198 | current->description = NULL; | |
199 | free(current->comment); | |
200 | current->comment = NULL; | |
201 | previous->next = current->next; | |
202 | free(current); | |
203 | current = previous->next; | |
204 | return 1; | |
205 | } | |
206 | } else { | |
207 | previous = current; | |
208 | current = current->next; | |
209 | } | |
210 | } | |
211 | return 0; | |
212 | } | |
213 | ||
214 | ||
215 | ||
81 | 216 | /* |
174 | 217 | * DEVICE ADD type |
218 | * DEVICE DEL uuid | |
219 | * DEVICE LIST | |
220 | * DEVICE GET uuid | |
221 | * DEVICE PUT uuid | |
157
259a018758f9
Added GET AIR, GET BEER, GET TARGET commands
Michiel Broek <mbroek@mbse.eu>
parents:
156
diff
changeset
|
222 | */ |
174 | 223 | int cmd_device(char *buf) |
157
259a018758f9
Added GET AIR, GET BEER, GET TARGET commands
Michiel Broek <mbroek@mbse.eu>
parents:
156
diff
changeset
|
224 | { |
174 | 225 | char *opt, *param, *kwd, *val, ibuf[SS_BUFSIZE]; |
226 | devices_list *device, *tmpd; | |
227 | socklen_t fromlen; | |
240
6bdda35b4a13
Added thread locks for device processing
Michiel Broek <mbroek@mbse.eu>
parents:
237
diff
changeset
|
228 | int i, rc, rlen, ival; |
174 | 229 | uuid_t uu; |
157
259a018758f9
Added GET AIR, GET BEER, GET TARGET commands
Michiel Broek <mbroek@mbse.eu>
parents:
156
diff
changeset
|
230 | |
259a018758f9
Added GET AIR, GET BEER, GET TARGET commands
Michiel Broek <mbroek@mbse.eu>
parents:
156
diff
changeset
|
231 | opt = strtok(buf, " \0"); |
259a018758f9
Added GET AIR, GET BEER, GET TARGET commands
Michiel Broek <mbroek@mbse.eu>
parents:
156
diff
changeset
|
232 | opt = strtok(NULL, " \0"); |
174 | 233 | |
234 | if (opt == NULL) { | |
213
2317b8d644fa
Code cleanup, streamlined error messages.
Michiel Broek <mbroek@mbse.eu>
parents:
209
diff
changeset
|
235 | srv_send((char *)"501 Subcommand missing"); |
174 | 236 | return 1; |
237 | } | |
238 | param = strtok(NULL, "\0"); | |
157
259a018758f9
Added GET AIR, GET BEER, GET TARGET commands
Michiel Broek <mbroek@mbse.eu>
parents:
156
diff
changeset
|
239 | |
174 | 240 | if (strcmp(opt, (char *)"LIST") == 0) { |
213
2317b8d644fa
Code cleanup, streamlined error messages.
Michiel Broek <mbroek@mbse.eu>
parents:
209
diff
changeset
|
241 | srv_send((char *)"212 Devices list follows:"); |
174 | 242 | for (device = Config.devices; device; device = device->next) { |
175
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
243 | srv_send((char *)"%s,%s,%d,%d,%s,%s", device->uuid, device->address, device->subdevice, device->inuse, device->comment, DEVDIR[device->direction]); |
174 | 244 | } |
245 | srv_send((char *)"."); | |
259
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
246 | return 1; |
174 | 247 | } |
248 | ||
249 | if (param == NULL) { | |
213
2317b8d644fa
Code cleanup, streamlined error messages.
Michiel Broek <mbroek@mbse.eu>
parents:
209
diff
changeset
|
250 | srv_send((char *)"502 Parameter missing"); |
157
259a018758f9
Added GET AIR, GET BEER, GET TARGET commands
Michiel Broek <mbroek@mbse.eu>
parents:
156
diff
changeset
|
251 | return 1; |
259a018758f9
Added GET AIR, GET BEER, GET TARGET commands
Michiel Broek <mbroek@mbse.eu>
parents:
156
diff
changeset
|
252 | } |
259a018758f9
Added GET AIR, GET BEER, GET TARGET commands
Michiel Broek <mbroek@mbse.eu>
parents:
156
diff
changeset
|
253 | |
174 | 254 | if (strcmp(opt, (char *)"ADD") == 0) { |
255 | if ((strcmp(param, (char *)"RC433") == 0) || (strcmp(param, (char *)"DHT") == 0) || | |
256 | (strcmp(param, (char *)"I2C") == 0) || (strcmp(param, (char *)"SPI") == 0)) { | |
170 | 257 | |
174 | 258 | device = (devices_list *)malloc(sizeof(devices_list)); |
259 | device->next = NULL; | |
260 | device->version = 1; | |
261 | device->uuid = malloc(37); | |
262 | uuid_generate(uu); | |
263 | uuid_unparse(uu, device->uuid); | |
259
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
264 | for (i = 0; i < 8; i++) { |
174 | 265 | if (strcmp(param, DEVTYPE[i]) == 0) { |
266 | device->type = i; | |
267 | break; | |
268 | } | |
269 | } | |
270 | device->direction = DEVDIR_UNDEF; | |
209
c5b1dfd83e81
Added offset value for sensor that need it
Michiel Broek <mbroek@mbse.eu>
parents:
208
diff
changeset
|
271 | device->value = device->offset = device->subdevice = device->inuse = 0; |
174 | 272 | device->present = DEVPRESENT_UNDEF; |
273 | device->address = xstrcpy((char *)"Enter address here"); | |
274 | device->gpiopin = -1; | |
275 | device->description = xstrcpy((char *)"Describe me here"); | |
276 | device->comment = xstrcpy((char *)"Comment here"); | |
170 | 277 | |
240
6bdda35b4a13
Added thread locks for device processing
Michiel Broek <mbroek@mbse.eu>
parents:
237
diff
changeset
|
278 | #ifdef HAVE_WIRINGPI_H |
6bdda35b4a13
Added thread locks for device processing
Michiel Broek <mbroek@mbse.eu>
parents:
237
diff
changeset
|
279 | piLock(LOCK_DEVICES); |
6bdda35b4a13
Added thread locks for device processing
Michiel Broek <mbroek@mbse.eu>
parents:
237
diff
changeset
|
280 | #endif |
174 | 281 | if (Config.devices == NULL) { |
282 | Config.devices = device; | |
283 | } else { | |
284 | for (tmpd = Config.devices; tmpd; tmpd = tmpd->next) { | |
285 | if (tmpd->next == NULL) { | |
286 | tmpd->next = device; | |
287 | break; | |
288 | } | |
157
259a018758f9
Added GET AIR, GET BEER, GET TARGET commands
Michiel Broek <mbroek@mbse.eu>
parents:
156
diff
changeset
|
289 | } |
259a018758f9
Added GET AIR, GET BEER, GET TARGET commands
Michiel Broek <mbroek@mbse.eu>
parents:
156
diff
changeset
|
290 | } |
240
6bdda35b4a13
Added thread locks for device processing
Michiel Broek <mbroek@mbse.eu>
parents:
237
diff
changeset
|
291 | #ifdef HAVE_WIRINGPI_H |
6bdda35b4a13
Added thread locks for device processing
Michiel Broek <mbroek@mbse.eu>
parents:
237
diff
changeset
|
292 | piUnlock(LOCK_DEVICES); |
6bdda35b4a13
Added thread locks for device processing
Michiel Broek <mbroek@mbse.eu>
parents:
237
diff
changeset
|
293 | #endif |
213
2317b8d644fa
Code cleanup, streamlined error messages.
Michiel Broek <mbroek@mbse.eu>
parents:
209
diff
changeset
|
294 | syslog(LOG_NOTICE, "Device %s added", device->uuid); |
2317b8d644fa
Code cleanup, streamlined error messages.
Michiel Broek <mbroek@mbse.eu>
parents:
209
diff
changeset
|
295 | srv_send((char *)"211 Device %s added", device->uuid); |
174 | 296 | return 0; |
157
259a018758f9
Added GET AIR, GET BEER, GET TARGET commands
Michiel Broek <mbroek@mbse.eu>
parents:
156
diff
changeset
|
297 | |
174 | 298 | } else { |
213
2317b8d644fa
Code cleanup, streamlined error messages.
Michiel Broek <mbroek@mbse.eu>
parents:
209
diff
changeset
|
299 | srv_send((char *)"503 Parameter error"); |
157
259a018758f9
Added GET AIR, GET BEER, GET TARGET commands
Michiel Broek <mbroek@mbse.eu>
parents:
156
diff
changeset
|
300 | return 1; |
259a018758f9
Added GET AIR, GET BEER, GET TARGET commands
Michiel Broek <mbroek@mbse.eu>
parents:
156
diff
changeset
|
301 | } |
259a018758f9
Added GET AIR, GET BEER, GET TARGET commands
Michiel Broek <mbroek@mbse.eu>
parents:
156
diff
changeset
|
302 | } |
259a018758f9
Added GET AIR, GET BEER, GET TARGET commands
Michiel Broek <mbroek@mbse.eu>
parents:
156
diff
changeset
|
303 | |
174 | 304 | if (strcmp(opt, (char *)"DEL") == 0) { |
305 | ||
240
6bdda35b4a13
Added thread locks for device processing
Michiel Broek <mbroek@mbse.eu>
parents:
237
diff
changeset
|
306 | #ifdef HAVE_WIRINGPI_H |
6bdda35b4a13
Added thread locks for device processing
Michiel Broek <mbroek@mbse.eu>
parents:
237
diff
changeset
|
307 | piLock(LOCK_DEVICES); |
6bdda35b4a13
Added thread locks for device processing
Michiel Broek <mbroek@mbse.eu>
parents:
237
diff
changeset
|
308 | #endif |
6bdda35b4a13
Added thread locks for device processing
Michiel Broek <mbroek@mbse.eu>
parents:
237
diff
changeset
|
309 | rc = delete_Device(param); |
6bdda35b4a13
Added thread locks for device processing
Michiel Broek <mbroek@mbse.eu>
parents:
237
diff
changeset
|
310 | #ifdef HAVE_WIRINGPI_H |
6bdda35b4a13
Added thread locks for device processing
Michiel Broek <mbroek@mbse.eu>
parents:
237
diff
changeset
|
311 | piUnlock(LOCK_DEVICES); |
6bdda35b4a13
Added thread locks for device processing
Michiel Broek <mbroek@mbse.eu>
parents:
237
diff
changeset
|
312 | #endif |
6bdda35b4a13
Added thread locks for device processing
Michiel Broek <mbroek@mbse.eu>
parents:
237
diff
changeset
|
313 | if (rc) { |
213
2317b8d644fa
Code cleanup, streamlined error messages.
Michiel Broek <mbroek@mbse.eu>
parents:
209
diff
changeset
|
314 | syslog(LOG_NOTICE, "Device %s deleted", param); |
174 | 315 | srv_send((char *)"211 Device %s deleted", param); |
316 | return 0; | |
317 | } else { | |
213
2317b8d644fa
Code cleanup, streamlined error messages.
Michiel Broek <mbroek@mbse.eu>
parents:
209
diff
changeset
|
318 | srv_send((char *)"440 No such device"); |
174 | 319 | return 1; |
320 | } | |
321 | } | |
322 | ||
323 | if (strcmp(opt, (char *)"GET") == 0) { | |
324 | for (device = Config.devices; device; device = device->next) { | |
325 | if (strcmp(device->uuid, param) == 0) { | |
325
35b6f6605ae3
More device locks in the network server
Michiel Broek <mbroek@mbse.eu>
parents:
313
diff
changeset
|
326 | #ifdef HAVE_WIRINGPI_H |
35b6f6605ae3
More device locks in the network server
Michiel Broek <mbroek@mbse.eu>
parents:
313
diff
changeset
|
327 | piLock(LOCK_DEVICES); |
35b6f6605ae3
More device locks in the network server
Michiel Broek <mbroek@mbse.eu>
parents:
313
diff
changeset
|
328 | #endif |
35b6f6605ae3
More device locks in the network server
Michiel Broek <mbroek@mbse.eu>
parents:
313
diff
changeset
|
329 | int my_value = device->value; |
35b6f6605ae3
More device locks in the network server
Michiel Broek <mbroek@mbse.eu>
parents:
313
diff
changeset
|
330 | int my_timestamp = (int)device->timestamp; |
35b6f6605ae3
More device locks in the network server
Michiel Broek <mbroek@mbse.eu>
parents:
313
diff
changeset
|
331 | #ifdef HAVE_WIRINGPI_H |
35b6f6605ae3
More device locks in the network server
Michiel Broek <mbroek@mbse.eu>
parents:
313
diff
changeset
|
332 | piUnlock(LOCK_DEVICES); |
35b6f6605ae3
More device locks in the network server
Michiel Broek <mbroek@mbse.eu>
parents:
313
diff
changeset
|
333 | #endif |
213
2317b8d644fa
Code cleanup, streamlined error messages.
Michiel Broek <mbroek@mbse.eu>
parents:
209
diff
changeset
|
334 | srv_send((char *)"213 Device record follows:"); |
174 | 335 | srv_send((char *)"TYPE,%s", DEVTYPE[device->type]); |
336 | srv_send((char *)"DIRECTION,%s", DEVDIR[device->direction]); | |
325
35b6f6605ae3
More device locks in the network server
Michiel Broek <mbroek@mbse.eu>
parents:
313
diff
changeset
|
337 | srv_send((char *)"VALUE,%d", my_value); |
209
c5b1dfd83e81
Added offset value for sensor that need it
Michiel Broek <mbroek@mbse.eu>
parents:
208
diff
changeset
|
338 | srv_send((char *)"OFFSET,%d", device->offset); |
174 | 339 | srv_send((char *)"PRESENT,%s", DEVPRESENT[device->present]); |
340 | srv_send((char *)"ADDRESS,%s", device->address); | |
341 | srv_send((char *)"SUBDEVICE,%d", device->subdevice); | |
342 | srv_send((char *)"GPIOPIN,%d", device->gpiopin); | |
343 | srv_send((char *)"DESCRIPTION,%s", device->description); | |
344 | srv_send((char *)"INUSE,%d", device->inuse); | |
345 | srv_send((char *)"COMMENT,%s", device->comment); | |
325
35b6f6605ae3
More device locks in the network server
Michiel Broek <mbroek@mbse.eu>
parents:
313
diff
changeset
|
346 | srv_send((char *)"TIMESTAMP,%d", my_timestamp); |
174 | 347 | srv_send((char *)"."); |
348 | return 1; | |
349 | } | |
350 | } | |
351 | srv_send((char *)"440 No such device"); | |
352 | return 1; | |
353 | } | |
354 | ||
355 | if (strcmp(opt, (char *)"PUT") == 0) { | |
356 | for (device = Config.devices; device; device = device->next) { | |
357 | if (strcmp(device->uuid, param) == 0) { | |
358 | while (1) { | |
359 | memset((char *)&ibuf, 0, SS_BUFSIZE); | |
360 | fromlen = sizeof(peeraddr_in); | |
361 | rlen = recvfrom(s, ibuf, sizeof(ibuf) -1, 0, (struct sockaddr *)&peeraddr_in, &fromlen); | |
362 | if (rlen == -1) { | |
268
dda91dfa4aa8
All syslog logging only to LOG_NOTICE
Michiel Broek <mbroek@mbse.eu>
parents:
266
diff
changeset
|
363 | syslog(LOG_NOTICE, "recvfrom(): %s", strerror(errno)); |
174 | 364 | srv_send((char *)"518 recfrom(): %s", strerror(errno)); |
365 | return 1; | |
366 | } | |
367 | for (i = 0; i < strlen(ibuf); i++) { | |
368 | if (ibuf[i] == '\n') | |
369 | ibuf[i] = '\0'; | |
370 | if (ibuf[i] == '\r') | |
371 | ibuf[i] = '\0'; | |
372 | } | |
373 | for (i = strlen(ibuf) -1; i > 0; i--) { | |
374 | if (ibuf[i] == ' ') | |
375 | ibuf[i] = '\0'; | |
376 | else | |
377 | break; | |
378 | } | |
379 | if (strlen(ibuf)) { | |
380 | if (debug) { | |
381 | syslog(LOG_NOTICE, "recv: \"%s\"", ibuf); | |
382 | fprintf(stdout, "recv: \"%s\"\n", ibuf); | |
383 | } | |
384 | if (strcmp(ibuf, (char *)".") == 0) { | |
385 | srv_send((char *)"219 Accepted Device record"); | |
386 | return 0; | |
387 | } | |
388 | kwd = strtok(ibuf, ",\0"); | |
389 | val = strtok(NULL, "\0"); | |
390 | if (kwd && val) { | |
391 | if (strcmp(kwd, (char *)"TYPE") == 0) { | |
259
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
392 | for (i = 0; i < 8; i++) { |
174 | 393 | if (strcmp(val, DEVTYPE[i]) == 0) { |
325
35b6f6605ae3
More device locks in the network server
Michiel Broek <mbroek@mbse.eu>
parents:
313
diff
changeset
|
394 | #ifdef HAVE_WIRINGPI_H |
35b6f6605ae3
More device locks in the network server
Michiel Broek <mbroek@mbse.eu>
parents:
313
diff
changeset
|
395 | piLock(LOCK_DEVICES); |
35b6f6605ae3
More device locks in the network server
Michiel Broek <mbroek@mbse.eu>
parents:
313
diff
changeset
|
396 | #endif |
276
a19cc3770f09
Profile progress logging now also shows the percentage done. The DEVICE PUT command logs all changed values.
Michiel Broek <mbroek@mbse.eu>
parents:
274
diff
changeset
|
397 | if (device->type != i) |
a19cc3770f09
Profile progress logging now also shows the percentage done. The DEVICE PUT command logs all changed values.
Michiel Broek <mbroek@mbse.eu>
parents:
274
diff
changeset
|
398 | syslog(LOG_NOTICE, "Device %s changed type %s to %s", device->uuid, DEVTYPE[device->type], DEVTYPE[i]); |
174 | 399 | device->type = i; |
325
35b6f6605ae3
More device locks in the network server
Michiel Broek <mbroek@mbse.eu>
parents:
313
diff
changeset
|
400 | #ifdef HAVE_WIRINGPI_H |
35b6f6605ae3
More device locks in the network server
Michiel Broek <mbroek@mbse.eu>
parents:
313
diff
changeset
|
401 | piUnlock(LOCK_DEVICES); |
35b6f6605ae3
More device locks in the network server
Michiel Broek <mbroek@mbse.eu>
parents:
313
diff
changeset
|
402 | #endif |
174 | 403 | break; |
404 | } | |
405 | } | |
406 | ||
407 | } else if (strcmp(kwd, (char *)"DIRECTION") == 0) { | |
408 | for (i = 0; i < 7; i++) { | |
409 | if (strcmp(val, DEVDIR[i]) == 0) { | |
325
35b6f6605ae3
More device locks in the network server
Michiel Broek <mbroek@mbse.eu>
parents:
313
diff
changeset
|
410 | #ifdef HAVE_WIRINGPI_H |
35b6f6605ae3
More device locks in the network server
Michiel Broek <mbroek@mbse.eu>
parents:
313
diff
changeset
|
411 | piLock(LOCK_DEVICES); |
35b6f6605ae3
More device locks in the network server
Michiel Broek <mbroek@mbse.eu>
parents:
313
diff
changeset
|
412 | #endif |
276
a19cc3770f09
Profile progress logging now also shows the percentage done. The DEVICE PUT command logs all changed values.
Michiel Broek <mbroek@mbse.eu>
parents:
274
diff
changeset
|
413 | if (device->direction != i) |
a19cc3770f09
Profile progress logging now also shows the percentage done. The DEVICE PUT command logs all changed values.
Michiel Broek <mbroek@mbse.eu>
parents:
274
diff
changeset
|
414 | syslog(LOG_NOTICE, "Device %s changed direction %s to %s", device->uuid, DEVDIR[device->type], DEVDIR[i]); |
174 | 415 | device->direction = i; |
325
35b6f6605ae3
More device locks in the network server
Michiel Broek <mbroek@mbse.eu>
parents:
313
diff
changeset
|
416 | #ifdef HAVE_WIRINGPI_H |
35b6f6605ae3
More device locks in the network server
Michiel Broek <mbroek@mbse.eu>
parents:
313
diff
changeset
|
417 | piUnlock(LOCK_DEVICES); |
35b6f6605ae3
More device locks in the network server
Michiel Broek <mbroek@mbse.eu>
parents:
313
diff
changeset
|
418 | #endif |
174 | 419 | break; |
420 | } | |
421 | } | |
422 | ||
423 | } else if (strcmp(kwd, (char *)"VALUE") == 0) { | |
276
a19cc3770f09
Profile progress logging now also shows the percentage done. The DEVICE PUT command logs all changed values.
Michiel Broek <mbroek@mbse.eu>
parents:
274
diff
changeset
|
424 | if (sscanf(val, "%d", &ival) == 1) { |
325
35b6f6605ae3
More device locks in the network server
Michiel Broek <mbroek@mbse.eu>
parents:
313
diff
changeset
|
425 | #ifdef HAVE_WIRINGPI_H |
35b6f6605ae3
More device locks in the network server
Michiel Broek <mbroek@mbse.eu>
parents:
313
diff
changeset
|
426 | piLock(LOCK_DEVICES); |
35b6f6605ae3
More device locks in the network server
Michiel Broek <mbroek@mbse.eu>
parents:
313
diff
changeset
|
427 | #endif |
35b6f6605ae3
More device locks in the network server
Michiel Broek <mbroek@mbse.eu>
parents:
313
diff
changeset
|
428 | if (device->value != ival) |
276
a19cc3770f09
Profile progress logging now also shows the percentage done. The DEVICE PUT command logs all changed values.
Michiel Broek <mbroek@mbse.eu>
parents:
274
diff
changeset
|
429 | syslog(LOG_NOTICE, "Device %s changed value %d to %d", device->uuid, device->value, ival); |
174 | 430 | device->value = ival; |
325
35b6f6605ae3
More device locks in the network server
Michiel Broek <mbroek@mbse.eu>
parents:
313
diff
changeset
|
431 | #ifdef HAVE_WIRINGPI_H |
35b6f6605ae3
More device locks in the network server
Michiel Broek <mbroek@mbse.eu>
parents:
313
diff
changeset
|
432 | piUnlock(LOCK_DEVICES); |
35b6f6605ae3
More device locks in the network server
Michiel Broek <mbroek@mbse.eu>
parents:
313
diff
changeset
|
433 | #endif |
276
a19cc3770f09
Profile progress logging now also shows the percentage done. The DEVICE PUT command logs all changed values.
Michiel Broek <mbroek@mbse.eu>
parents:
274
diff
changeset
|
434 | } |
174 | 435 | |
209
c5b1dfd83e81
Added offset value for sensor that need it
Michiel Broek <mbroek@mbse.eu>
parents:
208
diff
changeset
|
436 | } else if (strcmp(kwd, (char *)"OFFSET") == 0) { |
276
a19cc3770f09
Profile progress logging now also shows the percentage done. The DEVICE PUT command logs all changed values.
Michiel Broek <mbroek@mbse.eu>
parents:
274
diff
changeset
|
437 | if (sscanf(val, "%d", &ival) == 1) { |
325
35b6f6605ae3
More device locks in the network server
Michiel Broek <mbroek@mbse.eu>
parents:
313
diff
changeset
|
438 | #ifdef HAVE_WIRINGPI_H |
35b6f6605ae3
More device locks in the network server
Michiel Broek <mbroek@mbse.eu>
parents:
313
diff
changeset
|
439 | piLock(LOCK_DEVICES); |
35b6f6605ae3
More device locks in the network server
Michiel Broek <mbroek@mbse.eu>
parents:
313
diff
changeset
|
440 | #endif |
35b6f6605ae3
More device locks in the network server
Michiel Broek <mbroek@mbse.eu>
parents:
313
diff
changeset
|
441 | if (device->offset != ival) |
276
a19cc3770f09
Profile progress logging now also shows the percentage done. The DEVICE PUT command logs all changed values.
Michiel Broek <mbroek@mbse.eu>
parents:
274
diff
changeset
|
442 | syslog(LOG_NOTICE, "Device %s changed offset %d to %d", device->uuid, device->offset, ival); |
209
c5b1dfd83e81
Added offset value for sensor that need it
Michiel Broek <mbroek@mbse.eu>
parents:
208
diff
changeset
|
443 | device->offset = ival; |
325
35b6f6605ae3
More device locks in the network server
Michiel Broek <mbroek@mbse.eu>
parents:
313
diff
changeset
|
444 | #ifdef HAVE_WIRINGPI_H |
35b6f6605ae3
More device locks in the network server
Michiel Broek <mbroek@mbse.eu>
parents:
313
diff
changeset
|
445 | piUnlock(LOCK_DEVICES); |
35b6f6605ae3
More device locks in the network server
Michiel Broek <mbroek@mbse.eu>
parents:
313
diff
changeset
|
446 | #endif |
276
a19cc3770f09
Profile progress logging now also shows the percentage done. The DEVICE PUT command logs all changed values.
Michiel Broek <mbroek@mbse.eu>
parents:
274
diff
changeset
|
447 | } |
209
c5b1dfd83e81
Added offset value for sensor that need it
Michiel Broek <mbroek@mbse.eu>
parents:
208
diff
changeset
|
448 | |
174 | 449 | } else if (strcmp(kwd, (char *)"PRESENT") == 0) { |
450 | for (i = 0; i < 4; i++) { | |
179
417ee898fb02
Added PID implementation and 433 MHz radio control switches. Not reliable yet.
Michiel Broek <mbroek@mbse.eu>
parents:
178
diff
changeset
|
451 | if (strcmp(val, DEVPRESENT[i]) == 0) { |
325
35b6f6605ae3
More device locks in the network server
Michiel Broek <mbroek@mbse.eu>
parents:
313
diff
changeset
|
452 | #ifdef HAVE_WIRINGPI_H |
35b6f6605ae3
More device locks in the network server
Michiel Broek <mbroek@mbse.eu>
parents:
313
diff
changeset
|
453 | piLock(LOCK_DEVICES); |
35b6f6605ae3
More device locks in the network server
Michiel Broek <mbroek@mbse.eu>
parents:
313
diff
changeset
|
454 | #endif |
276
a19cc3770f09
Profile progress logging now also shows the percentage done. The DEVICE PUT command logs all changed values.
Michiel Broek <mbroek@mbse.eu>
parents:
274
diff
changeset
|
455 | if (device->present != i) |
a19cc3770f09
Profile progress logging now also shows the percentage done. The DEVICE PUT command logs all changed values.
Michiel Broek <mbroek@mbse.eu>
parents:
274
diff
changeset
|
456 | syslog(LOG_NOTICE, "Device %s changed present %s to %s", device->uuid, DEVPRESENT[device->present], DEVPRESENT[i]); |
174 | 457 | device->present = i; |
325
35b6f6605ae3
More device locks in the network server
Michiel Broek <mbroek@mbse.eu>
parents:
313
diff
changeset
|
458 | #ifdef HAVE_WIRINGPI_H |
35b6f6605ae3
More device locks in the network server
Michiel Broek <mbroek@mbse.eu>
parents:
313
diff
changeset
|
459 | piUnlock(LOCK_DEVICES); |
35b6f6605ae3
More device locks in the network server
Michiel Broek <mbroek@mbse.eu>
parents:
313
diff
changeset
|
460 | #endif |
35b6f6605ae3
More device locks in the network server
Michiel Broek <mbroek@mbse.eu>
parents:
313
diff
changeset
|
461 | break; |
179
417ee898fb02
Added PID implementation and 433 MHz radio control switches. Not reliable yet.
Michiel Broek <mbroek@mbse.eu>
parents:
178
diff
changeset
|
462 | } |
174 | 463 | } |
464 | ||
465 | } else if (strcmp(kwd, (char *)"ADDRESS") == 0) { | |
325
35b6f6605ae3
More device locks in the network server
Michiel Broek <mbroek@mbse.eu>
parents:
313
diff
changeset
|
466 | #ifdef HAVE_WIRINGPI_H |
35b6f6605ae3
More device locks in the network server
Michiel Broek <mbroek@mbse.eu>
parents:
313
diff
changeset
|
467 | piLock(LOCK_DEVICES); |
35b6f6605ae3
More device locks in the network server
Michiel Broek <mbroek@mbse.eu>
parents:
313
diff
changeset
|
468 | #endif |
276
a19cc3770f09
Profile progress logging now also shows the percentage done. The DEVICE PUT command logs all changed values.
Michiel Broek <mbroek@mbse.eu>
parents:
274
diff
changeset
|
469 | if (device->address) { |
a19cc3770f09
Profile progress logging now also shows the percentage done. The DEVICE PUT command logs all changed values.
Michiel Broek <mbroek@mbse.eu>
parents:
274
diff
changeset
|
470 | if (strcmp(device->address, val)) |
278
76c8a6f18e4d
GLOBAL PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
276
diff
changeset
|
471 | syslog(LOG_NOTICE, "Device %s changed address `%s' to `%s'", device->uuid, device->address, val); |
174 | 472 | free(device->address); |
276
a19cc3770f09
Profile progress logging now also shows the percentage done. The DEVICE PUT command logs all changed values.
Michiel Broek <mbroek@mbse.eu>
parents:
274
diff
changeset
|
473 | } |
174 | 474 | device->address = xstrcpy(val); |
325
35b6f6605ae3
More device locks in the network server
Michiel Broek <mbroek@mbse.eu>
parents:
313
diff
changeset
|
475 | #ifdef HAVE_WIRINGPI_H |
35b6f6605ae3
More device locks in the network server
Michiel Broek <mbroek@mbse.eu>
parents:
313
diff
changeset
|
476 | piUnlock(LOCK_DEVICES); |
35b6f6605ae3
More device locks in the network server
Michiel Broek <mbroek@mbse.eu>
parents:
313
diff
changeset
|
477 | #endif |
174 | 478 | |
479 | } else if (strcmp(kwd, (char *)"SUBDEVICE") == 0) { | |
276
a19cc3770f09
Profile progress logging now also shows the percentage done. The DEVICE PUT command logs all changed values.
Michiel Broek <mbroek@mbse.eu>
parents:
274
diff
changeset
|
480 | if (sscanf(val, "%d", &ival) == 1) { |
325
35b6f6605ae3
More device locks in the network server
Michiel Broek <mbroek@mbse.eu>
parents:
313
diff
changeset
|
481 | #ifdef HAVE_WIRINGPI_H |
35b6f6605ae3
More device locks in the network server
Michiel Broek <mbroek@mbse.eu>
parents:
313
diff
changeset
|
482 | piLock(LOCK_DEVICES); |
35b6f6605ae3
More device locks in the network server
Michiel Broek <mbroek@mbse.eu>
parents:
313
diff
changeset
|
483 | #endif |
276
a19cc3770f09
Profile progress logging now also shows the percentage done. The DEVICE PUT command logs all changed values.
Michiel Broek <mbroek@mbse.eu>
parents:
274
diff
changeset
|
484 | if (device->subdevice != ival) |
a19cc3770f09
Profile progress logging now also shows the percentage done. The DEVICE PUT command logs all changed values.
Michiel Broek <mbroek@mbse.eu>
parents:
274
diff
changeset
|
485 | syslog(LOG_NOTICE, "Device %s changed subdevice %d to %d", device->uuid, device->subdevice, ival); |
174 | 486 | device->subdevice = ival; |
325
35b6f6605ae3
More device locks in the network server
Michiel Broek <mbroek@mbse.eu>
parents:
313
diff
changeset
|
487 | #ifdef HAVE_WIRINGPI_H |
35b6f6605ae3
More device locks in the network server
Michiel Broek <mbroek@mbse.eu>
parents:
313
diff
changeset
|
488 | piUnlock(LOCK_DEVICES); |
35b6f6605ae3
More device locks in the network server
Michiel Broek <mbroek@mbse.eu>
parents:
313
diff
changeset
|
489 | #endif |
276
a19cc3770f09
Profile progress logging now also shows the percentage done. The DEVICE PUT command logs all changed values.
Michiel Broek <mbroek@mbse.eu>
parents:
274
diff
changeset
|
490 | } |
174 | 491 | |
492 | } else if (strcmp(kwd, (char *)"GPIOPIN") == 0) { | |
276
a19cc3770f09
Profile progress logging now also shows the percentage done. The DEVICE PUT command logs all changed values.
Michiel Broek <mbroek@mbse.eu>
parents:
274
diff
changeset
|
493 | if (sscanf(val, "%d", &ival) == 1) { |
325
35b6f6605ae3
More device locks in the network server
Michiel Broek <mbroek@mbse.eu>
parents:
313
diff
changeset
|
494 | #ifdef HAVE_WIRINGPI_H |
35b6f6605ae3
More device locks in the network server
Michiel Broek <mbroek@mbse.eu>
parents:
313
diff
changeset
|
495 | piLock(LOCK_DEVICES); |
35b6f6605ae3
More device locks in the network server
Michiel Broek <mbroek@mbse.eu>
parents:
313
diff
changeset
|
496 | #endif |
276
a19cc3770f09
Profile progress logging now also shows the percentage done. The DEVICE PUT command logs all changed values.
Michiel Broek <mbroek@mbse.eu>
parents:
274
diff
changeset
|
497 | if (device->gpiopin != ival) |
a19cc3770f09
Profile progress logging now also shows the percentage done. The DEVICE PUT command logs all changed values.
Michiel Broek <mbroek@mbse.eu>
parents:
274
diff
changeset
|
498 | syslog(LOG_NOTICE, "Device %s changed gpiopin %d to %d", device->uuid, device->gpiopin, ival); |
174 | 499 | device->gpiopin = ival; |
325
35b6f6605ae3
More device locks in the network server
Michiel Broek <mbroek@mbse.eu>
parents:
313
diff
changeset
|
500 | #ifdef HAVE_WIRINGPI_H |
35b6f6605ae3
More device locks in the network server
Michiel Broek <mbroek@mbse.eu>
parents:
313
diff
changeset
|
501 | piUnlock(LOCK_DEVICES); |
35b6f6605ae3
More device locks in the network server
Michiel Broek <mbroek@mbse.eu>
parents:
313
diff
changeset
|
502 | #endif |
276
a19cc3770f09
Profile progress logging now also shows the percentage done. The DEVICE PUT command logs all changed values.
Michiel Broek <mbroek@mbse.eu>
parents:
274
diff
changeset
|
503 | } |
174 | 504 | |
505 | } else if (strcmp(kwd, (char *)"DESCRIPTION") == 0) { | |
325
35b6f6605ae3
More device locks in the network server
Michiel Broek <mbroek@mbse.eu>
parents:
313
diff
changeset
|
506 | #ifdef HAVE_WIRINGPI_H |
35b6f6605ae3
More device locks in the network server
Michiel Broek <mbroek@mbse.eu>
parents:
313
diff
changeset
|
507 | piLock(LOCK_DEVICES); |
35b6f6605ae3
More device locks in the network server
Michiel Broek <mbroek@mbse.eu>
parents:
313
diff
changeset
|
508 | #endif |
276
a19cc3770f09
Profile progress logging now also shows the percentage done. The DEVICE PUT command logs all changed values.
Michiel Broek <mbroek@mbse.eu>
parents:
274
diff
changeset
|
509 | if (device->description) { |
a19cc3770f09
Profile progress logging now also shows the percentage done. The DEVICE PUT command logs all changed values.
Michiel Broek <mbroek@mbse.eu>
parents:
274
diff
changeset
|
510 | if (strcmp(device->description, val)) |
278
76c8a6f18e4d
GLOBAL PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
276
diff
changeset
|
511 | syslog(LOG_NOTICE, "Device %s changed description `%s' to `%s'", device->uuid, device->description, val); |
174 | 512 | free(device->description); |
276
a19cc3770f09
Profile progress logging now also shows the percentage done. The DEVICE PUT command logs all changed values.
Michiel Broek <mbroek@mbse.eu>
parents:
274
diff
changeset
|
513 | } |
174 | 514 | device->description = xstrcpy(val); |
325
35b6f6605ae3
More device locks in the network server
Michiel Broek <mbroek@mbse.eu>
parents:
313
diff
changeset
|
515 | #ifdef HAVE_WIRINGPI_H |
35b6f6605ae3
More device locks in the network server
Michiel Broek <mbroek@mbse.eu>
parents:
313
diff
changeset
|
516 | piUnlock(LOCK_DEVICES); |
35b6f6605ae3
More device locks in the network server
Michiel Broek <mbroek@mbse.eu>
parents:
313
diff
changeset
|
517 | #endif |
174 | 518 | |
519 | } else if (strcmp(kwd, (char *)"COMMENT") == 0) { | |
325
35b6f6605ae3
More device locks in the network server
Michiel Broek <mbroek@mbse.eu>
parents:
313
diff
changeset
|
520 | #ifdef HAVE_WIRINGPI_H |
35b6f6605ae3
More device locks in the network server
Michiel Broek <mbroek@mbse.eu>
parents:
313
diff
changeset
|
521 | piLock(LOCK_DEVICES); |
35b6f6605ae3
More device locks in the network server
Michiel Broek <mbroek@mbse.eu>
parents:
313
diff
changeset
|
522 | #endif |
276
a19cc3770f09
Profile progress logging now also shows the percentage done. The DEVICE PUT command logs all changed values.
Michiel Broek <mbroek@mbse.eu>
parents:
274
diff
changeset
|
523 | if (device->comment) { |
a19cc3770f09
Profile progress logging now also shows the percentage done. The DEVICE PUT command logs all changed values.
Michiel Broek <mbroek@mbse.eu>
parents:
274
diff
changeset
|
524 | if (strcmp(device->comment, val)) |
278
76c8a6f18e4d
GLOBAL PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
276
diff
changeset
|
525 | syslog(LOG_NOTICE, "Device %s changed comment `%s' to `%s'", device->uuid, device->comment, val); |
174 | 526 | free(device->comment); |
276
a19cc3770f09
Profile progress logging now also shows the percentage done. The DEVICE PUT command logs all changed values.
Michiel Broek <mbroek@mbse.eu>
parents:
274
diff
changeset
|
527 | } |
174 | 528 | device->comment = xstrcpy(val); |
325
35b6f6605ae3
More device locks in the network server
Michiel Broek <mbroek@mbse.eu>
parents:
313
diff
changeset
|
529 | #ifdef HAVE_WIRINGPI_H |
35b6f6605ae3
More device locks in the network server
Michiel Broek <mbroek@mbse.eu>
parents:
313
diff
changeset
|
530 | piUnlock(LOCK_DEVICES); |
35b6f6605ae3
More device locks in the network server
Michiel Broek <mbroek@mbse.eu>
parents:
313
diff
changeset
|
531 | #endif |
174 | 532 | |
533 | } | |
534 | } | |
535 | } | |
536 | } | |
537 | } | |
538 | } | |
539 | srv_send((char *)"440 No such device"); | |
540 | return 1; | |
541 | } | |
542 | ||
213
2317b8d644fa
Code cleanup, streamlined error messages.
Michiel Broek <mbroek@mbse.eu>
parents:
209
diff
changeset
|
543 | srv_send((char *)"504 Subcommand error"); |
157
259a018758f9
Added GET AIR, GET BEER, GET TARGET commands
Michiel Broek <mbroek@mbse.eu>
parents:
156
diff
changeset
|
544 | return 1; |
259a018758f9
Added GET AIR, GET BEER, GET TARGET commands
Michiel Broek <mbroek@mbse.eu>
parents:
156
diff
changeset
|
545 | } |
259a018758f9
Added GET AIR, GET BEER, GET TARGET commands
Michiel Broek <mbroek@mbse.eu>
parents:
156
diff
changeset
|
546 | |
259a018758f9
Added GET AIR, GET BEER, GET TARGET commands
Michiel Broek <mbroek@mbse.eu>
parents:
156
diff
changeset
|
547 | |
259a018758f9
Added GET AIR, GET BEER, GET TARGET commands
Michiel Broek <mbroek@mbse.eu>
parents:
156
diff
changeset
|
548 | |
259a018758f9
Added GET AIR, GET BEER, GET TARGET commands
Michiel Broek <mbroek@mbse.eu>
parents:
156
diff
changeset
|
549 | /* |
206
78fb6f99e473
Added GLOBAL GET and GLOBAL PUT commands.
Michiel Broek <mbroek@mbse.eu>
parents:
195
diff
changeset
|
550 | * GLOBAL GET |
78fb6f99e473
Added GLOBAL GET and GLOBAL PUT commands.
Michiel Broek <mbroek@mbse.eu>
parents:
195
diff
changeset
|
551 | * GLOBAL PUT |
78fb6f99e473
Added GLOBAL GET and GLOBAL PUT commands.
Michiel Broek <mbroek@mbse.eu>
parents:
195
diff
changeset
|
552 | */ |
78fb6f99e473
Added GLOBAL GET and GLOBAL PUT commands.
Michiel Broek <mbroek@mbse.eu>
parents:
195
diff
changeset
|
553 | int cmd_global(char *buf) |
78fb6f99e473
Added GLOBAL GET and GLOBAL PUT commands.
Michiel Broek <mbroek@mbse.eu>
parents:
195
diff
changeset
|
554 | { |
78fb6f99e473
Added GLOBAL GET and GLOBAL PUT commands.
Michiel Broek <mbroek@mbse.eu>
parents:
195
diff
changeset
|
555 | char *opt, *kwd, *val, ibuf[SS_BUFSIZE]; |
78fb6f99e473
Added GLOBAL GET and GLOBAL PUT commands.
Michiel Broek <mbroek@mbse.eu>
parents:
195
diff
changeset
|
556 | int ival, i, rlen; |
78fb6f99e473
Added GLOBAL GET and GLOBAL PUT commands.
Michiel Broek <mbroek@mbse.eu>
parents:
195
diff
changeset
|
557 | socklen_t fromlen; |
78fb6f99e473
Added GLOBAL GET and GLOBAL PUT commands.
Michiel Broek <mbroek@mbse.eu>
parents:
195
diff
changeset
|
558 | |
78fb6f99e473
Added GLOBAL GET and GLOBAL PUT commands.
Michiel Broek <mbroek@mbse.eu>
parents:
195
diff
changeset
|
559 | opt = strtok(buf, " \0"); |
78fb6f99e473
Added GLOBAL GET and GLOBAL PUT commands.
Michiel Broek <mbroek@mbse.eu>
parents:
195
diff
changeset
|
560 | opt = strtok(NULL, "\0"); |
78fb6f99e473
Added GLOBAL GET and GLOBAL PUT commands.
Michiel Broek <mbroek@mbse.eu>
parents:
195
diff
changeset
|
561 | |
78fb6f99e473
Added GLOBAL GET and GLOBAL PUT commands.
Michiel Broek <mbroek@mbse.eu>
parents:
195
diff
changeset
|
562 | if (opt == NULL) { |
213
2317b8d644fa
Code cleanup, streamlined error messages.
Michiel Broek <mbroek@mbse.eu>
parents:
209
diff
changeset
|
563 | srv_send((char *)"501 Subcommand missing"); |
206
78fb6f99e473
Added GLOBAL GET and GLOBAL PUT commands.
Michiel Broek <mbroek@mbse.eu>
parents:
195
diff
changeset
|
564 | return 1; |
78fb6f99e473
Added GLOBAL GET and GLOBAL PUT commands.
Michiel Broek <mbroek@mbse.eu>
parents:
195
diff
changeset
|
565 | } |
78fb6f99e473
Added GLOBAL GET and GLOBAL PUT commands.
Michiel Broek <mbroek@mbse.eu>
parents:
195
diff
changeset
|
566 | |
78fb6f99e473
Added GLOBAL GET and GLOBAL PUT commands.
Michiel Broek <mbroek@mbse.eu>
parents:
195
diff
changeset
|
567 | if (strcmp(opt, (char *)"GET") == 0) { |
78fb6f99e473
Added GLOBAL GET and GLOBAL PUT commands.
Michiel Broek <mbroek@mbse.eu>
parents:
195
diff
changeset
|
568 | srv_send((char *)"213 Global Settings record follows:"); |
269
dc88583a068d
All web screens now show the program name and version
Michiel Broek <mbroek@mbse.eu>
parents:
268
diff
changeset
|
569 | srv_send((char *)"RELEASE,%s", VERSION); |
206
78fb6f99e473
Added GLOBAL GET and GLOBAL PUT commands.
Michiel Broek <mbroek@mbse.eu>
parents:
195
diff
changeset
|
570 | srv_send((char *)"NAME,%s", Config.name); |
78fb6f99e473
Added GLOBAL GET and GLOBAL PUT commands.
Michiel Broek <mbroek@mbse.eu>
parents:
195
diff
changeset
|
571 | srv_send((char *)"PORT,%d", Config.my_port); |
78fb6f99e473
Added GLOBAL GET and GLOBAL PUT commands.
Michiel Broek <mbroek@mbse.eu>
parents:
195
diff
changeset
|
572 | srv_send((char *)"TEMPFORMAT,%c", Config.tempFormat); |
78fb6f99e473
Added GLOBAL GET and GLOBAL PUT commands.
Michiel Broek <mbroek@mbse.eu>
parents:
195
diff
changeset
|
573 | srv_send((char *)"TEMP_ADDRESS,%s", Config.temp_address); |
78fb6f99e473
Added GLOBAL GET and GLOBAL PUT commands.
Michiel Broek <mbroek@mbse.eu>
parents:
195
diff
changeset
|
574 | srv_send((char *)"TEMP_STATE,%s", TEMPSTATE[Config.temp_state]); |
208
934d45d9751d
Added room temperature and humidity to the web interface
Michiel Broek <mbroek@mbse.eu>
parents:
206
diff
changeset
|
575 | srv_send((char *)"TEMP_VALUE,%.1f", Config.temp_value / 1000.0); |
206
78fb6f99e473
Added GLOBAL GET and GLOBAL PUT commands.
Michiel Broek <mbroek@mbse.eu>
parents:
195
diff
changeset
|
576 | srv_send((char *)"HUM_ADDRESS,%s", Config.hum_address); |
78fb6f99e473
Added GLOBAL GET and GLOBAL PUT commands.
Michiel Broek <mbroek@mbse.eu>
parents:
195
diff
changeset
|
577 | srv_send((char *)"HUM_STATE,%s", TEMPSTATE[Config.hum_state]); |
208
934d45d9751d
Added room temperature and humidity to the web interface
Michiel Broek <mbroek@mbse.eu>
parents:
206
diff
changeset
|
578 | srv_send((char *)"HUM_VALUE,%.0f", Config.hum_value / 1000.0); |
206
78fb6f99e473
Added GLOBAL GET and GLOBAL PUT commands.
Michiel Broek <mbroek@mbse.eu>
parents:
195
diff
changeset
|
579 | #ifdef HAVE_WIRINGPI_H |
78fb6f99e473
Added GLOBAL GET and GLOBAL PUT commands.
Michiel Broek <mbroek@mbse.eu>
parents:
195
diff
changeset
|
580 | srv_send((char *)"LCD_COLS,%d", Config.lcd_cols); |
78fb6f99e473
Added GLOBAL GET and GLOBAL PUT commands.
Michiel Broek <mbroek@mbse.eu>
parents:
195
diff
changeset
|
581 | srv_send((char *)"LCD_ROWS,%d", Config.lcd_rows); |
78fb6f99e473
Added GLOBAL GET and GLOBAL PUT commands.
Michiel Broek <mbroek@mbse.eu>
parents:
195
diff
changeset
|
582 | #endif |
78fb6f99e473
Added GLOBAL GET and GLOBAL PUT commands.
Michiel Broek <mbroek@mbse.eu>
parents:
195
diff
changeset
|
583 | srv_send((char *)"."); |
78fb6f99e473
Added GLOBAL GET and GLOBAL PUT commands.
Michiel Broek <mbroek@mbse.eu>
parents:
195
diff
changeset
|
584 | return 1; |
78fb6f99e473
Added GLOBAL GET and GLOBAL PUT commands.
Michiel Broek <mbroek@mbse.eu>
parents:
195
diff
changeset
|
585 | } |
78fb6f99e473
Added GLOBAL GET and GLOBAL PUT commands.
Michiel Broek <mbroek@mbse.eu>
parents:
195
diff
changeset
|
586 | |
78fb6f99e473
Added GLOBAL GET and GLOBAL PUT commands.
Michiel Broek <mbroek@mbse.eu>
parents:
195
diff
changeset
|
587 | if (strcmp(opt, (char *)"PUT") == 0) { |
78fb6f99e473
Added GLOBAL GET and GLOBAL PUT commands.
Michiel Broek <mbroek@mbse.eu>
parents:
195
diff
changeset
|
588 | while (1) { |
78fb6f99e473
Added GLOBAL GET and GLOBAL PUT commands.
Michiel Broek <mbroek@mbse.eu>
parents:
195
diff
changeset
|
589 | memset((char *)&ibuf, 0, SS_BUFSIZE); |
78fb6f99e473
Added GLOBAL GET and GLOBAL PUT commands.
Michiel Broek <mbroek@mbse.eu>
parents:
195
diff
changeset
|
590 | fromlen = sizeof(peeraddr_in); |
78fb6f99e473
Added GLOBAL GET and GLOBAL PUT commands.
Michiel Broek <mbroek@mbse.eu>
parents:
195
diff
changeset
|
591 | rlen = recvfrom(s, ibuf, sizeof(ibuf) -1, 0, (struct sockaddr *)&peeraddr_in, &fromlen); |
78fb6f99e473
Added GLOBAL GET and GLOBAL PUT commands.
Michiel Broek <mbroek@mbse.eu>
parents:
195
diff
changeset
|
592 | if (rlen == -1) { |
268
dda91dfa4aa8
All syslog logging only to LOG_NOTICE
Michiel Broek <mbroek@mbse.eu>
parents:
266
diff
changeset
|
593 | syslog(LOG_NOTICE, "recvfrom(): %s", strerror(errno)); |
206
78fb6f99e473
Added GLOBAL GET and GLOBAL PUT commands.
Michiel Broek <mbroek@mbse.eu>
parents:
195
diff
changeset
|
594 | srv_send((char *)"518 recfrom(): %s", strerror(errno)); |
78fb6f99e473
Added GLOBAL GET and GLOBAL PUT commands.
Michiel Broek <mbroek@mbse.eu>
parents:
195
diff
changeset
|
595 | return 1; |
78fb6f99e473
Added GLOBAL GET and GLOBAL PUT commands.
Michiel Broek <mbroek@mbse.eu>
parents:
195
diff
changeset
|
596 | } |
78fb6f99e473
Added GLOBAL GET and GLOBAL PUT commands.
Michiel Broek <mbroek@mbse.eu>
parents:
195
diff
changeset
|
597 | for (i = 0; i < strlen(ibuf); i++) { |
78fb6f99e473
Added GLOBAL GET and GLOBAL PUT commands.
Michiel Broek <mbroek@mbse.eu>
parents:
195
diff
changeset
|
598 | if (ibuf[i] == '\n') |
78fb6f99e473
Added GLOBAL GET and GLOBAL PUT commands.
Michiel Broek <mbroek@mbse.eu>
parents:
195
diff
changeset
|
599 | ibuf[i] = '\0'; |
78fb6f99e473
Added GLOBAL GET and GLOBAL PUT commands.
Michiel Broek <mbroek@mbse.eu>
parents:
195
diff
changeset
|
600 | if (ibuf[i] == '\r') |
78fb6f99e473
Added GLOBAL GET and GLOBAL PUT commands.
Michiel Broek <mbroek@mbse.eu>
parents:
195
diff
changeset
|
601 | ibuf[i] = '\0'; |
78fb6f99e473
Added GLOBAL GET and GLOBAL PUT commands.
Michiel Broek <mbroek@mbse.eu>
parents:
195
diff
changeset
|
602 | } |
78fb6f99e473
Added GLOBAL GET and GLOBAL PUT commands.
Michiel Broek <mbroek@mbse.eu>
parents:
195
diff
changeset
|
603 | for (i = strlen(ibuf) -1; i > 0; i--) { |
78fb6f99e473
Added GLOBAL GET and GLOBAL PUT commands.
Michiel Broek <mbroek@mbse.eu>
parents:
195
diff
changeset
|
604 | if (ibuf[i] == ' ') |
78fb6f99e473
Added GLOBAL GET and GLOBAL PUT commands.
Michiel Broek <mbroek@mbse.eu>
parents:
195
diff
changeset
|
605 | ibuf[i] = '\0'; |
78fb6f99e473
Added GLOBAL GET and GLOBAL PUT commands.
Michiel Broek <mbroek@mbse.eu>
parents:
195
diff
changeset
|
606 | else |
78fb6f99e473
Added GLOBAL GET and GLOBAL PUT commands.
Michiel Broek <mbroek@mbse.eu>
parents:
195
diff
changeset
|
607 | break; |
78fb6f99e473
Added GLOBAL GET and GLOBAL PUT commands.
Michiel Broek <mbroek@mbse.eu>
parents:
195
diff
changeset
|
608 | } |
78fb6f99e473
Added GLOBAL GET and GLOBAL PUT commands.
Michiel Broek <mbroek@mbse.eu>
parents:
195
diff
changeset
|
609 | if (strlen(ibuf)) { |
78fb6f99e473
Added GLOBAL GET and GLOBAL PUT commands.
Michiel Broek <mbroek@mbse.eu>
parents:
195
diff
changeset
|
610 | if (debug) { |
78fb6f99e473
Added GLOBAL GET and GLOBAL PUT commands.
Michiel Broek <mbroek@mbse.eu>
parents:
195
diff
changeset
|
611 | syslog(LOG_NOTICE, "recv: \"%s\"", ibuf); |
78fb6f99e473
Added GLOBAL GET and GLOBAL PUT commands.
Michiel Broek <mbroek@mbse.eu>
parents:
195
diff
changeset
|
612 | fprintf(stdout, "recv: \"%s\"\n", ibuf); |
78fb6f99e473
Added GLOBAL GET and GLOBAL PUT commands.
Michiel Broek <mbroek@mbse.eu>
parents:
195
diff
changeset
|
613 | } |
78fb6f99e473
Added GLOBAL GET and GLOBAL PUT commands.
Michiel Broek <mbroek@mbse.eu>
parents:
195
diff
changeset
|
614 | if (strcmp(ibuf, (char *)".") == 0) { |
78fb6f99e473
Added GLOBAL GET and GLOBAL PUT commands.
Michiel Broek <mbroek@mbse.eu>
parents:
195
diff
changeset
|
615 | srv_send((char *)"219 Accepted Global record"); |
78fb6f99e473
Added GLOBAL GET and GLOBAL PUT commands.
Michiel Broek <mbroek@mbse.eu>
parents:
195
diff
changeset
|
616 | return 0; |
78fb6f99e473
Added GLOBAL GET and GLOBAL PUT commands.
Michiel Broek <mbroek@mbse.eu>
parents:
195
diff
changeset
|
617 | } |
78fb6f99e473
Added GLOBAL GET and GLOBAL PUT commands.
Michiel Broek <mbroek@mbse.eu>
parents:
195
diff
changeset
|
618 | kwd = strtok(ibuf, ",\0"); |
78fb6f99e473
Added GLOBAL GET and GLOBAL PUT commands.
Michiel Broek <mbroek@mbse.eu>
parents:
195
diff
changeset
|
619 | val = strtok(NULL, "\0"); |
78fb6f99e473
Added GLOBAL GET and GLOBAL PUT commands.
Michiel Broek <mbroek@mbse.eu>
parents:
195
diff
changeset
|
620 | if (kwd) { |
78fb6f99e473
Added GLOBAL GET and GLOBAL PUT commands.
Michiel Broek <mbroek@mbse.eu>
parents:
195
diff
changeset
|
621 | if (strcmp(kwd, (char *)"NAME") == 0) { |
278
76c8a6f18e4d
GLOBAL PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
276
diff
changeset
|
622 | if (val && Config.name && strcmp(val, Config.name)) |
76c8a6f18e4d
GLOBAL PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
276
diff
changeset
|
623 | syslog(LOG_NOTICE, "Global name `%s' to `%s'", Config.name, val); |
206
78fb6f99e473
Added GLOBAL GET and GLOBAL PUT commands.
Michiel Broek <mbroek@mbse.eu>
parents:
195
diff
changeset
|
624 | if (Config.name) |
78fb6f99e473
Added GLOBAL GET and GLOBAL PUT commands.
Michiel Broek <mbroek@mbse.eu>
parents:
195
diff
changeset
|
625 | free(Config.name); |
78fb6f99e473
Added GLOBAL GET and GLOBAL PUT commands.
Michiel Broek <mbroek@mbse.eu>
parents:
195
diff
changeset
|
626 | if (val) |
78fb6f99e473
Added GLOBAL GET and GLOBAL PUT commands.
Michiel Broek <mbroek@mbse.eu>
parents:
195
diff
changeset
|
627 | Config.name = xstrcpy(val); |
78fb6f99e473
Added GLOBAL GET and GLOBAL PUT commands.
Michiel Broek <mbroek@mbse.eu>
parents:
195
diff
changeset
|
628 | else |
78fb6f99e473
Added GLOBAL GET and GLOBAL PUT commands.
Michiel Broek <mbroek@mbse.eu>
parents:
195
diff
changeset
|
629 | Config.name = NULL; |
78fb6f99e473
Added GLOBAL GET and GLOBAL PUT commands.
Michiel Broek <mbroek@mbse.eu>
parents:
195
diff
changeset
|
630 | |
78fb6f99e473
Added GLOBAL GET and GLOBAL PUT commands.
Michiel Broek <mbroek@mbse.eu>
parents:
195
diff
changeset
|
631 | } else if (val && (strcmp(kwd, (char *)"PORT") == 0)) { |
278
76c8a6f18e4d
GLOBAL PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
276
diff
changeset
|
632 | if (sscanf(val, "%d", &ival) == 1) { |
76c8a6f18e4d
GLOBAL PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
276
diff
changeset
|
633 | if (Config.my_port != ival) |
76c8a6f18e4d
GLOBAL PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
276
diff
changeset
|
634 | syslog(LOG_NOTICE, "Global port %d to %d", Config.my_port, ival); |
206
78fb6f99e473
Added GLOBAL GET and GLOBAL PUT commands.
Michiel Broek <mbroek@mbse.eu>
parents:
195
diff
changeset
|
635 | Config.my_port = ival; |
278
76c8a6f18e4d
GLOBAL PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
276
diff
changeset
|
636 | } |
206
78fb6f99e473
Added GLOBAL GET and GLOBAL PUT commands.
Michiel Broek <mbroek@mbse.eu>
parents:
195
diff
changeset
|
637 | |
78fb6f99e473
Added GLOBAL GET and GLOBAL PUT commands.
Michiel Broek <mbroek@mbse.eu>
parents:
195
diff
changeset
|
638 | } else if (val && (strcmp(kwd, (char *)"TEMPFORMAT") == 0)) { |
278
76c8a6f18e4d
GLOBAL PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
276
diff
changeset
|
639 | if ((val[0] == 'C') || (val[0] == 'F')) { |
76c8a6f18e4d
GLOBAL PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
276
diff
changeset
|
640 | if (Config.tempFormat != val[0]) |
76c8a6f18e4d
GLOBAL PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
276
diff
changeset
|
641 | syslog(LOG_NOTICE, "Global port %c to %c", Config.tempFormat, val[0]); |
206
78fb6f99e473
Added GLOBAL GET and GLOBAL PUT commands.
Michiel Broek <mbroek@mbse.eu>
parents:
195
diff
changeset
|
642 | Config.tempFormat = val[0]; |
278
76c8a6f18e4d
GLOBAL PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
276
diff
changeset
|
643 | } |
206
78fb6f99e473
Added GLOBAL GET and GLOBAL PUT commands.
Michiel Broek <mbroek@mbse.eu>
parents:
195
diff
changeset
|
644 | |
78fb6f99e473
Added GLOBAL GET and GLOBAL PUT commands.
Michiel Broek <mbroek@mbse.eu>
parents:
195
diff
changeset
|
645 | } else if (strcmp(kwd, (char *)"TEMP_ADDRESS") == 0) { |
278
76c8a6f18e4d
GLOBAL PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
276
diff
changeset
|
646 | if (val && Config.temp_address && (strcmp(val, Config.temp_address))) |
76c8a6f18e4d
GLOBAL PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
276
diff
changeset
|
647 | syslog(LOG_NOTICE, "Global temperature address `%s' to `%s'", Config.temp_address, val); |
206
78fb6f99e473
Added GLOBAL GET and GLOBAL PUT commands.
Michiel Broek <mbroek@mbse.eu>
parents:
195
diff
changeset
|
648 | if (Config.temp_address) { |
78fb6f99e473
Added GLOBAL GET and GLOBAL PUT commands.
Michiel Broek <mbroek@mbse.eu>
parents:
195
diff
changeset
|
649 | device_count(FALSE, Config.temp_address); |
78fb6f99e473
Added GLOBAL GET and GLOBAL PUT commands.
Michiel Broek <mbroek@mbse.eu>
parents:
195
diff
changeset
|
650 | free(Config.temp_address); |
78fb6f99e473
Added GLOBAL GET and GLOBAL PUT commands.
Michiel Broek <mbroek@mbse.eu>
parents:
195
diff
changeset
|
651 | } |
78fb6f99e473
Added GLOBAL GET and GLOBAL PUT commands.
Michiel Broek <mbroek@mbse.eu>
parents:
195
diff
changeset
|
652 | if (val) { |
78fb6f99e473
Added GLOBAL GET and GLOBAL PUT commands.
Michiel Broek <mbroek@mbse.eu>
parents:
195
diff
changeset
|
653 | Config.temp_address = xstrcpy(val); |
78fb6f99e473
Added GLOBAL GET and GLOBAL PUT commands.
Michiel Broek <mbroek@mbse.eu>
parents:
195
diff
changeset
|
654 | device_count(TRUE, Config.temp_address); |
78fb6f99e473
Added GLOBAL GET and GLOBAL PUT commands.
Michiel Broek <mbroek@mbse.eu>
parents:
195
diff
changeset
|
655 | } else |
78fb6f99e473
Added GLOBAL GET and GLOBAL PUT commands.
Michiel Broek <mbroek@mbse.eu>
parents:
195
diff
changeset
|
656 | Config.temp_address = NULL; |
78fb6f99e473
Added GLOBAL GET and GLOBAL PUT commands.
Michiel Broek <mbroek@mbse.eu>
parents:
195
diff
changeset
|
657 | |
78fb6f99e473
Added GLOBAL GET and GLOBAL PUT commands.
Michiel Broek <mbroek@mbse.eu>
parents:
195
diff
changeset
|
658 | } else if (strcmp(kwd, (char *)"HUM_ADDRESS") == 0) { |
278
76c8a6f18e4d
GLOBAL PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
276
diff
changeset
|
659 | if (val && Config.hum_address && (strcmp(val, Config.hum_address))) |
76c8a6f18e4d
GLOBAL PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
276
diff
changeset
|
660 | syslog(LOG_NOTICE, "Global humidity address `%s' to `%s'", Config.hum_address, val); |
206
78fb6f99e473
Added GLOBAL GET and GLOBAL PUT commands.
Michiel Broek <mbroek@mbse.eu>
parents:
195
diff
changeset
|
661 | if (Config.hum_address) { |
78fb6f99e473
Added GLOBAL GET and GLOBAL PUT commands.
Michiel Broek <mbroek@mbse.eu>
parents:
195
diff
changeset
|
662 | device_count(FALSE, Config.hum_address); |
78fb6f99e473
Added GLOBAL GET and GLOBAL PUT commands.
Michiel Broek <mbroek@mbse.eu>
parents:
195
diff
changeset
|
663 | free(Config.hum_address); |
78fb6f99e473
Added GLOBAL GET and GLOBAL PUT commands.
Michiel Broek <mbroek@mbse.eu>
parents:
195
diff
changeset
|
664 | } |
78fb6f99e473
Added GLOBAL GET and GLOBAL PUT commands.
Michiel Broek <mbroek@mbse.eu>
parents:
195
diff
changeset
|
665 | if (val) { |
78fb6f99e473
Added GLOBAL GET and GLOBAL PUT commands.
Michiel Broek <mbroek@mbse.eu>
parents:
195
diff
changeset
|
666 | Config.hum_address = xstrcpy(val); |
78fb6f99e473
Added GLOBAL GET and GLOBAL PUT commands.
Michiel Broek <mbroek@mbse.eu>
parents:
195
diff
changeset
|
667 | device_count(TRUE, Config.hum_address); |
78fb6f99e473
Added GLOBAL GET and GLOBAL PUT commands.
Michiel Broek <mbroek@mbse.eu>
parents:
195
diff
changeset
|
668 | } else |
78fb6f99e473
Added GLOBAL GET and GLOBAL PUT commands.
Michiel Broek <mbroek@mbse.eu>
parents:
195
diff
changeset
|
669 | Config.hum_address = NULL; |
78fb6f99e473
Added GLOBAL GET and GLOBAL PUT commands.
Michiel Broek <mbroek@mbse.eu>
parents:
195
diff
changeset
|
670 | |
78fb6f99e473
Added GLOBAL GET and GLOBAL PUT commands.
Michiel Broek <mbroek@mbse.eu>
parents:
195
diff
changeset
|
671 | #ifdef HAVE_WIRINGPI_H |
78fb6f99e473
Added GLOBAL GET and GLOBAL PUT commands.
Michiel Broek <mbroek@mbse.eu>
parents:
195
diff
changeset
|
672 | } else if (val && (strcmp(kwd, (char *)"LCD_COLS") == 0)) { |
278
76c8a6f18e4d
GLOBAL PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
276
diff
changeset
|
673 | if (sscanf(val, "%d", &ival) == 1) { |
76c8a6f18e4d
GLOBAL PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
276
diff
changeset
|
674 | if (Config.lcd_cols != ival) |
76c8a6f18e4d
GLOBAL PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
276
diff
changeset
|
675 | syslog(LOG_NOTICE, "Global LCD columns %d to %d", Config.lcd_cols, ival); |
206
78fb6f99e473
Added GLOBAL GET and GLOBAL PUT commands.
Michiel Broek <mbroek@mbse.eu>
parents:
195
diff
changeset
|
676 | Config.lcd_cols = ival; |
278
76c8a6f18e4d
GLOBAL PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
276
diff
changeset
|
677 | } |
206
78fb6f99e473
Added GLOBAL GET and GLOBAL PUT commands.
Michiel Broek <mbroek@mbse.eu>
parents:
195
diff
changeset
|
678 | |
78fb6f99e473
Added GLOBAL GET and GLOBAL PUT commands.
Michiel Broek <mbroek@mbse.eu>
parents:
195
diff
changeset
|
679 | } else if (val && (strcmp(kwd, (char *)"LCD_ROWS") == 0)) { |
278
76c8a6f18e4d
GLOBAL PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
276
diff
changeset
|
680 | if (sscanf(val, "%d", &ival) == 1) { |
76c8a6f18e4d
GLOBAL PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
276
diff
changeset
|
681 | if (Config.lcd_rows != ival) |
76c8a6f18e4d
GLOBAL PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
276
diff
changeset
|
682 | syslog(LOG_NOTICE, "Global LCD rows %d to %d", Config.lcd_rows, ival); |
206
78fb6f99e473
Added GLOBAL GET and GLOBAL PUT commands.
Michiel Broek <mbroek@mbse.eu>
parents:
195
diff
changeset
|
683 | Config.lcd_rows = ival; |
278
76c8a6f18e4d
GLOBAL PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
276
diff
changeset
|
684 | } |
206
78fb6f99e473
Added GLOBAL GET and GLOBAL PUT commands.
Michiel Broek <mbroek@mbse.eu>
parents:
195
diff
changeset
|
685 | #endif |
78fb6f99e473
Added GLOBAL GET and GLOBAL PUT commands.
Michiel Broek <mbroek@mbse.eu>
parents:
195
diff
changeset
|
686 | } |
78fb6f99e473
Added GLOBAL GET and GLOBAL PUT commands.
Michiel Broek <mbroek@mbse.eu>
parents:
195
diff
changeset
|
687 | } |
78fb6f99e473
Added GLOBAL GET and GLOBAL PUT commands.
Michiel Broek <mbroek@mbse.eu>
parents:
195
diff
changeset
|
688 | } |
78fb6f99e473
Added GLOBAL GET and GLOBAL PUT commands.
Michiel Broek <mbroek@mbse.eu>
parents:
195
diff
changeset
|
689 | } |
78fb6f99e473
Added GLOBAL GET and GLOBAL PUT commands.
Michiel Broek <mbroek@mbse.eu>
parents:
195
diff
changeset
|
690 | } |
78fb6f99e473
Added GLOBAL GET and GLOBAL PUT commands.
Michiel Broek <mbroek@mbse.eu>
parents:
195
diff
changeset
|
691 | |
213
2317b8d644fa
Code cleanup, streamlined error messages.
Michiel Broek <mbroek@mbse.eu>
parents:
209
diff
changeset
|
692 | srv_send((char *)"504 Subcommand error"); |
206
78fb6f99e473
Added GLOBAL GET and GLOBAL PUT commands.
Michiel Broek <mbroek@mbse.eu>
parents:
195
diff
changeset
|
693 | return 1; |
78fb6f99e473
Added GLOBAL GET and GLOBAL PUT commands.
Michiel Broek <mbroek@mbse.eu>
parents:
195
diff
changeset
|
694 | } |
78fb6f99e473
Added GLOBAL GET and GLOBAL PUT commands.
Michiel Broek <mbroek@mbse.eu>
parents:
195
diff
changeset
|
695 | |
78fb6f99e473
Added GLOBAL GET and GLOBAL PUT commands.
Michiel Broek <mbroek@mbse.eu>
parents:
195
diff
changeset
|
696 | |
78fb6f99e473
Added GLOBAL GET and GLOBAL PUT commands.
Michiel Broek <mbroek@mbse.eu>
parents:
195
diff
changeset
|
697 | |
78fb6f99e473
Added GLOBAL GET and GLOBAL PUT commands.
Michiel Broek <mbroek@mbse.eu>
parents:
195
diff
changeset
|
698 | /* |
81 | 699 | * LIST |
120 | 700 | * LIST LOG |
81 | 701 | */ |
702 | int cmd_list(char *buf) | |
703 | { | |
299
d1c52fb43e30
Show heater/cooler usgae in percent on the web page. Bunped to version 0.2.5
Michiel Broek <mbroek@mbse.eu>
parents:
293
diff
changeset
|
704 | char *opt, *param, *filename, q[5], buffer[256], outbuf[256]; |
d1c52fb43e30
Show heater/cooler usgae in percent on the web page. Bunped to version 0.2.5
Michiel Broek <mbroek@mbse.eu>
parents:
293
diff
changeset
|
705 | char *date_n, *mode_n, *air_n, *beer_n, *target_n, *heater_n, *cooler_n; |
d1c52fb43e30
Show heater/cooler usgae in percent on the web page. Bunped to version 0.2.5
Michiel Broek <mbroek@mbse.eu>
parents:
293
diff
changeset
|
706 | char *heater_u, *cooler_u; |
300
4ce46ff3e37d
The LIST LOG command now automatic adjusts the number of output lines and resolution by calculating a reasonable interval between 1 and 60 minutes. Bumped to version 0.2.6
Michiel Broek <mbroek@mbse.eu>
parents:
299
diff
changeset
|
707 | int heater_l = 0, cooler_l = 0, h = 0, c = 0, heat_used = 0, cool_used = 0, lines = 0, graphstep = 0; |
84 | 708 | units_list *unit; |
120 | 709 | FILE *fp; |
81 | 710 | |
87
55f1315c94f1
Added unit command and list unit command
Michiel Broek <mbroek@mbse.eu>
parents:
86
diff
changeset
|
711 | opt = strtok(buf, " \0"); |
191
c74bbc24a1c8
Client/Server communication is now almost final
Michiel Broek <mbroek@mbse.eu>
parents:
189
diff
changeset
|
712 | opt = strtok(NULL, " \0"); |
84 | 713 | |
81 | 714 | if (opt == NULL) { |
92 | 715 | /* |
716 | * Default, list available units | |
717 | */ | |
81 | 718 | srv_send((char *)"212 Fermenter list follows:"); |
719 | for (unit = Config.units; unit; unit = unit->next) { | |
131
528dc0bb81ab
Always use uuid to select units and remove numeric record id's.
Michiel Broek <mbroek@mbse.eu>
parents:
125
diff
changeset
|
720 | srv_send((char *)"%s,%s,%s", unit->uuid, unit->name, UNITMODE[unit->mode]); |
81 | 721 | } |
722 | srv_send((char *)"."); | |
259
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
723 | return 1; |
92 | 724 | |
120 | 725 | } else if (strcmp(opt, (char *)"LOG") == 0) { |
191
c74bbc24a1c8
Client/Server communication is now almost final
Michiel Broek <mbroek@mbse.eu>
parents:
189
diff
changeset
|
726 | |
c74bbc24a1c8
Client/Server communication is now almost final
Michiel Broek <mbroek@mbse.eu>
parents:
189
diff
changeset
|
727 | param = strtok(NULL, "\0"); |
c74bbc24a1c8
Client/Server communication is now almost final
Michiel Broek <mbroek@mbse.eu>
parents:
189
diff
changeset
|
728 | if (param == NULL) { |
213
2317b8d644fa
Code cleanup, streamlined error messages.
Michiel Broek <mbroek@mbse.eu>
parents:
209
diff
changeset
|
729 | srv_send((char *)"502 Parameter missing"); |
120 | 730 | return 1; |
731 | } | |
732 | ||
266
07819a7ad3c1
Better log output for web graphs. Webgraphs can now display heater and cooler usage.
Michiel Broek <mbroek@mbse.eu>
parents:
264
diff
changeset
|
733 | q[0] = q[1] = q[2] = q[3] = q[4] = 'a'; |
120 | 734 | for (unit = Config.units; unit; unit = unit->next) { |
191
c74bbc24a1c8
Client/Server communication is now almost final
Michiel Broek <mbroek@mbse.eu>
parents:
189
diff
changeset
|
735 | if (strcmp(param, unit->uuid) == 0) |
120 | 736 | break; |
737 | } | |
738 | ||
739 | srv_send((char *)"212 Logfile list follows:"); | |
740 | if (getenv((char *)"USER") == NULL) { | |
741 | filename = xstrcpy((char *)"/root"); | |
742 | } else { | |
743 | filename = xstrcpy(getenv((char *)"HOME")); | |
744 | } | |
745 | filename = xstrcat(filename, (char *)"/.thermferm/log/"); | |
746 | filename = xstrcat(filename, unit->name); | |
747 | filename = xstrcat(filename, (char *)".log"); | |
748 | if ((fp = fopen(filename, "r"))) { | |
300
4ce46ff3e37d
The LIST LOG command now automatic adjusts the number of output lines and resolution by calculating a reasonable interval between 1 and 60 minutes. Bumped to version 0.2.6
Michiel Broek <mbroek@mbse.eu>
parents:
299
diff
changeset
|
749 | |
4ce46ff3e37d
The LIST LOG command now automatic adjusts the number of output lines and resolution by calculating a reasonable interval between 1 and 60 minutes. Bumped to version 0.2.6
Michiel Broek <mbroek@mbse.eu>
parents:
299
diff
changeset
|
750 | /* |
4ce46ff3e37d
The LIST LOG command now automatic adjusts the number of output lines and resolution by calculating a reasonable interval between 1 and 60 minutes. Bumped to version 0.2.6
Michiel Broek <mbroek@mbse.eu>
parents:
299
diff
changeset
|
751 | * Count the lines in the logfile |
4ce46ff3e37d
The LIST LOG command now automatic adjusts the number of output lines and resolution by calculating a reasonable interval between 1 and 60 minutes. Bumped to version 0.2.6
Michiel Broek <mbroek@mbse.eu>
parents:
299
diff
changeset
|
752 | */ |
4ce46ff3e37d
The LIST LOG command now automatic adjusts the number of output lines and resolution by calculating a reasonable interval between 1 and 60 minutes. Bumped to version 0.2.6
Michiel Broek <mbroek@mbse.eu>
parents:
299
diff
changeset
|
753 | lines = 0; |
4ce46ff3e37d
The LIST LOG command now automatic adjusts the number of output lines and resolution by calculating a reasonable interval between 1 and 60 minutes. Bumped to version 0.2.6
Michiel Broek <mbroek@mbse.eu>
parents:
299
diff
changeset
|
754 | while (fgets(buffer, sizeof(buffer)-1, fp) != NULL) { |
4ce46ff3e37d
The LIST LOG command now automatic adjusts the number of output lines and resolution by calculating a reasonable interval between 1 and 60 minutes. Bumped to version 0.2.6
Michiel Broek <mbroek@mbse.eu>
parents:
299
diff
changeset
|
755 | lines++; |
4ce46ff3e37d
The LIST LOG command now automatic adjusts the number of output lines and resolution by calculating a reasonable interval between 1 and 60 minutes. Bumped to version 0.2.6
Michiel Broek <mbroek@mbse.eu>
parents:
299
diff
changeset
|
756 | } |
4ce46ff3e37d
The LIST LOG command now automatic adjusts the number of output lines and resolution by calculating a reasonable interval between 1 and 60 minutes. Bumped to version 0.2.6
Michiel Broek <mbroek@mbse.eu>
parents:
299
diff
changeset
|
757 | fseek(fp, 0L, SEEK_SET); |
4ce46ff3e37d
The LIST LOG command now automatic adjusts the number of output lines and resolution by calculating a reasonable interval between 1 and 60 minutes. Bumped to version 0.2.6
Michiel Broek <mbroek@mbse.eu>
parents:
299
diff
changeset
|
758 | /* |
4ce46ff3e37d
The LIST LOG command now automatic adjusts the number of output lines and resolution by calculating a reasonable interval between 1 and 60 minutes. Bumped to version 0.2.6
Michiel Broek <mbroek@mbse.eu>
parents:
299
diff
changeset
|
759 | * We have counted the lines in the logfile including the header lines. |
4ce46ff3e37d
The LIST LOG command now automatic adjusts the number of output lines and resolution by calculating a reasonable interval between 1 and 60 minutes. Bumped to version 0.2.6
Michiel Broek <mbroek@mbse.eu>
parents:
299
diff
changeset
|
760 | * The header lines should be ignored but there are so few of them, we |
4ce46ff3e37d
The LIST LOG command now automatic adjusts the number of output lines and resolution by calculating a reasonable interval between 1 and 60 minutes. Bumped to version 0.2.6
Michiel Broek <mbroek@mbse.eu>
parents:
299
diff
changeset
|
761 | * just include them in the total. |
4ce46ff3e37d
The LIST LOG command now automatic adjusts the number of output lines and resolution by calculating a reasonable interval between 1 and 60 minutes. Bumped to version 0.2.6
Michiel Broek <mbroek@mbse.eu>
parents:
299
diff
changeset
|
762 | * Now find a reasonable interval of lines to sent to the client. |
4ce46ff3e37d
The LIST LOG command now automatic adjusts the number of output lines and resolution by calculating a reasonable interval between 1 and 60 minutes. Bumped to version 0.2.6
Michiel Broek <mbroek@mbse.eu>
parents:
299
diff
changeset
|
763 | */ |
4ce46ff3e37d
The LIST LOG command now automatic adjusts the number of output lines and resolution by calculating a reasonable interval between 1 and 60 minutes. Bumped to version 0.2.6
Michiel Broek <mbroek@mbse.eu>
parents:
299
diff
changeset
|
764 | for (graphstep = 1; graphstep <= MAX_INTERVALS; graphstep++) { |
4ce46ff3e37d
The LIST LOG command now automatic adjusts the number of output lines and resolution by calculating a reasonable interval between 1 and 60 minutes. Bumped to version 0.2.6
Michiel Broek <mbroek@mbse.eu>
parents:
299
diff
changeset
|
765 | if (lines < GRAPH_DATALINES[graphstep]) { |
4ce46ff3e37d
The LIST LOG command now automatic adjusts the number of output lines and resolution by calculating a reasonable interval between 1 and 60 minutes. Bumped to version 0.2.6
Michiel Broek <mbroek@mbse.eu>
parents:
299
diff
changeset
|
766 | break; |
4ce46ff3e37d
The LIST LOG command now automatic adjusts the number of output lines and resolution by calculating a reasonable interval between 1 and 60 minutes. Bumped to version 0.2.6
Michiel Broek <mbroek@mbse.eu>
parents:
299
diff
changeset
|
767 | } |
4ce46ff3e37d
The LIST LOG command now automatic adjusts the number of output lines and resolution by calculating a reasonable interval between 1 and 60 minutes. Bumped to version 0.2.6
Michiel Broek <mbroek@mbse.eu>
parents:
299
diff
changeset
|
768 | } |
4ce46ff3e37d
The LIST LOG command now automatic adjusts the number of output lines and resolution by calculating a reasonable interval between 1 and 60 minutes. Bumped to version 0.2.6
Michiel Broek <mbroek@mbse.eu>
parents:
299
diff
changeset
|
769 | syslog(LOG_NOTICE, "LIST LOG %s: lines=%d, interval=%d, graphstep=%d", unit->name, lines, GRAPH_INTERVAL[graphstep], graphstep); |
4ce46ff3e37d
The LIST LOG command now automatic adjusts the number of output lines and resolution by calculating a reasonable interval between 1 and 60 minutes. Bumped to version 0.2.6
Michiel Broek <mbroek@mbse.eu>
parents:
299
diff
changeset
|
770 | |
120 | 771 | while (fgets(buffer, sizeof(buffer)-1, fp) != NULL) { |
299
d1c52fb43e30
Show heater/cooler usgae in percent on the web page. Bunped to version 0.2.5
Michiel Broek <mbroek@mbse.eu>
parents:
293
diff
changeset
|
772 | /* |
d1c52fb43e30
Show heater/cooler usgae in percent on the web page. Bunped to version 0.2.5
Michiel Broek <mbroek@mbse.eu>
parents:
293
diff
changeset
|
773 | * 2014-11-15 18:39,BEER,20.312,19.750,20.0,0,NA,NA,NA,78105,NA,NA |
d1c52fb43e30
Show heater/cooler usgae in percent on the web page. Bunped to version 0.2.5
Michiel Broek <mbroek@mbse.eu>
parents:
293
diff
changeset
|
774 | */ |
300
4ce46ff3e37d
The LIST LOG command now automatic adjusts the number of output lines and resolution by calculating a reasonable interval between 1 and 60 minutes. Bumped to version 0.2.6
Michiel Broek <mbroek@mbse.eu>
parents:
299
diff
changeset
|
775 | q[0] = buffer[11]; |
4ce46ff3e37d
The LIST LOG command now automatic adjusts the number of output lines and resolution by calculating a reasonable interval between 1 and 60 minutes. Bumped to version 0.2.6
Michiel Broek <mbroek@mbse.eu>
parents:
299
diff
changeset
|
776 | q[1] = buffer[12]; |
4ce46ff3e37d
The LIST LOG command now automatic adjusts the number of output lines and resolution by calculating a reasonable interval between 1 and 60 minutes. Bumped to version 0.2.6
Michiel Broek <mbroek@mbse.eu>
parents:
299
diff
changeset
|
777 | q[2] = buffer[14]; |
4ce46ff3e37d
The LIST LOG command now automatic adjusts the number of output lines and resolution by calculating a reasonable interval between 1 and 60 minutes. Bumped to version 0.2.6
Michiel Broek <mbroek@mbse.eu>
parents:
299
diff
changeset
|
778 | q[3] = buffer[15]; |
120 | 779 | buffer[strlen(buffer) -1] = '\0'; |
299
d1c52fb43e30
Show heater/cooler usgae in percent on the web page. Bunped to version 0.2.5
Michiel Broek <mbroek@mbse.eu>
parents:
293
diff
changeset
|
780 | date_n = strtok(buffer, ",\0"); /* timestamp */ |
d1c52fb43e30
Show heater/cooler usgae in percent on the web page. Bunped to version 0.2.5
Michiel Broek <mbroek@mbse.eu>
parents:
293
diff
changeset
|
781 | mode_n = strtok(NULL, ",\0"); /* unit mode */ |
d1c52fb43e30
Show heater/cooler usgae in percent on the web page. Bunped to version 0.2.5
Michiel Broek <mbroek@mbse.eu>
parents:
293
diff
changeset
|
782 | air_n = strtok(NULL, ",\0"); /* air temp */ |
d1c52fb43e30
Show heater/cooler usgae in percent on the web page. Bunped to version 0.2.5
Michiel Broek <mbroek@mbse.eu>
parents:
293
diff
changeset
|
783 | beer_n = strtok(NULL, ",\0"); /* beer temp */ |
d1c52fb43e30
Show heater/cooler usgae in percent on the web page. Bunped to version 0.2.5
Michiel Broek <mbroek@mbse.eu>
parents:
293
diff
changeset
|
784 | target_n = strtok(NULL, ",\0"); /* target temp */ |
d1c52fb43e30
Show heater/cooler usgae in percent on the web page. Bunped to version 0.2.5
Michiel Broek <mbroek@mbse.eu>
parents:
293
diff
changeset
|
785 | heater_n = strtok(NULL, ",\0"); /* current heater state */ |
d1c52fb43e30
Show heater/cooler usgae in percent on the web page. Bunped to version 0.2.5
Michiel Broek <mbroek@mbse.eu>
parents:
293
diff
changeset
|
786 | cooler_n = strtok(NULL, ",\0"); /* current cooler state */ |
d1c52fb43e30
Show heater/cooler usgae in percent on the web page. Bunped to version 0.2.5
Michiel Broek <mbroek@mbse.eu>
parents:
293
diff
changeset
|
787 | heater_u = strtok(NULL, ",\0"); /* current fan state */ |
d1c52fb43e30
Show heater/cooler usgae in percent on the web page. Bunped to version 0.2.5
Michiel Broek <mbroek@mbse.eu>
parents:
293
diff
changeset
|
788 | heater_u = strtok(NULL, ",\0"); /* current door state */ |
d1c52fb43e30
Show heater/cooler usgae in percent on the web page. Bunped to version 0.2.5
Michiel Broek <mbroek@mbse.eu>
parents:
293
diff
changeset
|
789 | heater_u = strtok(NULL, ",\0"); /* heater use counter */ |
d1c52fb43e30
Show heater/cooler usgae in percent on the web page. Bunped to version 0.2.5
Michiel Broek <mbroek@mbse.eu>
parents:
293
diff
changeset
|
790 | cooler_u = strtok(NULL, ",\0"); /* cooler use counter */ |
264
91c358556ecf
LIST LOG also output lines on state changes
Michiel Broek <mbroek@mbse.eu>
parents:
261
diff
changeset
|
791 | |
91c358556ecf
LIST LOG also output lines on state changes
Michiel Broek <mbroek@mbse.eu>
parents:
261
diff
changeset
|
792 | if (strncmp(mode_n, (char *)"Mode", 4)) { |
266
07819a7ad3c1
Better log output for web graphs. Webgraphs can now display heater and cooler usage.
Michiel Broek <mbroek@mbse.eu>
parents:
264
diff
changeset
|
793 | /* |
300
4ce46ff3e37d
The LIST LOG command now automatic adjusts the number of output lines and resolution by calculating a reasonable interval between 1 and 60 minutes. Bumped to version 0.2.6
Michiel Broek <mbroek@mbse.eu>
parents:
299
diff
changeset
|
794 | * Output a line at the right intervals |
266
07819a7ad3c1
Better log output for web graphs. Webgraphs can now display heater and cooler usage.
Michiel Broek <mbroek@mbse.eu>
parents:
264
diff
changeset
|
795 | */ |
300
4ce46ff3e37d
The LIST LOG command now automatic adjusts the number of output lines and resolution by calculating a reasonable interval between 1 and 60 minutes. Bumped to version 0.2.6
Michiel Broek <mbroek@mbse.eu>
parents:
299
diff
changeset
|
796 | if (((graphstep == 1)) || |
4ce46ff3e37d
The LIST LOG command now automatic adjusts the number of output lines and resolution by calculating a reasonable interval between 1 and 60 minutes. Bumped to version 0.2.6
Michiel Broek <mbroek@mbse.eu>
parents:
299
diff
changeset
|
797 | ((graphstep == 2) && (q[3] == '0' || q[3] == '5')) || |
4ce46ff3e37d
The LIST LOG command now automatic adjusts the number of output lines and resolution by calculating a reasonable interval between 1 and 60 minutes. Bumped to version 0.2.6
Michiel Broek <mbroek@mbse.eu>
parents:
299
diff
changeset
|
798 | ((graphstep == 3) && ((q[2] == '0' && q[3] == '0') || (q[2] == '1' && q[3] == '5') || (q[2] == '3' && q[3] == '0') || (q[2] == '4' && q[3] == '5'))) || |
4ce46ff3e37d
The LIST LOG command now automatic adjusts the number of output lines and resolution by calculating a reasonable interval between 1 and 60 minutes. Bumped to version 0.2.6
Michiel Broek <mbroek@mbse.eu>
parents:
299
diff
changeset
|
799 | ((graphstep == 4) && ((q[2] == '0' && q[3] == '0') || (q[2] == '3' && q[3] == '0'))) || |
4ce46ff3e37d
The LIST LOG command now automatic adjusts the number of output lines and resolution by calculating a reasonable interval between 1 and 60 minutes. Bumped to version 0.2.6
Michiel Broek <mbroek@mbse.eu>
parents:
299
diff
changeset
|
800 | ((graphstep == 5) && (q[2] == '0' && q[3] == '0')) ) { |
4ce46ff3e37d
The LIST LOG command now automatic adjusts the number of output lines and resolution by calculating a reasonable interval between 1 and 60 minutes. Bumped to version 0.2.6
Michiel Broek <mbroek@mbse.eu>
parents:
299
diff
changeset
|
801 | heat_used = cool_used = 0; |
4ce46ff3e37d
The LIST LOG command now automatic adjusts the number of output lines and resolution by calculating a reasonable interval between 1 and 60 minutes. Bumped to version 0.2.6
Michiel Broek <mbroek@mbse.eu>
parents:
299
diff
changeset
|
802 | if (strcmp(heater_u, "NA") && (sscanf(heater_u, "%d", &h) == 1)) { |
4ce46ff3e37d
The LIST LOG command now automatic adjusts the number of output lines and resolution by calculating a reasonable interval between 1 and 60 minutes. Bumped to version 0.2.6
Michiel Broek <mbroek@mbse.eu>
parents:
299
diff
changeset
|
803 | if (h && heater_l) { |
4ce46ff3e37d
The LIST LOG command now automatic adjusts the number of output lines and resolution by calculating a reasonable interval between 1 and 60 minutes. Bumped to version 0.2.6
Michiel Broek <mbroek@mbse.eu>
parents:
299
diff
changeset
|
804 | heat_used = ((h - heater_l) * 100) / (GRAPH_INTERVAL[graphstep] * 60); |
299
d1c52fb43e30
Show heater/cooler usgae in percent on the web page. Bunped to version 0.2.5
Michiel Broek <mbroek@mbse.eu>
parents:
293
diff
changeset
|
805 | } |
300
4ce46ff3e37d
The LIST LOG command now automatic adjusts the number of output lines and resolution by calculating a reasonable interval between 1 and 60 minutes. Bumped to version 0.2.6
Michiel Broek <mbroek@mbse.eu>
parents:
299
diff
changeset
|
806 | } |
4ce46ff3e37d
The LIST LOG command now automatic adjusts the number of output lines and resolution by calculating a reasonable interval between 1 and 60 minutes. Bumped to version 0.2.6
Michiel Broek <mbroek@mbse.eu>
parents:
299
diff
changeset
|
807 | if (strcmp(cooler_u, "NA") && (sscanf(cooler_u, "%d", &c) == 1)) { |
4ce46ff3e37d
The LIST LOG command now automatic adjusts the number of output lines and resolution by calculating a reasonable interval between 1 and 60 minutes. Bumped to version 0.2.6
Michiel Broek <mbroek@mbse.eu>
parents:
299
diff
changeset
|
808 | if (c && cooler_l) { |
4ce46ff3e37d
The LIST LOG command now automatic adjusts the number of output lines and resolution by calculating a reasonable interval between 1 and 60 minutes. Bumped to version 0.2.6
Michiel Broek <mbroek@mbse.eu>
parents:
299
diff
changeset
|
809 | cool_used = ((c - cooler_l) * 100) / (GRAPH_INTERVAL[graphstep] * 60); |
299
d1c52fb43e30
Show heater/cooler usgae in percent on the web page. Bunped to version 0.2.5
Michiel Broek <mbroek@mbse.eu>
parents:
293
diff
changeset
|
810 | } |
300
4ce46ff3e37d
The LIST LOG command now automatic adjusts the number of output lines and resolution by calculating a reasonable interval between 1 and 60 minutes. Bumped to version 0.2.6
Michiel Broek <mbroek@mbse.eu>
parents:
299
diff
changeset
|
811 | } |
4ce46ff3e37d
The LIST LOG command now automatic adjusts the number of output lines and resolution by calculating a reasonable interval between 1 and 60 minutes. Bumped to version 0.2.6
Michiel Broek <mbroek@mbse.eu>
parents:
299
diff
changeset
|
812 | snprintf(outbuf, 255, "%s,%s,%s,%s,%s,%s,%s,%d,%d", |
299
d1c52fb43e30
Show heater/cooler usgae in percent on the web page. Bunped to version 0.2.5
Michiel Broek <mbroek@mbse.eu>
parents:
293
diff
changeset
|
813 | date_n, mode_n, air_n, beer_n, target_n, heater_n, cooler_n, heat_used, cool_used); |
300
4ce46ff3e37d
The LIST LOG command now automatic adjusts the number of output lines and resolution by calculating a reasonable interval between 1 and 60 minutes. Bumped to version 0.2.6
Michiel Broek <mbroek@mbse.eu>
parents:
299
diff
changeset
|
814 | srv_send(outbuf); |
4ce46ff3e37d
The LIST LOG command now automatic adjusts the number of output lines and resolution by calculating a reasonable interval between 1 and 60 minutes. Bumped to version 0.2.6
Michiel Broek <mbroek@mbse.eu>
parents:
299
diff
changeset
|
815 | if (h && strcmp(heater_u, "NA")) |
4ce46ff3e37d
The LIST LOG command now automatic adjusts the number of output lines and resolution by calculating a reasonable interval between 1 and 60 minutes. Bumped to version 0.2.6
Michiel Broek <mbroek@mbse.eu>
parents:
299
diff
changeset
|
816 | heater_l = h; |
4ce46ff3e37d
The LIST LOG command now automatic adjusts the number of output lines and resolution by calculating a reasonable interval between 1 and 60 minutes. Bumped to version 0.2.6
Michiel Broek <mbroek@mbse.eu>
parents:
299
diff
changeset
|
817 | if (c & strcmp(cooler_u, "NA")) |
4ce46ff3e37d
The LIST LOG command now automatic adjusts the number of output lines and resolution by calculating a reasonable interval between 1 and 60 minutes. Bumped to version 0.2.6
Michiel Broek <mbroek@mbse.eu>
parents:
299
diff
changeset
|
818 | cooler_l = c; |
120 | 819 | } |
266
07819a7ad3c1
Better log output for web graphs. Webgraphs can now display heater and cooler usage.
Michiel Broek <mbroek@mbse.eu>
parents:
264
diff
changeset
|
820 | } |
120 | 821 | } |
822 | } | |
823 | free(filename); | |
824 | filename = NULL; | |
825 | srv_send((char *)"."); | |
259
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
826 | return 1; |
191
c74bbc24a1c8
Client/Server communication is now almost final
Michiel Broek <mbroek@mbse.eu>
parents:
189
diff
changeset
|
827 | } |
120 | 828 | |
213
2317b8d644fa
Code cleanup, streamlined error messages.
Michiel Broek <mbroek@mbse.eu>
parents:
209
diff
changeset
|
829 | srv_send((char *)"504 Subcommand error"); |
191
c74bbc24a1c8
Client/Server communication is now almost final
Michiel Broek <mbroek@mbse.eu>
parents:
189
diff
changeset
|
830 | return 1; |
c74bbc24a1c8
Client/Server communication is now almost final
Michiel Broek <mbroek@mbse.eu>
parents:
189
diff
changeset
|
831 | } |
c74bbc24a1c8
Client/Server communication is now almost final
Michiel Broek <mbroek@mbse.eu>
parents:
189
diff
changeset
|
832 | |
c74bbc24a1c8
Client/Server communication is now almost final
Michiel Broek <mbroek@mbse.eu>
parents:
189
diff
changeset
|
833 | |
c74bbc24a1c8
Client/Server communication is now almost final
Michiel Broek <mbroek@mbse.eu>
parents:
189
diff
changeset
|
834 | |
c74bbc24a1c8
Client/Server communication is now almost final
Michiel Broek <mbroek@mbse.eu>
parents:
189
diff
changeset
|
835 | /* |
c74bbc24a1c8
Client/Server communication is now almost final
Michiel Broek <mbroek@mbse.eu>
parents:
189
diff
changeset
|
836 | * PROFILE ADD name Add a new profile |
c74bbc24a1c8
Client/Server communication is now almost final
Michiel Broek <mbroek@mbse.eu>
parents:
189
diff
changeset
|
837 | * PROFILE DEL uuid Delete profile with uuid |
c74bbc24a1c8
Client/Server communication is now almost final
Michiel Broek <mbroek@mbse.eu>
parents:
189
diff
changeset
|
838 | * PROFILE LIST List available profiles |
258
e02393b29733
Updated web dashboard layout
Michiel Broek <mbroek@mbse.eu>
parents:
249
diff
changeset
|
839 | * PROFILE GET uuid Get profile record |
e02393b29733
Updated web dashboard layout
Michiel Broek <mbroek@mbse.eu>
parents:
249
diff
changeset
|
840 | * PROFILE PUT uuid Put profile record |
191
c74bbc24a1c8
Client/Server communication is now almost final
Michiel Broek <mbroek@mbse.eu>
parents:
189
diff
changeset
|
841 | * PROFILE GETS uuid Get profile steps list |
c74bbc24a1c8
Client/Server communication is now almost final
Michiel Broek <mbroek@mbse.eu>
parents:
189
diff
changeset
|
842 | * PROFILE PUTS uuid Put profile steps list |
c74bbc24a1c8
Client/Server communication is now almost final
Michiel Broek <mbroek@mbse.eu>
parents:
189
diff
changeset
|
843 | */ |
c74bbc24a1c8
Client/Server communication is now almost final
Michiel Broek <mbroek@mbse.eu>
parents:
189
diff
changeset
|
844 | int cmd_profile(char *buf) |
c74bbc24a1c8
Client/Server communication is now almost final
Michiel Broek <mbroek@mbse.eu>
parents:
189
diff
changeset
|
845 | { |
192
5d013b4a9138
Added PROFILE GET and PROFILE PUT commands. Adjusted the web interface
Michiel Broek <mbroek@mbse.eu>
parents:
191
diff
changeset
|
846 | char ibuf[SS_BUFSIZE], *sstep, *rest, *targ, *param, *kwd, *val; |
191
c74bbc24a1c8
Client/Server communication is now almost final
Michiel Broek <mbroek@mbse.eu>
parents:
189
diff
changeset
|
847 | int i, j, rlen, istep, irest; |
192
5d013b4a9138
Added PROFILE GET and PROFILE PUT commands. Adjusted the web interface
Michiel Broek <mbroek@mbse.eu>
parents:
191
diff
changeset
|
848 | float ftarg, fval; |
191
c74bbc24a1c8
Client/Server communication is now almost final
Michiel Broek <mbroek@mbse.eu>
parents:
189
diff
changeset
|
849 | socklen_t fromlen; |
c74bbc24a1c8
Client/Server communication is now almost final
Michiel Broek <mbroek@mbse.eu>
parents:
189
diff
changeset
|
850 | char *opt; |
c74bbc24a1c8
Client/Server communication is now almost final
Michiel Broek <mbroek@mbse.eu>
parents:
189
diff
changeset
|
851 | profiles_list *profile, *tmpp; |
c74bbc24a1c8
Client/Server communication is now almost final
Michiel Broek <mbroek@mbse.eu>
parents:
189
diff
changeset
|
852 | prof_step *step, *olds; |
c74bbc24a1c8
Client/Server communication is now almost final
Michiel Broek <mbroek@mbse.eu>
parents:
189
diff
changeset
|
853 | uuid_t uu; |
c74bbc24a1c8
Client/Server communication is now almost final
Michiel Broek <mbroek@mbse.eu>
parents:
189
diff
changeset
|
854 | |
c74bbc24a1c8
Client/Server communication is now almost final
Michiel Broek <mbroek@mbse.eu>
parents:
189
diff
changeset
|
855 | opt = strtok(buf, " \0"); |
c74bbc24a1c8
Client/Server communication is now almost final
Michiel Broek <mbroek@mbse.eu>
parents:
189
diff
changeset
|
856 | opt = strtok(NULL, " \0"); |
c74bbc24a1c8
Client/Server communication is now almost final
Michiel Broek <mbroek@mbse.eu>
parents:
189
diff
changeset
|
857 | |
c74bbc24a1c8
Client/Server communication is now almost final
Michiel Broek <mbroek@mbse.eu>
parents:
189
diff
changeset
|
858 | if (opt == NULL) { |
c74bbc24a1c8
Client/Server communication is now almost final
Michiel Broek <mbroek@mbse.eu>
parents:
189
diff
changeset
|
859 | srv_send((char *)"501 Subcommand missing"); |
c74bbc24a1c8
Client/Server communication is now almost final
Michiel Broek <mbroek@mbse.eu>
parents:
189
diff
changeset
|
860 | return 1; |
c74bbc24a1c8
Client/Server communication is now almost final
Michiel Broek <mbroek@mbse.eu>
parents:
189
diff
changeset
|
861 | } |
c74bbc24a1c8
Client/Server communication is now almost final
Michiel Broek <mbroek@mbse.eu>
parents:
189
diff
changeset
|
862 | |
c74bbc24a1c8
Client/Server communication is now almost final
Michiel Broek <mbroek@mbse.eu>
parents:
189
diff
changeset
|
863 | if (strcmp(opt, (char *)"LIST") == 0) { |
86
3d7a241329e2
Using final user paths for log, configuration and profiles
Michiel Broek <mbroek@mbse.eu>
parents:
85
diff
changeset
|
864 | /* |
92 | 865 | * Fermenting profiles |
86
3d7a241329e2
Using final user paths for log, configuration and profiles
Michiel Broek <mbroek@mbse.eu>
parents:
85
diff
changeset
|
866 | */ |
213
2317b8d644fa
Code cleanup, streamlined error messages.
Michiel Broek <mbroek@mbse.eu>
parents:
209
diff
changeset
|
867 | srv_send((char *)"212 Profiles list follows:"); |
92 | 868 | for (profile = Config.profiles; profile; profile = profile->next) { |
124
350401bac16e
Added maintenance tabs and extended server output
Michiel Broek <mbroek@mbse.eu>
parents:
120
diff
changeset
|
869 | j = 0; |
350401bac16e
Added maintenance tabs and extended server output
Michiel Broek <mbroek@mbse.eu>
parents:
120
diff
changeset
|
870 | for (step = profile->steps; step; step = step->next) |
350401bac16e
Added maintenance tabs and extended server output
Michiel Broek <mbroek@mbse.eu>
parents:
120
diff
changeset
|
871 | j++; |
136
264e5ee5abfc
Profiles now have a busy state
Michiel Broek <mbroek@mbse.eu>
parents:
133
diff
changeset
|
872 | srv_send((char *)"%s,%s,%d,%d", profile->uuid, profile->name, j, profile->busy); |
86
3d7a241329e2
Using final user paths for log, configuration and profiles
Michiel Broek <mbroek@mbse.eu>
parents:
85
diff
changeset
|
873 | } |
92 | 874 | srv_send((char *)"."); |
191
c74bbc24a1c8
Client/Server communication is now almost final
Michiel Broek <mbroek@mbse.eu>
parents:
189
diff
changeset
|
875 | return 1; |
c74bbc24a1c8
Client/Server communication is now almost final
Michiel Broek <mbroek@mbse.eu>
parents:
189
diff
changeset
|
876 | } |
c74bbc24a1c8
Client/Server communication is now almost final
Michiel Broek <mbroek@mbse.eu>
parents:
189
diff
changeset
|
877 | |
c74bbc24a1c8
Client/Server communication is now almost final
Michiel Broek <mbroek@mbse.eu>
parents:
189
diff
changeset
|
878 | param = strtok(NULL, "\0"); |
c74bbc24a1c8
Client/Server communication is now almost final
Michiel Broek <mbroek@mbse.eu>
parents:
189
diff
changeset
|
879 | if (param == NULL) { |
213
2317b8d644fa
Code cleanup, streamlined error messages.
Michiel Broek <mbroek@mbse.eu>
parents:
209
diff
changeset
|
880 | srv_send((char *)"502 Parameter missing"); |
191
c74bbc24a1c8
Client/Server communication is now almost final
Michiel Broek <mbroek@mbse.eu>
parents:
189
diff
changeset
|
881 | return 1; |
81 | 882 | } |
883 | ||
191
c74bbc24a1c8
Client/Server communication is now almost final
Michiel Broek <mbroek@mbse.eu>
parents:
189
diff
changeset
|
884 | if (strcmp(opt, (char *)"ADD") == 0) { |
c74bbc24a1c8
Client/Server communication is now almost final
Michiel Broek <mbroek@mbse.eu>
parents:
189
diff
changeset
|
885 | profile = (profiles_list *)malloc(sizeof(profiles_list)); |
c74bbc24a1c8
Client/Server communication is now almost final
Michiel Broek <mbroek@mbse.eu>
parents:
189
diff
changeset
|
886 | profile->next = NULL; |
c74bbc24a1c8
Client/Server communication is now almost final
Michiel Broek <mbroek@mbse.eu>
parents:
189
diff
changeset
|
887 | profile->version = 1; |
c74bbc24a1c8
Client/Server communication is now almost final
Michiel Broek <mbroek@mbse.eu>
parents:
189
diff
changeset
|
888 | profile->uuid = malloc(37); |
c74bbc24a1c8
Client/Server communication is now almost final
Michiel Broek <mbroek@mbse.eu>
parents:
189
diff
changeset
|
889 | uuid_generate(uu); |
c74bbc24a1c8
Client/Server communication is now almost final
Michiel Broek <mbroek@mbse.eu>
parents:
189
diff
changeset
|
890 | uuid_unparse(uu, profile->uuid); |
c74bbc24a1c8
Client/Server communication is now almost final
Michiel Broek <mbroek@mbse.eu>
parents:
189
diff
changeset
|
891 | profile->name = xstrcpy(param); |
c74bbc24a1c8
Client/Server communication is now almost final
Michiel Broek <mbroek@mbse.eu>
parents:
189
diff
changeset
|
892 | profile->busy = 0; |
c74bbc24a1c8
Client/Server communication is now almost final
Michiel Broek <mbroek@mbse.eu>
parents:
189
diff
changeset
|
893 | profile->inittemp = 20.0; |
c74bbc24a1c8
Client/Server communication is now almost final
Michiel Broek <mbroek@mbse.eu>
parents:
189
diff
changeset
|
894 | profile->steps = NULL; |
c74bbc24a1c8
Client/Server communication is now almost final
Michiel Broek <mbroek@mbse.eu>
parents:
189
diff
changeset
|
895 | if (Config.profiles == NULL) { |
c74bbc24a1c8
Client/Server communication is now almost final
Michiel Broek <mbroek@mbse.eu>
parents:
189
diff
changeset
|
896 | Config.profiles = profile; |
c74bbc24a1c8
Client/Server communication is now almost final
Michiel Broek <mbroek@mbse.eu>
parents:
189
diff
changeset
|
897 | } else { |
c74bbc24a1c8
Client/Server communication is now almost final
Michiel Broek <mbroek@mbse.eu>
parents:
189
diff
changeset
|
898 | for (tmpp = Config.profiles; tmpp; tmpp = tmpp->next) { |
c74bbc24a1c8
Client/Server communication is now almost final
Michiel Broek <mbroek@mbse.eu>
parents:
189
diff
changeset
|
899 | if (tmpp->next == NULL) { |
c74bbc24a1c8
Client/Server communication is now almost final
Michiel Broek <mbroek@mbse.eu>
parents:
189
diff
changeset
|
900 | tmpp->next = profile; |
c74bbc24a1c8
Client/Server communication is now almost final
Michiel Broek <mbroek@mbse.eu>
parents:
189
diff
changeset
|
901 | break; |
c74bbc24a1c8
Client/Server communication is now almost final
Michiel Broek <mbroek@mbse.eu>
parents:
189
diff
changeset
|
902 | } |
c74bbc24a1c8
Client/Server communication is now almost final
Michiel Broek <mbroek@mbse.eu>
parents:
189
diff
changeset
|
903 | } |
c74bbc24a1c8
Client/Server communication is now almost final
Michiel Broek <mbroek@mbse.eu>
parents:
189
diff
changeset
|
904 | } |
81 | 905 | |
213
2317b8d644fa
Code cleanup, streamlined error messages.
Michiel Broek <mbroek@mbse.eu>
parents:
209
diff
changeset
|
906 | syslog(LOG_NOTICE, "Profile %s added", profile->uuid); |
2317b8d644fa
Code cleanup, streamlined error messages.
Michiel Broek <mbroek@mbse.eu>
parents:
209
diff
changeset
|
907 | srv_send((char *)"211 Profile %s added", profile->uuid); |
191
c74bbc24a1c8
Client/Server communication is now almost final
Michiel Broek <mbroek@mbse.eu>
parents:
189
diff
changeset
|
908 | return 0; |
81 | 909 | |
910 | ||
191
c74bbc24a1c8
Client/Server communication is now almost final
Michiel Broek <mbroek@mbse.eu>
parents:
189
diff
changeset
|
911 | } else if (strcmp(opt, (char *)"DEL") == 0) { |
c74bbc24a1c8
Client/Server communication is now almost final
Michiel Broek <mbroek@mbse.eu>
parents:
189
diff
changeset
|
912 | if (delete_Profile(param)) { |
213
2317b8d644fa
Code cleanup, streamlined error messages.
Michiel Broek <mbroek@mbse.eu>
parents:
209
diff
changeset
|
913 | syslog(LOG_NOTICE, "Profile %s deleted", param); |
191
c74bbc24a1c8
Client/Server communication is now almost final
Michiel Broek <mbroek@mbse.eu>
parents:
189
diff
changeset
|
914 | srv_send((char *)"211 Profile %s deleted", param); |
c74bbc24a1c8
Client/Server communication is now almost final
Michiel Broek <mbroek@mbse.eu>
parents:
189
diff
changeset
|
915 | return 0; |
c74bbc24a1c8
Client/Server communication is now almost final
Michiel Broek <mbroek@mbse.eu>
parents:
189
diff
changeset
|
916 | } else { |
213
2317b8d644fa
Code cleanup, streamlined error messages.
Michiel Broek <mbroek@mbse.eu>
parents:
209
diff
changeset
|
917 | srv_send((char *)"440 No such profile"); |
132
8bd209d1c020
Added some profile commands to the server. Profile names can be changed from the web interface. Removed obsolete commands.
Michiel Broek <mbroek@mbse.eu>
parents:
131
diff
changeset
|
918 | return 1; |
8bd209d1c020
Added some profile commands to the server. Profile names can be changed from the web interface. Removed obsolete commands.
Michiel Broek <mbroek@mbse.eu>
parents:
131
diff
changeset
|
919 | } |
191
c74bbc24a1c8
Client/Server communication is now almost final
Michiel Broek <mbroek@mbse.eu>
parents:
189
diff
changeset
|
920 | |
192
5d013b4a9138
Added PROFILE GET and PROFILE PUT commands. Adjusted the web interface
Michiel Broek <mbroek@mbse.eu>
parents:
191
diff
changeset
|
921 | } else if (strcmp(opt, (char *)"GET") == 0) { |
5d013b4a9138
Added PROFILE GET and PROFILE PUT commands. Adjusted the web interface
Michiel Broek <mbroek@mbse.eu>
parents:
191
diff
changeset
|
922 | for (profile = Config.profiles; profile; profile = profile->next) { |
5d013b4a9138
Added PROFILE GET and PROFILE PUT commands. Adjusted the web interface
Michiel Broek <mbroek@mbse.eu>
parents:
191
diff
changeset
|
923 | if (strcmp(profile->uuid, param) == 0) { |
213
2317b8d644fa
Code cleanup, streamlined error messages.
Michiel Broek <mbroek@mbse.eu>
parents:
209
diff
changeset
|
924 | srv_send((char *)"213 Profile record follows:"); |
192
5d013b4a9138
Added PROFILE GET and PROFILE PUT commands. Adjusted the web interface
Michiel Broek <mbroek@mbse.eu>
parents:
191
diff
changeset
|
925 | srv_send((char *)"UUID,%s", profile->uuid); |
5d013b4a9138
Added PROFILE GET and PROFILE PUT commands. Adjusted the web interface
Michiel Broek <mbroek@mbse.eu>
parents:
191
diff
changeset
|
926 | srv_send((char *)"NAME,%s", profile->name); |
5d013b4a9138
Added PROFILE GET and PROFILE PUT commands. Adjusted the web interface
Michiel Broek <mbroek@mbse.eu>
parents:
191
diff
changeset
|
927 | srv_send((char *)"INITTEMP,%.1f", profile->inittemp); |
5d013b4a9138
Added PROFILE GET and PROFILE PUT commands. Adjusted the web interface
Michiel Broek <mbroek@mbse.eu>
parents:
191
diff
changeset
|
928 | srv_send((char *)"."); |
5d013b4a9138
Added PROFILE GET and PROFILE PUT commands. Adjusted the web interface
Michiel Broek <mbroek@mbse.eu>
parents:
191
diff
changeset
|
929 | return 1; |
5d013b4a9138
Added PROFILE GET and PROFILE PUT commands. Adjusted the web interface
Michiel Broek <mbroek@mbse.eu>
parents:
191
diff
changeset
|
930 | } |
5d013b4a9138
Added PROFILE GET and PROFILE PUT commands. Adjusted the web interface
Michiel Broek <mbroek@mbse.eu>
parents:
191
diff
changeset
|
931 | } |
5d013b4a9138
Added PROFILE GET and PROFILE PUT commands. Adjusted the web interface
Michiel Broek <mbroek@mbse.eu>
parents:
191
diff
changeset
|
932 | srv_send((char *)"440 No such profile"); |
5d013b4a9138
Added PROFILE GET and PROFILE PUT commands. Adjusted the web interface
Michiel Broek <mbroek@mbse.eu>
parents:
191
diff
changeset
|
933 | return 1; |
5d013b4a9138
Added PROFILE GET and PROFILE PUT commands. Adjusted the web interface
Michiel Broek <mbroek@mbse.eu>
parents:
191
diff
changeset
|
934 | |
5d013b4a9138
Added PROFILE GET and PROFILE PUT commands. Adjusted the web interface
Michiel Broek <mbroek@mbse.eu>
parents:
191
diff
changeset
|
935 | } else if (strcmp(opt, (char *)"PUT") == 0) { |
5d013b4a9138
Added PROFILE GET and PROFILE PUT commands. Adjusted the web interface
Michiel Broek <mbroek@mbse.eu>
parents:
191
diff
changeset
|
936 | for (profile = Config.profiles; profile; profile = profile->next) { |
5d013b4a9138
Added PROFILE GET and PROFILE PUT commands. Adjusted the web interface
Michiel Broek <mbroek@mbse.eu>
parents:
191
diff
changeset
|
937 | if (strcmp(profile->uuid, param) == 0) { |
5d013b4a9138
Added PROFILE GET and PROFILE PUT commands. Adjusted the web interface
Michiel Broek <mbroek@mbse.eu>
parents:
191
diff
changeset
|
938 | while (1) { |
5d013b4a9138
Added PROFILE GET and PROFILE PUT commands. Adjusted the web interface
Michiel Broek <mbroek@mbse.eu>
parents:
191
diff
changeset
|
939 | memset((char *)&ibuf, 0, SS_BUFSIZE); |
5d013b4a9138
Added PROFILE GET and PROFILE PUT commands. Adjusted the web interface
Michiel Broek <mbroek@mbse.eu>
parents:
191
diff
changeset
|
940 | fromlen = sizeof(peeraddr_in); |
5d013b4a9138
Added PROFILE GET and PROFILE PUT commands. Adjusted the web interface
Michiel Broek <mbroek@mbse.eu>
parents:
191
diff
changeset
|
941 | rlen = recvfrom(s, ibuf, sizeof(ibuf) -1, 0, (struct sockaddr *)&peeraddr_in, &fromlen); |
5d013b4a9138
Added PROFILE GET and PROFILE PUT commands. Adjusted the web interface
Michiel Broek <mbroek@mbse.eu>
parents:
191
diff
changeset
|
942 | if (rlen == -1) { |
268
dda91dfa4aa8
All syslog logging only to LOG_NOTICE
Michiel Broek <mbroek@mbse.eu>
parents:
266
diff
changeset
|
943 | syslog(LOG_NOTICE, "recvfrom(): %s", strerror(errno)); |
192
5d013b4a9138
Added PROFILE GET and PROFILE PUT commands. Adjusted the web interface
Michiel Broek <mbroek@mbse.eu>
parents:
191
diff
changeset
|
944 | srv_send((char *)"518 recfrom(): %s", strerror(errno)); |
5d013b4a9138
Added PROFILE GET and PROFILE PUT commands. Adjusted the web interface
Michiel Broek <mbroek@mbse.eu>
parents:
191
diff
changeset
|
945 | return 1; |
5d013b4a9138
Added PROFILE GET and PROFILE PUT commands. Adjusted the web interface
Michiel Broek <mbroek@mbse.eu>
parents:
191
diff
changeset
|
946 | } |
5d013b4a9138
Added PROFILE GET and PROFILE PUT commands. Adjusted the web interface
Michiel Broek <mbroek@mbse.eu>
parents:
191
diff
changeset
|
947 | for (i = 0; i < strlen(ibuf); i++) { |
5d013b4a9138
Added PROFILE GET and PROFILE PUT commands. Adjusted the web interface
Michiel Broek <mbroek@mbse.eu>
parents:
191
diff
changeset
|
948 | if (ibuf[i] == '\n') |
5d013b4a9138
Added PROFILE GET and PROFILE PUT commands. Adjusted the web interface
Michiel Broek <mbroek@mbse.eu>
parents:
191
diff
changeset
|
949 | ibuf[i] = '\0'; |
5d013b4a9138
Added PROFILE GET and PROFILE PUT commands. Adjusted the web interface
Michiel Broek <mbroek@mbse.eu>
parents:
191
diff
changeset
|
950 | if (ibuf[i] == '\r') |
5d013b4a9138
Added PROFILE GET and PROFILE PUT commands. Adjusted the web interface
Michiel Broek <mbroek@mbse.eu>
parents:
191
diff
changeset
|
951 | ibuf[i] = '\0'; |
5d013b4a9138
Added PROFILE GET and PROFILE PUT commands. Adjusted the web interface
Michiel Broek <mbroek@mbse.eu>
parents:
191
diff
changeset
|
952 | } |
5d013b4a9138
Added PROFILE GET and PROFILE PUT commands. Adjusted the web interface
Michiel Broek <mbroek@mbse.eu>
parents:
191
diff
changeset
|
953 | for (i = strlen(ibuf) -1; i > 0; i--) { |
5d013b4a9138
Added PROFILE GET and PROFILE PUT commands. Adjusted the web interface
Michiel Broek <mbroek@mbse.eu>
parents:
191
diff
changeset
|
954 | if (ibuf[i] == ' ') |
5d013b4a9138
Added PROFILE GET and PROFILE PUT commands. Adjusted the web interface
Michiel Broek <mbroek@mbse.eu>
parents:
191
diff
changeset
|
955 | ibuf[i] = '\0'; |
5d013b4a9138
Added PROFILE GET and PROFILE PUT commands. Adjusted the web interface
Michiel Broek <mbroek@mbse.eu>
parents:
191
diff
changeset
|
956 | else |
5d013b4a9138
Added PROFILE GET and PROFILE PUT commands. Adjusted the web interface
Michiel Broek <mbroek@mbse.eu>
parents:
191
diff
changeset
|
957 | break; |
5d013b4a9138
Added PROFILE GET and PROFILE PUT commands. Adjusted the web interface
Michiel Broek <mbroek@mbse.eu>
parents:
191
diff
changeset
|
958 | } |
5d013b4a9138
Added PROFILE GET and PROFILE PUT commands. Adjusted the web interface
Michiel Broek <mbroek@mbse.eu>
parents:
191
diff
changeset
|
959 | if (strlen(ibuf)) { |
5d013b4a9138
Added PROFILE GET and PROFILE PUT commands. Adjusted the web interface
Michiel Broek <mbroek@mbse.eu>
parents:
191
diff
changeset
|
960 | if (debug) { |
5d013b4a9138
Added PROFILE GET and PROFILE PUT commands. Adjusted the web interface
Michiel Broek <mbroek@mbse.eu>
parents:
191
diff
changeset
|
961 | syslog(LOG_NOTICE, "recv: \"%s\"", ibuf); |
5d013b4a9138
Added PROFILE GET and PROFILE PUT commands. Adjusted the web interface
Michiel Broek <mbroek@mbse.eu>
parents:
191
diff
changeset
|
962 | fprintf(stdout, "recv: \"%s\"\n", ibuf); |
5d013b4a9138
Added PROFILE GET and PROFILE PUT commands. Adjusted the web interface
Michiel Broek <mbroek@mbse.eu>
parents:
191
diff
changeset
|
963 | } |
5d013b4a9138
Added PROFILE GET and PROFILE PUT commands. Adjusted the web interface
Michiel Broek <mbroek@mbse.eu>
parents:
191
diff
changeset
|
964 | if (strcmp(ibuf, (char *)".") == 0) { |
213
2317b8d644fa
Code cleanup, streamlined error messages.
Michiel Broek <mbroek@mbse.eu>
parents:
209
diff
changeset
|
965 | srv_send((char *)"219 Accepted Profile record"); |
192
5d013b4a9138
Added PROFILE GET and PROFILE PUT commands. Adjusted the web interface
Michiel Broek <mbroek@mbse.eu>
parents:
191
diff
changeset
|
966 | return 0; |
5d013b4a9138
Added PROFILE GET and PROFILE PUT commands. Adjusted the web interface
Michiel Broek <mbroek@mbse.eu>
parents:
191
diff
changeset
|
967 | } |
5d013b4a9138
Added PROFILE GET and PROFILE PUT commands. Adjusted the web interface
Michiel Broek <mbroek@mbse.eu>
parents:
191
diff
changeset
|
968 | kwd = strtok(ibuf, ",\0"); |
5d013b4a9138
Added PROFILE GET and PROFILE PUT commands. Adjusted the web interface
Michiel Broek <mbroek@mbse.eu>
parents:
191
diff
changeset
|
969 | val = strtok(NULL, "\0"); |
5d013b4a9138
Added PROFILE GET and PROFILE PUT commands. Adjusted the web interface
Michiel Broek <mbroek@mbse.eu>
parents:
191
diff
changeset
|
970 | if (kwd && val) { |
5d013b4a9138
Added PROFILE GET and PROFILE PUT commands. Adjusted the web interface
Michiel Broek <mbroek@mbse.eu>
parents:
191
diff
changeset
|
971 | if (strcmp(kwd, (char *)"NAME") == 0) { |
279
4c505414435c
PROFILE PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
278
diff
changeset
|
972 | if (profile->name) { |
4c505414435c
PROFILE PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
278
diff
changeset
|
973 | if (strcmp(profile->name, val)) |
4c505414435c
PROFILE PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
278
diff
changeset
|
974 | syslog(LOG_NOTICE, "Profile %s name `%s' to `%s'", profile->uuid, profile->name, val); |
192
5d013b4a9138
Added PROFILE GET and PROFILE PUT commands. Adjusted the web interface
Michiel Broek <mbroek@mbse.eu>
parents:
191
diff
changeset
|
975 | free(profile->name); |
279
4c505414435c
PROFILE PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
278
diff
changeset
|
976 | } |
192
5d013b4a9138
Added PROFILE GET and PROFILE PUT commands. Adjusted the web interface
Michiel Broek <mbroek@mbse.eu>
parents:
191
diff
changeset
|
977 | profile->name = xstrcpy(val); |
5d013b4a9138
Added PROFILE GET and PROFILE PUT commands. Adjusted the web interface
Michiel Broek <mbroek@mbse.eu>
parents:
191
diff
changeset
|
978 | } else if (strcmp(kwd, (char *)"INITTEMP") == 0) { |
279
4c505414435c
PROFILE PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
278
diff
changeset
|
979 | if (sscanf(val, "%f", &fval) == 1) { |
4c505414435c
PROFILE PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
278
diff
changeset
|
980 | if (profile->inittemp != fval) |
4c505414435c
PROFILE PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
278
diff
changeset
|
981 | syslog(LOG_NOTICE, "Profile %s initial temperature %.1f to %.1f", profile->uuid, profile->inittemp, fval); |
192
5d013b4a9138
Added PROFILE GET and PROFILE PUT commands. Adjusted the web interface
Michiel Broek <mbroek@mbse.eu>
parents:
191
diff
changeset
|
982 | profile->inittemp = fval; |
279
4c505414435c
PROFILE PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
278
diff
changeset
|
983 | } |
192
5d013b4a9138
Added PROFILE GET and PROFILE PUT commands. Adjusted the web interface
Michiel Broek <mbroek@mbse.eu>
parents:
191
diff
changeset
|
984 | } |
5d013b4a9138
Added PROFILE GET and PROFILE PUT commands. Adjusted the web interface
Michiel Broek <mbroek@mbse.eu>
parents:
191
diff
changeset
|
985 | } |
5d013b4a9138
Added PROFILE GET and PROFILE PUT commands. Adjusted the web interface
Michiel Broek <mbroek@mbse.eu>
parents:
191
diff
changeset
|
986 | } |
5d013b4a9138
Added PROFILE GET and PROFILE PUT commands. Adjusted the web interface
Michiel Broek <mbroek@mbse.eu>
parents:
191
diff
changeset
|
987 | } |
5d013b4a9138
Added PROFILE GET and PROFILE PUT commands. Adjusted the web interface
Michiel Broek <mbroek@mbse.eu>
parents:
191
diff
changeset
|
988 | } |
5d013b4a9138
Added PROFILE GET and PROFILE PUT commands. Adjusted the web interface
Michiel Broek <mbroek@mbse.eu>
parents:
191
diff
changeset
|
989 | } |
5d013b4a9138
Added PROFILE GET and PROFILE PUT commands. Adjusted the web interface
Michiel Broek <mbroek@mbse.eu>
parents:
191
diff
changeset
|
990 | srv_send((char *)"440 No such profile"); |
5d013b4a9138
Added PROFILE GET and PROFILE PUT commands. Adjusted the web interface
Michiel Broek <mbroek@mbse.eu>
parents:
191
diff
changeset
|
991 | return 1; |
5d013b4a9138
Added PROFILE GET and PROFILE PUT commands. Adjusted the web interface
Michiel Broek <mbroek@mbse.eu>
parents:
191
diff
changeset
|
992 | |
140
1b001de37945
Implemented PROFILE PUTS command
Michiel Broek <mbroek@mbse.eu>
parents:
138
diff
changeset
|
993 | } else if (strcmp(opt, (char *)"GETS") == 0) { |
1b001de37945
Implemented PROFILE PUTS command
Michiel Broek <mbroek@mbse.eu>
parents:
138
diff
changeset
|
994 | |
1b001de37945
Implemented PROFILE PUTS command
Michiel Broek <mbroek@mbse.eu>
parents:
138
diff
changeset
|
995 | for (profile = Config.profiles; profile; profile = profile->next) { |
191
c74bbc24a1c8
Client/Server communication is now almost final
Michiel Broek <mbroek@mbse.eu>
parents:
189
diff
changeset
|
996 | if (strcmp(profile->uuid, param) == 0) { |
140
1b001de37945
Implemented PROFILE PUTS command
Michiel Broek <mbroek@mbse.eu>
parents:
138
diff
changeset
|
997 | srv_send((char *)"215 Profile steps follow:"); |
1b001de37945
Implemented PROFILE PUTS command
Michiel Broek <mbroek@mbse.eu>
parents:
138
diff
changeset
|
998 | for (step = profile->steps; step; step = step->next) { |
1b001de37945
Implemented PROFILE PUTS command
Michiel Broek <mbroek@mbse.eu>
parents:
138
diff
changeset
|
999 | srv_send((char *)"%d,%d,%.1f", step->steptime, step->resttime, step->target); |
1b001de37945
Implemented PROFILE PUTS command
Michiel Broek <mbroek@mbse.eu>
parents:
138
diff
changeset
|
1000 | } |
1b001de37945
Implemented PROFILE PUTS command
Michiel Broek <mbroek@mbse.eu>
parents:
138
diff
changeset
|
1001 | srv_send((char *)"."); |
1b001de37945
Implemented PROFILE PUTS command
Michiel Broek <mbroek@mbse.eu>
parents:
138
diff
changeset
|
1002 | return 1; |
1b001de37945
Implemented PROFILE PUTS command
Michiel Broek <mbroek@mbse.eu>
parents:
138
diff
changeset
|
1003 | } |
1b001de37945
Implemented PROFILE PUTS command
Michiel Broek <mbroek@mbse.eu>
parents:
138
diff
changeset
|
1004 | } |
1b001de37945
Implemented PROFILE PUTS command
Michiel Broek <mbroek@mbse.eu>
parents:
138
diff
changeset
|
1005 | |
1b001de37945
Implemented PROFILE PUTS command
Michiel Broek <mbroek@mbse.eu>
parents:
138
diff
changeset
|
1006 | srv_send((char *)"440 No such profile"); |
1b001de37945
Implemented PROFILE PUTS command
Michiel Broek <mbroek@mbse.eu>
parents:
138
diff
changeset
|
1007 | return 1; |
1b001de37945
Implemented PROFILE PUTS command
Michiel Broek <mbroek@mbse.eu>
parents:
138
diff
changeset
|
1008 | |
1b001de37945
Implemented PROFILE PUTS command
Michiel Broek <mbroek@mbse.eu>
parents:
138
diff
changeset
|
1009 | } else if (strcmp(opt, (char *)"PUTS") == 0) { |
1b001de37945
Implemented PROFILE PUTS command
Michiel Broek <mbroek@mbse.eu>
parents:
138
diff
changeset
|
1010 | |
1b001de37945
Implemented PROFILE PUTS command
Michiel Broek <mbroek@mbse.eu>
parents:
138
diff
changeset
|
1011 | for (profile = Config.profiles; profile; profile = profile->next) { |
191
c74bbc24a1c8
Client/Server communication is now almost final
Michiel Broek <mbroek@mbse.eu>
parents:
189
diff
changeset
|
1012 | if (strcmp(profile->uuid, param) == 0) { |
140
1b001de37945
Implemented PROFILE PUTS command
Michiel Broek <mbroek@mbse.eu>
parents:
138
diff
changeset
|
1013 | |
1b001de37945
Implemented PROFILE PUTS command
Michiel Broek <mbroek@mbse.eu>
parents:
138
diff
changeset
|
1014 | if (profile->steps) { |
280
de3dc781ba65
PROFILE PUTS command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
279
diff
changeset
|
1015 | syslog(LOG_NOTICE, "PROFILE PUTS %s erased all old steps", profile->uuid); |
140
1b001de37945
Implemented PROFILE PUTS command
Michiel Broek <mbroek@mbse.eu>
parents:
138
diff
changeset
|
1016 | for (step = profile->steps; step; step = olds) { |
1b001de37945
Implemented PROFILE PUTS command
Michiel Broek <mbroek@mbse.eu>
parents:
138
diff
changeset
|
1017 | olds = step->next; |
1b001de37945
Implemented PROFILE PUTS command
Michiel Broek <mbroek@mbse.eu>
parents:
138
diff
changeset
|
1018 | free(step); |
1b001de37945
Implemented PROFILE PUTS command
Michiel Broek <mbroek@mbse.eu>
parents:
138
diff
changeset
|
1019 | } |
1b001de37945
Implemented PROFILE PUTS command
Michiel Broek <mbroek@mbse.eu>
parents:
138
diff
changeset
|
1020 | profile->steps = NULL; |
1b001de37945
Implemented PROFILE PUTS command
Michiel Broek <mbroek@mbse.eu>
parents:
138
diff
changeset
|
1021 | } |
1b001de37945
Implemented PROFILE PUTS command
Michiel Broek <mbroek@mbse.eu>
parents:
138
diff
changeset
|
1022 | |
280
de3dc781ba65
PROFILE PUTS command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
279
diff
changeset
|
1023 | j = 0; |
140
1b001de37945
Implemented PROFILE PUTS command
Michiel Broek <mbroek@mbse.eu>
parents:
138
diff
changeset
|
1024 | while (1) { |
1b001de37945
Implemented PROFILE PUTS command
Michiel Broek <mbroek@mbse.eu>
parents:
138
diff
changeset
|
1025 | memset((char *)&ibuf, 0, SS_BUFSIZE); |
1b001de37945
Implemented PROFILE PUTS command
Michiel Broek <mbroek@mbse.eu>
parents:
138
diff
changeset
|
1026 | fromlen = sizeof(peeraddr_in); |
1b001de37945
Implemented PROFILE PUTS command
Michiel Broek <mbroek@mbse.eu>
parents:
138
diff
changeset
|
1027 | rlen = recvfrom(s, ibuf, sizeof(ibuf) -1, 0, (struct sockaddr *)&peeraddr_in, &fromlen); |
1b001de37945
Implemented PROFILE PUTS command
Michiel Broek <mbroek@mbse.eu>
parents:
138
diff
changeset
|
1028 | if (rlen == -1) { |
268
dda91dfa4aa8
All syslog logging only to LOG_NOTICE
Michiel Broek <mbroek@mbse.eu>
parents:
266
diff
changeset
|
1029 | syslog(LOG_NOTICE, "recvfrom(): %s", strerror(errno)); |
140
1b001de37945
Implemented PROFILE PUTS command
Michiel Broek <mbroek@mbse.eu>
parents:
138
diff
changeset
|
1030 | srv_send((char *)"518 recfrom(): %s", strerror(errno)); |
1b001de37945
Implemented PROFILE PUTS command
Michiel Broek <mbroek@mbse.eu>
parents:
138
diff
changeset
|
1031 | return 1; |
1b001de37945
Implemented PROFILE PUTS command
Michiel Broek <mbroek@mbse.eu>
parents:
138
diff
changeset
|
1032 | } else { |
1b001de37945
Implemented PROFILE PUTS command
Michiel Broek <mbroek@mbse.eu>
parents:
138
diff
changeset
|
1033 | for (i = 0; i < strlen(ibuf); i++) { |
1b001de37945
Implemented PROFILE PUTS command
Michiel Broek <mbroek@mbse.eu>
parents:
138
diff
changeset
|
1034 | if (ibuf[i] == '\n') |
1b001de37945
Implemented PROFILE PUTS command
Michiel Broek <mbroek@mbse.eu>
parents:
138
diff
changeset
|
1035 | ibuf[i] = '\0'; |
1b001de37945
Implemented PROFILE PUTS command
Michiel Broek <mbroek@mbse.eu>
parents:
138
diff
changeset
|
1036 | if (ibuf[i] == '\r') |
1b001de37945
Implemented PROFILE PUTS command
Michiel Broek <mbroek@mbse.eu>
parents:
138
diff
changeset
|
1037 | ibuf[i] = '\0'; |
1b001de37945
Implemented PROFILE PUTS command
Michiel Broek <mbroek@mbse.eu>
parents:
138
diff
changeset
|
1038 | } |
1b001de37945
Implemented PROFILE PUTS command
Michiel Broek <mbroek@mbse.eu>
parents:
138
diff
changeset
|
1039 | for (i = strlen(ibuf) -1; i > 0; i--) { |
1b001de37945
Implemented PROFILE PUTS command
Michiel Broek <mbroek@mbse.eu>
parents:
138
diff
changeset
|
1040 | if (ibuf[i] == ' ') |
1b001de37945
Implemented PROFILE PUTS command
Michiel Broek <mbroek@mbse.eu>
parents:
138
diff
changeset
|
1041 | ibuf[i] = '\0'; |
1b001de37945
Implemented PROFILE PUTS command
Michiel Broek <mbroek@mbse.eu>
parents:
138
diff
changeset
|
1042 | else |
1b001de37945
Implemented PROFILE PUTS command
Michiel Broek <mbroek@mbse.eu>
parents:
138
diff
changeset
|
1043 | break; |
1b001de37945
Implemented PROFILE PUTS command
Michiel Broek <mbroek@mbse.eu>
parents:
138
diff
changeset
|
1044 | } |
1b001de37945
Implemented PROFILE PUTS command
Michiel Broek <mbroek@mbse.eu>
parents:
138
diff
changeset
|
1045 | if (strlen(ibuf)) { |
1b001de37945
Implemented PROFILE PUTS command
Michiel Broek <mbroek@mbse.eu>
parents:
138
diff
changeset
|
1046 | if (debug) { |
1b001de37945
Implemented PROFILE PUTS command
Michiel Broek <mbroek@mbse.eu>
parents:
138
diff
changeset
|
1047 | syslog(LOG_NOTICE, "recv: \"%s\"", ibuf); |
1b001de37945
Implemented PROFILE PUTS command
Michiel Broek <mbroek@mbse.eu>
parents:
138
diff
changeset
|
1048 | fprintf(stdout, "recv: \"%s\"\n", ibuf); |
1b001de37945
Implemented PROFILE PUTS command
Michiel Broek <mbroek@mbse.eu>
parents:
138
diff
changeset
|
1049 | } |
1b001de37945
Implemented PROFILE PUTS command
Michiel Broek <mbroek@mbse.eu>
parents:
138
diff
changeset
|
1050 | if (strcmp(ibuf, (char *)".") == 0) { |
1b001de37945
Implemented PROFILE PUTS command
Michiel Broek <mbroek@mbse.eu>
parents:
138
diff
changeset
|
1051 | |
213
2317b8d644fa
Code cleanup, streamlined error messages.
Michiel Broek <mbroek@mbse.eu>
parents:
209
diff
changeset
|
1052 | srv_send((char *)"219 Accepted Profile steps"); |
140
1b001de37945
Implemented PROFILE PUTS command
Michiel Broek <mbroek@mbse.eu>
parents:
138
diff
changeset
|
1053 | return 0; |
1b001de37945
Implemented PROFILE PUTS command
Michiel Broek <mbroek@mbse.eu>
parents:
138
diff
changeset
|
1054 | } |
1b001de37945
Implemented PROFILE PUTS command
Michiel Broek <mbroek@mbse.eu>
parents:
138
diff
changeset
|
1055 | sstep = strtok(ibuf, ",\0"); |
1b001de37945
Implemented PROFILE PUTS command
Michiel Broek <mbroek@mbse.eu>
parents:
138
diff
changeset
|
1056 | rest = strtok(NULL, ",\0"); |
1b001de37945
Implemented PROFILE PUTS command
Michiel Broek <mbroek@mbse.eu>
parents:
138
diff
changeset
|
1057 | targ = strtok(NULL, "\0"); |
1b001de37945
Implemented PROFILE PUTS command
Michiel Broek <mbroek@mbse.eu>
parents:
138
diff
changeset
|
1058 | |
1b001de37945
Implemented PROFILE PUTS command
Michiel Broek <mbroek@mbse.eu>
parents:
138
diff
changeset
|
1059 | if ((sscanf(sstep, "%d", &istep) == 1) && |
1b001de37945
Implemented PROFILE PUTS command
Michiel Broek <mbroek@mbse.eu>
parents:
138
diff
changeset
|
1060 | (sscanf(rest, "%d", &irest) == 1) && |
1b001de37945
Implemented PROFILE PUTS command
Michiel Broek <mbroek@mbse.eu>
parents:
138
diff
changeset
|
1061 | (sscanf(targ, "%f", &ftarg) == 1)) { |
1b001de37945
Implemented PROFILE PUTS command
Michiel Broek <mbroek@mbse.eu>
parents:
138
diff
changeset
|
1062 | |
280
de3dc781ba65
PROFILE PUTS command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
279
diff
changeset
|
1063 | j++; |
de3dc781ba65
PROFILE PUTS command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
279
diff
changeset
|
1064 | syslog(LOG_NOTICE, "PROFILE PUTS %s add step %d: steptime=%d resttime=%d target=%.1f", |
de3dc781ba65
PROFILE PUTS command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
279
diff
changeset
|
1065 | profile->uuid, j, istep, irest, ftarg); |
140
1b001de37945
Implemented PROFILE PUTS command
Michiel Broek <mbroek@mbse.eu>
parents:
138
diff
changeset
|
1066 | step = (prof_step *)malloc(sizeof(prof_step)); |
1b001de37945
Implemented PROFILE PUTS command
Michiel Broek <mbroek@mbse.eu>
parents:
138
diff
changeset
|
1067 | step->next = NULL; |
1b001de37945
Implemented PROFILE PUTS command
Michiel Broek <mbroek@mbse.eu>
parents:
138
diff
changeset
|
1068 | step->version = 1; |
1b001de37945
Implemented PROFILE PUTS command
Michiel Broek <mbroek@mbse.eu>
parents:
138
diff
changeset
|
1069 | step->steptime = istep; |
1b001de37945
Implemented PROFILE PUTS command
Michiel Broek <mbroek@mbse.eu>
parents:
138
diff
changeset
|
1070 | step->resttime = irest; |
1b001de37945
Implemented PROFILE PUTS command
Michiel Broek <mbroek@mbse.eu>
parents:
138
diff
changeset
|
1071 | step->target = ftarg; |
1b001de37945
Implemented PROFILE PUTS command
Michiel Broek <mbroek@mbse.eu>
parents:
138
diff
changeset
|
1072 | |
1b001de37945
Implemented PROFILE PUTS command
Michiel Broek <mbroek@mbse.eu>
parents:
138
diff
changeset
|
1073 | if (profile->steps == NULL) { |
1b001de37945
Implemented PROFILE PUTS command
Michiel Broek <mbroek@mbse.eu>
parents:
138
diff
changeset
|
1074 | profile->steps = step; |
1b001de37945
Implemented PROFILE PUTS command
Michiel Broek <mbroek@mbse.eu>
parents:
138
diff
changeset
|
1075 | } else { |
1b001de37945
Implemented PROFILE PUTS command
Michiel Broek <mbroek@mbse.eu>
parents:
138
diff
changeset
|
1076 | for (olds = profile->steps; olds; olds = olds->next) { |
1b001de37945
Implemented PROFILE PUTS command
Michiel Broek <mbroek@mbse.eu>
parents:
138
diff
changeset
|
1077 | if (olds->next == NULL) { |
1b001de37945
Implemented PROFILE PUTS command
Michiel Broek <mbroek@mbse.eu>
parents:
138
diff
changeset
|
1078 | olds->next = step; |
1b001de37945
Implemented PROFILE PUTS command
Michiel Broek <mbroek@mbse.eu>
parents:
138
diff
changeset
|
1079 | break; |
1b001de37945
Implemented PROFILE PUTS command
Michiel Broek <mbroek@mbse.eu>
parents:
138
diff
changeset
|
1080 | } |
1b001de37945
Implemented PROFILE PUTS command
Michiel Broek <mbroek@mbse.eu>
parents:
138
diff
changeset
|
1081 | } |
1b001de37945
Implemented PROFILE PUTS command
Michiel Broek <mbroek@mbse.eu>
parents:
138
diff
changeset
|
1082 | } |
1b001de37945
Implemented PROFILE PUTS command
Michiel Broek <mbroek@mbse.eu>
parents:
138
diff
changeset
|
1083 | } |
1b001de37945
Implemented PROFILE PUTS command
Michiel Broek <mbroek@mbse.eu>
parents:
138
diff
changeset
|
1084 | } |
1b001de37945
Implemented PROFILE PUTS command
Michiel Broek <mbroek@mbse.eu>
parents:
138
diff
changeset
|
1085 | } |
1b001de37945
Implemented PROFILE PUTS command
Michiel Broek <mbroek@mbse.eu>
parents:
138
diff
changeset
|
1086 | } |
1b001de37945
Implemented PROFILE PUTS command
Michiel Broek <mbroek@mbse.eu>
parents:
138
diff
changeset
|
1087 | } |
1b001de37945
Implemented PROFILE PUTS command
Michiel Broek <mbroek@mbse.eu>
parents:
138
diff
changeset
|
1088 | } |
1b001de37945
Implemented PROFILE PUTS command
Michiel Broek <mbroek@mbse.eu>
parents:
138
diff
changeset
|
1089 | |
1b001de37945
Implemented PROFILE PUTS command
Michiel Broek <mbroek@mbse.eu>
parents:
138
diff
changeset
|
1090 | srv_send((char *)"440 No such profile"); |
1b001de37945
Implemented PROFILE PUTS command
Michiel Broek <mbroek@mbse.eu>
parents:
138
diff
changeset
|
1091 | return 1; |
88 | 1092 | } |
1093 | ||
213
2317b8d644fa
Code cleanup, streamlined error messages.
Michiel Broek <mbroek@mbse.eu>
parents:
209
diff
changeset
|
1094 | srv_send((char *)"504 Subcommand error"); |
88 | 1095 | return 1; |
1096 | } | |
1097 | ||
1098 | ||
1099 | ||
259
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1100 | #ifdef USE_SIMULATOR |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1101 | int delete_Simulator(char *uuid) |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1102 | { |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1103 | simulator_list *current = Config.simulators; |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1104 | simulator_list *previous = NULL; |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1105 | |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1106 | while (current) { |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1107 | if (strcmp(current->uuid, uuid) == 0) { |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1108 | if (previous == NULL) { |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1109 | Config.simulators = current->next; |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1110 | free(current->uuid); |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1111 | current->uuid = NULL; |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1112 | free(current->name); |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1113 | current->name = NULL; |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1114 | free(current); |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1115 | return 1; |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1116 | } else { |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1117 | free(current->uuid); |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1118 | current->uuid = NULL; |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1119 | free(current->name); |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1120 | current->name = NULL; |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1121 | previous->next = current->next; |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1122 | free(current); |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1123 | current = previous->next; |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1124 | return 1; |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1125 | } |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1126 | } else { |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1127 | previous = current; |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1128 | current = current->next; |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1129 | } |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1130 | } |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1131 | return 0; |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1132 | } |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1133 | |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1134 | |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1135 | |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1136 | /* |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1137 | * SIMULATOR ADD name |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1138 | * SIMULATOR DEL uuid |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1139 | * SIMULATOR LIST |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1140 | * SIMULATOR GET uuid |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1141 | * SIMULATOR PUT uuid |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1142 | */ |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1143 | int cmd_simulator(char *buf) |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1144 | { |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1145 | char *opt, *param, *kwd, *val, ibuf[SS_BUFSIZE]; |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1146 | simulator_list *simulator, *tmps; |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1147 | socklen_t fromlen; |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1148 | int i, rc, rlen, ival; |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1149 | float fval; |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1150 | uuid_t uu; |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1151 | |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1152 | opt = strtok(buf, " \0"); |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1153 | opt = strtok(NULL, " \0"); |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1154 | |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1155 | if (opt == NULL) { |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1156 | srv_send((char *)"501 Subcommand missing"); |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1157 | return 1; |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1158 | } |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1159 | param = strtok(NULL, "\0"); |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1160 | |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1161 | if (strcmp(opt, (char *)"LIST") == 0) { |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1162 | srv_send((char *)"212 Simulators list follows:"); |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1163 | for (simulator = Config.simulators; simulator; simulator = simulator->next) { |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1164 | srv_send((char *)"%s,%s", simulator->uuid, simulator->name); |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1165 | } |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1166 | srv_send((char *)"."); |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1167 | return 1; |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1168 | } |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1169 | |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1170 | if (param == NULL) { |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1171 | srv_send((char *)"502 Parameter missing"); |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1172 | return 1; |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1173 | } |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1174 | |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1175 | if (strcmp(opt, (char *)"ADD") == 0) { |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1176 | |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1177 | /* |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1178 | * For now, only one simulator is allowed. |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1179 | */ |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1180 | if (Config.simulators) { |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1181 | srv_send((char *)"441 Maximum simulators reached"); |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1182 | return 1; |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1183 | } |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1184 | |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1185 | simulator = (simulator_list *)malloc(sizeof(simulator_list)); |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1186 | simulator->next = NULL; |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1187 | simulator->version = 1; |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1188 | simulator->uuid = malloc(37); |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1189 | uuid_generate(uu); |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1190 | uuid_unparse(uu, simulator->uuid); |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1191 | simulator->name = xstrcpy(param); |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1192 | simulator->volume_air = 150; |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1193 | simulator->volume_beer = 50; |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1194 | simulator->room_temperature = simulator->air_temperature = simulator->beer_temperature = simulator->s_cool_temp = simulator->s_heat_temp = 20.0; |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1195 | simulator->cooler_temp = -3.0; /* Cooling temperature */ |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1196 | simulator->cooler_time = 720; /* About 12 minutes for the cooler plate */ |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1197 | simulator->cooler_size = 0.8; /* 0.8 square meter cooler plate */ |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1198 | simulator->heater_temp = 150.0; /* Heating temperature */ |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1199 | simulator->heater_time = 3; /* 3 seconds to heat-up */ |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1200 | simulator->heater_size = 0.01; /* 0.01 square meter heater plate */ |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1201 | simulator->heater_state = simulator->cooler_state = 0; |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1202 | simulator->frigo_isolation = 0.002; |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1203 | simulator->s_yeast_heat = 0.0; |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1204 | simulator->s_yeast_started = simulator->s_cool_changed = simulator->s_heat_changed = (int)0; |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1205 | |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1206 | if (Config.simulators == NULL) { |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1207 | Config.simulators = simulator; |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1208 | } else { |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1209 | for (tmps = Config.simulators; tmps; tmps = tmps->next) { |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1210 | if (tmps->next == NULL) { |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1211 | tmps->next = simulator; |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1212 | break; |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1213 | } |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1214 | } |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1215 | } |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1216 | |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1217 | syslog(LOG_NOTICE, "Simulator %s added", simulator->uuid); |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1218 | srv_send((char *)"211 Simulator %s added", simulator->uuid); |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1219 | return 0; |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1220 | } |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1221 | |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1222 | if (strcmp(opt, (char *)"DEL") == 0) { |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1223 | rc = delete_Simulator(param); |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1224 | if (rc) { |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1225 | syslog(LOG_NOTICE, "Simulator %s deleted", param); |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1226 | srv_send((char *)"211 Simulator %s deleted", param); |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1227 | return 0; |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1228 | } else { |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1229 | srv_send((char *)"440 No such simulator"); |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1230 | return 1; |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1231 | } |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1232 | } |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1233 | |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1234 | if (strcmp(opt, (char *)"GET") == 0) { |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1235 | for (simulator = Config.simulators; simulator; simulator = simulator->next) { |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1236 | if (strcmp(simulator->uuid, param) == 0) { |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1237 | srv_send((char *)"213 Simulator record follows:"); |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1238 | srv_send((char *)"NAME,%s", simulator->name); |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1239 | srv_send((char *)"VOLUME_AIR,%d", simulator->volume_air); |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1240 | srv_send((char *)"VOLUME_BEER,%d", simulator->volume_beer); |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1241 | srv_send((char *)"ROOM_TEMPERATURE,%.1f", simulator->room_temperature); |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1242 | srv_send((char *)"AIR_TEMPERATURE,%.3f", simulator->air_temperature); |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1243 | srv_send((char *)"BEER_TEMPERATURE,%.3f", simulator->beer_temperature); |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1244 | srv_send((char *)"COOLER_TEMP,%.1f", simulator->cooler_temp); |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1245 | srv_send((char *)"COOLER_TIME,%d", simulator->cooler_time); |
261 | 1246 | srv_send((char *)"COOLER_SIZE,%.3f", simulator->cooler_size); |
259
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1247 | srv_send((char *)"HEATER_TEMP,%.1f", simulator->heater_temp); |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1248 | srv_send((char *)"HEATER_TIME,%d", simulator->heater_time); |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1249 | srv_send((char *)"HEATER_SIZE,%.3f", simulator->heater_size); |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1250 | srv_send((char *)"HEATER_STATE,%d", simulator->heater_state); |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1251 | srv_send((char *)"COOLER_STATE,%d", simulator->cooler_state); |
261 | 1252 | srv_send((char *)"FRIGO_ISOLATION,%.3f", simulator->frigo_isolation); |
259
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1253 | srv_send((char *)"."); |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1254 | return 1; |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1255 | } |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1256 | } |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1257 | srv_send((char *)"440 No such simulator"); |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1258 | return 1; |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1259 | } |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1260 | |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1261 | if (strcmp(opt, (char *)"PUT") == 0) { |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1262 | for (simulator = Config.simulators; simulator; simulator = simulator->next) { |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1263 | if (strcmp(simulator->uuid, param) == 0) { |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1264 | while (1) { |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1265 | memset((char *)&ibuf, 0, SS_BUFSIZE); |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1266 | fromlen = sizeof(peeraddr_in); |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1267 | rlen = recvfrom(s, ibuf, sizeof(ibuf) -1, 0, (struct sockaddr *)&peeraddr_in, &fromlen); |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1268 | if (rlen == -1) { |
268
dda91dfa4aa8
All syslog logging only to LOG_NOTICE
Michiel Broek <mbroek@mbse.eu>
parents:
266
diff
changeset
|
1269 | syslog(LOG_NOTICE, "recvfrom(): %s", strerror(errno)); |
259
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1270 | srv_send((char *)"518 recfrom(): %s", strerror(errno)); |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1271 | return 1; |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1272 | } |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1273 | for (i = 0; i < strlen(ibuf); i++) { |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1274 | if (ibuf[i] == '\n') |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1275 | ibuf[i] = '\0'; |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1276 | if (ibuf[i] == '\r') |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1277 | ibuf[i] = '\0'; |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1278 | } |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1279 | for (i = strlen(ibuf) -1; i > 0; i--) { |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1280 | if (ibuf[i] == ' ') |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1281 | ibuf[i] = '\0'; |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1282 | else |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1283 | break; |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1284 | } |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1285 | if (strlen(ibuf)) { |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1286 | if (debug) { |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1287 | syslog(LOG_NOTICE, "recv: \"%s\"", ibuf); |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1288 | fprintf(stdout, "recv: \"%s\"\n", ibuf); |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1289 | } |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1290 | if (strcmp(ibuf, (char *)".") == 0) { |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1291 | srv_send((char *)"219 Accepted Simulator record"); |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1292 | return 0; |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1293 | } |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1294 | kwd = strtok(ibuf, ",\0"); |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1295 | val = strtok(NULL, "\0"); |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1296 | if (kwd && val) { |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1297 | |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1298 | if (strcmp(kwd, (char *)"NAME") == 0) { |
281
12a5dbbfd0e3
SIMULATOR PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
280
diff
changeset
|
1299 | if (simulator->name) { |
12a5dbbfd0e3
SIMULATOR PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
280
diff
changeset
|
1300 | if (strcmp(simulator->name, val)) |
12a5dbbfd0e3
SIMULATOR PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
280
diff
changeset
|
1301 | syslog(LOG_NOTICE, "Simulator %s name `%s' to `%s'", simulator->uuid, simulator->name, val); |
259
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1302 | free(simulator->name); |
281
12a5dbbfd0e3
SIMULATOR PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
280
diff
changeset
|
1303 | } |
259
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1304 | simulator->name = xstrcpy(val); |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1305 | |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1306 | } else if (strcmp(kwd, (char *)"VOLUME_AIR") == 0) { |
281
12a5dbbfd0e3
SIMULATOR PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
280
diff
changeset
|
1307 | if (sscanf(val, "%d", &ival) == 1) { |
12a5dbbfd0e3
SIMULATOR PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
280
diff
changeset
|
1308 | if (simulator->volume_air != ival) |
12a5dbbfd0e3
SIMULATOR PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
280
diff
changeset
|
1309 | syslog(LOG_NOTICE, "Simulator %s volume air %d to %d", simulator->uuid, simulator->volume_air, ival); |
259
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1310 | simulator->volume_air = ival; |
281
12a5dbbfd0e3
SIMULATOR PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
280
diff
changeset
|
1311 | } |
259
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1312 | |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1313 | } else if (strcmp(kwd, (char *)"VOLUME_BEER") == 0) { |
281
12a5dbbfd0e3
SIMULATOR PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
280
diff
changeset
|
1314 | if (sscanf(val, "%d", &ival) == 1) { |
12a5dbbfd0e3
SIMULATOR PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
280
diff
changeset
|
1315 | if (simulator->volume_beer != ival) |
12a5dbbfd0e3
SIMULATOR PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
280
diff
changeset
|
1316 | syslog(LOG_NOTICE, "Simulator %s volume beer %d to %d", simulator->uuid, simulator->volume_beer, ival); |
259
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1317 | simulator->volume_beer = ival; |
281
12a5dbbfd0e3
SIMULATOR PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
280
diff
changeset
|
1318 | } |
259
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1319 | |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1320 | } else if (strcmp(kwd, (char *)"ROOM_TEMPERATURE") == 0) { |
281
12a5dbbfd0e3
SIMULATOR PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
280
diff
changeset
|
1321 | if (sscanf(val, "%f", &fval) == 1) { |
12a5dbbfd0e3
SIMULATOR PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
280
diff
changeset
|
1322 | if (simulator->room_temperature != fval) |
12a5dbbfd0e3
SIMULATOR PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
280
diff
changeset
|
1323 | syslog(LOG_NOTICE, "Simulator %s room temperature %.1f to %.1f", simulator->uuid, simulator->room_temperature, fval); |
259
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1324 | simulator->room_temperature = fval; |
281
12a5dbbfd0e3
SIMULATOR PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
280
diff
changeset
|
1325 | } |
259
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1326 | |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1327 | } else if (strcmp(kwd, (char *)"AIR_TEMPERATURE") == 0) { |
281
12a5dbbfd0e3
SIMULATOR PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
280
diff
changeset
|
1328 | if (sscanf(val, "%f", &fval) == 1) { |
12a5dbbfd0e3
SIMULATOR PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
280
diff
changeset
|
1329 | if (simulator->air_temperature != fval) |
12a5dbbfd0e3
SIMULATOR PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
280
diff
changeset
|
1330 | syslog(LOG_NOTICE, "Simulator %s air temperature %.1f to %.1f", simulator->uuid, simulator->air_temperature, fval); |
259
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1331 | simulator->air_temperature = fval; |
281
12a5dbbfd0e3
SIMULATOR PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
280
diff
changeset
|
1332 | } |
259
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1333 | |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1334 | } else if (strcmp(kwd, (char *)"BEER_TEMPERATURE") == 0) { |
281
12a5dbbfd0e3
SIMULATOR PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
280
diff
changeset
|
1335 | if (sscanf(val, "%f", &fval) == 1) { |
12a5dbbfd0e3
SIMULATOR PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
280
diff
changeset
|
1336 | if (simulator->beer_temperature != fval) |
12a5dbbfd0e3
SIMULATOR PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
280
diff
changeset
|
1337 | syslog(LOG_NOTICE, "Simulator %s beer temperature %.1f to %.1f", simulator->uuid, simulator->beer_temperature, fval); |
259
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1338 | simulator->beer_temperature = fval; |
281
12a5dbbfd0e3
SIMULATOR PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
280
diff
changeset
|
1339 | } |
259
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1340 | |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1341 | } else if (strcmp(kwd, (char *)"COOLER_TEMP") == 0) { |
281
12a5dbbfd0e3
SIMULATOR PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
280
diff
changeset
|
1342 | if (sscanf(val, "%f", &fval) == 1) { |
12a5dbbfd0e3
SIMULATOR PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
280
diff
changeset
|
1343 | if (simulator->cooler_temp != fval) |
12a5dbbfd0e3
SIMULATOR PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
280
diff
changeset
|
1344 | syslog(LOG_NOTICE, "Simulator %s cooler temperature %.1f to %.1f", simulator->uuid, simulator->cooler_temp, fval); |
259
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1345 | simulator->cooler_temp = fval; |
281
12a5dbbfd0e3
SIMULATOR PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
280
diff
changeset
|
1346 | } |
259
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1347 | |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1348 | } else if (strcmp(kwd, (char *)"COOLER_TIME") == 0) { |
281
12a5dbbfd0e3
SIMULATOR PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
280
diff
changeset
|
1349 | if (sscanf(val, "%d", &ival) == 1) { |
12a5dbbfd0e3
SIMULATOR PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
280
diff
changeset
|
1350 | if (simulator->cooler_time != ival) |
12a5dbbfd0e3
SIMULATOR PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
280
diff
changeset
|
1351 | syslog(LOG_NOTICE, "Simulator %s cooler time %d to %d", simulator->uuid, simulator->cooler_time, ival); |
259
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1352 | simulator->cooler_time = ival; |
281
12a5dbbfd0e3
SIMULATOR PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
280
diff
changeset
|
1353 | } |
259
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1354 | |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1355 | } else if (strcmp(kwd, (char *)"COOLER_SIZE") == 0) { |
281
12a5dbbfd0e3
SIMULATOR PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
280
diff
changeset
|
1356 | if (sscanf(val, "%f", &fval) == 1) { |
12a5dbbfd0e3
SIMULATOR PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
280
diff
changeset
|
1357 | if (simulator->cooler_size != fval) |
12a5dbbfd0e3
SIMULATOR PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
280
diff
changeset
|
1358 | syslog(LOG_NOTICE, "Simulator %s cooler size %.1f to %.1f", simulator->uuid, simulator->cooler_size, fval); |
259
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1359 | simulator->cooler_size = fval; |
281
12a5dbbfd0e3
SIMULATOR PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
280
diff
changeset
|
1360 | } |
259
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1361 | |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1362 | } else if (strcmp(kwd, (char *)"HEATER_TEMP") == 0) { |
281
12a5dbbfd0e3
SIMULATOR PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
280
diff
changeset
|
1363 | if (sscanf(val, "%f", &fval) == 1) { |
12a5dbbfd0e3
SIMULATOR PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
280
diff
changeset
|
1364 | if (simulator->heater_temp != fval) |
12a5dbbfd0e3
SIMULATOR PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
280
diff
changeset
|
1365 | syslog(LOG_NOTICE, "Simulator %s heater temperature %.1f to %.1f", simulator->uuid, simulator->heater_temp, fval); |
259
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1366 | simulator->heater_temp = fval; |
281
12a5dbbfd0e3
SIMULATOR PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
280
diff
changeset
|
1367 | } |
259
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1368 | |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1369 | } else if (strcmp(kwd, (char *)"HEATER_TIME") == 0) { |
281
12a5dbbfd0e3
SIMULATOR PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
280
diff
changeset
|
1370 | if (sscanf(val, "%d", &ival) == 1) { |
12a5dbbfd0e3
SIMULATOR PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
280
diff
changeset
|
1371 | if (simulator->heater_time != ival) |
12a5dbbfd0e3
SIMULATOR PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
280
diff
changeset
|
1372 | syslog(LOG_NOTICE, "Simulator %s heater time %d to %d", simulator->uuid, simulator->heater_time, ival); |
259
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1373 | simulator->heater_time = ival; |
281
12a5dbbfd0e3
SIMULATOR PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
280
diff
changeset
|
1374 | } |
259
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1375 | |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1376 | } else if (strcmp(kwd, (char *)"HEATER_SIZE") == 0) { |
281
12a5dbbfd0e3
SIMULATOR PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
280
diff
changeset
|
1377 | if (sscanf(val, "%f", &fval) == 1) { |
12a5dbbfd0e3
SIMULATOR PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
280
diff
changeset
|
1378 | if (simulator->heater_size != fval) |
12a5dbbfd0e3
SIMULATOR PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
280
diff
changeset
|
1379 | syslog(LOG_NOTICE, "Simulator %s heater size %.1f to %.1f", simulator->uuid, simulator->heater_size, fval); |
259
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1380 | simulator->heater_size = fval; |
281
12a5dbbfd0e3
SIMULATOR PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
280
diff
changeset
|
1381 | } |
259
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1382 | |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1383 | } else if (strcmp(kwd, (char *)"HEATER_STATE") == 0) { |
281
12a5dbbfd0e3
SIMULATOR PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
280
diff
changeset
|
1384 | if (sscanf(val, "%d", &ival) == 1) { |
12a5dbbfd0e3
SIMULATOR PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
280
diff
changeset
|
1385 | if (simulator->heater_state != ival) |
12a5dbbfd0e3
SIMULATOR PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
280
diff
changeset
|
1386 | syslog(LOG_NOTICE, "Simulator %s heater state %d to %d", simulator->uuid, simulator->heater_state, ival); |
259
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1387 | simulator->heater_state = ival; |
281
12a5dbbfd0e3
SIMULATOR PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
280
diff
changeset
|
1388 | } |
259
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1389 | |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1390 | } else if (strcmp(kwd, (char *)"COOLER_STATE") == 0) { |
281
12a5dbbfd0e3
SIMULATOR PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
280
diff
changeset
|
1391 | if (sscanf(val, "%d", &ival) == 1) { |
12a5dbbfd0e3
SIMULATOR PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
280
diff
changeset
|
1392 | if (simulator->cooler_state != ival) |
12a5dbbfd0e3
SIMULATOR PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
280
diff
changeset
|
1393 | syslog(LOG_NOTICE, "Simulator %s cooler state %d to %d", simulator->uuid, simulator->cooler_state, ival); |
259
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1394 | simulator->cooler_state = ival; |
281
12a5dbbfd0e3
SIMULATOR PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
280
diff
changeset
|
1395 | } |
259
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1396 | |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1397 | } else if (strcmp(kwd, (char *)"FRIGO_ISOLATION") == 0) { |
281
12a5dbbfd0e3
SIMULATOR PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
280
diff
changeset
|
1398 | if (sscanf(val, "%f", &fval) == 1) { |
12a5dbbfd0e3
SIMULATOR PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
280
diff
changeset
|
1399 | if (simulator->frigo_isolation != fval) |
12a5dbbfd0e3
SIMULATOR PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
280
diff
changeset
|
1400 | syslog(LOG_NOTICE, "Simulator %s frigo isolation %.1f to %.1f", simulator->uuid, simulator->frigo_isolation, fval); |
259
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1401 | simulator->frigo_isolation = fval; |
281
12a5dbbfd0e3
SIMULATOR PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
280
diff
changeset
|
1402 | } |
259
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1403 | |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1404 | } |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1405 | } |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1406 | } |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1407 | } |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1408 | } |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1409 | } |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1410 | srv_send((char *)"440 No such simulator"); |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1411 | return 1; |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1412 | } |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1413 | |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1414 | srv_send((char *)"504 Subcommand error"); |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1415 | return 1; |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1416 | } |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1417 | #endif |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1418 | |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1419 | |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
1420 | |
175
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1421 | int delete_Unit(char *uuid) |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1422 | { |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1423 | units_list *current = Config.units; |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1424 | units_list *previous = NULL; |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1425 | |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1426 | while (current) { |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1427 | if (strcmp(current->uuid, uuid) == 0) { |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1428 | if (previous == NULL) { |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1429 | Config.units = current->next; |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1430 | free(current->uuid); |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1431 | current->uuid = NULL; |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1432 | free(current->name); |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1433 | current->name = NULL; |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1434 | if (current->air_address) |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1435 | free(current->air_address); |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1436 | current->air_address = NULL; |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1437 | if (current->beer_address) |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1438 | free(current->beer_address); |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1439 | current->beer_address = NULL; |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1440 | if (current->heater_address) |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1441 | free(current->heater_address); |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1442 | current->heater_address = NULL; |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1443 | if (current->cooler_address) |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1444 | free(current->cooler_address); |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1445 | current->cooler_address = NULL; |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1446 | if (current->fan_address) |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1447 | free(current->fan_address); |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1448 | current->fan_address = NULL; |
306
97602274eb58
Updated to add support for lights in a fermenter unit and a Power Supply status.
Michiel Broek <mbroek@mbse.eu>
parents:
303
diff
changeset
|
1449 | if (current->light_address) |
97602274eb58
Updated to add support for lights in a fermenter unit and a Power Supply status.
Michiel Broek <mbroek@mbse.eu>
parents:
303
diff
changeset
|
1450 | free(current->light_address); |
97602274eb58
Updated to add support for lights in a fermenter unit and a Power Supply status.
Michiel Broek <mbroek@mbse.eu>
parents:
303
diff
changeset
|
1451 | current->light_address = NULL; |
175
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1452 | if (current->door_address) |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1453 | free(current->door_address); |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1454 | current->door_address = NULL; |
306
97602274eb58
Updated to add support for lights in a fermenter unit and a Power Supply status.
Michiel Broek <mbroek@mbse.eu>
parents:
303
diff
changeset
|
1455 | if (current->psu_address) |
97602274eb58
Updated to add support for lights in a fermenter unit and a Power Supply status.
Michiel Broek <mbroek@mbse.eu>
parents:
303
diff
changeset
|
1456 | free(current->psu_address); |
97602274eb58
Updated to add support for lights in a fermenter unit and a Power Supply status.
Michiel Broek <mbroek@mbse.eu>
parents:
303
diff
changeset
|
1457 | current->psu_address = NULL; |
175
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1458 | if (current->profile) |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1459 | free(current->profile); |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1460 | current->profile = NULL; |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1461 | free(current); |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1462 | return 1; |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1463 | } else { |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1464 | free(current->uuid); |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1465 | current->uuid = NULL; |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1466 | free(current->name); |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1467 | current->name = NULL; |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1468 | if (current->air_address) |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1469 | free(current->air_address); |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1470 | current->air_address = NULL; |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1471 | if (current->beer_address) |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1472 | free(current->beer_address); |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1473 | current->beer_address = NULL; |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1474 | if (current->heater_address) |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1475 | free(current->heater_address); |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1476 | current->heater_address = NULL; |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1477 | if (current->cooler_address) |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1478 | free(current->cooler_address); |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1479 | current->cooler_address = NULL; |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1480 | if (current->fan_address) |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1481 | free(current->fan_address); |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1482 | current->fan_address = NULL; |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1483 | if (current->door_address) |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1484 | free(current->door_address); |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1485 | current->door_address = NULL; |
306
97602274eb58
Updated to add support for lights in a fermenter unit and a Power Supply status.
Michiel Broek <mbroek@mbse.eu>
parents:
303
diff
changeset
|
1486 | if (current->light_address) |
97602274eb58
Updated to add support for lights in a fermenter unit and a Power Supply status.
Michiel Broek <mbroek@mbse.eu>
parents:
303
diff
changeset
|
1487 | free(current->light_address); |
97602274eb58
Updated to add support for lights in a fermenter unit and a Power Supply status.
Michiel Broek <mbroek@mbse.eu>
parents:
303
diff
changeset
|
1488 | current->light_address = NULL; |
97602274eb58
Updated to add support for lights in a fermenter unit and a Power Supply status.
Michiel Broek <mbroek@mbse.eu>
parents:
303
diff
changeset
|
1489 | if (current->psu_address) |
97602274eb58
Updated to add support for lights in a fermenter unit and a Power Supply status.
Michiel Broek <mbroek@mbse.eu>
parents:
303
diff
changeset
|
1490 | free(current->psu_address); |
97602274eb58
Updated to add support for lights in a fermenter unit and a Power Supply status.
Michiel Broek <mbroek@mbse.eu>
parents:
303
diff
changeset
|
1491 | current->psu_address = NULL; |
175
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1492 | if (current->profile) |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1493 | free(current->profile); |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1494 | current->profile = NULL; |
245
b01b6238eb67
You can now safely add and remove units on a running system.
Michiel Broek <mbroek@mbse.eu>
parents:
240
diff
changeset
|
1495 | previous->next = current->next; |
175
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1496 | free(current); |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1497 | current = previous->next; |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1498 | return 1; |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1499 | } |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1500 | } else { |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1501 | previous = current; |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1502 | current = current->next; |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1503 | } |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1504 | } |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1505 | return 0; |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1506 | } |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1507 | |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1508 | |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1509 | |
88 | 1510 | /* |
175
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1511 | * UNIT ADD name |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1512 | * UNIT DEL uuid |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1513 | * UNIT LIST |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1514 | * UNIT GET uuid |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1515 | * UNIT PUT uuid |
87
55f1315c94f1
Added unit command and list unit command
Michiel Broek <mbroek@mbse.eu>
parents:
86
diff
changeset
|
1516 | */ |
55f1315c94f1
Added unit command and list unit command
Michiel Broek <mbroek@mbse.eu>
parents:
86
diff
changeset
|
1517 | int cmd_unit(char *buf) |
55f1315c94f1
Added unit command and list unit command
Michiel Broek <mbroek@mbse.eu>
parents:
86
diff
changeset
|
1518 | { |
175
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1519 | char *opt, *param = NULL, *kwd, *val, ibuf[SS_BUFSIZE]; |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1520 | units_list *unit, *tmpu; |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1521 | uuid_t uu; |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1522 | socklen_t fromlen; |
245
b01b6238eb67
You can now safely add and remove units on a running system.
Michiel Broek <mbroek@mbse.eu>
parents:
240
diff
changeset
|
1523 | int ival, i, rc, rlen; |
175
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1524 | float fval; |
87
55f1315c94f1
Added unit command and list unit command
Michiel Broek <mbroek@mbse.eu>
parents:
86
diff
changeset
|
1525 | |
55f1315c94f1
Added unit command and list unit command
Michiel Broek <mbroek@mbse.eu>
parents:
86
diff
changeset
|
1526 | opt = strtok(buf, " \0"); |
55f1315c94f1
Added unit command and list unit command
Michiel Broek <mbroek@mbse.eu>
parents:
86
diff
changeset
|
1527 | opt = strtok(NULL, " \0"); |
55f1315c94f1
Added unit command and list unit command
Michiel Broek <mbroek@mbse.eu>
parents:
86
diff
changeset
|
1528 | |
55f1315c94f1
Added unit command and list unit command
Michiel Broek <mbroek@mbse.eu>
parents:
86
diff
changeset
|
1529 | if (opt == NULL) { |
213
2317b8d644fa
Code cleanup, streamlined error messages.
Michiel Broek <mbroek@mbse.eu>
parents:
209
diff
changeset
|
1530 | srv_send((char *)"501 Subcommand missing"); |
87
55f1315c94f1
Added unit command and list unit command
Michiel Broek <mbroek@mbse.eu>
parents:
86
diff
changeset
|
1531 | return 1; |
55f1315c94f1
Added unit command and list unit command
Michiel Broek <mbroek@mbse.eu>
parents:
86
diff
changeset
|
1532 | } |
175
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1533 | param = strtok(NULL, "\0"); |
87
55f1315c94f1
Added unit command and list unit command
Michiel Broek <mbroek@mbse.eu>
parents:
86
diff
changeset
|
1534 | |
175
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1535 | if ((strcmp(opt, (char *)"LIST") == 0) && (param == NULL)) { |
213
2317b8d644fa
Code cleanup, streamlined error messages.
Michiel Broek <mbroek@mbse.eu>
parents:
209
diff
changeset
|
1536 | srv_send((char *)"212 Fermenter list follows:"); |
175
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1537 | for (unit = Config.units; unit; unit = unit->next) { |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1538 | srv_send((char *)"%s,%s,%s", unit->uuid, unit->name, UNITMODE[unit->mode]); |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1539 | } |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1540 | srv_send((char *)"."); |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1541 | return 1; |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1542 | } |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1543 | |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1544 | if (param == NULL) { |
213
2317b8d644fa
Code cleanup, streamlined error messages.
Michiel Broek <mbroek@mbse.eu>
parents:
209
diff
changeset
|
1545 | srv_send((char *)"502 Parameter missing"); |
175
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1546 | return 1; |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1547 | } |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1548 | |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1549 | if (strcmp(opt, (char *)"ADD") == 0) { |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1550 | unit = (units_list *)malloc(sizeof(units_list)); |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1551 | unit->next = NULL; |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1552 | unit->version = 1; |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1553 | unit->uuid = malloc(37); |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1554 | uuid_generate(uu); |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1555 | uuid_unparse(uu, unit->uuid); |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1556 | unit->name = xstrcpy(param); |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1557 | unit->air_address = unit->beer_address = unit->heater_address = unit->cooler_address = \ |
306
97602274eb58
Updated to add support for lights in a fermenter unit and a Power Supply status.
Michiel Broek <mbroek@mbse.eu>
parents:
303
diff
changeset
|
1558 | unit->fan_address = unit->door_address = unit->light_address = \ |
97602274eb58
Updated to add support for lights in a fermenter unit and a Power Supply status.
Michiel Broek <mbroek@mbse.eu>
parents:
303
diff
changeset
|
1559 | unit->psu_address = unit->profile = NULL; |
289
d810df0df36a
Added code to detect primary fermentation
Michiel Broek <mbroek@mbse.eu>
parents:
285
diff
changeset
|
1560 | unit->volume = unit->prof_peak_abs = unit->prof_peak_rel = 0.0; |
175
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1561 | unit->air_state = unit->beer_state = 1; |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1562 | unit->air_temperature = unit->beer_temperature = 20000; |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1563 | unit->beer_set = unit->fridge_set = 20.0; |
306
97602274eb58
Updated to add support for lights in a fermenter unit and a Power Supply status.
Michiel Broek <mbroek@mbse.eu>
parents:
303
diff
changeset
|
1564 | unit->heater_state = unit->cooler_state = unit->fan_state = unit->door_state = unit->mode = \ |
97602274eb58
Updated to add support for lights in a fermenter unit and a Power Supply status.
Michiel Broek <mbroek@mbse.eu>
parents:
303
diff
changeset
|
1565 | unit->light_state = unit->psu_state = unit->prof_state = 0; |
97602274eb58
Updated to add support for lights in a fermenter unit and a Power Supply status.
Michiel Broek <mbroek@mbse.eu>
parents:
303
diff
changeset
|
1566 | unit->heater_delay = unit->cooler_delay = unit->fan_delay = 20; /* 5 minutes delay */ |
97602274eb58
Updated to add support for lights in a fermenter unit and a Power Supply status.
Michiel Broek <mbroek@mbse.eu>
parents:
303
diff
changeset
|
1567 | unit->light_delay = 1; /* 15 seconds delay */ |
97602274eb58
Updated to add support for lights in a fermenter unit and a Power Supply status.
Michiel Broek <mbroek@mbse.eu>
parents:
303
diff
changeset
|
1568 | unit->heater_wait = unit->cooler_wait = unit->fan_wait = unit->light_wait = 0; |
97602274eb58
Updated to add support for lights in a fermenter unit and a Power Supply status.
Michiel Broek <mbroek@mbse.eu>
parents:
303
diff
changeset
|
1569 | unit->heater_usage = unit->cooler_usage = unit->fan_usage = unit->light_usage = 0; |
175
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1570 | unit->temp_set_min = 1.0; |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1571 | unit->temp_set_max = 30.0; |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1572 | unit->idle_rangeH = 1.0; |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1573 | unit->idle_rangeL = -1.0; |
289
d810df0df36a
Added code to detect primary fermentation
Michiel Broek <mbroek@mbse.eu>
parents:
285
diff
changeset
|
1574 | unit->prof_started = unit->prof_paused = unit->prof_primary_done = (time_t)0; |
284
9e6fb5aed618
Profile progress is visible in the web interface
Michiel Broek <mbroek@mbse.eu>
parents:
282
diff
changeset
|
1575 | unit->prof_percent = 0; |
313 | 1576 | unit->PID_dState = unit->PID_iState = unit->PID_Kp = unit->PID_Kd = unit->PID_Ki = 0.0; |
175
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1577 | |
245
b01b6238eb67
You can now safely add and remove units on a running system.
Michiel Broek <mbroek@mbse.eu>
parents:
240
diff
changeset
|
1578 | /* |
b01b6238eb67
You can now safely add and remove units on a running system.
Michiel Broek <mbroek@mbse.eu>
parents:
240
diff
changeset
|
1579 | * Block main process |
b01b6238eb67
You can now safely add and remove units on a running system.
Michiel Broek <mbroek@mbse.eu>
parents:
240
diff
changeset
|
1580 | */ |
b01b6238eb67
You can now safely add and remove units on a running system.
Michiel Broek <mbroek@mbse.eu>
parents:
240
diff
changeset
|
1581 | run_pause = TRUE; |
b01b6238eb67
You can now safely add and remove units on a running system.
Michiel Broek <mbroek@mbse.eu>
parents:
240
diff
changeset
|
1582 | for (;;) { |
b01b6238eb67
You can now safely add and remove units on a running system.
Michiel Broek <mbroek@mbse.eu>
parents:
240
diff
changeset
|
1583 | usleep(100000); |
b01b6238eb67
You can now safely add and remove units on a running system.
Michiel Broek <mbroek@mbse.eu>
parents:
240
diff
changeset
|
1584 | if (run_hold) |
b01b6238eb67
You can now safely add and remove units on a running system.
Michiel Broek <mbroek@mbse.eu>
parents:
240
diff
changeset
|
1585 | break; |
b01b6238eb67
You can now safely add and remove units on a running system.
Michiel Broek <mbroek@mbse.eu>
parents:
240
diff
changeset
|
1586 | } |
b01b6238eb67
You can now safely add and remove units on a running system.
Michiel Broek <mbroek@mbse.eu>
parents:
240
diff
changeset
|
1587 | |
175
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1588 | if (Config.units == NULL) { |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1589 | Config.units = unit; |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1590 | } else { |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1591 | for (tmpu = Config.units; tmpu; tmpu = tmpu->next) { |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1592 | if (tmpu->next == NULL) { |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1593 | tmpu->next = unit; |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1594 | break; |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1595 | } |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1596 | } |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1597 | } |
249 | 1598 | #ifdef HAVE_WIRINGPI_H |
245
b01b6238eb67
You can now safely add and remove units on a running system.
Michiel Broek <mbroek@mbse.eu>
parents:
240
diff
changeset
|
1599 | lcd_buf_reset(); |
249 | 1600 | #endif |
245
b01b6238eb67
You can now safely add and remove units on a running system.
Michiel Broek <mbroek@mbse.eu>
parents:
240
diff
changeset
|
1601 | run_pause = FALSE; |
175
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1602 | |
213
2317b8d644fa
Code cleanup, streamlined error messages.
Michiel Broek <mbroek@mbse.eu>
parents:
209
diff
changeset
|
1603 | syslog(LOG_NOTICE, "Unit %s added", unit->uuid); |
2317b8d644fa
Code cleanup, streamlined error messages.
Michiel Broek <mbroek@mbse.eu>
parents:
209
diff
changeset
|
1604 | srv_send((char *)"211 Unit %s added", unit->uuid); |
175
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1605 | return 0; |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1606 | } |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1607 | |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1608 | if (strcmp(opt, (char *)"DEL") == 0) { |
245
b01b6238eb67
You can now safely add and remove units on a running system.
Michiel Broek <mbroek@mbse.eu>
parents:
240
diff
changeset
|
1609 | /* |
b01b6238eb67
You can now safely add and remove units on a running system.
Michiel Broek <mbroek@mbse.eu>
parents:
240
diff
changeset
|
1610 | * Block main process. |
b01b6238eb67
You can now safely add and remove units on a running system.
Michiel Broek <mbroek@mbse.eu>
parents:
240
diff
changeset
|
1611 | */ |
b01b6238eb67
You can now safely add and remove units on a running system.
Michiel Broek <mbroek@mbse.eu>
parents:
240
diff
changeset
|
1612 | run_pause = TRUE; |
b01b6238eb67
You can now safely add and remove units on a running system.
Michiel Broek <mbroek@mbse.eu>
parents:
240
diff
changeset
|
1613 | for (;;) { |
b01b6238eb67
You can now safely add and remove units on a running system.
Michiel Broek <mbroek@mbse.eu>
parents:
240
diff
changeset
|
1614 | usleep(100000); |
b01b6238eb67
You can now safely add and remove units on a running system.
Michiel Broek <mbroek@mbse.eu>
parents:
240
diff
changeset
|
1615 | if (run_hold) |
b01b6238eb67
You can now safely add and remove units on a running system.
Michiel Broek <mbroek@mbse.eu>
parents:
240
diff
changeset
|
1616 | break; |
b01b6238eb67
You can now safely add and remove units on a running system.
Michiel Broek <mbroek@mbse.eu>
parents:
240
diff
changeset
|
1617 | } |
b01b6238eb67
You can now safely add and remove units on a running system.
Michiel Broek <mbroek@mbse.eu>
parents:
240
diff
changeset
|
1618 | |
b01b6238eb67
You can now safely add and remove units on a running system.
Michiel Broek <mbroek@mbse.eu>
parents:
240
diff
changeset
|
1619 | rc = delete_Unit(param); |
249 | 1620 | #ifdef HAVE_WIRINGPI_H |
245
b01b6238eb67
You can now safely add and remove units on a running system.
Michiel Broek <mbroek@mbse.eu>
parents:
240
diff
changeset
|
1621 | lcd_buf_reset(); |
249 | 1622 | #endif |
245
b01b6238eb67
You can now safely add and remove units on a running system.
Michiel Broek <mbroek@mbse.eu>
parents:
240
diff
changeset
|
1623 | run_pause = FALSE; |
b01b6238eb67
You can now safely add and remove units on a running system.
Michiel Broek <mbroek@mbse.eu>
parents:
240
diff
changeset
|
1624 | |
b01b6238eb67
You can now safely add and remove units on a running system.
Michiel Broek <mbroek@mbse.eu>
parents:
240
diff
changeset
|
1625 | if (rc) { |
213
2317b8d644fa
Code cleanup, streamlined error messages.
Michiel Broek <mbroek@mbse.eu>
parents:
209
diff
changeset
|
1626 | syslog(LOG_NOTICE, "Unit %s deleted", param); |
175
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1627 | srv_send((char *)"211 Unit %s deleted", param); |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1628 | return 0; |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1629 | } else { |
213
2317b8d644fa
Code cleanup, streamlined error messages.
Michiel Broek <mbroek@mbse.eu>
parents:
209
diff
changeset
|
1630 | srv_send((char *)"440 No such unit"); |
175
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1631 | return 1; |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1632 | } |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1633 | } |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1634 | |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1635 | if (strcmp(opt, (char *)"GET") == 0) { |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1636 | for (unit = Config.units; unit; unit = unit->next) { |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1637 | if (strcmp(param, unit->uuid) == 0) { |
213
2317b8d644fa
Code cleanup, streamlined error messages.
Michiel Broek <mbroek@mbse.eu>
parents:
209
diff
changeset
|
1638 | srv_send((char *)"213 Unit listing follows:"); |
175
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1639 | srv_send((char *)"NAME,%s", unit->name); |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1640 | srv_send((char *)"UUID,%s", unit->uuid); |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1641 | srv_send((char *)"VOLUME,%2f", unit->volume); |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1642 | srv_send((char *)"AIR_ADDRESS,%s", unit->air_address); |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1643 | srv_send((char *)"AIR_STATE,%s", TEMPSTATE[unit->air_state]); |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1644 | srv_send((char *)"AIR_TEMPERATURE,%.3f", unit->air_temperature / 1000.0); |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1645 | srv_send((char *)"BEER_ADDRESS,%s", MBSE_SS(unit->beer_address)); |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1646 | srv_send((char *)"BEER_STATE,%s", TEMPSTATE[unit->beer_state]); |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1647 | srv_send((char *)"BEER_TEMPERATURE,%.3f", unit->beer_temperature / 1000.0); |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1648 | srv_send((char *)"HEATER_ADDRESS,%s", unit->heater_address); |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1649 | srv_send((char *)"HEATER_STATE,%d", unit->heater_state); |
270
df81d583c2c3
The PID commands have an adjustable delay, default 5 minutes
Michiel Broek <mbroek@mbse.eu>
parents:
269
diff
changeset
|
1650 | srv_send((char *)"HEATER_DELAY,%d", unit->heater_delay); |
293 | 1651 | srv_send((char *)"HEATER_USAGE,%d", unit->heater_usage); |
175
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1652 | srv_send((char *)"COOLER_ADDRESS,%s", unit->cooler_address); |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1653 | srv_send((char *)"COOLER_STATE,%d", unit->cooler_state); |
270
df81d583c2c3
The PID commands have an adjustable delay, default 5 minutes
Michiel Broek <mbroek@mbse.eu>
parents:
269
diff
changeset
|
1654 | srv_send((char *)"COOLER_DELAY,%d", unit->cooler_delay); |
293 | 1655 | srv_send((char *)"COOLER_USAGE,%d", unit->cooler_usage); |
175
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1656 | srv_send((char *)"FAN_ADDRESS,%s", unit->fan_address); |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1657 | srv_send((char *)"FAN_STATE,%d", unit->fan_state); |
270
df81d583c2c3
The PID commands have an adjustable delay, default 5 minutes
Michiel Broek <mbroek@mbse.eu>
parents:
269
diff
changeset
|
1658 | srv_send((char *)"FAN_DELAY,%d", unit->fan_delay); |
293 | 1659 | srv_send((char *)"FAN_USAGE,%d", unit->fan_usage); |
306
97602274eb58
Updated to add support for lights in a fermenter unit and a Power Supply status.
Michiel Broek <mbroek@mbse.eu>
parents:
303
diff
changeset
|
1660 | srv_send((char *)"LIGHT_ADDRESS,%s", unit->light_address); |
97602274eb58
Updated to add support for lights in a fermenter unit and a Power Supply status.
Michiel Broek <mbroek@mbse.eu>
parents:
303
diff
changeset
|
1661 | srv_send((char *)"LIGHT_STATE,%d", unit->light_state); |
97602274eb58
Updated to add support for lights in a fermenter unit and a Power Supply status.
Michiel Broek <mbroek@mbse.eu>
parents:
303
diff
changeset
|
1662 | srv_send((char *)"LIGHT_DELAY,%d", unit->light_delay); |
97602274eb58
Updated to add support for lights in a fermenter unit and a Power Supply status.
Michiel Broek <mbroek@mbse.eu>
parents:
303
diff
changeset
|
1663 | srv_send((char *)"LIGHT_USAGE,%d", unit->light_usage); |
175
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1664 | srv_send((char *)"DOOR_ADDRESS,%s", unit->door_address); |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1665 | srv_send((char *)"DOOR_STATE,%d", unit->door_state); |
306
97602274eb58
Updated to add support for lights in a fermenter unit and a Power Supply status.
Michiel Broek <mbroek@mbse.eu>
parents:
303
diff
changeset
|
1666 | srv_send((char *)"PSU_ADDRESS,%s", unit->psu_address); |
97602274eb58
Updated to add support for lights in a fermenter unit and a Power Supply status.
Michiel Broek <mbroek@mbse.eu>
parents:
303
diff
changeset
|
1667 | srv_send((char *)"PSU_STATE,%d", unit->psu_state); |
175
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1668 | srv_send((char *)"MODE,%s", UNITMODE[unit->mode]); |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1669 | srv_send((char *)"FRIDGE_SET,%.1f", unit->fridge_set); |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1670 | srv_send((char *)"BEER_SET,%.1f", unit->beer_set); |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1671 | srv_send((char *)"PROFILE,%s", unit->profile); |
217 | 1672 | srv_send((char *)"PROF_STARTED,%d", (int)unit->prof_started); |
284
9e6fb5aed618
Profile progress is visible in the web interface
Michiel Broek <mbroek@mbse.eu>
parents:
282
diff
changeset
|
1673 | if (unit->prof_state == PROFILE_RUN) { |
9e6fb5aed618
Profile progress is visible in the web interface
Michiel Broek <mbroek@mbse.eu>
parents:
282
diff
changeset
|
1674 | srv_send((char *)"PROF_STATE,%s %d%%", PROFSTATE[unit->prof_state], unit->prof_percent); |
9e6fb5aed618
Profile progress is visible in the web interface
Michiel Broek <mbroek@mbse.eu>
parents:
282
diff
changeset
|
1675 | } else { |
9e6fb5aed618
Profile progress is visible in the web interface
Michiel Broek <mbroek@mbse.eu>
parents:
282
diff
changeset
|
1676 | srv_send((char *)"PROF_STATE,%s", PROFSTATE[unit->prof_state]); |
9e6fb5aed618
Profile progress is visible in the web interface
Michiel Broek <mbroek@mbse.eu>
parents:
282
diff
changeset
|
1677 | } |
217 | 1678 | srv_send((char *)"PROF_TARGET,%.3f", unit->prof_target); |
289
d810df0df36a
Added code to detect primary fermentation
Michiel Broek <mbroek@mbse.eu>
parents:
285
diff
changeset
|
1679 | srv_send((char *)"PROF_PEAK_ABS,%.3f", unit->prof_peak_abs); |
d810df0df36a
Added code to detect primary fermentation
Michiel Broek <mbroek@mbse.eu>
parents:
285
diff
changeset
|
1680 | srv_send((char *)"PROF_PEAK_REL,%.3f", unit->prof_peak_rel); |
d810df0df36a
Added code to detect primary fermentation
Michiel Broek <mbroek@mbse.eu>
parents:
285
diff
changeset
|
1681 | srv_send((char *)"PROF_PRIMARY_DONE,%d", (int)unit->prof_primary_done); |
175
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1682 | srv_send((char *)"TEMP_SET_MIN,%.1f", unit->temp_set_min); |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1683 | srv_send((char *)"TEMP_SET_MAX,%.1f", unit->temp_set_max); |
312
7b0f819a3805
Added more precision to the unit low and high black window margins. Switched to PID routine from Pid without a PhD. The PID compute routine is now in the one second loop. The switch delay times are now in seconds, 0..720.
Michiel Broek <mbroek@mbse.eu>
parents:
311
diff
changeset
|
1684 | srv_send((char *)"IDLE_RANGE_L,%.2f", unit->idle_rangeL); |
7b0f819a3805
Added more precision to the unit low and high black window margins. Switched to PID routine from Pid without a PhD. The PID compute routine is now in the one second loop. The switch delay times are now in seconds, 0..720.
Michiel Broek <mbroek@mbse.eu>
parents:
311
diff
changeset
|
1685 | srv_send((char *)"IDLE_RANGE_H,%.2f", unit->idle_rangeH); |
310
53774295e14a
Added Kp, Kd and Ki settings to the units. Bumped to version 0.2.9
Michiel Broek <mbroek@mbse.eu>
parents:
306
diff
changeset
|
1686 | srv_send((char *)"PID_KP,%.2f", unit->PID_Kp); |
311
f3b0e9ac9bcb
PID changes and algorithm tuning.
Michiel Broek <mbroek@mbse.eu>
parents:
310
diff
changeset
|
1687 | srv_send((char *)"PID_KI,%.2f", unit->PID_Ki); |
310
53774295e14a
Added Kp, Kd and Ki settings to the units. Bumped to version 0.2.9
Michiel Broek <mbroek@mbse.eu>
parents:
306
diff
changeset
|
1688 | srv_send((char *)"PID_KD,%.2f", unit->PID_Kd); |
175
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1689 | srv_send((char *)"."); |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1690 | return 1; |
87
55f1315c94f1
Added unit command and list unit command
Michiel Broek <mbroek@mbse.eu>
parents:
86
diff
changeset
|
1691 | } |
55f1315c94f1
Added unit command and list unit command
Michiel Broek <mbroek@mbse.eu>
parents:
86
diff
changeset
|
1692 | } |
213
2317b8d644fa
Code cleanup, streamlined error messages.
Michiel Broek <mbroek@mbse.eu>
parents:
209
diff
changeset
|
1693 | srv_send((char *)"440 No such unit"); |
87
55f1315c94f1
Added unit command and list unit command
Michiel Broek <mbroek@mbse.eu>
parents:
86
diff
changeset
|
1694 | return 1; |
55f1315c94f1
Added unit command and list unit command
Michiel Broek <mbroek@mbse.eu>
parents:
86
diff
changeset
|
1695 | } |
55f1315c94f1
Added unit command and list unit command
Michiel Broek <mbroek@mbse.eu>
parents:
86
diff
changeset
|
1696 | |
175
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1697 | if (strcmp(opt, (char *)"PUT") == 0) { |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1698 | for (unit = Config.units ; unit; unit = unit->next) { |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1699 | if (strcmp(unit->uuid, param) == 0) { |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1700 | while (1) { |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1701 | memset((char *)&ibuf, 0, SS_BUFSIZE); |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1702 | fromlen = sizeof(peeraddr_in); |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1703 | rlen = recvfrom(s, ibuf, sizeof(ibuf) -1, 0, (struct sockaddr *)&peeraddr_in, &fromlen); |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1704 | if (rlen == -1) { |
268
dda91dfa4aa8
All syslog logging only to LOG_NOTICE
Michiel Broek <mbroek@mbse.eu>
parents:
266
diff
changeset
|
1705 | syslog(LOG_NOTICE, "recvfrom(): %s", strerror(errno)); |
175
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1706 | srv_send((char *)"518 recfrom(): %s", strerror(errno)); |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1707 | return 1; |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1708 | } |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1709 | for (i = 0; i < strlen(ibuf); i++) { |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1710 | if (ibuf[i] == '\n') |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1711 | ibuf[i] = '\0'; |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1712 | if (ibuf[i] == '\r') |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1713 | ibuf[i] = '\0'; |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1714 | } |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1715 | for (i = strlen(ibuf) -1; i > 0; i--) { |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1716 | if (ibuf[i] == ' ') |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1717 | ibuf[i] = '\0'; |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1718 | else |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1719 | break; |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1720 | } |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1721 | if (strlen(ibuf)) { |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1722 | if (debug) { |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1723 | syslog(LOG_NOTICE, "recv: \"%s\"", ibuf); |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1724 | fprintf(stdout, "recv: \"%s\"\n", ibuf); |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1725 | } |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1726 | if (strcmp(ibuf, (char *)".") == 0) { |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1727 | srv_send((char *)"219 Accepted Unit record"); |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1728 | return 0; |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1729 | } |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1730 | kwd = strtok(ibuf, ",\0"); |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1731 | val = strtok(NULL, "\0"); |
178
988a898974f3
Web - server communication for switches improved.
Michiel Broek <mbroek@mbse.eu>
parents:
176
diff
changeset
|
1732 | if (kwd) { |
175
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1733 | /* |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1734 | * Accept writable data. The client can sent just one line, |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1735 | * but may also sent everything. Simply ignore things we |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1736 | * don't understand. |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1737 | */ |
178
988a898974f3
Web - server communication for switches improved.
Michiel Broek <mbroek@mbse.eu>
parents:
176
diff
changeset
|
1738 | if (val && (strcmp(kwd, (char *)"NAME") == 0)) { |
282
885e5243bb50
UNIT PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
281
diff
changeset
|
1739 | if (unit->name) { |
885e5243bb50
UNIT PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
281
diff
changeset
|
1740 | if (strcmp(unit->name, val)) |
885e5243bb50
UNIT PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
281
diff
changeset
|
1741 | syslog(LOG_NOTICE, "Fermenter unit %s name `%s' to `%s'", unit->uuid, unit->name, val); |
175
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1742 | free(unit->name); |
282
885e5243bb50
UNIT PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
281
diff
changeset
|
1743 | } |
175
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1744 | unit->name = xstrcpy(val); |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1745 | |
178
988a898974f3
Web - server communication for switches improved.
Michiel Broek <mbroek@mbse.eu>
parents:
176
diff
changeset
|
1746 | } else if (val && (strcmp(kwd, (char *)"VOLUME") == 0)) { |
282
885e5243bb50
UNIT PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
281
diff
changeset
|
1747 | if (sscanf(val, "%f", &fval) == 1) { |
885e5243bb50
UNIT PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
281
diff
changeset
|
1748 | if (unit->volume != fval) |
885e5243bb50
UNIT PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
281
diff
changeset
|
1749 | syslog(LOG_NOTICE, "Fermenter unit %s volume %.3f to %.3f", unit->uuid, unit->volume, fval); |
175
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1750 | unit->volume = fval; |
282
885e5243bb50
UNIT PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
281
diff
changeset
|
1751 | } |
175
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1752 | |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1753 | } else if (strcmp(kwd, (char *)"AIR_ADDRESS") == 0) { |
282
885e5243bb50
UNIT PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
281
diff
changeset
|
1754 | if (val && unit->air_address && (strcmp(val, unit->air_address))) |
885e5243bb50
UNIT PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
281
diff
changeset
|
1755 | syslog(LOG_NOTICE, "Fermenter unit %s air address `%s' to `%s'", unit->uuid, unit->air_address, val); |
179
417ee898fb02
Added PID implementation and 433 MHz radio control switches. Not reliable yet.
Michiel Broek <mbroek@mbse.eu>
parents:
178
diff
changeset
|
1756 | if (unit->air_address) { |
417ee898fb02
Added PID implementation and 433 MHz radio control switches. Not reliable yet.
Michiel Broek <mbroek@mbse.eu>
parents:
178
diff
changeset
|
1757 | device_count(FALSE, unit->air_address); |
175
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1758 | free(unit->air_address); |
179
417ee898fb02
Added PID implementation and 433 MHz radio control switches. Not reliable yet.
Michiel Broek <mbroek@mbse.eu>
parents:
178
diff
changeset
|
1759 | } |
417ee898fb02
Added PID implementation and 433 MHz radio control switches. Not reliable yet.
Michiel Broek <mbroek@mbse.eu>
parents:
178
diff
changeset
|
1760 | if (val) { |
178
988a898974f3
Web - server communication for switches improved.
Michiel Broek <mbroek@mbse.eu>
parents:
176
diff
changeset
|
1761 | unit->air_address = xstrcpy(val); |
179
417ee898fb02
Added PID implementation and 433 MHz radio control switches. Not reliable yet.
Michiel Broek <mbroek@mbse.eu>
parents:
178
diff
changeset
|
1762 | device_count(TRUE, unit->air_address); |
417ee898fb02
Added PID implementation and 433 MHz radio control switches. Not reliable yet.
Michiel Broek <mbroek@mbse.eu>
parents:
178
diff
changeset
|
1763 | } else |
178
988a898974f3
Web - server communication for switches improved.
Michiel Broek <mbroek@mbse.eu>
parents:
176
diff
changeset
|
1764 | unit->air_address = NULL; |
175
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1765 | |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1766 | } else if (strcmp(kwd, (char *)"BEER_ADDRESS") == 0) { |
282
885e5243bb50
UNIT PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
281
diff
changeset
|
1767 | if (val && unit->beer_address && (strcmp(val, unit->beer_address))) |
885e5243bb50
UNIT PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
281
diff
changeset
|
1768 | syslog(LOG_NOTICE, "Fermenter unit %s beer address `%s' to `%s'", unit->uuid, unit->beer_address, val); |
179
417ee898fb02
Added PID implementation and 433 MHz radio control switches. Not reliable yet.
Michiel Broek <mbroek@mbse.eu>
parents:
178
diff
changeset
|
1769 | if (unit->beer_address) { |
417ee898fb02
Added PID implementation and 433 MHz radio control switches. Not reliable yet.
Michiel Broek <mbroek@mbse.eu>
parents:
178
diff
changeset
|
1770 | device_count(FALSE, unit->beer_address); |
175
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1771 | free(unit->beer_address); |
179
417ee898fb02
Added PID implementation and 433 MHz radio control switches. Not reliable yet.
Michiel Broek <mbroek@mbse.eu>
parents:
178
diff
changeset
|
1772 | } |
417ee898fb02
Added PID implementation and 433 MHz radio control switches. Not reliable yet.
Michiel Broek <mbroek@mbse.eu>
parents:
178
diff
changeset
|
1773 | if (val) { |
178
988a898974f3
Web - server communication for switches improved.
Michiel Broek <mbroek@mbse.eu>
parents:
176
diff
changeset
|
1774 | unit->beer_address = xstrcpy(val); |
179
417ee898fb02
Added PID implementation and 433 MHz radio control switches. Not reliable yet.
Michiel Broek <mbroek@mbse.eu>
parents:
178
diff
changeset
|
1775 | device_count(TRUE, unit->beer_address); |
417ee898fb02
Added PID implementation and 433 MHz radio control switches. Not reliable yet.
Michiel Broek <mbroek@mbse.eu>
parents:
178
diff
changeset
|
1776 | } else |
178
988a898974f3
Web - server communication for switches improved.
Michiel Broek <mbroek@mbse.eu>
parents:
176
diff
changeset
|
1777 | unit->beer_address = NULL; |
175
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1778 | |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1779 | } else if (strcmp(kwd, (char *)"HEATER_ADDRESS") == 0) { |
282
885e5243bb50
UNIT PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
281
diff
changeset
|
1780 | if (val && unit->heater_address && (strcmp(val, unit->heater_address))) |
885e5243bb50
UNIT PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
281
diff
changeset
|
1781 | syslog(LOG_NOTICE, "Fermenter unit %s heater address `%s' to `%s'", unit->uuid, unit->heater_address, val); |
179
417ee898fb02
Added PID implementation and 433 MHz radio control switches. Not reliable yet.
Michiel Broek <mbroek@mbse.eu>
parents:
178
diff
changeset
|
1782 | if (unit->heater_address) { |
417ee898fb02
Added PID implementation and 433 MHz radio control switches. Not reliable yet.
Michiel Broek <mbroek@mbse.eu>
parents:
178
diff
changeset
|
1783 | device_count(FALSE, unit->heater_address); |
175
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1784 | free(unit->heater_address); |
179
417ee898fb02
Added PID implementation and 433 MHz radio control switches. Not reliable yet.
Michiel Broek <mbroek@mbse.eu>
parents:
178
diff
changeset
|
1785 | } |
417ee898fb02
Added PID implementation and 433 MHz radio control switches. Not reliable yet.
Michiel Broek <mbroek@mbse.eu>
parents:
178
diff
changeset
|
1786 | if (val) { |
178
988a898974f3
Web - server communication for switches improved.
Michiel Broek <mbroek@mbse.eu>
parents:
176
diff
changeset
|
1787 | unit->heater_address = xstrcpy(val); |
179
417ee898fb02
Added PID implementation and 433 MHz radio control switches. Not reliable yet.
Michiel Broek <mbroek@mbse.eu>
parents:
178
diff
changeset
|
1788 | device_count(TRUE, unit->heater_address); |
417ee898fb02
Added PID implementation and 433 MHz radio control switches. Not reliable yet.
Michiel Broek <mbroek@mbse.eu>
parents:
178
diff
changeset
|
1789 | } else |
178
988a898974f3
Web - server communication for switches improved.
Michiel Broek <mbroek@mbse.eu>
parents:
176
diff
changeset
|
1790 | unit->heater_address = NULL; |
988a898974f3
Web - server communication for switches improved.
Michiel Broek <mbroek@mbse.eu>
parents:
176
diff
changeset
|
1791 | |
988a898974f3
Web - server communication for switches improved.
Michiel Broek <mbroek@mbse.eu>
parents:
176
diff
changeset
|
1792 | } else if (val && (strcmp(kwd, (char *)"HEATER_STATE") == 0)) { |
282
885e5243bb50
UNIT PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
281
diff
changeset
|
1793 | if ((sscanf(val, "%d", &ival) == 1) && ((ival == 0) || (ival == 100))) { |
885e5243bb50
UNIT PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
281
diff
changeset
|
1794 | if (unit->heater_state != ival) |
885e5243bb50
UNIT PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
281
diff
changeset
|
1795 | syslog(LOG_NOTICE, "Fermenter unit %s heater state %d to %d", unit->uuid, unit->heater_state, ival); |
178
988a898974f3
Web - server communication for switches improved.
Michiel Broek <mbroek@mbse.eu>
parents:
176
diff
changeset
|
1796 | unit->heater_state = ival; |
282
885e5243bb50
UNIT PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
281
diff
changeset
|
1797 | } |
175
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1798 | |
270
df81d583c2c3
The PID commands have an adjustable delay, default 5 minutes
Michiel Broek <mbroek@mbse.eu>
parents:
269
diff
changeset
|
1799 | } else if (val && (strcmp(kwd, (char *)"HEATER_DELAY") == 0)) { |
282
885e5243bb50
UNIT PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
281
diff
changeset
|
1800 | if (sscanf(val, "%d", &ival) == 1) { |
885e5243bb50
UNIT PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
281
diff
changeset
|
1801 | if (unit->heater_delay != ival) |
885e5243bb50
UNIT PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
281
diff
changeset
|
1802 | syslog(LOG_NOTICE, "Fermenter unit %s heater delay %d to %d", unit->uuid, unit->heater_delay, ival); |
270
df81d583c2c3
The PID commands have an adjustable delay, default 5 minutes
Michiel Broek <mbroek@mbse.eu>
parents:
269
diff
changeset
|
1803 | unit->heater_delay = ival; |
282
885e5243bb50
UNIT PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
281
diff
changeset
|
1804 | } |
270
df81d583c2c3
The PID commands have an adjustable delay, default 5 minutes
Michiel Broek <mbroek@mbse.eu>
parents:
269
diff
changeset
|
1805 | |
175
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1806 | } else if (strcmp(kwd, (char *)"COOLER_ADDRESS") == 0) { |
282
885e5243bb50
UNIT PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
281
diff
changeset
|
1807 | if (val && unit->cooler_address && (strcmp(val, unit->cooler_address))) |
885e5243bb50
UNIT PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
281
diff
changeset
|
1808 | syslog(LOG_NOTICE, "Fermenter unit %s cooler address `%s' to `%s'", unit->uuid, unit->cooler_address, val); |
179
417ee898fb02
Added PID implementation and 433 MHz radio control switches. Not reliable yet.
Michiel Broek <mbroek@mbse.eu>
parents:
178
diff
changeset
|
1809 | if (unit->cooler_address) { |
417ee898fb02
Added PID implementation and 433 MHz radio control switches. Not reliable yet.
Michiel Broek <mbroek@mbse.eu>
parents:
178
diff
changeset
|
1810 | device_count(FALSE, unit->cooler_address); |
175
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1811 | free(unit->cooler_address); |
179
417ee898fb02
Added PID implementation and 433 MHz radio control switches. Not reliable yet.
Michiel Broek <mbroek@mbse.eu>
parents:
178
diff
changeset
|
1812 | } |
417ee898fb02
Added PID implementation and 433 MHz radio control switches. Not reliable yet.
Michiel Broek <mbroek@mbse.eu>
parents:
178
diff
changeset
|
1813 | if (val) { |
178
988a898974f3
Web - server communication for switches improved.
Michiel Broek <mbroek@mbse.eu>
parents:
176
diff
changeset
|
1814 | unit->cooler_address = xstrcpy(val); |
179
417ee898fb02
Added PID implementation and 433 MHz radio control switches. Not reliable yet.
Michiel Broek <mbroek@mbse.eu>
parents:
178
diff
changeset
|
1815 | device_count(TRUE, unit->cooler_address); |
417ee898fb02
Added PID implementation and 433 MHz radio control switches. Not reliable yet.
Michiel Broek <mbroek@mbse.eu>
parents:
178
diff
changeset
|
1816 | } else |
178
988a898974f3
Web - server communication for switches improved.
Michiel Broek <mbroek@mbse.eu>
parents:
176
diff
changeset
|
1817 | unit->cooler_address = NULL; |
988a898974f3
Web - server communication for switches improved.
Michiel Broek <mbroek@mbse.eu>
parents:
176
diff
changeset
|
1818 | |
988a898974f3
Web - server communication for switches improved.
Michiel Broek <mbroek@mbse.eu>
parents:
176
diff
changeset
|
1819 | } else if (val && (strcmp(kwd, (char *)"COOLER_STATE") == 0)) { |
282
885e5243bb50
UNIT PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
281
diff
changeset
|
1820 | if ((sscanf(val, "%d", &ival) == 1) && ((ival == 0) || (ival == 100))) { |
885e5243bb50
UNIT PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
281
diff
changeset
|
1821 | if (unit->cooler_state != ival) |
885e5243bb50
UNIT PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
281
diff
changeset
|
1822 | syslog(LOG_NOTICE, "Fermenter unit %s cooler state %d to %d", unit->uuid, unit->cooler_state, ival); |
178
988a898974f3
Web - server communication for switches improved.
Michiel Broek <mbroek@mbse.eu>
parents:
176
diff
changeset
|
1823 | unit->cooler_state = ival; |
282
885e5243bb50
UNIT PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
281
diff
changeset
|
1824 | } |
175
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1825 | |
270
df81d583c2c3
The PID commands have an adjustable delay, default 5 minutes
Michiel Broek <mbroek@mbse.eu>
parents:
269
diff
changeset
|
1826 | } else if (val && (strcmp(kwd, (char *)"COOLER_DELAY") == 0)) { |
282
885e5243bb50
UNIT PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
281
diff
changeset
|
1827 | if (sscanf(val, "%d", &ival) == 1) { |
885e5243bb50
UNIT PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
281
diff
changeset
|
1828 | if (unit->cooler_delay != ival) |
885e5243bb50
UNIT PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
281
diff
changeset
|
1829 | syslog(LOG_NOTICE, "Fermenter unit %s cooler delay %d to %d", unit->uuid, unit->cooler_delay, ival); |
270
df81d583c2c3
The PID commands have an adjustable delay, default 5 minutes
Michiel Broek <mbroek@mbse.eu>
parents:
269
diff
changeset
|
1830 | unit->cooler_delay = ival; |
282
885e5243bb50
UNIT PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
281
diff
changeset
|
1831 | } |
270
df81d583c2c3
The PID commands have an adjustable delay, default 5 minutes
Michiel Broek <mbroek@mbse.eu>
parents:
269
diff
changeset
|
1832 | |
175
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1833 | } else if (strcmp(kwd, (char *)"FAN_ADDRESS") == 0) { |
282
885e5243bb50
UNIT PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
281
diff
changeset
|
1834 | if (val && unit->fan_address && (strcmp(val, unit->fan_address))) |
885e5243bb50
UNIT PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
281
diff
changeset
|
1835 | syslog(LOG_NOTICE, "Fermenter unit %s fan address `%s' to `%s'", unit->uuid, unit->fan_address, val); |
179
417ee898fb02
Added PID implementation and 433 MHz radio control switches. Not reliable yet.
Michiel Broek <mbroek@mbse.eu>
parents:
178
diff
changeset
|
1836 | if (unit->fan_address) { |
417ee898fb02
Added PID implementation and 433 MHz radio control switches. Not reliable yet.
Michiel Broek <mbroek@mbse.eu>
parents:
178
diff
changeset
|
1837 | device_count(FALSE, unit->fan_address); |
178
988a898974f3
Web - server communication for switches improved.
Michiel Broek <mbroek@mbse.eu>
parents:
176
diff
changeset
|
1838 | free(unit->fan_address); |
179
417ee898fb02
Added PID implementation and 433 MHz radio control switches. Not reliable yet.
Michiel Broek <mbroek@mbse.eu>
parents:
178
diff
changeset
|
1839 | } |
417ee898fb02
Added PID implementation and 433 MHz radio control switches. Not reliable yet.
Michiel Broek <mbroek@mbse.eu>
parents:
178
diff
changeset
|
1840 | if (val) { |
178
988a898974f3
Web - server communication for switches improved.
Michiel Broek <mbroek@mbse.eu>
parents:
176
diff
changeset
|
1841 | unit->fan_address = xstrcpy(val); |
179
417ee898fb02
Added PID implementation and 433 MHz radio control switches. Not reliable yet.
Michiel Broek <mbroek@mbse.eu>
parents:
178
diff
changeset
|
1842 | device_count(TRUE, unit->fan_address); |
417ee898fb02
Added PID implementation and 433 MHz radio control switches. Not reliable yet.
Michiel Broek <mbroek@mbse.eu>
parents:
178
diff
changeset
|
1843 | } else |
178
988a898974f3
Web - server communication for switches improved.
Michiel Broek <mbroek@mbse.eu>
parents:
176
diff
changeset
|
1844 | unit->fan_address = NULL; |
175
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1845 | |
178
988a898974f3
Web - server communication for switches improved.
Michiel Broek <mbroek@mbse.eu>
parents:
176
diff
changeset
|
1846 | } else if (val && (strcmp(kwd, (char *)"FAN_STATE") == 0)) { |
282
885e5243bb50
UNIT PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
281
diff
changeset
|
1847 | if ((sscanf(val, "%d", &ival) == 1) && ((ival == 0) || (ival == 100))) { |
885e5243bb50
UNIT PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
281
diff
changeset
|
1848 | if (unit->fan_state != ival) |
885e5243bb50
UNIT PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
281
diff
changeset
|
1849 | syslog(LOG_NOTICE, "Fermenter unit %s fan state %d to %d", unit->uuid, unit->fan_state, ival); |
178
988a898974f3
Web - server communication for switches improved.
Michiel Broek <mbroek@mbse.eu>
parents:
176
diff
changeset
|
1850 | unit->fan_state = ival; |
282
885e5243bb50
UNIT PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
281
diff
changeset
|
1851 | } |
178
988a898974f3
Web - server communication for switches improved.
Michiel Broek <mbroek@mbse.eu>
parents:
176
diff
changeset
|
1852 | |
270
df81d583c2c3
The PID commands have an adjustable delay, default 5 minutes
Michiel Broek <mbroek@mbse.eu>
parents:
269
diff
changeset
|
1853 | } else if (val && (strcmp(kwd, (char *)"FAN_DELAY") == 0)) { |
282
885e5243bb50
UNIT PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
281
diff
changeset
|
1854 | if (sscanf(val, "%d", &ival) == 1) { |
885e5243bb50
UNIT PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
281
diff
changeset
|
1855 | if (unit->fan_delay != ival) |
885e5243bb50
UNIT PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
281
diff
changeset
|
1856 | syslog(LOG_NOTICE, "Fermenter unit %s fan delay %d to %d", unit->uuid, unit->fan_delay, ival); |
270
df81d583c2c3
The PID commands have an adjustable delay, default 5 minutes
Michiel Broek <mbroek@mbse.eu>
parents:
269
diff
changeset
|
1857 | unit->fan_delay = ival; |
282
885e5243bb50
UNIT PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
281
diff
changeset
|
1858 | } |
270
df81d583c2c3
The PID commands have an adjustable delay, default 5 minutes
Michiel Broek <mbroek@mbse.eu>
parents:
269
diff
changeset
|
1859 | |
306
97602274eb58
Updated to add support for lights in a fermenter unit and a Power Supply status.
Michiel Broek <mbroek@mbse.eu>
parents:
303
diff
changeset
|
1860 | } else if (strcmp(kwd, (char *)"LIGHT_ADDRESS") == 0) { |
97602274eb58
Updated to add support for lights in a fermenter unit and a Power Supply status.
Michiel Broek <mbroek@mbse.eu>
parents:
303
diff
changeset
|
1861 | if (val && unit->light_address && (strcmp(val, unit->light_address))) |
97602274eb58
Updated to add support for lights in a fermenter unit and a Power Supply status.
Michiel Broek <mbroek@mbse.eu>
parents:
303
diff
changeset
|
1862 | syslog(LOG_NOTICE, "Fermenter unit %s light address `%s' to `%s'", unit->uuid, unit->light_address, val); |
97602274eb58
Updated to add support for lights in a fermenter unit and a Power Supply status.
Michiel Broek <mbroek@mbse.eu>
parents:
303
diff
changeset
|
1863 | if (unit->light_address) { |
97602274eb58
Updated to add support for lights in a fermenter unit and a Power Supply status.
Michiel Broek <mbroek@mbse.eu>
parents:
303
diff
changeset
|
1864 | device_count(FALSE, unit->light_address); |
97602274eb58
Updated to add support for lights in a fermenter unit and a Power Supply status.
Michiel Broek <mbroek@mbse.eu>
parents:
303
diff
changeset
|
1865 | free(unit->light_address); |
97602274eb58
Updated to add support for lights in a fermenter unit and a Power Supply status.
Michiel Broek <mbroek@mbse.eu>
parents:
303
diff
changeset
|
1866 | } |
97602274eb58
Updated to add support for lights in a fermenter unit and a Power Supply status.
Michiel Broek <mbroek@mbse.eu>
parents:
303
diff
changeset
|
1867 | if (val) { |
97602274eb58
Updated to add support for lights in a fermenter unit and a Power Supply status.
Michiel Broek <mbroek@mbse.eu>
parents:
303
diff
changeset
|
1868 | unit->light_address = xstrcpy(val); |
97602274eb58
Updated to add support for lights in a fermenter unit and a Power Supply status.
Michiel Broek <mbroek@mbse.eu>
parents:
303
diff
changeset
|
1869 | device_count(TRUE, unit->light_address); |
97602274eb58
Updated to add support for lights in a fermenter unit and a Power Supply status.
Michiel Broek <mbroek@mbse.eu>
parents:
303
diff
changeset
|
1870 | } else |
97602274eb58
Updated to add support for lights in a fermenter unit and a Power Supply status.
Michiel Broek <mbroek@mbse.eu>
parents:
303
diff
changeset
|
1871 | unit->light_address = NULL; |
97602274eb58
Updated to add support for lights in a fermenter unit and a Power Supply status.
Michiel Broek <mbroek@mbse.eu>
parents:
303
diff
changeset
|
1872 | |
97602274eb58
Updated to add support for lights in a fermenter unit and a Power Supply status.
Michiel Broek <mbroek@mbse.eu>
parents:
303
diff
changeset
|
1873 | } else if (val && (strcmp(kwd, (char *)"LIGHT_STATE") == 0)) { |
97602274eb58
Updated to add support for lights in a fermenter unit and a Power Supply status.
Michiel Broek <mbroek@mbse.eu>
parents:
303
diff
changeset
|
1874 | if ((sscanf(val, "%d", &ival) == 1) && ((ival == 0) || (ival == 100))) { |
97602274eb58
Updated to add support for lights in a fermenter unit and a Power Supply status.
Michiel Broek <mbroek@mbse.eu>
parents:
303
diff
changeset
|
1875 | if (unit->light_state != ival) |
97602274eb58
Updated to add support for lights in a fermenter unit and a Power Supply status.
Michiel Broek <mbroek@mbse.eu>
parents:
303
diff
changeset
|
1876 | syslog(LOG_NOTICE, "Fermenter unit %s light state %d to %d", unit->uuid, unit->light_state, ival); |
97602274eb58
Updated to add support for lights in a fermenter unit and a Power Supply status.
Michiel Broek <mbroek@mbse.eu>
parents:
303
diff
changeset
|
1877 | unit->light_state = ival; |
97602274eb58
Updated to add support for lights in a fermenter unit and a Power Supply status.
Michiel Broek <mbroek@mbse.eu>
parents:
303
diff
changeset
|
1878 | } |
97602274eb58
Updated to add support for lights in a fermenter unit and a Power Supply status.
Michiel Broek <mbroek@mbse.eu>
parents:
303
diff
changeset
|
1879 | |
97602274eb58
Updated to add support for lights in a fermenter unit and a Power Supply status.
Michiel Broek <mbroek@mbse.eu>
parents:
303
diff
changeset
|
1880 | } else if (val && (strcmp(kwd, (char *)"LIGHT_DELAY") == 0)) { |
97602274eb58
Updated to add support for lights in a fermenter unit and a Power Supply status.
Michiel Broek <mbroek@mbse.eu>
parents:
303
diff
changeset
|
1881 | if (sscanf(val, "%d", &ival) == 1) { |
97602274eb58
Updated to add support for lights in a fermenter unit and a Power Supply status.
Michiel Broek <mbroek@mbse.eu>
parents:
303
diff
changeset
|
1882 | if (unit->light_delay != ival) |
97602274eb58
Updated to add support for lights in a fermenter unit and a Power Supply status.
Michiel Broek <mbroek@mbse.eu>
parents:
303
diff
changeset
|
1883 | syslog(LOG_NOTICE, "Fermenter unit %s light delay %d to %d", unit->uuid, unit->light_delay, ival); |
97602274eb58
Updated to add support for lights in a fermenter unit and a Power Supply status.
Michiel Broek <mbroek@mbse.eu>
parents:
303
diff
changeset
|
1884 | unit->light_delay = ival; |
97602274eb58
Updated to add support for lights in a fermenter unit and a Power Supply status.
Michiel Broek <mbroek@mbse.eu>
parents:
303
diff
changeset
|
1885 | } |
97602274eb58
Updated to add support for lights in a fermenter unit and a Power Supply status.
Michiel Broek <mbroek@mbse.eu>
parents:
303
diff
changeset
|
1886 | |
175
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1887 | } else if (strcmp(kwd, (char *)"DOOR_ADDRESS") == 0) { |
282
885e5243bb50
UNIT PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
281
diff
changeset
|
1888 | if (val && unit->door_address && (strcmp(val, unit->door_address))) |
885e5243bb50
UNIT PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
281
diff
changeset
|
1889 | syslog(LOG_NOTICE, "Fermenter unit %s door address `%s' to `%s'", unit->uuid, unit->door_address, val); |
179
417ee898fb02
Added PID implementation and 433 MHz radio control switches. Not reliable yet.
Michiel Broek <mbroek@mbse.eu>
parents:
178
diff
changeset
|
1890 | if (unit->door_address) { |
417ee898fb02
Added PID implementation and 433 MHz radio control switches. Not reliable yet.
Michiel Broek <mbroek@mbse.eu>
parents:
178
diff
changeset
|
1891 | device_count(FALSE, unit->door_address); |
178
988a898974f3
Web - server communication for switches improved.
Michiel Broek <mbroek@mbse.eu>
parents:
176
diff
changeset
|
1892 | free(unit->door_address); |
179
417ee898fb02
Added PID implementation and 433 MHz radio control switches. Not reliable yet.
Michiel Broek <mbroek@mbse.eu>
parents:
178
diff
changeset
|
1893 | } |
417ee898fb02
Added PID implementation and 433 MHz radio control switches. Not reliable yet.
Michiel Broek <mbroek@mbse.eu>
parents:
178
diff
changeset
|
1894 | if (val) { |
178
988a898974f3
Web - server communication for switches improved.
Michiel Broek <mbroek@mbse.eu>
parents:
176
diff
changeset
|
1895 | unit->door_address = xstrcpy(val); |
179
417ee898fb02
Added PID implementation and 433 MHz radio control switches. Not reliable yet.
Michiel Broek <mbroek@mbse.eu>
parents:
178
diff
changeset
|
1896 | device_count(TRUE, unit->door_address); |
417ee898fb02
Added PID implementation and 433 MHz radio control switches. Not reliable yet.
Michiel Broek <mbroek@mbse.eu>
parents:
178
diff
changeset
|
1897 | } else |
178
988a898974f3
Web - server communication for switches improved.
Michiel Broek <mbroek@mbse.eu>
parents:
176
diff
changeset
|
1898 | unit->door_address = NULL; |
175
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1899 | |
306
97602274eb58
Updated to add support for lights in a fermenter unit and a Power Supply status.
Michiel Broek <mbroek@mbse.eu>
parents:
303
diff
changeset
|
1900 | } else if (strcmp(kwd, (char *)"PSU_ADDRESS") == 0) { |
97602274eb58
Updated to add support for lights in a fermenter unit and a Power Supply status.
Michiel Broek <mbroek@mbse.eu>
parents:
303
diff
changeset
|
1901 | if (val && unit->psu_address && (strcmp(val, unit->psu_address))) |
97602274eb58
Updated to add support for lights in a fermenter unit and a Power Supply status.
Michiel Broek <mbroek@mbse.eu>
parents:
303
diff
changeset
|
1902 | syslog(LOG_NOTICE, "Fermenter unit %s psu address `%s' to `%s'", unit->uuid, unit->psu_address, val); |
97602274eb58
Updated to add support for lights in a fermenter unit and a Power Supply status.
Michiel Broek <mbroek@mbse.eu>
parents:
303
diff
changeset
|
1903 | if (unit->psu_address) { |
97602274eb58
Updated to add support for lights in a fermenter unit and a Power Supply status.
Michiel Broek <mbroek@mbse.eu>
parents:
303
diff
changeset
|
1904 | device_count(FALSE, unit->psu_address); |
97602274eb58
Updated to add support for lights in a fermenter unit and a Power Supply status.
Michiel Broek <mbroek@mbse.eu>
parents:
303
diff
changeset
|
1905 | free(unit->psu_address); |
97602274eb58
Updated to add support for lights in a fermenter unit and a Power Supply status.
Michiel Broek <mbroek@mbse.eu>
parents:
303
diff
changeset
|
1906 | } |
97602274eb58
Updated to add support for lights in a fermenter unit and a Power Supply status.
Michiel Broek <mbroek@mbse.eu>
parents:
303
diff
changeset
|
1907 | if (val) { |
97602274eb58
Updated to add support for lights in a fermenter unit and a Power Supply status.
Michiel Broek <mbroek@mbse.eu>
parents:
303
diff
changeset
|
1908 | unit->psu_address = xstrcpy(val); |
97602274eb58
Updated to add support for lights in a fermenter unit and a Power Supply status.
Michiel Broek <mbroek@mbse.eu>
parents:
303
diff
changeset
|
1909 | device_count(TRUE, unit->psu_address); |
97602274eb58
Updated to add support for lights in a fermenter unit and a Power Supply status.
Michiel Broek <mbroek@mbse.eu>
parents:
303
diff
changeset
|
1910 | } else |
97602274eb58
Updated to add support for lights in a fermenter unit and a Power Supply status.
Michiel Broek <mbroek@mbse.eu>
parents:
303
diff
changeset
|
1911 | unit->psu_address = NULL; |
97602274eb58
Updated to add support for lights in a fermenter unit and a Power Supply status.
Michiel Broek <mbroek@mbse.eu>
parents:
303
diff
changeset
|
1912 | |
178
988a898974f3
Web - server communication for switches improved.
Michiel Broek <mbroek@mbse.eu>
parents:
176
diff
changeset
|
1913 | } else if (val && (strcmp(kwd, (char *)"MODE") == 0)) { |
175
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1914 | for (i = 0; i < 5; i++) { |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1915 | if (strcmp(val, UNITMODE[i]) == 0) { |
189
cc2b04d4db99
Init logfile when a unit is turned on. Added comments for profile processing.
Michiel Broek <mbroek@mbse.eu>
parents:
185
diff
changeset
|
1916 | /* Initialize log if the unit is turned on */ |
cc2b04d4db99
Init logfile when a unit is turned on. Added comments for profile processing.
Michiel Broek <mbroek@mbse.eu>
parents:
185
diff
changeset
|
1917 | if ((unit->mode == UNITMODE_OFF) && (i != UNITMODE_OFF)) |
cc2b04d4db99
Init logfile when a unit is turned on. Added comments for profile processing.
Michiel Broek <mbroek@mbse.eu>
parents:
185
diff
changeset
|
1918 | initlog(unit->name); |
282
885e5243bb50
UNIT PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
281
diff
changeset
|
1919 | syslog(LOG_NOTICE, "Fermenter unit %s mode %s to %s", unit->uuid, UNITMODE[unit->mode], UNITMODE[i]); |
175
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1920 | unit->mode = i; |
178
988a898974f3
Web - server communication for switches improved.
Michiel Broek <mbroek@mbse.eu>
parents:
176
diff
changeset
|
1921 | /* Allways turn everything off after a mode change */ |
313 | 1922 | unit->PID_iState = unit->PID_dState = 0.0; |
306
97602274eb58
Updated to add support for lights in a fermenter unit and a Power Supply status.
Michiel Broek <mbroek@mbse.eu>
parents:
303
diff
changeset
|
1923 | unit->heater_state = unit->cooler_state = unit->fan_state = unit->light_state = 0; |
97602274eb58
Updated to add support for lights in a fermenter unit and a Power Supply status.
Michiel Broek <mbroek@mbse.eu>
parents:
303
diff
changeset
|
1924 | unit->heater_wait = unit->cooler_wait = unit->fan_wait = unit->light_wait = 0; |
184 | 1925 | device_out(unit->heater_address, unit->heater_state); |
1926 | device_out(unit->cooler_address, unit->cooler_state); | |
1927 | device_out(unit->fan_address, unit->fan_state); | |
306
97602274eb58
Updated to add support for lights in a fermenter unit and a Power Supply status.
Michiel Broek <mbroek@mbse.eu>
parents:
303
diff
changeset
|
1928 | device_out(unit->light_address, unit->light_state); |
237
51a294d683cd
Add a sane default for profile precessing.
Michiel Broek <mbroek@mbse.eu>
parents:
235
diff
changeset
|
1929 | if (unit->mode == UNITMODE_PROFILE) { |
51a294d683cd
Add a sane default for profile precessing.
Michiel Broek <mbroek@mbse.eu>
parents:
235
diff
changeset
|
1930 | /* |
51a294d683cd
Add a sane default for profile precessing.
Michiel Broek <mbroek@mbse.eu>
parents:
235
diff
changeset
|
1931 | * Set a sane default until it will be overruled by the |
51a294d683cd
Add a sane default for profile precessing.
Michiel Broek <mbroek@mbse.eu>
parents:
235
diff
changeset
|
1932 | * main processing loop. |
51a294d683cd
Add a sane default for profile precessing.
Michiel Broek <mbroek@mbse.eu>
parents:
235
diff
changeset
|
1933 | */ |
51a294d683cd
Add a sane default for profile precessing.
Michiel Broek <mbroek@mbse.eu>
parents:
235
diff
changeset
|
1934 | unit->prof_target = 20.0; |
51a294d683cd
Add a sane default for profile precessing.
Michiel Broek <mbroek@mbse.eu>
parents:
235
diff
changeset
|
1935 | } |
175
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1936 | break; |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1937 | } |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1938 | } |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1939 | |
178
988a898974f3
Web - server communication for switches improved.
Michiel Broek <mbroek@mbse.eu>
parents:
176
diff
changeset
|
1940 | } else if (val && (strcmp(kwd, (char *)"FRIDGE_SET") == 0)) { |
246
6df404da3537
Setting fridge and beer temperature from the panel implemented
Michiel Broek <mbroek@mbse.eu>
parents:
245
diff
changeset
|
1941 | if ((sscanf(val, "%f", &fval) == 1) && (fval >= unit->temp_set_min) && (fval <= unit->temp_set_max)) { |
282
885e5243bb50
UNIT PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
281
diff
changeset
|
1942 | if (unit->fridge_set != fval) |
885e5243bb50
UNIT PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
281
diff
changeset
|
1943 | syslog(LOG_NOTICE, "Fermenter unit %s fridge temperature %.1f to %.1f", unit->uuid, unit->fridge_set, fval); |
175
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1944 | unit->fridge_set = fval; |
246
6df404da3537
Setting fridge and beer temperature from the panel implemented
Michiel Broek <mbroek@mbse.eu>
parents:
245
diff
changeset
|
1945 | } |
175
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1946 | |
178
988a898974f3
Web - server communication for switches improved.
Michiel Broek <mbroek@mbse.eu>
parents:
176
diff
changeset
|
1947 | } else if (val && (strcmp(kwd, (char *)"BEER_SET") == 0)) { |
246
6df404da3537
Setting fridge and beer temperature from the panel implemented
Michiel Broek <mbroek@mbse.eu>
parents:
245
diff
changeset
|
1948 | if ((sscanf(val, "%f", &fval) == 1) && (fval >= unit->temp_set_min) && (fval <= unit->temp_set_max)) { |
310
53774295e14a
Added Kp, Kd and Ki settings to the units. Bumped to version 0.2.9
Michiel Broek <mbroek@mbse.eu>
parents:
306
diff
changeset
|
1949 | if (unit->beer_set != fval) |
282
885e5243bb50
UNIT PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
281
diff
changeset
|
1950 | syslog(LOG_NOTICE, "Fermenter unit %s beer temperature %.1f to %.1f", unit->uuid, unit->beer_set, fval); |
175
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1951 | unit->beer_set = fval; |
246
6df404da3537
Setting fridge and beer temperature from the panel implemented
Michiel Broek <mbroek@mbse.eu>
parents:
245
diff
changeset
|
1952 | } |
175
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1953 | |
310
53774295e14a
Added Kp, Kd and Ki settings to the units. Bumped to version 0.2.9
Michiel Broek <mbroek@mbse.eu>
parents:
306
diff
changeset
|
1954 | } else if (val && (strcmp(kwd, (char *)"PID_KP") == 0)) { |
53774295e14a
Added Kp, Kd and Ki settings to the units. Bumped to version 0.2.9
Michiel Broek <mbroek@mbse.eu>
parents:
306
diff
changeset
|
1955 | if ((sscanf(val, "%f", &fval) == 1) && (fval >= 0.0)) { |
53774295e14a
Added Kp, Kd and Ki settings to the units. Bumped to version 0.2.9
Michiel Broek <mbroek@mbse.eu>
parents:
306
diff
changeset
|
1956 | if (unit->PID_Kp != fval) |
53774295e14a
Added Kp, Kd and Ki settings to the units. Bumped to version 0.2.9
Michiel Broek <mbroek@mbse.eu>
parents:
306
diff
changeset
|
1957 | syslog(LOG_NOTICE, "Fermenter unit %s PID Kp %.2f to %.2f", unit->uuid, unit->PID_Kp, fval); |
53774295e14a
Added Kp, Kd and Ki settings to the units. Bumped to version 0.2.9
Michiel Broek <mbroek@mbse.eu>
parents:
306
diff
changeset
|
1958 | unit->PID_Kp = fval; |
53774295e14a
Added Kp, Kd and Ki settings to the units. Bumped to version 0.2.9
Michiel Broek <mbroek@mbse.eu>
parents:
306
diff
changeset
|
1959 | } |
53774295e14a
Added Kp, Kd and Ki settings to the units. Bumped to version 0.2.9
Michiel Broek <mbroek@mbse.eu>
parents:
306
diff
changeset
|
1960 | |
53774295e14a
Added Kp, Kd and Ki settings to the units. Bumped to version 0.2.9
Michiel Broek <mbroek@mbse.eu>
parents:
306
diff
changeset
|
1961 | } else if (val && (strcmp(kwd, (char *)"PID_KD") == 0)) { |
53774295e14a
Added Kp, Kd and Ki settings to the units. Bumped to version 0.2.9
Michiel Broek <mbroek@mbse.eu>
parents:
306
diff
changeset
|
1962 | if ((sscanf(val, "%f", &fval) == 1) && (fval >= 0.0)) { |
53774295e14a
Added Kp, Kd and Ki settings to the units. Bumped to version 0.2.9
Michiel Broek <mbroek@mbse.eu>
parents:
306
diff
changeset
|
1963 | if (unit->PID_Kd != fval) |
53774295e14a
Added Kp, Kd and Ki settings to the units. Bumped to version 0.2.9
Michiel Broek <mbroek@mbse.eu>
parents:
306
diff
changeset
|
1964 | syslog(LOG_NOTICE, "Fermenter unit %s PID Kd %.2f to %.2f", unit->uuid, unit->PID_Kd, fval); |
53774295e14a
Added Kp, Kd and Ki settings to the units. Bumped to version 0.2.9
Michiel Broek <mbroek@mbse.eu>
parents:
306
diff
changeset
|
1965 | unit->PID_Kd = fval; |
53774295e14a
Added Kp, Kd and Ki settings to the units. Bumped to version 0.2.9
Michiel Broek <mbroek@mbse.eu>
parents:
306
diff
changeset
|
1966 | } |
53774295e14a
Added Kp, Kd and Ki settings to the units. Bumped to version 0.2.9
Michiel Broek <mbroek@mbse.eu>
parents:
306
diff
changeset
|
1967 | |
53774295e14a
Added Kp, Kd and Ki settings to the units. Bumped to version 0.2.9
Michiel Broek <mbroek@mbse.eu>
parents:
306
diff
changeset
|
1968 | } else if (val && (strcmp(kwd, (char *)"PID_KI") == 0)) { |
53774295e14a
Added Kp, Kd and Ki settings to the units. Bumped to version 0.2.9
Michiel Broek <mbroek@mbse.eu>
parents:
306
diff
changeset
|
1969 | if ((sscanf(val, "%f", &fval) == 1) && (fval >= 0.0)) { |
53774295e14a
Added Kp, Kd and Ki settings to the units. Bumped to version 0.2.9
Michiel Broek <mbroek@mbse.eu>
parents:
306
diff
changeset
|
1970 | if (unit->PID_Ki != fval) |
53774295e14a
Added Kp, Kd and Ki settings to the units. Bumped to version 0.2.9
Michiel Broek <mbroek@mbse.eu>
parents:
306
diff
changeset
|
1971 | syslog(LOG_NOTICE, "Fermenter unit %s PID Ki %.2f to %.2f", unit->uuid, unit->PID_Ki, fval); |
53774295e14a
Added Kp, Kd and Ki settings to the units. Bumped to version 0.2.9
Michiel Broek <mbroek@mbse.eu>
parents:
306
diff
changeset
|
1972 | unit->PID_Ki = fval; |
53774295e14a
Added Kp, Kd and Ki settings to the units. Bumped to version 0.2.9
Michiel Broek <mbroek@mbse.eu>
parents:
306
diff
changeset
|
1973 | } |
53774295e14a
Added Kp, Kd and Ki settings to the units. Bumped to version 0.2.9
Michiel Broek <mbroek@mbse.eu>
parents:
306
diff
changeset
|
1974 | |
175
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
1975 | } else if (strcmp(kwd, (char *)"PROFILE") == 0) { |
191
c74bbc24a1c8
Client/Server communication is now almost final
Michiel Broek <mbroek@mbse.eu>
parents:
189
diff
changeset
|
1976 | if (unit->prof_state == PROFILE_OFF) { |
c74bbc24a1c8
Client/Server communication is now almost final
Michiel Broek <mbroek@mbse.eu>
parents:
189
diff
changeset
|
1977 | /* |
c74bbc24a1c8
Client/Server communication is now almost final
Michiel Broek <mbroek@mbse.eu>
parents:
189
diff
changeset
|
1978 | * Only change profile if it is not active, else drop this one. |
c74bbc24a1c8
Client/Server communication is now almost final
Michiel Broek <mbroek@mbse.eu>
parents:
189
diff
changeset
|
1979 | */ |
282
885e5243bb50
UNIT PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
281
diff
changeset
|
1980 | if (unit->profile && val && strcmp(unit->profile, val)) |
885e5243bb50
UNIT PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
281
diff
changeset
|
1981 | syslog(LOG_NOTICE, "Fermenter unit %s profile name `%s' to `%s'", unit->uuid, unit->profile, val); |
191
c74bbc24a1c8
Client/Server communication is now almost final
Michiel Broek <mbroek@mbse.eu>
parents:
189
diff
changeset
|
1982 | if (unit->profile) |
c74bbc24a1c8
Client/Server communication is now almost final
Michiel Broek <mbroek@mbse.eu>
parents:
189
diff
changeset
|
1983 | free(unit->profile); |
282
885e5243bb50
UNIT PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
281
diff
changeset
|
1984 | |
191
c74bbc24a1c8
Client/Server communication is now almost final
Michiel Broek <mbroek@mbse.eu>
parents:
189
diff
changeset
|
1985 | if (val) |
c74bbc24a1c8
Client/Server communication is now almost final
Michiel Broek <mbroek@mbse.eu>
parents:
189
diff
changeset
|
1986 | unit->profile = xstrcpy(val); |
c74bbc24a1c8
Client/Server communication is now almost final
Michiel Broek <mbroek@mbse.eu>
parents:
189
diff
changeset
|
1987 | else |
c74bbc24a1c8
Client/Server communication is now almost final
Michiel Broek <mbroek@mbse.eu>
parents:
189
diff
changeset
|
1988 | unit->profile = NULL; |
195
b34a1b2421fb
Reset output when a different profile is selected. Better startup logging about the unit state. Added Beer, Fridge and partial Profile settings from the liveview weeb screen.
Michiel Broek <mbroek@mbse.eu>
parents:
194
diff
changeset
|
1989 | /* |
b34a1b2421fb
Reset output when a different profile is selected. Better startup logging about the unit state. Added Beer, Fridge and partial Profile settings from the liveview weeb screen.
Michiel Broek <mbroek@mbse.eu>
parents:
194
diff
changeset
|
1990 | * Reset all output devices |
b34a1b2421fb
Reset output when a different profile is selected. Better startup logging about the unit state. Added Beer, Fridge and partial Profile settings from the liveview weeb screen.
Michiel Broek <mbroek@mbse.eu>
parents:
194
diff
changeset
|
1991 | */ |
313 | 1992 | unit->PID_iState = unit->PID_dState = 0.0; |
306
97602274eb58
Updated to add support for lights in a fermenter unit and a Power Supply status.
Michiel Broek <mbroek@mbse.eu>
parents:
303
diff
changeset
|
1993 | unit->heater_state = unit->cooler_state = unit->fan_state = unit->light_state = 0; |
97602274eb58
Updated to add support for lights in a fermenter unit and a Power Supply status.
Michiel Broek <mbroek@mbse.eu>
parents:
303
diff
changeset
|
1994 | unit->heater_wait = unit->cooler_wait = unit->fan_wait = unit->light_wait = 0; |
195
b34a1b2421fb
Reset output when a different profile is selected. Better startup logging about the unit state. Added Beer, Fridge and partial Profile settings from the liveview weeb screen.
Michiel Broek <mbroek@mbse.eu>
parents:
194
diff
changeset
|
1995 | device_out(unit->heater_address, unit->heater_state); |
b34a1b2421fb
Reset output when a different profile is selected. Better startup logging about the unit state. Added Beer, Fridge and partial Profile settings from the liveview weeb screen.
Michiel Broek <mbroek@mbse.eu>
parents:
194
diff
changeset
|
1996 | device_out(unit->cooler_address, unit->cooler_state); |
b34a1b2421fb
Reset output when a different profile is selected. Better startup logging about the unit state. Added Beer, Fridge and partial Profile settings from the liveview weeb screen.
Michiel Broek <mbroek@mbse.eu>
parents:
194
diff
changeset
|
1997 | device_out(unit->fan_address, unit->fan_state); |
306
97602274eb58
Updated to add support for lights in a fermenter unit and a Power Supply status.
Michiel Broek <mbroek@mbse.eu>
parents:
303
diff
changeset
|
1998 | device_out(unit->light_address, unit->light_state); |
191
c74bbc24a1c8
Client/Server communication is now almost final
Michiel Broek <mbroek@mbse.eu>
parents:
189
diff
changeset
|
1999 | } |
175
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
2000 | |
178
988a898974f3
Web - server communication for switches improved.
Michiel Broek <mbroek@mbse.eu>
parents:
176
diff
changeset
|
2001 | } else if (val && (strcmp(kwd, (char *)"PROF_STATE") == 0)) { |
217 | 2002 | for (i = 0; i < 5; i++) { |
175
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
2003 | if (strcmp(val, PROFSTATE[i]) == 0) { |
219
ae720212accc
Added profile running and steps handling.
Michiel Broek <mbroek@mbse.eu>
parents:
217
diff
changeset
|
2004 | switch (i) { |
274
111b0e9663dc
Added logging if profile state is changed via the web interface. Log profile progress each half hour in syslog. Profile resttime steps 0 hours is allowed, meaning resttime or steptime must be set for a valid step. Updated the helptext on the web page.
Michiel Broek <mbroek@mbse.eu>
parents:
273
diff
changeset
|
2005 | case PROFILE_OFF: if (unit->prof_state == PROFILE_DONE) { |
219
ae720212accc
Added profile running and steps handling.
Michiel Broek <mbroek@mbse.eu>
parents:
217
diff
changeset
|
2006 | unit->prof_state = PROFILE_OFF; |
282
885e5243bb50
UNIT PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
281
diff
changeset
|
2007 | syslog(LOG_NOTICE, "Fermenter unit %s profile to OFF", unit->uuid); |
274
111b0e9663dc
Added logging if profile state is changed via the web interface. Log profile progress each half hour in syslog. Profile resttime steps 0 hours is allowed, meaning resttime or steptime must be set for a valid step. Updated the helptext on the web page.
Michiel Broek <mbroek@mbse.eu>
parents:
273
diff
changeset
|
2008 | } |
219
ae720212accc
Added profile running and steps handling.
Michiel Broek <mbroek@mbse.eu>
parents:
217
diff
changeset
|
2009 | break; |
274
111b0e9663dc
Added logging if profile state is changed via the web interface. Log profile progress each half hour in syslog. Profile resttime steps 0 hours is allowed, meaning resttime or steptime must be set for a valid step. Updated the helptext on the web page.
Michiel Broek <mbroek@mbse.eu>
parents:
273
diff
changeset
|
2010 | case PROFILE_PAUSE: if (unit->prof_state == PROFILE_RUN) { |
219
ae720212accc
Added profile running and steps handling.
Michiel Broek <mbroek@mbse.eu>
parents:
217
diff
changeset
|
2011 | unit->prof_state = PROFILE_PAUSE; |
282
885e5243bb50
UNIT PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
281
diff
changeset
|
2012 | syslog(LOG_NOTICE, "Fermenter unit %s profile PAUSE", unit->uuid); |
274
111b0e9663dc
Added logging if profile state is changed via the web interface. Log profile progress each half hour in syslog. Profile resttime steps 0 hours is allowed, meaning resttime or steptime must be set for a valid step. Updated the helptext on the web page.
Michiel Broek <mbroek@mbse.eu>
parents:
273
diff
changeset
|
2013 | } else if (unit->prof_state == PROFILE_PAUSE) { |
219
ae720212accc
Added profile running and steps handling.
Michiel Broek <mbroek@mbse.eu>
parents:
217
diff
changeset
|
2014 | unit->prof_state = PROFILE_RUN; |
282
885e5243bb50
UNIT PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
281
diff
changeset
|
2015 | syslog(LOG_NOTICE, "Fermenter unit %s profile RESUME", unit->uuid); |
274
111b0e9663dc
Added logging if profile state is changed via the web interface. Log profile progress each half hour in syslog. Profile resttime steps 0 hours is allowed, meaning resttime or steptime must be set for a valid step. Updated the helptext on the web page.
Michiel Broek <mbroek@mbse.eu>
parents:
273
diff
changeset
|
2016 | } |
219
ae720212accc
Added profile running and steps handling.
Michiel Broek <mbroek@mbse.eu>
parents:
217
diff
changeset
|
2017 | break; |
ae720212accc
Added profile running and steps handling.
Michiel Broek <mbroek@mbse.eu>
parents:
217
diff
changeset
|
2018 | case PROFILE_RUN: if (unit->prof_state == PROFILE_OFF) { |
ae720212accc
Added profile running and steps handling.
Michiel Broek <mbroek@mbse.eu>
parents:
217
diff
changeset
|
2019 | unit->prof_state = PROFILE_RUN; |
ae720212accc
Added profile running and steps handling.
Michiel Broek <mbroek@mbse.eu>
parents:
217
diff
changeset
|
2020 | unit->prof_started = time(NULL); |
289
d810df0df36a
Added code to detect primary fermentation
Michiel Broek <mbroek@mbse.eu>
parents:
285
diff
changeset
|
2021 | unit->prof_paused = unit->prof_primary_done = 0; |
d810df0df36a
Added code to detect primary fermentation
Michiel Broek <mbroek@mbse.eu>
parents:
285
diff
changeset
|
2022 | unit->prof_peak_abs = unit->prof_peak_rel = 0.0; |
282
885e5243bb50
UNIT PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
281
diff
changeset
|
2023 | syslog(LOG_NOTICE, "Fermenter unit %s profile to RUN", unit->uuid); |
219
ae720212accc
Added profile running and steps handling.
Michiel Broek <mbroek@mbse.eu>
parents:
217
diff
changeset
|
2024 | } |
ae720212accc
Added profile running and steps handling.
Michiel Broek <mbroek@mbse.eu>
parents:
217
diff
changeset
|
2025 | break; |
ae720212accc
Added profile running and steps handling.
Michiel Broek <mbroek@mbse.eu>
parents:
217
diff
changeset
|
2026 | case PROFILE_DONE: break; /* Command is illegal */ |
ae720212accc
Added profile running and steps handling.
Michiel Broek <mbroek@mbse.eu>
parents:
217
diff
changeset
|
2027 | case PROFILE_ABORT: if ((unit->prof_state == PROFILE_RUN) || (unit->prof_state == PROFILE_PAUSE)) { |
ae720212accc
Added profile running and steps handling.
Michiel Broek <mbroek@mbse.eu>
parents:
217
diff
changeset
|
2028 | unit->prof_state = PROFILE_OFF; |
ae720212accc
Added profile running and steps handling.
Michiel Broek <mbroek@mbse.eu>
parents:
217
diff
changeset
|
2029 | unit->prof_started = 0; |
282
885e5243bb50
UNIT PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
281
diff
changeset
|
2030 | syslog(LOG_NOTICE, "Fermenter unit %s profile ABORT", unit->uuid); |
219
ae720212accc
Added profile running and steps handling.
Michiel Broek <mbroek@mbse.eu>
parents:
217
diff
changeset
|
2031 | } |
ae720212accc
Added profile running and steps handling.
Michiel Broek <mbroek@mbse.eu>
parents:
217
diff
changeset
|
2032 | break; |
ae720212accc
Added profile running and steps handling.
Michiel Broek <mbroek@mbse.eu>
parents:
217
diff
changeset
|
2033 | } |
175
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
2034 | break; |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
2035 | } |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
2036 | } |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
2037 | |
178
988a898974f3
Web - server communication for switches improved.
Michiel Broek <mbroek@mbse.eu>
parents:
176
diff
changeset
|
2038 | } else if (val && (strcmp(kwd, (char *)"TEMP_SET_MIN") == 0)) { |
282
885e5243bb50
UNIT PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
281
diff
changeset
|
2039 | if (sscanf(val, "%f", &fval) == 1) { |
885e5243bb50
UNIT PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
281
diff
changeset
|
2040 | if (unit->temp_set_min != fval) |
885e5243bb50
UNIT PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
281
diff
changeset
|
2041 | syslog(LOG_NOTICE, "Fermenter unit %s temperature set minimum %.1f to %.1f", unit->uuid, unit->temp_set_min, fval); |
175
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
2042 | unit->temp_set_min = fval; |
282
885e5243bb50
UNIT PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
281
diff
changeset
|
2043 | } |
175
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
2044 | |
178
988a898974f3
Web - server communication for switches improved.
Michiel Broek <mbroek@mbse.eu>
parents:
176
diff
changeset
|
2045 | } else if (val && (strcmp(kwd, (char *)"TEMP_SET_MAX") == 0)) { |
282
885e5243bb50
UNIT PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
281
diff
changeset
|
2046 | if (sscanf(val, "%f", &fval) == 1) { |
885e5243bb50
UNIT PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
281
diff
changeset
|
2047 | if (unit->temp_set_max != fval) |
885e5243bb50
UNIT PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
281
diff
changeset
|
2048 | syslog(LOG_NOTICE, "Fermenter unit %s temperature set maximum %.1f to %.1f", unit->uuid, unit->temp_set_max, fval); |
175
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
2049 | unit->temp_set_max = fval; |
282
885e5243bb50
UNIT PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
281
diff
changeset
|
2050 | } |
175
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
2051 | |
178
988a898974f3
Web - server communication for switches improved.
Michiel Broek <mbroek@mbse.eu>
parents:
176
diff
changeset
|
2052 | } else if (val && (strcmp(kwd, (char *)"IDLE_RANGE_L") == 0)) { |
282
885e5243bb50
UNIT PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
281
diff
changeset
|
2053 | if (sscanf(val, "%f", &fval) == 1) { |
885e5243bb50
UNIT PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
281
diff
changeset
|
2054 | if (unit->idle_rangeL != fval) |
312
7b0f819a3805
Added more precision to the unit low and high black window margins. Switched to PID routine from Pid without a PhD. The PID compute routine is now in the one second loop. The switch delay times are now in seconds, 0..720.
Michiel Broek <mbroek@mbse.eu>
parents:
311
diff
changeset
|
2055 | syslog(LOG_NOTICE, "Fermenter unit %s idle range low %.2f to %.2f", unit->uuid, unit->idle_rangeL, fval); |
175
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
2056 | unit->idle_rangeL = fval; |
282
885e5243bb50
UNIT PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
281
diff
changeset
|
2057 | } |
175
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
2058 | |
178
988a898974f3
Web - server communication for switches improved.
Michiel Broek <mbroek@mbse.eu>
parents:
176
diff
changeset
|
2059 | } else if (val && (strcmp(kwd, (char *)"IDLE_RANGE_H") == 0)) { |
282
885e5243bb50
UNIT PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
281
diff
changeset
|
2060 | if (sscanf(val, "%f", &fval) == 1) { |
885e5243bb50
UNIT PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
281
diff
changeset
|
2061 | if (unit->idle_rangeH != fval) |
312
7b0f819a3805
Added more precision to the unit low and high black window margins. Switched to PID routine from Pid without a PhD. The PID compute routine is now in the one second loop. The switch delay times are now in seconds, 0..720.
Michiel Broek <mbroek@mbse.eu>
parents:
311
diff
changeset
|
2062 | syslog(LOG_NOTICE, "Fermenter unit %s idle range high %.2f to %.2f", unit->uuid, unit->idle_rangeH, fval); |
175
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
2063 | unit->idle_rangeH = fval; |
282
885e5243bb50
UNIT PUT command logging added.
Michiel Broek <mbroek@mbse.eu>
parents:
281
diff
changeset
|
2064 | } |
175
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
2065 | |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
2066 | } |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
2067 | } |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
2068 | } |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
2069 | } |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
2070 | } |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
2071 | } |
213
2317b8d644fa
Code cleanup, streamlined error messages.
Michiel Broek <mbroek@mbse.eu>
parents:
209
diff
changeset
|
2072 | srv_send((char *)"440 No such unit"); |
175
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
2073 | return 1; |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
2074 | } |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
2075 | |
213
2317b8d644fa
Code cleanup, streamlined error messages.
Michiel Broek <mbroek@mbse.eu>
parents:
209
diff
changeset
|
2076 | srv_send((char *)"504 Subcommand error"); |
87
55f1315c94f1
Added unit command and list unit command
Michiel Broek <mbroek@mbse.eu>
parents:
86
diff
changeset
|
2077 | return 1; |
55f1315c94f1
Added unit command and list unit command
Michiel Broek <mbroek@mbse.eu>
parents:
86
diff
changeset
|
2078 | } |
55f1315c94f1
Added unit command and list unit command
Michiel Broek <mbroek@mbse.eu>
parents:
86
diff
changeset
|
2079 | |
55f1315c94f1
Added unit command and list unit command
Michiel Broek <mbroek@mbse.eu>
parents:
86
diff
changeset
|
2080 | |
55f1315c94f1
Added unit command and list unit command
Michiel Broek <mbroek@mbse.eu>
parents:
86
diff
changeset
|
2081 | |
43 | 2082 | void cmd_server(void) |
2083 | { | |
132
8bd209d1c020
Added some profile commands to the server. Profile names can be changed from the web interface. Removed obsolete commands.
Michiel Broek <mbroek@mbse.eu>
parents:
131
diff
changeset
|
2084 | char buf[SS_BUFSIZE]; |
8bd209d1c020
Added some profile commands to the server. Profile names can be changed from the web interface. Removed obsolete commands.
Michiel Broek <mbroek@mbse.eu>
parents:
131
diff
changeset
|
2085 | int i, rlen; |
43 | 2086 | socklen_t fromlen; |
42
01b96a24ae7c
Corrected missing and obsolete files
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
2087 | |
48 | 2088 | memset((char *)&buf, 0, SS_BUFSIZE); |
2089 | fromlen = sizeof(peeraddr_in); | |
2090 | rlen = recvfrom(s, buf, sizeof(buf) -1, 0, (struct sockaddr *)&peeraddr_in, &fromlen); | |
2091 | if (rlen == -1) { | |
268
dda91dfa4aa8
All syslog logging only to LOG_NOTICE
Michiel Broek <mbroek@mbse.eu>
parents:
266
diff
changeset
|
2092 | syslog(LOG_NOTICE, "recvfrom(): %s", strerror(errno)); |
48 | 2093 | } else { |
2094 | for (i = 0; i < strlen(buf); i++) { | |
2095 | if (buf[i] == '\n') | |
2096 | buf[i] = '\0'; | |
2097 | if (buf[i] == '\r') | |
2098 | buf[i] = '\0'; | |
2099 | } | |
80
81bf78a7618e
Switched to xml configuration
Michiel Broek <mbroek@mbse.eu>
parents:
79
diff
changeset
|
2100 | for (i = strlen(buf) -1; i > 0; i--) { |
81bf78a7618e
Switched to xml configuration
Michiel Broek <mbroek@mbse.eu>
parents:
79
diff
changeset
|
2101 | if (buf[i] == ' ') |
81bf78a7618e
Switched to xml configuration
Michiel Broek <mbroek@mbse.eu>
parents:
79
diff
changeset
|
2102 | buf[i] = '\0'; |
81bf78a7618e
Switched to xml configuration
Michiel Broek <mbroek@mbse.eu>
parents:
79
diff
changeset
|
2103 | else |
81bf78a7618e
Switched to xml configuration
Michiel Broek <mbroek@mbse.eu>
parents:
79
diff
changeset
|
2104 | break; |
81bf78a7618e
Switched to xml configuration
Michiel Broek <mbroek@mbse.eu>
parents:
79
diff
changeset
|
2105 | } |
48 | 2106 | if (strlen(buf)) { |
2107 | if (debug) { | |
2108 | syslog(LOG_NOTICE, "recv: \"%s\"", buf); | |
2109 | fprintf(stdout, "recv: \"%s\"\n", buf); | |
43 | 2110 | } |
2111 | ||
2112 | /* | |
48 | 2113 | * Process commands from the client |
43 | 2114 | */ |
191
c74bbc24a1c8
Client/Server communication is now almost final
Michiel Broek <mbroek@mbse.eu>
parents:
189
diff
changeset
|
2115 | if (strncmp(buf, "DEVICE", 6) == 0) { |
174 | 2116 | if (cmd_device(buf) == 0) |
2117 | wrconfig(); | |
206
78fb6f99e473
Added GLOBAL GET and GLOBAL PUT commands.
Michiel Broek <mbroek@mbse.eu>
parents:
195
diff
changeset
|
2118 | } else if (strncmp(buf, "GLOBAL", 6) == 0) { |
78fb6f99e473
Added GLOBAL GET and GLOBAL PUT commands.
Michiel Broek <mbroek@mbse.eu>
parents:
195
diff
changeset
|
2119 | if (cmd_global(buf) == 0) |
78fb6f99e473
Added GLOBAL GET and GLOBAL PUT commands.
Michiel Broek <mbroek@mbse.eu>
parents:
195
diff
changeset
|
2120 | wrconfig(); |
80
81bf78a7618e
Switched to xml configuration
Michiel Broek <mbroek@mbse.eu>
parents:
79
diff
changeset
|
2121 | } else if (strncmp(buf, "HELP", 4) == 0) { |
68
6dba71439cd8
Added first part of out own protocol
Michiel Broek <mbroek@mbse.eu>
parents:
66
diff
changeset
|
2122 | srv_send((char *)"100 Help text follows"); |
6dba71439cd8
Added first part of out own protocol
Michiel Broek <mbroek@mbse.eu>
parents:
66
diff
changeset
|
2123 | srv_send((char *)"Recognized commands:"); |
6dba71439cd8
Added first part of out own protocol
Michiel Broek <mbroek@mbse.eu>
parents:
66
diff
changeset
|
2124 | srv_send((char *)""); |
132
8bd209d1c020
Added some profile commands to the server. Profile names can be changed from the web interface. Removed obsolete commands.
Michiel Broek <mbroek@mbse.eu>
parents:
131
diff
changeset
|
2125 | // 12345678901234567890123456789012345678901234567890123456789012345678901234567890 |
174 | 2126 | srv_send((char *)"DEVICE ADD type Add new Device type"); |
175
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
2127 | srv_send((char *)"DEVICE DEL uuid Delete Device by uuid"); |
174 | 2128 | srv_send((char *)"DEVICE LIST List Devices"); |
2129 | srv_send((char *)"DEVICE GET uuid Get Device record by uuid"); | |
2130 | srv_send((char *)"DEVICE PUT uuid Put Device record by uuid"); | |
206
78fb6f99e473
Added GLOBAL GET and GLOBAL PUT commands.
Michiel Broek <mbroek@mbse.eu>
parents:
195
diff
changeset
|
2131 | srv_send((char *)"GLOBAL GET Get global settings"); |
78fb6f99e473
Added GLOBAL GET and GLOBAL PUT commands.
Michiel Broek <mbroek@mbse.eu>
parents:
195
diff
changeset
|
2132 | srv_send((char *)"GLOBAL PUT Put global settings"); |
132
8bd209d1c020
Added some profile commands to the server. Profile names can be changed from the web interface. Removed obsolete commands.
Michiel Broek <mbroek@mbse.eu>
parents:
131
diff
changeset
|
2133 | srv_send((char *)"LIST List all fermenter units"); |
191
c74bbc24a1c8
Client/Server communication is now almost final
Michiel Broek <mbroek@mbse.eu>
parents:
189
diff
changeset
|
2134 | srv_send((char *)"LIST LOG uuid List logfile data in 1 hour lines"); |
132
8bd209d1c020
Added some profile commands to the server. Profile names can be changed from the web interface. Removed obsolete commands.
Michiel Broek <mbroek@mbse.eu>
parents:
131
diff
changeset
|
2135 | srv_send((char *)"PROFILE uuid,name Profile rename"); |
259
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
2136 | srv_send((char *)"PROFILE ADD name Add new Profile with name"); |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
2137 | srv_send((char *)"PROFILE DEL uuid Delete Profile by uuid"); |
191
c74bbc24a1c8
Client/Server communication is now almost final
Michiel Broek <mbroek@mbse.eu>
parents:
189
diff
changeset
|
2138 | srv_send((char *)"PROFILE LIST List available profiles"); |
192
5d013b4a9138
Added PROFILE GET and PROFILE PUT commands. Adjusted the web interface
Michiel Broek <mbroek@mbse.eu>
parents:
191
diff
changeset
|
2139 | srv_send((char *)"PROFILE GET uuid Get Profile record by uuid"); |
5d013b4a9138
Added PROFILE GET and PROFILE PUT commands. Adjusted the web interface
Michiel Broek <mbroek@mbse.eu>
parents:
191
diff
changeset
|
2140 | srv_send((char *)"PROFILE PUT uuid Put Profile record by uuid"); |
140
1b001de37945
Implemented PROFILE PUTS command
Michiel Broek <mbroek@mbse.eu>
parents:
138
diff
changeset
|
2141 | srv_send((char *)"PROFILE GETS uuid Profile get steps list"); |
1b001de37945
Implemented PROFILE PUTS command
Michiel Broek <mbroek@mbse.eu>
parents:
138
diff
changeset
|
2142 | srv_send((char *)"PROFILE PUTS uuid Profile put steps list"); |
259
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
2143 | #ifdef USE_SIMULATOR |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
2144 | srv_send((char *)"SIMULATOR ADD name Add a new Simulator with name"); |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
2145 | srv_send((char *)"SIMULATOR DEL uuid Delete Simulator by uuid"); |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
2146 | srv_send((char *)"SIMULATOR LIST List all Simulators"); |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
2147 | srv_send((char *)"SIMULATOR GET uuid Get Simulator record by uuid"); |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
2148 | srv_send((char *)"SIMULATOR PUT uuid Put Simulator record by uuid"); |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
2149 | #endif |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
2150 | srv_send((char *)"UNIT ADD name Add a new Unit with name"); |
175
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
2151 | srv_send((char *)"UNIT DEL uuid Delete Unit by uuid"); |
206
78fb6f99e473
Added GLOBAL GET and GLOBAL PUT commands.
Michiel Broek <mbroek@mbse.eu>
parents:
195
diff
changeset
|
2152 | srv_send((char *)"UNIT LIST List all Units"); |
175
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
2153 | srv_send((char *)"UNIT GET uuid Get Unit record by uuid"); |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
2154 | srv_send((char *)"UNIT PUT uuid Put Unit record by uuid"); |
68
6dba71439cd8
Added first part of out own protocol
Michiel Broek <mbroek@mbse.eu>
parents:
66
diff
changeset
|
2155 | srv_send((char *)"."); |
81 | 2156 | } else if (strncmp(buf, "LIST", 4) == 0) { |
2157 | cmd_list(buf); | |
303
19a9a3912d03
Added PING/PONG command to the server. Bumped to version 0.2.7
Michiel Broek <mbroek@mbse.eu>
parents:
300
diff
changeset
|
2158 | } else if (strncmp(buf, "PING", 4) == 0) { |
19a9a3912d03
Added PING/PONG command to the server. Bumped to version 0.2.7
Michiel Broek <mbroek@mbse.eu>
parents:
300
diff
changeset
|
2159 | srv_send((char *)"101 PONG"); |
132
8bd209d1c020
Added some profile commands to the server. Profile names can be changed from the web interface. Removed obsolete commands.
Michiel Broek <mbroek@mbse.eu>
parents:
131
diff
changeset
|
2160 | } else if (strncmp(buf, "PROFILE", 7) == 0) { |
8bd209d1c020
Added some profile commands to the server. Profile names can be changed from the web interface. Removed obsolete commands.
Michiel Broek <mbroek@mbse.eu>
parents:
131
diff
changeset
|
2161 | if (cmd_profile(buf) == 0) |
8bd209d1c020
Added some profile commands to the server. Profile names can be changed from the web interface. Removed obsolete commands.
Michiel Broek <mbroek@mbse.eu>
parents:
131
diff
changeset
|
2162 | wrconfig(); |
259
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
2163 | #ifdef USE_SIMULATOR |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
2164 | } else if (strncmp(buf, "SIMULATOR", 9) == 0) { |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
2165 | if (cmd_simulator(buf) == 0) |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
2166 | wrconfig(); |
b7c967359771
Added framework for a simulation of a fridge with heater to use as controlled fermentor
Michiel Broek <mbroek@mbse.eu>
parents:
258
diff
changeset
|
2167 | #endif |
87
55f1315c94f1
Added unit command and list unit command
Michiel Broek <mbroek@mbse.eu>
parents:
86
diff
changeset
|
2168 | } else if (strncmp(buf, "UNIT", 4) == 0) { |
175
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
2169 | if (cmd_unit(buf) == 0) |
b73490398368
Units editing is more or less complete. Changed structures for heating, cooling, fan and door. Updated the web interface to confuigure all these things.
Michiel Broek <mbroek@mbse.eu>
parents:
174
diff
changeset
|
2170 | wrconfig(); |
43 | 2171 | } else { |
132
8bd209d1c020
Added some profile commands to the server. Profile names can be changed from the web interface. Removed obsolete commands.
Michiel Broek <mbroek@mbse.eu>
parents:
131
diff
changeset
|
2172 | srv_send((char *)"500 Unknown command"); |
43 | 2173 | } |
2174 | } | |
42
01b96a24ae7c
Corrected missing and obsolete files
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
2175 | } |
44 | 2176 | |
2177 | close(s); | |
42
01b96a24ae7c
Corrected missing and obsolete files
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
2178 | } |
01b96a24ae7c
Corrected missing and obsolete files
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
2179 | |
01b96a24ae7c
Corrected missing and obsolete files
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
2180 | |
132
8bd209d1c020
Added some profile commands to the server. Profile names can be changed from the web interface. Removed obsolete commands.
Michiel Broek <mbroek@mbse.eu>
parents:
131
diff
changeset
|
2181 | |
66
805f1d285acd
Compiles with 1-wire bus on PC hardware
Michiel Broek <mbroek@mbse.eu>
parents:
62
diff
changeset
|
2182 | #ifdef HAVE_WIRINGPI_H |
43 | 2183 | PI_THREAD (my_server_loop) |
66
805f1d285acd
Compiles with 1-wire bus on PC hardware
Michiel Broek <mbroek@mbse.eu>
parents:
62
diff
changeset
|
2184 | #else |
74 | 2185 | void *my_server_loop(void *threadid) |
66
805f1d285acd
Compiles with 1-wire bus on PC hardware
Michiel Broek <mbroek@mbse.eu>
parents:
62
diff
changeset
|
2186 | #endif |
43 | 2187 | { |
2188 | socklen_t addrlen; | |
44 | 2189 | int optval = 1; |
43 | 2190 | |
2191 | syslog(LOG_NOTICE, "Thread my_server_loop started"); | |
2192 | if (debug) | |
2193 | fprintf(stdout, "Thread my_server_loop started\n"); | |
2194 | ||
44 | 2195 | memset((char *)&myaddr_in, 0, sizeof(struct sockaddr_in)); |
2196 | memset((char *)&peeraddr_in, 0, sizeof(struct sockaddr_in)); | |
2197 | myaddr_in.sin_family = AF_INET; | |
2198 | myaddr_in.sin_addr.s_addr = INADDR_ANY; | |
2199 | myaddr_in.sin_port = htons(Config.my_port); | |
2200 | ||
2201 | ls = socket(AF_INET, SOCK_STREAM, 0); | |
2202 | if (ls == -1) { | |
268
dda91dfa4aa8
All syslog logging only to LOG_NOTICE
Michiel Broek <mbroek@mbse.eu>
parents:
266
diff
changeset
|
2203 | syslog(LOG_NOTICE, "Can't create listen socket: %s", strerror(errno)); |
44 | 2204 | fprintf(stderr, "Can't create listen socket: %s\n", strerror(errno)); |
2205 | return 0; | |
2206 | } | |
2207 | ||
2208 | if (setsockopt(ls, SOL_SOCKET, SO_KEEPALIVE, &optval, sizeof(optval)) == -1) { | |
268
dda91dfa4aa8
All syslog logging only to LOG_NOTICE
Michiel Broek <mbroek@mbse.eu>
parents:
266
diff
changeset
|
2209 | syslog(LOG_NOTICE, "Can't setsockopt SO_KEEPALIVE socket: %s", strerror(errno)); |
44 | 2210 | close(ls); |
2211 | return 0; | |
2212 | } | |
2213 | ||
2214 | if (setsockopt(ls, SOL_SOCKET, SO_REUSEADDR, &optval, sizeof(optval)) == -1) { | |
268
dda91dfa4aa8
All syslog logging only to LOG_NOTICE
Michiel Broek <mbroek@mbse.eu>
parents:
266
diff
changeset
|
2215 | syslog(LOG_NOTICE, "Can't setsockopt SO_REUSEADDR socket: %s", strerror(errno)); |
44 | 2216 | close(ls); |
66
805f1d285acd
Compiles with 1-wire bus on PC hardware
Michiel Broek <mbroek@mbse.eu>
parents:
62
diff
changeset
|
2217 | return 0; |
44 | 2218 | } |
2219 | ||
2220 | if (bind(ls, (struct sockaddr *)&myaddr_in, sizeof(struct sockaddr_in)) == -1) { | |
268
dda91dfa4aa8
All syslog logging only to LOG_NOTICE
Michiel Broek <mbroek@mbse.eu>
parents:
266
diff
changeset
|
2221 | syslog(LOG_NOTICE, "Can't bind to listen socket: %s", strerror(errno)); |
44 | 2222 | close(ls); |
66
805f1d285acd
Compiles with 1-wire bus on PC hardware
Michiel Broek <mbroek@mbse.eu>
parents:
62
diff
changeset
|
2223 | return 0; |
44 | 2224 | } |
2225 | ||
2226 | if (listen(ls, 5) == -1) { | |
268
dda91dfa4aa8
All syslog logging only to LOG_NOTICE
Michiel Broek <mbroek@mbse.eu>
parents:
266
diff
changeset
|
2227 | syslog(LOG_NOTICE, "Can't listen on listen socket: %s", strerror(errno)); |
44 | 2228 | close(ls); |
66
805f1d285acd
Compiles with 1-wire bus on PC hardware
Michiel Broek <mbroek@mbse.eu>
parents:
62
diff
changeset
|
2229 | return 0; |
44 | 2230 | } |
2231 | ||
2232 | syslog(LOG_NOTICE, "listen socket created %d", ls); | |
2233 | ||
2234 | ||
43 | 2235 | /* |
2236 | * Loop forever until the external shutdown variable is set. | |
2237 | */ | |
2238 | for (;;) { | |
2239 | ||
2240 | addrlen = sizeof(struct sockaddr_in); | |
2241 | /* | |
2242 | * This call will block until a new connection | |
2243 | * arrives. Then it will return the address of | |
2244 | * the connecting peer, and a new socket | |
2245 | * descriptor, s, for that connection. | |
2246 | */ | |
2247 | s = accept(ls, (struct sockaddr *)&peeraddr_in, &addrlen); | |
2248 | if (s == -1) { | |
268
dda91dfa4aa8
All syslog logging only to LOG_NOTICE
Michiel Broek <mbroek@mbse.eu>
parents:
266
diff
changeset
|
2249 | syslog(LOG_NOTICE, "my_server_loop accept failed %s", strerror(errno)); |
43 | 2250 | if (debug) |
2251 | fprintf(stdout, "my_server_loop accept failed %s\n", strerror(errno)); | |
44 | 2252 | return 0; |
43 | 2253 | } |
2254 | ||
48 | 2255 | cmd_server(); |
43 | 2256 | |
2257 | if (my_shutdown) { | |
2258 | syslog(LOG_NOTICE, "Thread my_server_loop stopped"); | |
2259 | if (debug) | |
2260 | fprintf(stdout, "Thread my_server_loop stopped\n"); | |
2261 | return 0; | |
2262 | } | |
2263 | ||
2264 | } | |
2265 | } | |
2266 | ||
2267 |