Mercurial > templog
annotate main.c @ 432:b90e9c695cfd
merge
author | Matt Johnston <matt@ucc.asn.au> |
---|---|
date | Sun, 14 Oct 2012 21:52:00 +0800 |
parents | 516bb4ef0587 |
children | 405785632c78 |
rev | line source |
---|---|
306 | 1 #include <stdio.h> |
2 #include <string.h> | |
319 | 3 #include <stddef.h> |
415
83d6574c7889
set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents:
414
diff
changeset
|
4 #include <stdbool.h> |
83d6574c7889
set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents:
414
diff
changeset
|
5 #include <stdlib.h> |
307 | 6 #include <avr/io.h> |
7 #include <avr/interrupt.h> | |
8 #include <avr/sleep.h> | |
313 | 9 #include <util/delay.h> |
312 | 10 #include <avr/pgmspace.h> |
319 | 11 #include <avr/eeprom.h> |
360
5d86f1182f62
add "awake" and "reset" functions
Matt Johnston <matt@ucc.asn.au>
parents:
358
diff
changeset
|
12 #include <avr/wdt.h> |
365 | 13 #include <util/atomic.h> |
306 | 14 #include <util/crc16.h> |
15 | |
318 | 16 #include "simple_ds18b20.h" |
319 | 17 #include "onewire.h" |
309 | 18 |
306 | 19 // configuration params |
20 // - measurement interval | |
21 // - transmit interval | |
22 // - bluetooth params | |
23 // - number of sensors (and range?) | |
24 | |
420
d386bbab85cf
try and take account of the fridge temperature too
Matt Johnston <matt@ucc.asn.au>
parents:
417
diff
changeset
|
25 #define MIN(X,Y) ((X) < (Y) ? (X) : (Y)) |
d386bbab85cf
try and take account of the fridge temperature too
Matt Johnston <matt@ucc.asn.au>
parents:
417
diff
changeset
|
26 #define MAX(X,Y) ((X) > (Y) ? (X) : (Y)) |
d386bbab85cf
try and take account of the fridge temperature too
Matt Johnston <matt@ucc.asn.au>
parents:
417
diff
changeset
|
27 |
386 | 28 // TICK should be 8 or less (8 untested). all timers need |
29 // to be a multiple. | |
30 | |
31 #define TICK 6 | |
32 // we have 1024 prescaler, 32768 crystal. | |
33 #define SLEEP_COMPARE (32*TICK-1) | |
310
0a64532c1de1
Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents:
309
diff
changeset
|
34 |
381
83c83014e5e3
report raw ds18b20 values instead
Matt Johnston <matt@ucc.asn.au>
parents:
368
diff
changeset
|
35 #define VALUE_NOSENSOR 0x07D0 // 125 degrees |
83c83014e5e3
report raw ds18b20 values instead
Matt Johnston <matt@ucc.asn.au>
parents:
368
diff
changeset
|
36 #define VALUE_BROKEN 0x07D1 // 125.0625 |
319 | 37 |
421
5055caf46064
fridge range is decicelcius
Matt Johnston <matt@ucc.asn.au>
parents:
420
diff
changeset
|
38 // ranges are in decicelcius |
428
516bb4ef0587
simplify, only use the fridge temp if the wort's busted
Matt Johnston <matt@ucc.asn.au>
parents:
427
diff
changeset
|
39 #define OVERSHOOT_DELAY 1800 // 30 mins |
516bb4ef0587
simplify, only use the fridge temp if the wort's busted
Matt Johnston <matt@ucc.asn.au>
parents:
427
diff
changeset
|
40 #define OVERSHOOT_FACTOR 1 |
516bb4ef0587
simplify, only use the fridge temp if the wort's busted
Matt Johnston <matt@ucc.asn.au>
parents:
427
diff
changeset
|
41 #define WORT_INVALID_TIME 900 // 15 mins |
516bb4ef0587
simplify, only use the fridge temp if the wort's busted
Matt Johnston <matt@ucc.asn.au>
parents:
427
diff
changeset
|
42 // fridge min/max are only used if the wort sensor is invalid |
516bb4ef0587
simplify, only use the fridge temp if the wort's busted
Matt Johnston <matt@ucc.asn.au>
parents:
427
diff
changeset
|
43 #define FRIDGE_AIR_MIN_RANGE 40 // 4º |
516bb4ef0587
simplify, only use the fridge temp if the wort's busted
Matt Johnston <matt@ucc.asn.au>
parents:
427
diff
changeset
|
44 #define FRIDGE_AIR_MAX_RANGE 40 // 4º |
420
d386bbab85cf
try and take account of the fridge temperature too
Matt Johnston <matt@ucc.asn.au>
parents:
417
diff
changeset
|
45 |
316 | 46 #define BAUD 19200 |
313 | 47 #define UBRR ((F_CPU)/8/(BAUD)-1) |
48 | |
49 #define PORT_LED PORTC | |
50 #define DDR_LED DDRC | |
51 #define PIN_LED PC4 | |
307 | 52 |
321
df7384336798
Add shutdown handling, print sensors in "fetch" output
Matt Johnston <matt@ucc.asn.au>
parents:
320
diff
changeset
|
53 #define PORT_SHDN PORTD |
df7384336798
Add shutdown handling, print sensors in "fetch" output
Matt Johnston <matt@ucc.asn.au>
parents:
320
diff
changeset
|
54 #define DDR_SHDN DDRD |
df7384336798
Add shutdown handling, print sensors in "fetch" output
Matt Johnston <matt@ucc.asn.au>
parents:
320
diff
changeset
|
55 #define PIN_SHDN PD7 |
df7384336798
Add shutdown handling, print sensors in "fetch" output
Matt Johnston <matt@ucc.asn.au>
parents:
320
diff
changeset
|
56 |
414 | 57 #define PORT_FRIDGE PORTD |
58 #define DDR_FRIDGE DDRD | |
59 #define PIN_FRIDGE PD6 | |
60 | |
386 | 61 // total amount of 16bit values available for measurements. |
62 // adjust emperically, be sure to allow enough stack space too | |
420
d386bbab85cf
try and take account of the fridge temperature too
Matt Johnston <matt@ucc.asn.au>
parents:
417
diff
changeset
|
63 #define TOTAL_MEASUREMENTS 800 |
386 | 64 |
65 // each sensor slot uses 8 bytes | |
66 #define MAX_SENSORS 6 | |
312 | 67 |
321
df7384336798
Add shutdown handling, print sensors in "fetch" output
Matt Johnston <matt@ucc.asn.au>
parents:
320
diff
changeset
|
68 // fixed at 8, have a shorter name |
df7384336798
Add shutdown handling, print sensors in "fetch" output
Matt Johnston <matt@ucc.asn.au>
parents:
320
diff
changeset
|
69 #define ID_LEN OW_ROMCODE_SIZE |
df7384336798
Add shutdown handling, print sensors in "fetch" output
Matt Johnston <matt@ucc.asn.au>
parents:
320
diff
changeset
|
70 |
339
449272fc63a3
- Debug log file for server
Matt Johnston <matt@ucc.asn.au>
parents:
338
diff
changeset
|
71 // #define HAVE_UART_ECHO |
449272fc63a3
- Debug log file for server
Matt Johnston <matt@ucc.asn.au>
parents:
338
diff
changeset
|
72 |
396
a17a5984116f
print the remainder of timers as well
Matt Johnston <matt@ucc.asn.au>
parents:
395
diff
changeset
|
73 // stores a value of clock_epoch combined with the remainder of TCNT2, |
a17a5984116f
print the remainder of timers as well
Matt Johnston <matt@ucc.asn.au>
parents:
395
diff
changeset
|
74 // for 1/32 second accuracy |
a17a5984116f
print the remainder of timers as well
Matt Johnston <matt@ucc.asn.au>
parents:
395
diff
changeset
|
75 struct epoch_ticks |
a17a5984116f
print the remainder of timers as well
Matt Johnston <matt@ucc.asn.au>
parents:
395
diff
changeset
|
76 { |
a17a5984116f
print the remainder of timers as well
Matt Johnston <matt@ucc.asn.au>
parents:
395
diff
changeset
|
77 uint32_t ticks; |
a17a5984116f
print the remainder of timers as well
Matt Johnston <matt@ucc.asn.au>
parents:
395
diff
changeset
|
78 // remainder |
a17a5984116f
print the remainder of timers as well
Matt Johnston <matt@ucc.asn.au>
parents:
395
diff
changeset
|
79 uint8_t rem; |
a17a5984116f
print the remainder of timers as well
Matt Johnston <matt@ucc.asn.au>
parents:
395
diff
changeset
|
80 }; |
a17a5984116f
print the remainder of timers as well
Matt Johnston <matt@ucc.asn.au>
parents:
395
diff
changeset
|
81 |
386 | 82 // eeprom-settable parameters. all timeouts should |
83 // be a multiple of TICK (6 seconds probably) | |
414 | 84 static uint16_t measure_wake = 61; // not a divisor of comms_wake |
85 static uint16_t comms_wake = 600; | |
386 | 86 static uint8_t wake_secs = 30; |
414 | 87 // decidegrees |
88 static int16_t fridge_setpoint = 180; // 18.0ºC | |
420
d386bbab85cf
try and take account of the fridge temperature too
Matt Johnston <matt@ucc.asn.au>
parents:
417
diff
changeset
|
89 static int16_t fridge_difference = 3; // 0.3ºC |
414 | 90 static uint16_t fridge_delay = 600; // seconds |
413 | 91 |
365 | 92 // ---- Atomic guards required accessing these variables |
420
d386bbab85cf
try and take account of the fridge temperature too
Matt Johnston <matt@ucc.asn.au>
parents:
417
diff
changeset
|
93 // clock_epoch in seconds |
365 | 94 static uint32_t clock_epoch; |
95 static uint16_t comms_count; | |
96 static uint16_t measure_count; | |
97 // ---- End atomic guards required | |
98 | |
323 | 99 static uint16_t n_measurements; |
365 | 100 |
386 | 101 // calculated at startup as TOTAL_MEASUREMENTS/n_sensors |
102 static uint16_t max_measurements; | |
103 | |
104 static uint16_t measurements[TOTAL_MEASUREMENTS]; | |
396
a17a5984116f
print the remainder of timers as well
Matt Johnston <matt@ucc.asn.au>
parents:
395
diff
changeset
|
105 |
a17a5984116f
print the remainder of timers as well
Matt Johnston <matt@ucc.asn.au>
parents:
395
diff
changeset
|
106 static struct epoch_ticks first_measurement_clock; |
328
46070aaf29ea
A bit of work on the server python
Matt Johnston <matt@ucc.asn.au>
parents:
326
diff
changeset
|
107 // last_measurement_clock is redundant but checks that we're not missing |
46070aaf29ea
A bit of work on the server python
Matt Johnston <matt@ucc.asn.au>
parents:
326
diff
changeset
|
108 // samples |
396
a17a5984116f
print the remainder of timers as well
Matt Johnston <matt@ucc.asn.au>
parents:
395
diff
changeset
|
109 static struct epoch_ticks last_measurement_clock; |
a17a5984116f
print the remainder of timers as well
Matt Johnston <matt@ucc.asn.au>
parents:
395
diff
changeset
|
110 static struct epoch_ticks last_comms_clock; |
365 | 111 |
310
0a64532c1de1
Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents:
309
diff
changeset
|
112 // boolean flags |
323 | 113 static uint8_t need_measurement; |
114 static uint8_t need_comms; | |
346 | 115 static uint8_t uart_enabled; |
386 | 116 static uint8_t stay_awake; |
396
a17a5984116f
print the remainder of timers as well
Matt Johnston <matt@ucc.asn.au>
parents:
395
diff
changeset
|
117 static uint8_t button_pressed; |
307 | 118 |
322
840f51824254
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
321
diff
changeset
|
119 // counts down from WAKE_SECS to 0, goes to deep sleep when hits 0 |
323 | 120 static uint8_t comms_timeout; |
307 | 121 |
323 | 122 static uint8_t readpos; |
306 | 123 static char readbuf[30]; |
333
298e502fdcd4
Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
332
diff
changeset
|
124 static uint8_t have_cmd; |
306 | 125 |
386 | 126 static uint8_t n_sensors; |
127 static uint8_t sensor_id[MAX_SENSORS][ID_LEN]; | |
128 | |
414 | 129 static int16_t last_fridge = DS18X20_INVALID_DECICELSIUS; |
130 static int16_t last_wort = DS18X20_INVALID_DECICELSIUS; | |
131 static struct epoch_ticks fridge_off_clock = {0}; | |
420
d386bbab85cf
try and take account of the fridge temperature too
Matt Johnston <matt@ucc.asn.au>
parents:
417
diff
changeset
|
132 static struct epoch_ticks fridge_on_clock = {0}; |
428
516bb4ef0587
simplify, only use the fridge temp if the wort's busted
Matt Johnston <matt@ucc.asn.au>
parents:
427
diff
changeset
|
133 static struct epoch_ticks wort_valid_clock = {0}; |
386 | 134 |
135 int uart_putchar(char c, FILE *stream); | |
136 static void long_delay(int ms); | |
137 static void blink(); | |
138 static uint16_t adc_vcc(); | |
139 | |
140 static FILE mystdout = FDEV_SETUP_STREAM(uart_putchar, NULL, | |
141 _FDEV_SETUP_WRITE); | |
142 | |
143 static uint16_t crc_out; | |
144 static FILE _crc_stdout = FDEV_SETUP_STREAM(uart_putchar, NULL, | |
145 _FDEV_SETUP_WRITE); | |
146 // convenience | |
147 static FILE *crc_stdout = &_crc_stdout; | |
148 | |
310
0a64532c1de1
Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents:
309
diff
changeset
|
149 |
319 | 150 // thanks to http://projectgus.com/2010/07/eeprom-access-with-arduino/ |
151 #define eeprom_read_to(dst_p, eeprom_field, dst_size) eeprom_read_block((dst_p), (void *)offsetof(struct __eeprom_data, eeprom_field), (dst_size)) | |
152 #define eeprom_read(dst, eeprom_field) eeprom_read_to((&dst), eeprom_field, sizeof(dst)) | |
153 #define eeprom_write_from(src_p, eeprom_field, src_size) eeprom_write_block((src_p), (void *)offsetof(struct __eeprom_data, eeprom_field), (src_size)) | |
154 #define eeprom_write(src, eeprom_field) { eeprom_write_from(&src, eeprom_field, sizeof(src)); } | |
155 | |
156 #define EXPECT_MAGIC 0x67c9 | |
157 | |
158 struct __attribute__ ((__packed__)) __eeprom_data { | |
159 uint16_t magic; | |
386 | 160 uint16_t measure_wake; |
161 uint16_t comms_wake; | |
162 uint8_t wake_secs; | |
413 | 163 |
414 | 164 int16_t fridge_setpoint; // decidegrees |
165 uint8_t fridge_difference; // decidegrees | |
166 uint16_t fridge_delay; | |
413 | 167 |
414 | 168 #if 0 |
169 static uint8_t wort_id[ID_LEN]; | |
170 static uint8_t fridge_id[ID_LEN]; | |
171 #endif | |
172 }; | |
413 | 173 |
414 | 174 static const uint8_t fridge_id[ID_LEN] = |
175 {0x28,0xCE,0xB2,0x1A,0x03,0x00,0x00,0x99}; | |
176 static const uint8_t wort_id[ID_LEN] = | |
177 {0x28,0x49,0xBC,0x1A,0x03,0x00,0x00,0x54}; | |
319 | 178 |
310
0a64532c1de1
Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents:
309
diff
changeset
|
179 static void deep_sleep(); |
307 | 180 |
416 | 181 // 0 or 1 |
182 static uint8_t | |
183 is_fridge_on() | |
184 { | |
185 if (PORT_FRIDGE & _BV(PIN_FRIDGE)) | |
186 { | |
187 return 1; | |
188 } | |
189 else | |
190 { | |
191 return 0; | |
192 } | |
193 } | |
194 | |
322
840f51824254
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
321
diff
changeset
|
195 // Very first setup |
324 | 196 static void |
322
840f51824254
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
321
diff
changeset
|
197 setup_chip() |
324 | 198 { |
360
5d86f1182f62
add "awake" and "reset" functions
Matt Johnston <matt@ucc.asn.au>
parents:
358
diff
changeset
|
199 cli(); |
5d86f1182f62
add "awake" and "reset" functions
Matt Johnston <matt@ucc.asn.au>
parents:
358
diff
changeset
|
200 |
5d86f1182f62
add "awake" and "reset" functions
Matt Johnston <matt@ucc.asn.au>
parents:
358
diff
changeset
|
201 // stop watchdog timer (might have been used to cause a reset) |
5d86f1182f62
add "awake" and "reset" functions
Matt Johnston <matt@ucc.asn.au>
parents:
358
diff
changeset
|
202 wdt_reset(); |
5d86f1182f62
add "awake" and "reset" functions
Matt Johnston <matt@ucc.asn.au>
parents:
358
diff
changeset
|
203 MCUSR &= ~_BV(WDRF); |
5d86f1182f62
add "awake" and "reset" functions
Matt Johnston <matt@ucc.asn.au>
parents:
358
diff
changeset
|
204 WDTCSR |= _BV(WDCE) | _BV(WDE); |
5d86f1182f62
add "awake" and "reset" functions
Matt Johnston <matt@ucc.asn.au>
parents:
358
diff
changeset
|
205 WDTCSR = 0; |
5d86f1182f62
add "awake" and "reset" functions
Matt Johnston <matt@ucc.asn.au>
parents:
358
diff
changeset
|
206 |
322
840f51824254
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
321
diff
changeset
|
207 // Set clock to 2mhz |
840f51824254
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
321
diff
changeset
|
208 CLKPR = _BV(CLKPCE); |
840f51824254
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
321
diff
changeset
|
209 // divide by 4 |
840f51824254
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
321
diff
changeset
|
210 CLKPR = _BV(CLKPS1); |
358
71d2cc90354a
try a few more power saving measures, untested
Matt Johnston <matt@ucc.asn.au>
parents:
352
diff
changeset
|
211 |
71d2cc90354a
try a few more power saving measures, untested
Matt Johnston <matt@ucc.asn.au>
parents:
352
diff
changeset
|
212 // enable pullups |
71d2cc90354a
try a few more power saving measures, untested
Matt Johnston <matt@ucc.asn.au>
parents:
352
diff
changeset
|
213 PORTB = 0xff; // XXX change when using SPI |
71d2cc90354a
try a few more power saving measures, untested
Matt Johnston <matt@ucc.asn.au>
parents:
352
diff
changeset
|
214 PORTD = 0xff; |
71d2cc90354a
try a few more power saving measures, untested
Matt Johnston <matt@ucc.asn.au>
parents:
352
diff
changeset
|
215 PORTC = 0xff; |
322
840f51824254
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
321
diff
changeset
|
216 |
325 | 217 // 3.3v power for bluetooth and SD |
322
840f51824254
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
321
diff
changeset
|
218 DDR_LED |= _BV(PIN_LED); |
840f51824254
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
321
diff
changeset
|
219 DDR_SHDN |= _BV(PIN_SHDN); |
325 | 220 |
422
91e3d410ed51
turn off the fridge port first
Matt Johnston <matt@ucc.asn.au>
parents:
421
diff
changeset
|
221 PORT_FRIDGE &= ~_BV(PIN_FRIDGE); |
414 | 222 DDR_FRIDGE |= _BV(PIN_FRIDGE); |
223 | |
352
99f8b97a9449
Use the PRR etc, set value to proper ones
Matt Johnston <matt@ucc.asn.au>
parents:
349
diff
changeset
|
224 // set pullup |
99f8b97a9449
Use the PRR etc, set value to proper ones
Matt Johnston <matt@ucc.asn.au>
parents:
349
diff
changeset
|
225 PORTD |= _BV(PD2); |
347 | 226 // INT0 setup |
358
71d2cc90354a
try a few more power saving measures, untested
Matt Johnston <matt@ucc.asn.au>
parents:
352
diff
changeset
|
227 EICRA = (1<<ISC01); // falling edge - data sheet says it won't work? |
347 | 228 EIMSK = _BV(INT0); |
358
71d2cc90354a
try a few more power saving measures, untested
Matt Johnston <matt@ucc.asn.au>
parents:
352
diff
changeset
|
229 |
71d2cc90354a
try a few more power saving measures, untested
Matt Johnston <matt@ucc.asn.au>
parents:
352
diff
changeset
|
230 // comparator disable |
71d2cc90354a
try a few more power saving measures, untested
Matt Johnston <matt@ucc.asn.au>
parents:
352
diff
changeset
|
231 ACSR = _BV(ACD); |
71d2cc90354a
try a few more power saving measures, untested
Matt Johnston <matt@ucc.asn.au>
parents:
352
diff
changeset
|
232 |
71d2cc90354a
try a few more power saving measures, untested
Matt Johnston <matt@ucc.asn.au>
parents:
352
diff
changeset
|
233 // disable adc pin input buffers |
71d2cc90354a
try a few more power saving measures, untested
Matt Johnston <matt@ucc.asn.au>
parents:
352
diff
changeset
|
234 DIDR0 = 0x3F; // acd0-adc5 |
71d2cc90354a
try a few more power saving measures, untested
Matt Johnston <matt@ucc.asn.au>
parents:
352
diff
changeset
|
235 DIDR1 = (1<<AIN1D)|(1<<AIN0D); // ain0/ain1 |
71d2cc90354a
try a few more power saving measures, untested
Matt Johnston <matt@ucc.asn.au>
parents:
352
diff
changeset
|
236 |
71d2cc90354a
try a few more power saving measures, untested
Matt Johnston <matt@ucc.asn.au>
parents:
352
diff
changeset
|
237 sei(); |
324 | 238 } |
239 | |
322
840f51824254
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
321
diff
changeset
|
240 static void |
840f51824254
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
321
diff
changeset
|
241 set_aux_power(uint8_t on) |
840f51824254
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
321
diff
changeset
|
242 { |
840f51824254
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
321
diff
changeset
|
243 if (on) |
840f51824254
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
321
diff
changeset
|
244 { |
840f51824254
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
321
diff
changeset
|
245 PORT_SHDN &= ~_BV(PIN_SHDN); |
840f51824254
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
321
diff
changeset
|
246 } |
840f51824254
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
321
diff
changeset
|
247 else |
840f51824254
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
321
diff
changeset
|
248 { |
349 | 249 PORT_SHDN |= _BV(PIN_SHDN); |
322
840f51824254
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
321
diff
changeset
|
250 } |
840f51824254
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
321
diff
changeset
|
251 } |
840f51824254
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
321
diff
changeset
|
252 |
396
a17a5984116f
print the remainder of timers as well
Matt Johnston <matt@ucc.asn.au>
parents:
395
diff
changeset
|
253 static void |
a17a5984116f
print the remainder of timers as well
Matt Johnston <matt@ucc.asn.au>
parents:
395
diff
changeset
|
254 get_epoch_ticks(struct epoch_ticks *t) |
a17a5984116f
print the remainder of timers as well
Matt Johnston <matt@ucc.asn.au>
parents:
395
diff
changeset
|
255 { |
a17a5984116f
print the remainder of timers as well
Matt Johnston <matt@ucc.asn.au>
parents:
395
diff
changeset
|
256 ATOMIC_BLOCK(ATOMIC_RESTORESTATE) |
a17a5984116f
print the remainder of timers as well
Matt Johnston <matt@ucc.asn.au>
parents:
395
diff
changeset
|
257 { |
a17a5984116f
print the remainder of timers as well
Matt Johnston <matt@ucc.asn.au>
parents:
395
diff
changeset
|
258 t->ticks = clock_epoch; |
a17a5984116f
print the remainder of timers as well
Matt Johnston <matt@ucc.asn.au>
parents:
395
diff
changeset
|
259 t->rem = TCNT2; |
a17a5984116f
print the remainder of timers as well
Matt Johnston <matt@ucc.asn.au>
parents:
395
diff
changeset
|
260 } |
a17a5984116f
print the remainder of timers as well
Matt Johnston <matt@ucc.asn.au>
parents:
395
diff
changeset
|
261 } |
a17a5984116f
print the remainder of timers as well
Matt Johnston <matt@ucc.asn.au>
parents:
395
diff
changeset
|
262 |
386 | 263 static void |
264 set_measurement(uint8_t sensor, uint16_t measurement, uint16_t reading) | |
265 { | |
266 measurements[sensor*max_measurements + measurement] = reading; | |
267 } | |
268 | |
269 static uint16_t | |
270 get_measurement(uint8_t sensor, uint16_t measurement) | |
271 { | |
272 return measurements[sensor*max_measurements + measurement]; | |
273 } | |
274 | |
322
840f51824254
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
321
diff
changeset
|
275 static void |
840f51824254
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
321
diff
changeset
|
276 setup_tick_counter() |
840f51824254
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
321
diff
changeset
|
277 { |
840f51824254
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
321
diff
changeset
|
278 // set up counter2. |
840f51824254
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
321
diff
changeset
|
279 // COM21 COM20 Set OC2 on Compare Match (p116) |
840f51824254
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
321
diff
changeset
|
280 // WGM21 Clear counter on compare |
840f51824254
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
321
diff
changeset
|
281 //TCCR2A = _BV(COM2A1) | _BV(COM2A0) | _BV(WGM21); |
840f51824254
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
321
diff
changeset
|
282 // toggle on match |
840f51824254
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
321
diff
changeset
|
283 TCCR2A = _BV(COM2A0); |
840f51824254
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
321
diff
changeset
|
284 // CS22 CS21 CS20 clk/1024 |
840f51824254
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
321
diff
changeset
|
285 TCCR2B = _BV(CS22) | _BV(CS21) | _BV(CS20); |
840f51824254
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
321
diff
changeset
|
286 // set async mode |
840f51824254
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
321
diff
changeset
|
287 ASSR |= _BV(AS2); |
840f51824254
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
321
diff
changeset
|
288 TCNT2 = 0; |
840f51824254
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
321
diff
changeset
|
289 OCR2A = SLEEP_COMPARE; |
840f51824254
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
321
diff
changeset
|
290 // interrupt |
840f51824254
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
321
diff
changeset
|
291 TIMSK2 = _BV(OCIE2A); |
840f51824254
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
321
diff
changeset
|
292 } |
324 | 293 |
306 | 294 static void |
313 | 295 uart_on() |
306 | 296 { |
314 | 297 // Power reduction register |
352
99f8b97a9449
Use the PRR etc, set value to proper ones
Matt Johnston <matt@ucc.asn.au>
parents:
349
diff
changeset
|
298 PRR &= ~_BV(PRUSART0); |
314 | 299 |
322
840f51824254
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
321
diff
changeset
|
300 // All of this needs to be done each time after turning off the PRR |
306 | 301 // baud rate |
313 | 302 UBRR0H = (unsigned char)(UBRR >> 8); |
303 UBRR0L = (unsigned char)UBRR; | |
304 // set 2x clock, improves accuracy of UBRR | |
305 UCSR0A |= _BV(U2X0); | |
312 | 306 UCSR0B = _BV(RXCIE0) | _BV(RXEN0) | _BV(TXEN0); |
306 | 307 //8N1 |
313 | 308 UCSR0C = _BV(UCSZ01) | _BV(UCSZ00); |
347 | 309 uart_enabled = 1; |
312 | 310 } |
311 | |
312 static void | |
313 uart_off() | |
314 { | |
395
f0ddb75bcf04
main.c : add a delay before turning on uart
Matt Johnston <matt@ucc.asn.au>
parents:
393
diff
changeset
|
315 // Turn off interrupts and disable tx/rx |
312 | 316 UCSR0B = 0; |
347 | 317 uart_enabled = 0; |
312 | 318 |
319 // Power reduction register | |
352
99f8b97a9449
Use the PRR etc, set value to proper ones
Matt Johnston <matt@ucc.asn.au>
parents:
349
diff
changeset
|
320 PRR |= _BV(PRUSART0); |
306 | 321 } |
322 | |
316 | 323 int |
306 | 324 uart_putchar(char c, FILE *stream) |
325 { | |
347 | 326 if (!uart_enabled) |
327 { | |
328 return EOF; | |
329 } | |
326
f6b5941b4c34
Untested - calculate crc in uart_putchar
Matt Johnston <matt@ucc.asn.au>
parents:
325
diff
changeset
|
330 // XXX could perhaps sleep in the loop for power. |
314 | 331 if (c == '\n') |
332 { | |
316 | 333 loop_until_bit_is_set(UCSR0A, UDRE0); |
326
f6b5941b4c34
Untested - calculate crc in uart_putchar
Matt Johnston <matt@ucc.asn.au>
parents:
325
diff
changeset
|
334 UDR0 = '\r'; |
314 | 335 } |
308 | 336 loop_until_bit_is_set(UCSR0A, UDRE0); |
337 UDR0 = c; | |
326
f6b5941b4c34
Untested - calculate crc in uart_putchar
Matt Johnston <matt@ucc.asn.au>
parents:
325
diff
changeset
|
338 if (stream == crc_stdout) |
f6b5941b4c34
Untested - calculate crc in uart_putchar
Matt Johnston <matt@ucc.asn.au>
parents:
325
diff
changeset
|
339 { |
332
05c1249da994
- Move crc16 to utils and fix it
Matt Johnston <matt@ucc.asn.au>
parents:
331
diff
changeset
|
340 crc_out = _crc_ccitt_update(crc_out, c); |
326
f6b5941b4c34
Untested - calculate crc in uart_putchar
Matt Johnston <matt@ucc.asn.au>
parents:
325
diff
changeset
|
341 } |
316 | 342 if (c == '\r') |
343 { | |
344 loop_until_bit_is_set(UCSR0A, UDRE0); | |
326
f6b5941b4c34
Untested - calculate crc in uart_putchar
Matt Johnston <matt@ucc.asn.au>
parents:
325
diff
changeset
|
345 UDR0 = '\n'; |
f6b5941b4c34
Untested - calculate crc in uart_putchar
Matt Johnston <matt@ucc.asn.au>
parents:
325
diff
changeset
|
346 if (stream == crc_stdout) |
f6b5941b4c34
Untested - calculate crc in uart_putchar
Matt Johnston <matt@ucc.asn.au>
parents:
325
diff
changeset
|
347 { |
f6b5941b4c34
Untested - calculate crc in uart_putchar
Matt Johnston <matt@ucc.asn.au>
parents:
325
diff
changeset
|
348 crc_out = _crc_ccitt_update(crc_out, '\n'); |
f6b5941b4c34
Untested - calculate crc in uart_putchar
Matt Johnston <matt@ucc.asn.au>
parents:
325
diff
changeset
|
349 } |
316 | 350 } |
346 | 351 return (unsigned char)c; |
306 | 352 } |
353 | |
354 static void | |
355 cmd_fetch() | |
356 { | |
326
f6b5941b4c34
Untested - calculate crc in uart_putchar
Matt Johnston <matt@ucc.asn.au>
parents:
325
diff
changeset
|
357 crc_out = 0; |
361
cfcd200c69da
untested code to log voltage and internal temperature
Matt Johnston <matt@ucc.asn.au>
parents:
360
diff
changeset
|
358 |
387
1ee4485b59a2
try and be a bit more frugal with stack
Matt Johnston <matt@ucc.asn.au>
parents:
386
diff
changeset
|
359 fprintf_P(crc_stdout, PSTR("START\n")); |
365 | 360 { |
396
a17a5984116f
print the remainder of timers as well
Matt Johnston <matt@ucc.asn.au>
parents:
395
diff
changeset
|
361 struct epoch_ticks now; |
a17a5984116f
print the remainder of timers as well
Matt Johnston <matt@ucc.asn.au>
parents:
395
diff
changeset
|
362 get_epoch_ticks(&now); |
a17a5984116f
print the remainder of timers as well
Matt Johnston <matt@ucc.asn.au>
parents:
395
diff
changeset
|
363 fprintf_P(crc_stdout, PSTR("now=%lu\n"), now.ticks); |
a17a5984116f
print the remainder of timers as well
Matt Johnston <matt@ucc.asn.au>
parents:
395
diff
changeset
|
364 fprintf_P(crc_stdout, PSTR("now_rem=%hhu\n"), now.rem); |
365 | 365 } |
387
1ee4485b59a2
try and be a bit more frugal with stack
Matt Johnston <matt@ucc.asn.au>
parents:
386
diff
changeset
|
366 fprintf_P(crc_stdout, PSTR("time_step=%hu\n"), measure_wake); |
396
a17a5984116f
print the remainder of timers as well
Matt Johnston <matt@ucc.asn.au>
parents:
395
diff
changeset
|
367 fprintf_P(crc_stdout, PSTR("first_time=%lu\n"), first_measurement_clock.ticks); |
a17a5984116f
print the remainder of timers as well
Matt Johnston <matt@ucc.asn.au>
parents:
395
diff
changeset
|
368 fprintf_P(crc_stdout, PSTR("first_time_rem=%hhu\n"), first_measurement_clock.rem); |
a17a5984116f
print the remainder of timers as well
Matt Johnston <matt@ucc.asn.au>
parents:
395
diff
changeset
|
369 fprintf_P(crc_stdout, PSTR("last_time=%lu\n"), last_measurement_clock.ticks); |
a17a5984116f
print the remainder of timers as well
Matt Johnston <matt@ucc.asn.au>
parents:
395
diff
changeset
|
370 fprintf_P(crc_stdout, PSTR("last_time_rem=%hhu\n"), last_measurement_clock.rem); |
a17a5984116f
print the remainder of timers as well
Matt Johnston <matt@ucc.asn.au>
parents:
395
diff
changeset
|
371 fprintf_P(crc_stdout, PSTR("comms_time=%lu\n"), last_comms_clock.ticks); |
a17a5984116f
print the remainder of timers as well
Matt Johnston <matt@ucc.asn.au>
parents:
395
diff
changeset
|
372 fprintf_P(crc_stdout, PSTR("comms_time_rem=%hhu\n"), last_comms_clock.rem); |
387
1ee4485b59a2
try and be a bit more frugal with stack
Matt Johnston <matt@ucc.asn.au>
parents:
386
diff
changeset
|
373 fprintf_P(crc_stdout, PSTR("voltage=%hu\n"), adc_vcc()); |
393 | 374 fprintf_P(crc_stdout, PSTR("measure=%hu\n"), measure_wake); |
375 fprintf_P(crc_stdout, PSTR("comms=%hu\n"), comms_wake); | |
376 fprintf_P(crc_stdout, PSTR("wake=%hhu\n"), wake_secs); | |
414 | 377 fprintf_P(crc_stdout, PSTR("fridge=%.1f\n"), fridge_setpoint/10.0); |
378 fprintf_P(crc_stdout, PSTR("fridge_diff=%.1f\n"), fridge_difference/10.0); | |
379 fprintf_P(crc_stdout, PSTR("fridge_delay=%hu\n"), fridge_delay); | |
416 | 380 fprintf_P(crc_stdout, PSTR("fridge_status=%hhu\n"), is_fridge_on()); |
427
7c2efec9cd51
fix stupid bugs - lack of PSTR, MIN not MAX
Matt Johnston <matt@ucc.asn.au>
parents:
426
diff
changeset
|
381 fprintf_P(crc_stdout, PSTR("fridge_last_on=%lu\n"), fridge_on_clock.ticks); |
7c2efec9cd51
fix stupid bugs - lack of PSTR, MIN not MAX
Matt Johnston <matt@ucc.asn.au>
parents:
426
diff
changeset
|
382 fprintf_P(crc_stdout, PSTR("fridge_last_off=%lu\n"), fridge_off_clock.ticks); |
7c2efec9cd51
fix stupid bugs - lack of PSTR, MIN not MAX
Matt Johnston <matt@ucc.asn.au>
parents:
426
diff
changeset
|
383 fprintf_P(crc_stdout, PSTR("last_fridge=%hu\n"), last_fridge); |
7c2efec9cd51
fix stupid bugs - lack of PSTR, MIN not MAX
Matt Johnston <matt@ucc.asn.au>
parents:
426
diff
changeset
|
384 fprintf_P(crc_stdout, PSTR("last_wort=%hu\n"), last_wort); |
396
a17a5984116f
print the remainder of timers as well
Matt Johnston <matt@ucc.asn.au>
parents:
395
diff
changeset
|
385 fprintf_P(crc_stdout, PSTR("tick_secs=%d\n"), TICK); |
a17a5984116f
print the remainder of timers as well
Matt Johnston <matt@ucc.asn.au>
parents:
395
diff
changeset
|
386 fprintf_P(crc_stdout, PSTR("tick_wake=%d\n"), SLEEP_COMPARE); |
393 | 387 fprintf_P(crc_stdout, PSTR("maxsens=%hhu\n"), MAX_SENSORS); |
388 fprintf_P(crc_stdout, PSTR("totalmeas=%hu\n"), TOTAL_MEASUREMENTS); | |
387
1ee4485b59a2
try and be a bit more frugal with stack
Matt Johnston <matt@ucc.asn.au>
parents:
386
diff
changeset
|
389 fprintf_P(crc_stdout, PSTR("sensors=%hhu\n"), n_sensors); |
321
df7384336798
Add shutdown handling, print sensors in "fetch" output
Matt Johnston <matt@ucc.asn.au>
parents:
320
diff
changeset
|
390 for (uint8_t s = 0; s < n_sensors; s++) |
df7384336798
Add shutdown handling, print sensors in "fetch" output
Matt Johnston <matt@ucc.asn.au>
parents:
320
diff
changeset
|
391 { |
387
1ee4485b59a2
try and be a bit more frugal with stack
Matt Johnston <matt@ucc.asn.au>
parents:
386
diff
changeset
|
392 fprintf_P(crc_stdout, PSTR("sensor_id%hhu="), s); |
382
f429169aa3cd
don't store sensors in eeprom, scan at startup instead
Matt Johnston <matt@ucc.asn.au>
parents:
381
diff
changeset
|
393 printhex(sensor_id[s], ID_LEN, crc_stdout); |
326
f6b5941b4c34
Untested - calculate crc in uart_putchar
Matt Johnston <matt@ucc.asn.au>
parents:
325
diff
changeset
|
394 fputc('\n', crc_stdout); |
321
df7384336798
Add shutdown handling, print sensors in "fetch" output
Matt Johnston <matt@ucc.asn.au>
parents:
320
diff
changeset
|
395 } |
341
ccab04e2f601
- decrease measurement interval, measure at start
Matt Johnston <matt@ucc.asn.au>
parents:
339
diff
changeset
|
396 fprintf_P(crc_stdout, PSTR("measurements=%hu\n"), n_measurements); |
320 | 397 for (uint16_t n = 0; n < n_measurements; n++) |
306 | 398 { |
352
99f8b97a9449
Use the PRR etc, set value to proper ones
Matt Johnston <matt@ucc.asn.au>
parents:
349
diff
changeset
|
399 fprintf_P(crc_stdout, PSTR("meas%hu="), n); |
321
df7384336798
Add shutdown handling, print sensors in "fetch" output
Matt Johnston <matt@ucc.asn.au>
parents:
320
diff
changeset
|
400 for (uint8_t s = 0; s < n_sensors; s++) |
319 | 401 { |
386 | 402 fprintf_P(crc_stdout, PSTR(" %04hx"), get_measurement(s, n)); |
319 | 403 } |
326
f6b5941b4c34
Untested - calculate crc in uart_putchar
Matt Johnston <matt@ucc.asn.au>
parents:
325
diff
changeset
|
404 fputc('\n', crc_stdout); |
306 | 405 } |
326
f6b5941b4c34
Untested - calculate crc in uart_putchar
Matt Johnston <matt@ucc.asn.au>
parents:
325
diff
changeset
|
406 fprintf_P(crc_stdout, PSTR("END\n")); |
331
5de3fc71ce48
- Make the python work on openwrt
Matt Johnston <matt@ucc.asn.au>
parents:
330
diff
changeset
|
407 fprintf_P(stdout, PSTR("CRC=%hu\n"), crc_out); |
306 | 408 } |
409 | |
410 static void | |
411 cmd_clear() | |
412 { | |
313 | 413 n_measurements = 0; |
338 | 414 printf_P(PSTR("cleared\n")); |
306 | 415 } |
416 | |
417 static void | |
418 cmd_btoff() | |
419 { | |
399
744c3c7eb09d
don't reset the wake time when btoff happens
Matt Johnston <matt@ucc.asn.au>
parents:
396
diff
changeset
|
420 uint8_t rem; |
744c3c7eb09d
don't reset the wake time when btoff happens
Matt Johnston <matt@ucc.asn.au>
parents:
396
diff
changeset
|
421 uint16_t count_copy; |
365 | 422 ATOMIC_BLOCK(ATOMIC_RESTORESTATE) |
423 { | |
399
744c3c7eb09d
don't reset the wake time when btoff happens
Matt Johnston <matt@ucc.asn.au>
parents:
396
diff
changeset
|
424 count_copy = comms_count; |
744c3c7eb09d
don't reset the wake time when btoff happens
Matt Johnston <matt@ucc.asn.au>
parents:
396
diff
changeset
|
425 rem = TCNT2; |
365 | 426 } |
399
744c3c7eb09d
don't reset the wake time when btoff happens
Matt Johnston <matt@ucc.asn.au>
parents:
396
diff
changeset
|
427 printf_P(PSTR("next_wake=%hu,"), comms_wake-count_copy); |
396
a17a5984116f
print the remainder of timers as well
Matt Johnston <matt@ucc.asn.au>
parents:
395
diff
changeset
|
428 printf_P(PSTR("rem=%hhu,"), rem); |
a17a5984116f
print the remainder of timers as well
Matt Johnston <matt@ucc.asn.au>
parents:
395
diff
changeset
|
429 printf_P(PSTR("tick_secs=%hhu,"), TICK); |
a17a5984116f
print the remainder of timers as well
Matt Johnston <matt@ucc.asn.au>
parents:
395
diff
changeset
|
430 printf_P(PSTR("tick_wake=%hhu\n"), SLEEP_COMPARE); |
352
99f8b97a9449
Use the PRR etc, set value to proper ones
Matt Johnston <matt@ucc.asn.au>
parents:
349
diff
changeset
|
431 _delay_ms(100); |
322
840f51824254
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
321
diff
changeset
|
432 comms_timeout = 0; |
416 | 433 stay_awake = 0; |
306 | 434 } |
435 | |
436 static void | |
360
5d86f1182f62
add "awake" and "reset" functions
Matt Johnston <matt@ucc.asn.au>
parents:
358
diff
changeset
|
437 cmd_reset() |
5d86f1182f62
add "awake" and "reset" functions
Matt Johnston <matt@ucc.asn.au>
parents:
358
diff
changeset
|
438 { |
5d86f1182f62
add "awake" and "reset" functions
Matt Johnston <matt@ucc.asn.au>
parents:
358
diff
changeset
|
439 printf_P(PSTR("reset\n")); |
5d86f1182f62
add "awake" and "reset" functions
Matt Johnston <matt@ucc.asn.au>
parents:
358
diff
changeset
|
440 _delay_ms(100); |
5d86f1182f62
add "awake" and "reset" functions
Matt Johnston <matt@ucc.asn.au>
parents:
358
diff
changeset
|
441 cli(); // disable interrupts |
5d86f1182f62
add "awake" and "reset" functions
Matt Johnston <matt@ucc.asn.au>
parents:
358
diff
changeset
|
442 wdt_enable(WDTO_15MS); // enable watchdog |
5d86f1182f62
add "awake" and "reset" functions
Matt Johnston <matt@ucc.asn.au>
parents:
358
diff
changeset
|
443 while(1); // wait for watchdog to reset processor |
5d86f1182f62
add "awake" and "reset" functions
Matt Johnston <matt@ucc.asn.au>
parents:
358
diff
changeset
|
444 } |
5d86f1182f62
add "awake" and "reset" functions
Matt Johnston <matt@ucc.asn.au>
parents:
358
diff
changeset
|
445 |
5d86f1182f62
add "awake" and "reset" functions
Matt Johnston <matt@ucc.asn.au>
parents:
358
diff
changeset
|
446 static void |
318 | 447 cmd_measure() |
448 { | |
339
449272fc63a3
- Debug log file for server
Matt Johnston <matt@ucc.asn.au>
parents:
338
diff
changeset
|
449 printf_P(PSTR("measuring\n")); |
318 | 450 need_measurement = 1; |
451 } | |
452 | |
453 static void | |
454 cmd_sensors() | |
455 { | |
456 uint8_t ret = simple_ds18b20_start_meas(NULL); | |
387
1ee4485b59a2
try and be a bit more frugal with stack
Matt Johnston <matt@ucc.asn.au>
parents:
386
diff
changeset
|
457 printf_P(PSTR("All sensors, ret %hhu, waiting...\n"), ret); |
320 | 458 long_delay(DS18B20_TCONV_12BIT); |
318 | 459 simple_ds18b20_read_all(); |
460 } | |
461 | |
319 | 462 static void |
382
f429169aa3cd
don't store sensors in eeprom, scan at startup instead
Matt Johnston <matt@ucc.asn.au>
parents:
381
diff
changeset
|
463 init_sensors() |
319 | 464 { |
347 | 465 uint8_t id[OW_ROMCODE_SIZE]; |
382
f429169aa3cd
don't store sensors in eeprom, scan at startup instead
Matt Johnston <matt@ucc.asn.au>
parents:
381
diff
changeset
|
466 printf_P(PSTR("init sensors\n")); |
319 | 467 ow_reset(); |
347 | 468 for( uint8_t diff = OW_SEARCH_FIRST; diff != OW_LAST_DEVICE; ) |
469 { | |
470 diff = ow_rom_search( diff, &id[0] ); | |
471 if( diff == OW_PRESENCE_ERR ) { | |
472 printf_P( PSTR("No Sensor found\r") ); | |
473 return; | |
474 } | |
475 | |
476 if( diff == OW_DATA_ERR ) { | |
477 printf_P( PSTR("Bus Error\r") ); | |
478 return; | |
479 } | |
382
f429169aa3cd
don't store sensors in eeprom, scan at startup instead
Matt Johnston <matt@ucc.asn.au>
parents:
381
diff
changeset
|
480 |
f429169aa3cd
don't store sensors in eeprom, scan at startup instead
Matt Johnston <matt@ucc.asn.au>
parents:
381
diff
changeset
|
481 if (n_sensors < MAX_SENSORS) |
f429169aa3cd
don't store sensors in eeprom, scan at startup instead
Matt Johnston <matt@ucc.asn.au>
parents:
381
diff
changeset
|
482 { |
f429169aa3cd
don't store sensors in eeprom, scan at startup instead
Matt Johnston <matt@ucc.asn.au>
parents:
381
diff
changeset
|
483 memcpy(sensor_id[n_sensors], id, ID_LEN); |
387
1ee4485b59a2
try and be a bit more frugal with stack
Matt Johnston <matt@ucc.asn.au>
parents:
386
diff
changeset
|
484 printf_P(PSTR("Added sensor %hhu : "), n_sensors); |
382
f429169aa3cd
don't store sensors in eeprom, scan at startup instead
Matt Johnston <matt@ucc.asn.au>
parents:
381
diff
changeset
|
485 printhex(id, ID_LEN, stdout); |
f429169aa3cd
don't store sensors in eeprom, scan at startup instead
Matt Johnston <matt@ucc.asn.au>
parents:
381
diff
changeset
|
486 putchar('\n'); |
f429169aa3cd
don't store sensors in eeprom, scan at startup instead
Matt Johnston <matt@ucc.asn.au>
parents:
381
diff
changeset
|
487 n_sensors++; |
f429169aa3cd
don't store sensors in eeprom, scan at startup instead
Matt Johnston <matt@ucc.asn.au>
parents:
381
diff
changeset
|
488 } |
f429169aa3cd
don't store sensors in eeprom, scan at startup instead
Matt Johnston <matt@ucc.asn.au>
parents:
381
diff
changeset
|
489 else |
f429169aa3cd
don't store sensors in eeprom, scan at startup instead
Matt Johnston <matt@ucc.asn.au>
parents:
381
diff
changeset
|
490 { |
f429169aa3cd
don't store sensors in eeprom, scan at startup instead
Matt Johnston <matt@ucc.asn.au>
parents:
381
diff
changeset
|
491 printf_P(PSTR("Too many sensors\n")); |
f429169aa3cd
don't store sensors in eeprom, scan at startup instead
Matt Johnston <matt@ucc.asn.au>
parents:
381
diff
changeset
|
492 } |
319 | 493 } |
386 | 494 |
495 max_measurements = TOTAL_MEASUREMENTS / n_sensors; | |
496 } | |
497 | |
498 static void | |
499 load_params() | |
500 { | |
501 uint16_t magic; | |
502 eeprom_read(magic, magic); | |
503 if (magic == EXPECT_MAGIC) | |
504 { | |
505 eeprom_read(measure_wake, measure_wake); | |
506 eeprom_read(comms_wake, comms_wake); | |
507 eeprom_read(wake_secs, wake_secs); | |
414 | 508 eeprom_read(fridge_setpoint, fridge_setpoint); |
509 eeprom_read(fridge_difference, fridge_difference); | |
510 eeprom_read(fridge_delay, fridge_delay); | |
386 | 511 } |
512 } | |
513 | |
514 static void | |
515 cmd_get_params() | |
516 { | |
387
1ee4485b59a2
try and be a bit more frugal with stack
Matt Johnston <matt@ucc.asn.au>
parents:
386
diff
changeset
|
517 printf_P(PSTR("measure %hu\n"), measure_wake); |
1ee4485b59a2
try and be a bit more frugal with stack
Matt Johnston <matt@ucc.asn.au>
parents:
386
diff
changeset
|
518 printf_P(PSTR("comms %hu\n"), comms_wake); |
1ee4485b59a2
try and be a bit more frugal with stack
Matt Johnston <matt@ucc.asn.au>
parents:
386
diff
changeset
|
519 printf_P(PSTR("wake %hhu\n"), wake_secs); |
1ee4485b59a2
try and be a bit more frugal with stack
Matt Johnston <matt@ucc.asn.au>
parents:
386
diff
changeset
|
520 printf_P(PSTR("tick %d\n"), TICK); |
415
83d6574c7889
set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents:
414
diff
changeset
|
521 printf_P(PSTR("fridge %.1fº\n"), fridge_setpoint / 10.0f); |
83d6574c7889
set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents:
414
diff
changeset
|
522 printf_P(PSTR("fridge difference %.1fº\n"), fridge_difference / 10.0f); |
414 | 523 printf_P(PSTR("fridge_delay %hu\n"), fridge_delay); |
387
1ee4485b59a2
try and be a bit more frugal with stack
Matt Johnston <matt@ucc.asn.au>
parents:
386
diff
changeset
|
524 printf_P(PSTR("sensors %hhu (%hhu)\n"), |
1ee4485b59a2
try and be a bit more frugal with stack
Matt Johnston <matt@ucc.asn.au>
parents:
386
diff
changeset
|
525 n_sensors, MAX_SENSORS); |
1ee4485b59a2
try and be a bit more frugal with stack
Matt Johnston <matt@ucc.asn.au>
parents:
386
diff
changeset
|
526 printf_P(PSTR("meas %hu (%hu)\n"), |
386 | 527 max_measurements, TOTAL_MEASUREMENTS); |
319 | 528 } |
529 | |
530 static void | |
386 | 531 cmd_set_params(const char *params) |
319 | 532 { |
386 | 533 uint16_t new_measure_wake; |
534 uint16_t new_comms_wake; | |
535 uint8_t new_wake_secs; | |
415
83d6574c7889
set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents:
414
diff
changeset
|
536 int ret = sscanf_P(params, PSTR("%hu %hu %hhu"), |
83d6574c7889
set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents:
414
diff
changeset
|
537 &new_measure_wake, &new_comms_wake, &new_wake_secs); |
386 | 538 |
415
83d6574c7889
set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents:
414
diff
changeset
|
539 if (ret != 3) |
319 | 540 { |
386 | 541 printf_P(PSTR("Bad values\n")); |
542 } | |
543 else | |
544 { | |
414 | 545 ATOMIC_BLOCK(ATOMIC_RESTORESTATE) |
546 { | |
547 eeprom_write(new_measure_wake, measure_wake); | |
548 eeprom_write(new_comms_wake, comms_wake); | |
549 eeprom_write(new_wake_secs, wake_secs); | |
550 uint16_t magic = EXPECT_MAGIC; | |
551 eeprom_write(magic, magic); | |
552 } | |
386 | 553 printf_P(PSTR("set_params for next boot\n")); |
415
83d6574c7889
set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents:
414
diff
changeset
|
554 printf_P(PSTR("measure %hu comms %hu wake %hhu\n"), |
83d6574c7889
set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents:
414
diff
changeset
|
555 new_measure_wake, new_comms_wake, new_wake_secs); |
83d6574c7889
set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents:
414
diff
changeset
|
556 } |
83d6574c7889
set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents:
414
diff
changeset
|
557 } |
83d6574c7889
set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents:
414
diff
changeset
|
558 |
83d6574c7889
set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents:
414
diff
changeset
|
559 // returns true if eeprom was written |
83d6574c7889
set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents:
414
diff
changeset
|
560 static bool |
83d6574c7889
set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents:
414
diff
changeset
|
561 set_initial_eeprom() |
83d6574c7889
set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents:
414
diff
changeset
|
562 { |
83d6574c7889
set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents:
414
diff
changeset
|
563 uint16_t magic; |
83d6574c7889
set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents:
414
diff
changeset
|
564 eeprom_read(magic, magic); |
83d6574c7889
set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents:
414
diff
changeset
|
565 if (magic == EXPECT_MAGIC) |
83d6574c7889
set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents:
414
diff
changeset
|
566 { |
83d6574c7889
set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents:
414
diff
changeset
|
567 return false; |
83d6574c7889
set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents:
414
diff
changeset
|
568 } |
83d6574c7889
set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents:
414
diff
changeset
|
569 |
83d6574c7889
set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents:
414
diff
changeset
|
570 ATOMIC_BLOCK(ATOMIC_RESTORESTATE) |
83d6574c7889
set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents:
414
diff
changeset
|
571 { |
83d6574c7889
set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents:
414
diff
changeset
|
572 eeprom_write(measure_wake, measure_wake); |
83d6574c7889
set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents:
414
diff
changeset
|
573 eeprom_write(comms_wake, comms_wake); |
83d6574c7889
set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents:
414
diff
changeset
|
574 eeprom_write(wake_secs, wake_secs); |
83d6574c7889
set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents:
414
diff
changeset
|
575 eeprom_write(fridge_setpoint, fridge_setpoint); |
83d6574c7889
set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents:
414
diff
changeset
|
576 eeprom_write(fridge_difference, fridge_difference); |
83d6574c7889
set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents:
414
diff
changeset
|
577 eeprom_write(fridge_delay, fridge_delay); |
83d6574c7889
set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents:
414
diff
changeset
|
578 magic = EXPECT_MAGIC; |
83d6574c7889
set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents:
414
diff
changeset
|
579 eeprom_write(magic, magic); |
83d6574c7889
set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents:
414
diff
changeset
|
580 } |
83d6574c7889
set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents:
414
diff
changeset
|
581 |
83d6574c7889
set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents:
414
diff
changeset
|
582 return true; |
83d6574c7889
set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents:
414
diff
changeset
|
583 } |
83d6574c7889
set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents:
414
diff
changeset
|
584 |
83d6574c7889
set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents:
414
diff
changeset
|
585 static void |
83d6574c7889
set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents:
414
diff
changeset
|
586 cmd_set_fridge_setpoint(char *params) |
83d6574c7889
set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents:
414
diff
changeset
|
587 { |
83d6574c7889
set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents:
414
diff
changeset
|
588 float new_f = atof(params); |
83d6574c7889
set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents:
414
diff
changeset
|
589 if (new_f < 2 || new_f > 30) |
83d6574c7889
set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents:
414
diff
changeset
|
590 { |
83d6574c7889
set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents:
414
diff
changeset
|
591 printf_P(PSTR("Bad fridge value %f\n"), new_f); |
83d6574c7889
set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents:
414
diff
changeset
|
592 return; |
83d6574c7889
set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents:
414
diff
changeset
|
593 } |
413 | 594 |
420
d386bbab85cf
try and take account of the fridge temperature too
Matt Johnston <matt@ucc.asn.au>
parents:
417
diff
changeset
|
595 int16_t old_setpoint = fridge_setpoint; |
d386bbab85cf
try and take account of the fridge temperature too
Matt Johnston <matt@ucc.asn.au>
parents:
417
diff
changeset
|
596 |
415
83d6574c7889
set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents:
414
diff
changeset
|
597 fridge_setpoint = new_f * 10; |
83d6574c7889
set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents:
414
diff
changeset
|
598 bool written = set_initial_eeprom(); |
83d6574c7889
set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents:
414
diff
changeset
|
599 if (!written) |
83d6574c7889
set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents:
414
diff
changeset
|
600 { |
420
d386bbab85cf
try and take account of the fridge temperature too
Matt Johnston <matt@ucc.asn.au>
parents:
417
diff
changeset
|
601 if (old_setpoint != fridge_setpoint) |
415
83d6574c7889
set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents:
414
diff
changeset
|
602 { |
420
d386bbab85cf
try and take account of the fridge temperature too
Matt Johnston <matt@ucc.asn.au>
parents:
417
diff
changeset
|
603 ATOMIC_BLOCK(ATOMIC_RESTORESTATE) |
d386bbab85cf
try and take account of the fridge temperature too
Matt Johnston <matt@ucc.asn.au>
parents:
417
diff
changeset
|
604 { |
d386bbab85cf
try and take account of the fridge temperature too
Matt Johnston <matt@ucc.asn.au>
parents:
417
diff
changeset
|
605 eeprom_write(fridge_setpoint, fridge_setpoint); |
d386bbab85cf
try and take account of the fridge temperature too
Matt Johnston <matt@ucc.asn.au>
parents:
417
diff
changeset
|
606 } |
415
83d6574c7889
set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents:
414
diff
changeset
|
607 } |
83d6574c7889
set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents:
414
diff
changeset
|
608 } |
420
d386bbab85cf
try and take account of the fridge temperature too
Matt Johnston <matt@ucc.asn.au>
parents:
417
diff
changeset
|
609 printf_P(PSTR("old fridge %.1fº new fridge %.1fº\n"), |
d386bbab85cf
try and take account of the fridge temperature too
Matt Johnston <matt@ucc.asn.au>
parents:
417
diff
changeset
|
610 old_setpoint / 10.0f, fridge_setpoint / 10.0f); |
415
83d6574c7889
set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents:
414
diff
changeset
|
611 } |
83d6574c7889
set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents:
414
diff
changeset
|
612 |
83d6574c7889
set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents:
414
diff
changeset
|
613 static void |
83d6574c7889
set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents:
414
diff
changeset
|
614 cmd_set_fridge_difference(char *params) |
83d6574c7889
set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents:
414
diff
changeset
|
615 { |
83d6574c7889
set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents:
414
diff
changeset
|
616 float new_f = atof(params); |
83d6574c7889
set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents:
414
diff
changeset
|
617 if (new_f < 0 || new_f > 30) |
83d6574c7889
set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents:
414
diff
changeset
|
618 { |
83d6574c7889
set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents:
414
diff
changeset
|
619 printf_P(PSTR("Bad fridge value %f\n"), new_f); |
83d6574c7889
set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents:
414
diff
changeset
|
620 return; |
83d6574c7889
set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents:
414
diff
changeset
|
621 } |
83d6574c7889
set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents:
414
diff
changeset
|
622 |
83d6574c7889
set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents:
414
diff
changeset
|
623 fridge_difference = new_f * 10; |
83d6574c7889
set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents:
414
diff
changeset
|
624 bool written = set_initial_eeprom(); |
83d6574c7889
set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents:
414
diff
changeset
|
625 if (!written) |
83d6574c7889
set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents:
414
diff
changeset
|
626 { |
83d6574c7889
set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents:
414
diff
changeset
|
627 ATOMIC_BLOCK(ATOMIC_RESTORESTATE) |
83d6574c7889
set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents:
414
diff
changeset
|
628 { |
83d6574c7889
set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents:
414
diff
changeset
|
629 eeprom_write(fridge_difference, fridge_difference); |
83d6574c7889
set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents:
414
diff
changeset
|
630 } |
83d6574c7889
set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents:
414
diff
changeset
|
631 } |
417
b73ea78317dc
a bit more logging. make printf floats work
Matt Johnston <matt@ucc.asn.au>
parents:
416
diff
changeset
|
632 printf_P(PSTR("new fridge difference %.1fº\n"), fridge_difference / 10.0f); |
415
83d6574c7889
set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents:
414
diff
changeset
|
633 } |
83d6574c7889
set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents:
414
diff
changeset
|
634 |
83d6574c7889
set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents:
414
diff
changeset
|
635 static void |
83d6574c7889
set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents:
414
diff
changeset
|
636 cmd_set_fridge_delay(char *params) |
83d6574c7889
set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents:
414
diff
changeset
|
637 { |
83d6574c7889
set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents:
414
diff
changeset
|
638 uint16_t new_delay = atoi(params); |
83d6574c7889
set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents:
414
diff
changeset
|
639 if (new_delay < 5) |
83d6574c7889
set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents:
414
diff
changeset
|
640 { |
83d6574c7889
set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents:
414
diff
changeset
|
641 printf_P(PSTR("Bad fridge delay %d\n"), new_delay); |
83d6574c7889
set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents:
414
diff
changeset
|
642 return; |
83d6574c7889
set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents:
414
diff
changeset
|
643 } |
83d6574c7889
set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents:
414
diff
changeset
|
644 |
83d6574c7889
set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents:
414
diff
changeset
|
645 fridge_delay = new_delay; |
83d6574c7889
set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents:
414
diff
changeset
|
646 bool written = set_initial_eeprom(); |
83d6574c7889
set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents:
414
diff
changeset
|
647 if (!written) |
83d6574c7889
set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents:
414
diff
changeset
|
648 { |
83d6574c7889
set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents:
414
diff
changeset
|
649 ATOMIC_BLOCK(ATOMIC_RESTORESTATE) |
83d6574c7889
set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents:
414
diff
changeset
|
650 { |
83d6574c7889
set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents:
414
diff
changeset
|
651 eeprom_write(fridge_delay, fridge_delay); |
83d6574c7889
set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents:
414
diff
changeset
|
652 } |
413 | 653 } |
417
b73ea78317dc
a bit more logging. make printf floats work
Matt Johnston <matt@ucc.asn.au>
parents:
416
diff
changeset
|
654 printf_P(PSTR("new fridge delay %hu\n"), fridge_delay); |
386 | 655 } |
414 | 656 |
386 | 657 static void |
658 cmd_awake() | |
659 { | |
660 stay_awake = 1; | |
661 printf_P(PSTR("awake\n")); | |
319 | 662 } |
663 | |
318 | 664 static void |
306 | 665 read_handler() |
666 { | |
312 | 667 if (strcmp_P(readbuf, PSTR("fetch")) == 0) |
306 | 668 { |
669 cmd_fetch(); | |
670 } | |
312 | 671 else if (strcmp_P(readbuf, PSTR("clear")) == 0) |
306 | 672 { |
673 cmd_clear(); | |
674 } | |
312 | 675 else if (strcmp_P(readbuf, PSTR("btoff")) == 0) |
306 | 676 { |
677 cmd_btoff(); | |
678 } | |
318 | 679 else if (strcmp_P(readbuf, PSTR("measure")) == 0) |
680 { | |
681 cmd_measure(); | |
682 } | |
683 else if (strcmp_P(readbuf, PSTR("sensors")) == 0) | |
684 { | |
685 cmd_sensors(); | |
686 } | |
386 | 687 else if (strcmp_P(readbuf, PSTR("get_params")) == 0) |
688 { | |
689 cmd_get_params(); | |
690 } | |
389 | 691 else if (strncmp_P(readbuf, PSTR("set_params "), 11) == 0) |
386 | 692 { |
389 | 693 cmd_set_params(&readbuf[11]); |
386 | 694 } |
695 else if (strcmp_P(readbuf, PSTR("awake")) == 0) | |
696 { | |
697 cmd_awake(); | |
698 } | |
415
83d6574c7889
set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents:
414
diff
changeset
|
699 else if (strncmp_P(readbuf, PSTR("fridge_setpoint "), 16) == 0) |
83d6574c7889
set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents:
414
diff
changeset
|
700 { |
83d6574c7889
set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents:
414
diff
changeset
|
701 cmd_set_fridge_setpoint(&readbuf[16]); |
83d6574c7889
set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents:
414
diff
changeset
|
702 } |
83d6574c7889
set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents:
414
diff
changeset
|
703 else if (strncmp_P(readbuf, PSTR("fridge_diff "), 12) == 0) |
83d6574c7889
set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents:
414
diff
changeset
|
704 { |
83d6574c7889
set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents:
414
diff
changeset
|
705 cmd_set_fridge_difference(&readbuf[12]); |
83d6574c7889
set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents:
414
diff
changeset
|
706 } |
83d6574c7889
set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents:
414
diff
changeset
|
707 else if (strncmp_P(readbuf, PSTR("fridge_delay "), 13) == 0) |
83d6574c7889
set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents:
414
diff
changeset
|
708 { |
83d6574c7889
set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents:
414
diff
changeset
|
709 cmd_set_fridge_delay(&readbuf[13]); |
83d6574c7889
set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents:
414
diff
changeset
|
710 } |
360
5d86f1182f62
add "awake" and "reset" functions
Matt Johnston <matt@ucc.asn.au>
parents:
358
diff
changeset
|
711 else if (strcmp_P(readbuf, PSTR("reset")) == 0) |
5d86f1182f62
add "awake" and "reset" functions
Matt Johnston <matt@ucc.asn.au>
parents:
358
diff
changeset
|
712 { |
5d86f1182f62
add "awake" and "reset" functions
Matt Johnston <matt@ucc.asn.au>
parents:
358
diff
changeset
|
713 cmd_reset(); |
5d86f1182f62
add "awake" and "reset" functions
Matt Johnston <matt@ucc.asn.au>
parents:
358
diff
changeset
|
714 } |
306 | 715 else |
716 { | |
389 | 717 printf_P(PSTR("Bad command '%s'\n"), readbuf); |
306 | 718 } |
719 } | |
720 | |
326
f6b5941b4c34
Untested - calculate crc in uart_putchar
Matt Johnston <matt@ucc.asn.au>
parents:
325
diff
changeset
|
721 ISR(INT0_vect) |
324 | 722 { |
396
a17a5984116f
print the remainder of timers as well
Matt Johnston <matt@ucc.asn.au>
parents:
395
diff
changeset
|
723 button_pressed = 1; |
330
7ac6b8846eea
- some fixes for server code
Matt Johnston <matt@ucc.asn.au>
parents:
328
diff
changeset
|
724 blink(); |
7ac6b8846eea
- some fixes for server code
Matt Johnston <matt@ucc.asn.au>
parents:
328
diff
changeset
|
725 _delay_ms(100); |
7ac6b8846eea
- some fixes for server code
Matt Johnston <matt@ucc.asn.au>
parents:
328
diff
changeset
|
726 blink(); |
324 | 727 } |
728 | |
729 | |
308 | 730 ISR(USART_RX_vect) |
306 | 731 { |
308 | 732 char c = UDR0; |
339
449272fc63a3
- Debug log file for server
Matt Johnston <matt@ucc.asn.au>
parents:
338
diff
changeset
|
733 #ifdef HAVE_UART_ECHO |
318 | 734 uart_putchar(c, NULL); |
339
449272fc63a3
- Debug log file for server
Matt Johnston <matt@ucc.asn.au>
parents:
338
diff
changeset
|
735 #endif |
328
46070aaf29ea
A bit of work on the server python
Matt Johnston <matt@ucc.asn.au>
parents:
326
diff
changeset
|
736 if (c == '\r' || c == '\n') |
306 | 737 { |
328
46070aaf29ea
A bit of work on the server python
Matt Johnston <matt@ucc.asn.au>
parents:
326
diff
changeset
|
738 if (readpos > 0) |
46070aaf29ea
A bit of work on the server python
Matt Johnston <matt@ucc.asn.au>
parents:
326
diff
changeset
|
739 { |
46070aaf29ea
A bit of work on the server python
Matt Johnston <matt@ucc.asn.au>
parents:
326
diff
changeset
|
740 readbuf[readpos] = '\0'; |
333
298e502fdcd4
Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
332
diff
changeset
|
741 have_cmd = 1; |
328
46070aaf29ea
A bit of work on the server python
Matt Johnston <matt@ucc.asn.au>
parents:
326
diff
changeset
|
742 readpos = 0; |
46070aaf29ea
A bit of work on the server python
Matt Johnston <matt@ucc.asn.au>
parents:
326
diff
changeset
|
743 } |
306 | 744 } |
745 else | |
746 { | |
747 readbuf[readpos] = c; | |
748 readpos++; | |
749 if (readpos >= sizeof(readbuf)) | |
750 { | |
751 readpos = 0; | |
752 } | |
753 } | |
754 } | |
755 | |
308 | 756 ISR(TIMER2_COMPA_vect) |
307 | 757 { |
320 | 758 TCNT2 = 0; |
386 | 759 measure_count += TICK; |
760 comms_count += TICK; | |
322
840f51824254
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
321
diff
changeset
|
761 |
386 | 762 clock_epoch += TICK; |
323 | 763 |
322
840f51824254
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
321
diff
changeset
|
764 if (comms_timeout != 0) |
840f51824254
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
321
diff
changeset
|
765 { |
386 | 766 comms_timeout -= TICK; |
322
840f51824254
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
321
diff
changeset
|
767 } |
840f51824254
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
321
diff
changeset
|
768 |
386 | 769 if (measure_count >= measure_wake) |
307 | 770 { |
310
0a64532c1de1
Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents:
309
diff
changeset
|
771 measure_count = 0; |
307 | 772 need_measurement = 1; |
773 } | |
310
0a64532c1de1
Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents:
309
diff
changeset
|
774 |
386 | 775 if (comms_count >= comms_wake) |
347 | 776 { |
777 comms_count = 0; | |
778 need_comms = 1; | |
779 } | |
307 | 780 } |
781 | |
782 static void | |
783 deep_sleep() | |
784 { | |
785 // p119 of manual | |
308 | 786 OCR2A = SLEEP_COMPARE; |
787 loop_until_bit_is_clear(ASSR, OCR2AUB); | |
307 | 788 |
789 set_sleep_mode(SLEEP_MODE_PWR_SAVE); | |
790 sleep_mode(); | |
791 } | |
792 | |
793 static void | |
310
0a64532c1de1
Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents:
309
diff
changeset
|
794 idle_sleep() |
0a64532c1de1
Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents:
309
diff
changeset
|
795 { |
0a64532c1de1
Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents:
309
diff
changeset
|
796 set_sleep_mode(SLEEP_MODE_IDLE); |
0a64532c1de1
Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents:
309
diff
changeset
|
797 sleep_mode(); |
0a64532c1de1
Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents:
309
diff
changeset
|
798 } |
0a64532c1de1
Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents:
309
diff
changeset
|
799 |
365 | 800 static uint16_t |
801 adc_vcc() | |
361
cfcd200c69da
untested code to log voltage and internal temperature
Matt Johnston <matt@ucc.asn.au>
parents:
360
diff
changeset
|
802 { |
cfcd200c69da
untested code to log voltage and internal temperature
Matt Johnston <matt@ucc.asn.au>
parents:
360
diff
changeset
|
803 PRR &= ~_BV(PRADC); |
cfcd200c69da
untested code to log voltage and internal temperature
Matt Johnston <matt@ucc.asn.au>
parents:
360
diff
changeset
|
804 |
368 | 805 // /16 prescaler |
361
cfcd200c69da
untested code to log voltage and internal temperature
Matt Johnston <matt@ucc.asn.au>
parents:
360
diff
changeset
|
806 ADCSRA = _BV(ADEN) | _BV(ADPS2); |
cfcd200c69da
untested code to log voltage and internal temperature
Matt Johnston <matt@ucc.asn.au>
parents:
360
diff
changeset
|
807 |
cfcd200c69da
untested code to log voltage and internal temperature
Matt Johnston <matt@ucc.asn.au>
parents:
360
diff
changeset
|
808 // set to measure 1.1 reference |
364 | 809 ADMUX = _BV(REFS0) | _BV(MUX3) | _BV(MUX2) | _BV(MUX1); |
366 | 810 // average a number of samples |
811 uint16_t sum = 0; | |
812 uint8_t num = 0; | |
813 for (uint8_t n = 0; n < 20; n++) | |
365 | 814 { |
815 ADCSRA |= _BV(ADSC); | |
816 loop_until_bit_is_clear(ADCSRA, ADSC); | |
361
cfcd200c69da
untested code to log voltage and internal temperature
Matt Johnston <matt@ucc.asn.au>
parents:
360
diff
changeset
|
817 |
366 | 818 uint8_t low_11 = ADCL; |
819 uint8_t high_11 = ADCH; | |
820 uint16_t val = low_11 + (high_11 << 8); | |
312 | 821 |
366 | 822 if (n >= 4) |
823 { | |
824 sum += val; | |
825 num++; | |
826 } | |
827 } | |
828 ADCSRA = 0; | |
829 PRR |= _BV(PRADC); | |
312 | 830 |
386 | 831 //float res_volts = 1.1 * 1024 * num / sum; |
832 //return 1000 * res_volts; | |
833 return ((uint32_t)1100*1024*num) / sum; | |
312 | 834 } |
835 | |
310
0a64532c1de1
Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents:
309
diff
changeset
|
836 static void |
414 | 837 do_fridge() |
838 { | |
839 struct epoch_ticks now; | |
840 get_epoch_ticks(&now); | |
428
516bb4ef0587
simplify, only use the fridge temp if the wort's busted
Matt Johnston <matt@ucc.asn.au>
parents:
427
diff
changeset
|
841 uint32_t off_time = now.ticks - fridge_off_clock.ticks; |
420
d386bbab85cf
try and take account of the fridge temperature too
Matt Johnston <matt@ucc.asn.au>
parents:
417
diff
changeset
|
842 bool wort_valid = last_wort != DS18X20_INVALID_DECICELSIUS; |
d386bbab85cf
try and take account of the fridge temperature too
Matt Johnston <matt@ucc.asn.au>
parents:
417
diff
changeset
|
843 bool fridge_valid = last_fridge != DS18X20_INVALID_DECICELSIUS; |
d386bbab85cf
try and take account of the fridge temperature too
Matt Johnston <matt@ucc.asn.au>
parents:
417
diff
changeset
|
844 |
d386bbab85cf
try and take account of the fridge temperature too
Matt Johnston <matt@ucc.asn.au>
parents:
417
diff
changeset
|
845 int16_t wort_max = fridge_setpoint + fridge_difference; |
d386bbab85cf
try and take account of the fridge temperature too
Matt Johnston <matt@ucc.asn.au>
parents:
417
diff
changeset
|
846 int16_t wort_min = fridge_setpoint; |
d386bbab85cf
try and take account of the fridge temperature too
Matt Johnston <matt@ucc.asn.au>
parents:
417
diff
changeset
|
847 |
428
516bb4ef0587
simplify, only use the fridge temp if the wort's busted
Matt Johnston <matt@ucc.asn.au>
parents:
427
diff
changeset
|
848 // the fridge min/max only apply if the wort sensor is broken |
420
d386bbab85cf
try and take account of the fridge temperature too
Matt Johnston <matt@ucc.asn.au>
parents:
417
diff
changeset
|
849 int16_t fridge_min = fridge_setpoint - FRIDGE_AIR_MIN_RANGE; |
d386bbab85cf
try and take account of the fridge temperature too
Matt Johnston <matt@ucc.asn.au>
parents:
417
diff
changeset
|
850 int16_t fridge_max = fridge_setpoint + FRIDGE_AIR_MAX_RANGE; |
d386bbab85cf
try and take account of the fridge temperature too
Matt Johnston <matt@ucc.asn.au>
parents:
417
diff
changeset
|
851 |
d386bbab85cf
try and take account of the fridge temperature too
Matt Johnston <matt@ucc.asn.au>
parents:
417
diff
changeset
|
852 uint8_t fridge_on = PORT_FRIDGE & _BV(PIN_FRIDGE); |
428
516bb4ef0587
simplify, only use the fridge temp if the wort's busted
Matt Johnston <matt@ucc.asn.au>
parents:
427
diff
changeset
|
853 printf_P(PSTR("last_wort %hd (%hd, %hd), last_fridge %hd (%hd, %hd), setpoint %hd, diff %hd, fridge_on %hhu\n"), |
420
d386bbab85cf
try and take account of the fridge temperature too
Matt Johnston <matt@ucc.asn.au>
parents:
417
diff
changeset
|
854 last_wort, wort_min, wort_max, |
428
516bb4ef0587
simplify, only use the fridge temp if the wort's busted
Matt Johnston <matt@ucc.asn.au>
parents:
427
diff
changeset
|
855 last_fridge, fridge_min, fridge_max, |
516bb4ef0587
simplify, only use the fridge temp if the wort's busted
Matt Johnston <matt@ucc.asn.au>
parents:
427
diff
changeset
|
856 fridge_setpoint, fridge_difference, fridge_on); |
420
d386bbab85cf
try and take account of the fridge temperature too
Matt Johnston <matt@ucc.asn.au>
parents:
417
diff
changeset
|
857 |
d386bbab85cf
try and take account of the fridge temperature too
Matt Johnston <matt@ucc.asn.au>
parents:
417
diff
changeset
|
858 if (off_time < fridge_delay) |
414 | 859 { |
417
b73ea78317dc
a bit more logging. make printf floats work
Matt Johnston <matt@ucc.asn.au>
parents:
416
diff
changeset
|
860 printf_P(PSTR("waiting for fridge delay current %hu, wait %hu\n"), |
420
d386bbab85cf
try and take account of the fridge temperature too
Matt Johnston <matt@ucc.asn.au>
parents:
417
diff
changeset
|
861 off_time, fridge_delay); |
414 | 862 return; |
863 } | |
864 | |
428
516bb4ef0587
simplify, only use the fridge temp if the wort's busted
Matt Johnston <matt@ucc.asn.au>
parents:
427
diff
changeset
|
865 // handle failure of the wort sensor. if it is a short (intermittent?) |
516bb4ef0587
simplify, only use the fridge temp if the wort's busted
Matt Johnston <matt@ucc.asn.au>
parents:
427
diff
changeset
|
866 // failure we wait until it has been broken for a period of time |
516bb4ef0587
simplify, only use the fridge temp if the wort's busted
Matt Johnston <matt@ucc.asn.au>
parents:
427
diff
changeset
|
867 // (WORT_INVALID_TIME) before doing anything. |
516bb4ef0587
simplify, only use the fridge temp if the wort's busted
Matt Johnston <matt@ucc.asn.au>
parents:
427
diff
changeset
|
868 if (wort_valid) |
516bb4ef0587
simplify, only use the fridge temp if the wort's busted
Matt Johnston <matt@ucc.asn.au>
parents:
427
diff
changeset
|
869 { |
516bb4ef0587
simplify, only use the fridge temp if the wort's busted
Matt Johnston <matt@ucc.asn.au>
parents:
427
diff
changeset
|
870 wort_valid_clock = now; |
516bb4ef0587
simplify, only use the fridge temp if the wort's busted
Matt Johnston <matt@ucc.asn.au>
parents:
427
diff
changeset
|
871 } |
516bb4ef0587
simplify, only use the fridge temp if the wort's busted
Matt Johnston <matt@ucc.asn.au>
parents:
427
diff
changeset
|
872 else |
516bb4ef0587
simplify, only use the fridge temp if the wort's busted
Matt Johnston <matt@ucc.asn.au>
parents:
427
diff
changeset
|
873 { |
516bb4ef0587
simplify, only use the fridge temp if the wort's busted
Matt Johnston <matt@ucc.asn.au>
parents:
427
diff
changeset
|
874 printf_P(PSTR("wort sensor is invalid\n")); |
516bb4ef0587
simplify, only use the fridge temp if the wort's busted
Matt Johnston <matt@ucc.asn.au>
parents:
427
diff
changeset
|
875 uint32_t invalid_time = now.ticks - wort_valid_clock.ticks; |
516bb4ef0587
simplify, only use the fridge temp if the wort's busted
Matt Johnston <matt@ucc.asn.au>
parents:
427
diff
changeset
|
876 if (invalid_time < WORT_INVALID_TIME) |
516bb4ef0587
simplify, only use the fridge temp if the wort's busted
Matt Johnston <matt@ucc.asn.au>
parents:
427
diff
changeset
|
877 { |
516bb4ef0587
simplify, only use the fridge temp if the wort's busted
Matt Johnston <matt@ucc.asn.au>
parents:
427
diff
changeset
|
878 printf("only been invalid for %ld, waiting\n", invalid_time); |
516bb4ef0587
simplify, only use the fridge temp if the wort's busted
Matt Johnston <matt@ucc.asn.au>
parents:
427
diff
changeset
|
879 return; |
516bb4ef0587
simplify, only use the fridge temp if the wort's busted
Matt Johnston <matt@ucc.asn.au>
parents:
427
diff
changeset
|
880 } |
516bb4ef0587
simplify, only use the fridge temp if the wort's busted
Matt Johnston <matt@ucc.asn.au>
parents:
427
diff
changeset
|
881 } |
516bb4ef0587
simplify, only use the fridge temp if the wort's busted
Matt Johnston <matt@ucc.asn.au>
parents:
427
diff
changeset
|
882 |
516bb4ef0587
simplify, only use the fridge temp if the wort's busted
Matt Johnston <matt@ucc.asn.au>
parents:
427
diff
changeset
|
883 if (!fridge_valid) |
516bb4ef0587
simplify, only use the fridge temp if the wort's busted
Matt Johnston <matt@ucc.asn.au>
parents:
427
diff
changeset
|
884 { |
516bb4ef0587
simplify, only use the fridge temp if the wort's busted
Matt Johnston <matt@ucc.asn.au>
parents:
427
diff
changeset
|
885 printf_P(PSTR("fridge sensor is invalid\n")); |
516bb4ef0587
simplify, only use the fridge temp if the wort's busted
Matt Johnston <matt@ucc.asn.au>
parents:
427
diff
changeset
|
886 } |
414 | 887 |
888 if (fridge_on) | |
889 { | |
420
d386bbab85cf
try and take account of the fridge temperature too
Matt Johnston <matt@ucc.asn.au>
parents:
417
diff
changeset
|
890 bool turn_off = false; |
d386bbab85cf
try and take account of the fridge temperature too
Matt Johnston <matt@ucc.asn.au>
parents:
417
diff
changeset
|
891 uint16_t on_time = now.ticks - fridge_on_clock.ticks; |
d386bbab85cf
try and take account of the fridge temperature too
Matt Johnston <matt@ucc.asn.au>
parents:
417
diff
changeset
|
892 |
428
516bb4ef0587
simplify, only use the fridge temp if the wort's busted
Matt Johnston <matt@ucc.asn.au>
parents:
427
diff
changeset
|
893 uint16_t overshoot = 0; |
516bb4ef0587
simplify, only use the fridge temp if the wort's busted
Matt Johnston <matt@ucc.asn.au>
parents:
427
diff
changeset
|
894 if (on_time > 1800) |
516bb4ef0587
simplify, only use the fridge temp if the wort's busted
Matt Johnston <matt@ucc.asn.au>
parents:
427
diff
changeset
|
895 { |
516bb4ef0587
simplify, only use the fridge temp if the wort's busted
Matt Johnston <matt@ucc.asn.au>
parents:
427
diff
changeset
|
896 // *10.0f for decicelcius |
516bb4ef0587
simplify, only use the fridge temp if the wort's busted
Matt Johnston <matt@ucc.asn.au>
parents:
427
diff
changeset
|
897 overshoot = OVERSHOOT_FACTOR * 10.0f * MIN(3600, on_time) / 3600.0; |
516bb4ef0587
simplify, only use the fridge temp if the wort's busted
Matt Johnston <matt@ucc.asn.au>
parents:
427
diff
changeset
|
898 } |
427
7c2efec9cd51
fix stupid bugs - lack of PSTR, MIN not MAX
Matt Johnston <matt@ucc.asn.au>
parents:
426
diff
changeset
|
899 |
7c2efec9cd51
fix stupid bugs - lack of PSTR, MIN not MAX
Matt Johnston <matt@ucc.asn.au>
parents:
426
diff
changeset
|
900 printf_P(PSTR("on_time %hu, overshoot %hu\n"), on_time, overshoot); |
420
d386bbab85cf
try and take account of the fridge temperature too
Matt Johnston <matt@ucc.asn.au>
parents:
417
diff
changeset
|
901 |
d386bbab85cf
try and take account of the fridge temperature too
Matt Johnston <matt@ucc.asn.au>
parents:
417
diff
changeset
|
902 // wort has cooled enough. will probably cool a bit more by itself |
428
516bb4ef0587
simplify, only use the fridge temp if the wort's busted
Matt Johnston <matt@ucc.asn.au>
parents:
427
diff
changeset
|
903 if (wort_valid) |
420
d386bbab85cf
try and take account of the fridge temperature too
Matt Johnston <matt@ucc.asn.au>
parents:
417
diff
changeset
|
904 { |
428
516bb4ef0587
simplify, only use the fridge temp if the wort's busted
Matt Johnston <matt@ucc.asn.au>
parents:
427
diff
changeset
|
905 if ((last_wort - overshoot) < fridge_setpoint) |
516bb4ef0587
simplify, only use the fridge temp if the wort's busted
Matt Johnston <matt@ucc.asn.au>
parents:
427
diff
changeset
|
906 { |
516bb4ef0587
simplify, only use the fridge temp if the wort's busted
Matt Johnston <matt@ucc.asn.au>
parents:
427
diff
changeset
|
907 printf_P(PSTR("wort has cooled enough, overshoot %hu on_time %hu\n"), overshoot, on_time); |
516bb4ef0587
simplify, only use the fridge temp if the wort's busted
Matt Johnston <matt@ucc.asn.au>
parents:
427
diff
changeset
|
908 turn_off = true; |
516bb4ef0587
simplify, only use the fridge temp if the wort's busted
Matt Johnston <matt@ucc.asn.au>
parents:
427
diff
changeset
|
909 } |
420
d386bbab85cf
try and take account of the fridge temperature too
Matt Johnston <matt@ucc.asn.au>
parents:
417
diff
changeset
|
910 } |
428
516bb4ef0587
simplify, only use the fridge temp if the wort's busted
Matt Johnston <matt@ucc.asn.au>
parents:
427
diff
changeset
|
911 else |
420
d386bbab85cf
try and take account of the fridge temperature too
Matt Johnston <matt@ucc.asn.au>
parents:
417
diff
changeset
|
912 { |
428
516bb4ef0587
simplify, only use the fridge temp if the wort's busted
Matt Johnston <matt@ucc.asn.au>
parents:
427
diff
changeset
|
913 if (fridge_valid && last_fridge < fridge_min) |
516bb4ef0587
simplify, only use the fridge temp if the wort's busted
Matt Johnston <matt@ucc.asn.au>
parents:
427
diff
changeset
|
914 { |
516bb4ef0587
simplify, only use the fridge temp if the wort's busted
Matt Johnston <matt@ucc.asn.au>
parents:
427
diff
changeset
|
915 printf_P(PSTR("fridge off fallback\n")); |
516bb4ef0587
simplify, only use the fridge temp if the wort's busted
Matt Johnston <matt@ucc.asn.au>
parents:
427
diff
changeset
|
916 turn_off = true; |
516bb4ef0587
simplify, only use the fridge temp if the wort's busted
Matt Johnston <matt@ucc.asn.au>
parents:
427
diff
changeset
|
917 } |
420
d386bbab85cf
try and take account of the fridge temperature too
Matt Johnston <matt@ucc.asn.au>
parents:
417
diff
changeset
|
918 } |
d386bbab85cf
try and take account of the fridge temperature too
Matt Johnston <matt@ucc.asn.au>
parents:
417
diff
changeset
|
919 |
d386bbab85cf
try and take account of the fridge temperature too
Matt Johnston <matt@ucc.asn.au>
parents:
417
diff
changeset
|
920 if (turn_off) |
414 | 921 { |
922 // too cold, turn off | |
417
b73ea78317dc
a bit more logging. make printf floats work
Matt Johnston <matt@ucc.asn.au>
parents:
416
diff
changeset
|
923 printf_P(PSTR("Turning fridge off\n")); |
414 | 924 PORT_FRIDGE &= ~_BV(PIN_FRIDGE); |
925 fridge_off_clock = now; | |
926 } | |
927 } | |
928 else | |
929 { | |
420
d386bbab85cf
try and take account of the fridge temperature too
Matt Johnston <matt@ucc.asn.au>
parents:
417
diff
changeset
|
930 bool turn_on = false; |
d386bbab85cf
try and take account of the fridge temperature too
Matt Johnston <matt@ucc.asn.au>
parents:
417
diff
changeset
|
931 |
428
516bb4ef0587
simplify, only use the fridge temp if the wort's busted
Matt Johnston <matt@ucc.asn.au>
parents:
427
diff
changeset
|
932 if (wort_valid) |
426 | 933 { |
428
516bb4ef0587
simplify, only use the fridge temp if the wort's busted
Matt Johnston <matt@ucc.asn.au>
parents:
427
diff
changeset
|
934 if (last_wort >= wort_max) |
516bb4ef0587
simplify, only use the fridge temp if the wort's busted
Matt Johnston <matt@ucc.asn.au>
parents:
427
diff
changeset
|
935 { |
516bb4ef0587
simplify, only use the fridge temp if the wort's busted
Matt Johnston <matt@ucc.asn.au>
parents:
427
diff
changeset
|
936 printf_P(PSTR("wort is too hot\n")); |
516bb4ef0587
simplify, only use the fridge temp if the wort's busted
Matt Johnston <matt@ucc.asn.au>
parents:
427
diff
changeset
|
937 turn_on = true; |
516bb4ef0587
simplify, only use the fridge temp if the wort's busted
Matt Johnston <matt@ucc.asn.au>
parents:
427
diff
changeset
|
938 } |
426 | 939 } |
428
516bb4ef0587
simplify, only use the fridge temp if the wort's busted
Matt Johnston <matt@ucc.asn.au>
parents:
427
diff
changeset
|
940 else |
420
d386bbab85cf
try and take account of the fridge temperature too
Matt Johnston <matt@ucc.asn.au>
parents:
417
diff
changeset
|
941 { |
428
516bb4ef0587
simplify, only use the fridge temp if the wort's busted
Matt Johnston <matt@ucc.asn.au>
parents:
427
diff
changeset
|
942 if (fridge_valid && last_fridge >= fridge_max) |
516bb4ef0587
simplify, only use the fridge temp if the wort's busted
Matt Johnston <matt@ucc.asn.au>
parents:
427
diff
changeset
|
943 { |
516bb4ef0587
simplify, only use the fridge temp if the wort's busted
Matt Johnston <matt@ucc.asn.au>
parents:
427
diff
changeset
|
944 printf_P(PSTR("fridge on fallback\n")); |
516bb4ef0587
simplify, only use the fridge temp if the wort's busted
Matt Johnston <matt@ucc.asn.au>
parents:
427
diff
changeset
|
945 turn_on = true; |
516bb4ef0587
simplify, only use the fridge temp if the wort's busted
Matt Johnston <matt@ucc.asn.au>
parents:
427
diff
changeset
|
946 } |
420
d386bbab85cf
try and take account of the fridge temperature too
Matt Johnston <matt@ucc.asn.au>
parents:
417
diff
changeset
|
947 } |
d386bbab85cf
try and take account of the fridge temperature too
Matt Johnston <matt@ucc.asn.au>
parents:
417
diff
changeset
|
948 |
d386bbab85cf
try and take account of the fridge temperature too
Matt Johnston <matt@ucc.asn.au>
parents:
417
diff
changeset
|
949 if (turn_on) |
414 | 950 { |
951 // too hot, turn on | |
417
b73ea78317dc
a bit more logging. make printf floats work
Matt Johnston <matt@ucc.asn.au>
parents:
416
diff
changeset
|
952 printf_P(PSTR("Turning fridge on\n")); |
414 | 953 PORT_FRIDGE |= _BV(PIN_FRIDGE); |
420
d386bbab85cf
try and take account of the fridge temperature too
Matt Johnston <matt@ucc.asn.au>
parents:
417
diff
changeset
|
954 fridge_on_clock = now; |
414 | 955 } |
956 } | |
957 } | |
958 | |
959 static void | |
307 | 960 do_measurement() |
961 { | |
381
83c83014e5e3
report raw ds18b20 values instead
Matt Johnston <matt@ucc.asn.au>
parents:
368
diff
changeset
|
962 blink(); |
83c83014e5e3
report raw ds18b20 values instead
Matt Johnston <matt@ucc.asn.au>
parents:
368
diff
changeset
|
963 |
396
a17a5984116f
print the remainder of timers as well
Matt Johnston <matt@ucc.asn.au>
parents:
395
diff
changeset
|
964 /* Take the timer here since deep_sleep() below could take 6 seconds */ |
a17a5984116f
print the remainder of timers as well
Matt Johnston <matt@ucc.asn.au>
parents:
395
diff
changeset
|
965 get_epoch_ticks(&last_measurement_clock); |
a17a5984116f
print the remainder of timers as well
Matt Johnston <matt@ucc.asn.au>
parents:
395
diff
changeset
|
966 if (n_measurements == 0) |
a17a5984116f
print the remainder of timers as well
Matt Johnston <matt@ucc.asn.au>
parents:
395
diff
changeset
|
967 { |
a17a5984116f
print the remainder of timers as well
Matt Johnston <matt@ucc.asn.au>
parents:
395
diff
changeset
|
968 first_measurement_clock = last_measurement_clock; |
a17a5984116f
print the remainder of timers as well
Matt Johnston <matt@ucc.asn.au>
parents:
395
diff
changeset
|
969 } |
a17a5984116f
print the remainder of timers as well
Matt Johnston <matt@ucc.asn.au>
parents:
395
diff
changeset
|
970 |
361
cfcd200c69da
untested code to log voltage and internal temperature
Matt Johnston <matt@ucc.asn.au>
parents:
360
diff
changeset
|
971 simple_ds18b20_start_meas(NULL); |
365 | 972 // sleep rather than using a long delay |
416 | 973 idle_sleep(); |
365 | 974 //_delay_ms(DS18B20_TCONV_12BIT); |
319 | 975 |
386 | 976 if (n_measurements == max_measurements) |
319 | 977 { |
978 n_measurements = 0; | |
979 } | |
312 | 980 |
386 | 981 for (uint8_t s = 0; s < n_sensors; s++) |
319 | 982 { |
381
83c83014e5e3
report raw ds18b20 values instead
Matt Johnston <matt@ucc.asn.au>
parents:
368
diff
changeset
|
983 uint16_t reading; |
386 | 984 uint8_t ret = simple_ds18b20_read_raw(sensor_id[s], &reading); |
985 if (ret != DS18X20_OK) | |
319 | 986 { |
386 | 987 reading = VALUE_BROKEN; |
319 | 988 } |
386 | 989 set_measurement(s, n_measurements, reading); |
414 | 990 |
991 if (memcmp(sensor_id[s], fridge_id, sizeof(fridge_id)) == 0) | |
992 { | |
420
d386bbab85cf
try and take account of the fridge temperature too
Matt Johnston <matt@ucc.asn.au>
parents:
417
diff
changeset
|
993 last_fridge = ds18b20_raw16_to_decicelsius(reading); |
414 | 994 } |
995 if (memcmp(sensor_id[s], wort_id, sizeof(wort_id)) == 0) | |
996 { | |
420
d386bbab85cf
try and take account of the fridge temperature too
Matt Johnston <matt@ucc.asn.au>
parents:
417
diff
changeset
|
997 last_wort = ds18b20_raw16_to_decicelsius(reading); |
414 | 998 } |
319 | 999 } |
328
46070aaf29ea
A bit of work on the server python
Matt Johnston <matt@ucc.asn.au>
parents:
326
diff
changeset
|
1000 |
320 | 1001 n_measurements++; |
307 | 1002 } |
1003 | |
310
0a64532c1de1
Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents:
309
diff
changeset
|
1004 static void |
0a64532c1de1
Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents:
309
diff
changeset
|
1005 do_comms() |
0a64532c1de1
Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents:
309
diff
changeset
|
1006 { |
396
a17a5984116f
print the remainder of timers as well
Matt Johnston <matt@ucc.asn.au>
parents:
395
diff
changeset
|
1007 get_epoch_ticks(&last_comms_clock); |
a17a5984116f
print the remainder of timers as well
Matt Johnston <matt@ucc.asn.au>
parents:
395
diff
changeset
|
1008 |
347 | 1009 // turn on bluetooth |
330
7ac6b8846eea
- some fixes for server code
Matt Johnston <matt@ucc.asn.au>
parents:
328
diff
changeset
|
1010 set_aux_power(1); |
395
f0ddb75bcf04
main.c : add a delay before turning on uart
Matt Johnston <matt@ucc.asn.au>
parents:
393
diff
changeset
|
1011 // avoid receiving rubbish, perhaps |
f0ddb75bcf04
main.c : add a delay before turning on uart
Matt Johnston <matt@ucc.asn.au>
parents:
393
diff
changeset
|
1012 _delay_ms(50); |
313 | 1013 uart_on(); |
347 | 1014 |
1015 // write sd card here? same 3.3v regulator... | |
1016 | |
386 | 1017 for (comms_timeout = wake_secs; |
1018 comms_timeout > 0 || stay_awake; | |
1019 ) | |
347 | 1020 { |
312 | 1021 if (need_measurement) |
1022 { | |
320 | 1023 need_measurement = 0; |
312 | 1024 do_measurement(); |
414 | 1025 do_fridge(); |
349 | 1026 continue; |
312 | 1027 } |
1028 | |
333
298e502fdcd4
Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
332
diff
changeset
|
1029 if (have_cmd) |
298e502fdcd4
Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
332
diff
changeset
|
1030 { |
298e502fdcd4
Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
332
diff
changeset
|
1031 have_cmd = 0; |
298e502fdcd4
Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
332
diff
changeset
|
1032 read_handler(); |
349 | 1033 continue; |
333
298e502fdcd4
Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
332
diff
changeset
|
1034 } |
298e502fdcd4
Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
332
diff
changeset
|
1035 |
322
840f51824254
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
321
diff
changeset
|
1036 // wait for commands from the master |
347 | 1037 idle_sleep(); |
1038 } | |
310
0a64532c1de1
Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents:
309
diff
changeset
|
1039 |
312 | 1040 uart_off(); |
352
99f8b97a9449
Use the PRR etc, set value to proper ones
Matt Johnston <matt@ucc.asn.au>
parents:
349
diff
changeset
|
1041 // in case bluetooth takes time to flush |
99f8b97a9449
Use the PRR etc, set value to proper ones
Matt Johnston <matt@ucc.asn.au>
parents:
349
diff
changeset
|
1042 _delay_ms(100); |
322
840f51824254
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
321
diff
changeset
|
1043 set_aux_power(0); |
310
0a64532c1de1
Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents:
309
diff
changeset
|
1044 } |
0a64532c1de1
Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents:
309
diff
changeset
|
1045 |
313 | 1046 static void |
1047 blink() | |
1048 { | |
1049 PORT_LED &= ~_BV(PIN_LED); | |
315 | 1050 _delay_ms(1); |
313 | 1051 PORT_LED |= _BV(PIN_LED); |
1052 } | |
1053 | |
1054 static void | |
1055 long_delay(int ms) | |
1056 { | |
1057 int iter = ms / 100; | |
1058 | |
1059 for (int i = 0; i < iter; i++) | |
1060 { | |
1061 _delay_ms(100); | |
1062 } | |
1063 } | |
1064 | |
314 | 1065 ISR(BADISR_vect) |
1066 { | |
320 | 1067 //uart_on(); |
314 | 1068 printf_P(PSTR("Bad interrupt\n")); |
1069 } | |
1070 | |
306 | 1071 int main(void) |
1072 { | |
322
840f51824254
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
321
diff
changeset
|
1073 setup_chip(); |
840f51824254
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
321
diff
changeset
|
1074 blink(); |
315 | 1075 |
322
840f51824254
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
321
diff
changeset
|
1076 set_aux_power(0); |
313 | 1077 |
312 | 1078 stdout = &mystdout; |
313 | 1079 uart_on(); |
1080 | |
322
840f51824254
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
321
diff
changeset
|
1081 printf(PSTR("Started.\n")); |
319 | 1082 |
386 | 1083 load_params(); |
319 | 1084 |
382
f429169aa3cd
don't store sensors in eeprom, scan at startup instead
Matt Johnston <matt@ucc.asn.au>
parents:
381
diff
changeset
|
1085 init_sensors(); |
f429169aa3cd
don't store sensors in eeprom, scan at startup instead
Matt Johnston <matt@ucc.asn.au>
parents:
381
diff
changeset
|
1086 |
314 | 1087 uart_off(); |
306 | 1088 |
312 | 1089 // turn off everything except timer2 |
352
99f8b97a9449
Use the PRR etc, set value to proper ones
Matt Johnston <matt@ucc.asn.au>
parents:
349
diff
changeset
|
1090 PRR = _BV(PRTWI) | _BV(PRTIM0) | _BV(PRTIM1) | _BV(PRSPI) | _BV(PRUSART0) | _BV(PRADC); |
314 | 1091 |
322
840f51824254
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
321
diff
changeset
|
1092 setup_tick_counter(); |
840f51824254
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
321
diff
changeset
|
1093 |
318 | 1094 sei(); |
314 | 1095 |
331
5de3fc71ce48
- Make the python work on openwrt
Matt Johnston <matt@ucc.asn.au>
parents:
330
diff
changeset
|
1096 need_comms = 1; |
341
ccab04e2f601
- decrease measurement interval, measure at start
Matt Johnston <matt@ucc.asn.au>
parents:
339
diff
changeset
|
1097 need_measurement = 1; |
331
5de3fc71ce48
- Make the python work on openwrt
Matt Johnston <matt@ucc.asn.au>
parents:
330
diff
changeset
|
1098 |
416 | 1099 stay_awake = 1; |
1100 | |
322
840f51824254
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
321
diff
changeset
|
1101 for(;;) |
840f51824254
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
321
diff
changeset
|
1102 { |
396
a17a5984116f
print the remainder of timers as well
Matt Johnston <matt@ucc.asn.au>
parents:
395
diff
changeset
|
1103 if (button_pressed) |
a17a5984116f
print the remainder of timers as well
Matt Johnston <matt@ucc.asn.au>
parents:
395
diff
changeset
|
1104 { |
a17a5984116f
print the remainder of timers as well
Matt Johnston <matt@ucc.asn.au>
parents:
395
diff
changeset
|
1105 // debounce |
a17a5984116f
print the remainder of timers as well
Matt Johnston <matt@ucc.asn.au>
parents:
395
diff
changeset
|
1106 _delay_ms(200); |
a17a5984116f
print the remainder of timers as well
Matt Johnston <matt@ucc.asn.au>
parents:
395
diff
changeset
|
1107 need_comms = 1; |
a17a5984116f
print the remainder of timers as well
Matt Johnston <matt@ucc.asn.au>
parents:
395
diff
changeset
|
1108 comms_timeout = wake_secs; |
a17a5984116f
print the remainder of timers as well
Matt Johnston <matt@ucc.asn.au>
parents:
395
diff
changeset
|
1109 button_pressed = 0; |
347 | 1110 continue; |
307 | 1111 } |
310
0a64532c1de1
Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents:
309
diff
changeset
|
1112 |
0a64532c1de1
Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents:
309
diff
changeset
|
1113 if (need_comms) |
0a64532c1de1
Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents:
309
diff
changeset
|
1114 { |
322
840f51824254
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
321
diff
changeset
|
1115 need_comms = 0; |
310
0a64532c1de1
Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents:
309
diff
changeset
|
1116 do_comms(); |
347 | 1117 continue; |
310
0a64532c1de1
Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents:
309
diff
changeset
|
1118 } |
0a64532c1de1
Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents:
309
diff
changeset
|
1119 |
402 | 1120 if (need_measurement) |
1121 { | |
1122 need_measurement = 0; | |
1123 do_measurement(); | |
414 | 1124 do_fridge(); |
402 | 1125 continue; |
1126 } | |
1127 | |
347 | 1128 deep_sleep(); |
306 | 1129 } |
318 | 1130 |
306 | 1131 return 0; /* never reached */ |
1132 } |