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