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