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