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