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