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