Mercurial > templog
annotate main.c @ 323:5181ea55ea77
Add clock_epoch
| author | Matt Johnston <matt@ucc.asn.au> |
|---|---|
| date | Tue, 22 May 2012 21:24:04 +0800 |
| parents | 840f51824254 |
| children | f1016b151689 |
| rev | line source |
|---|---|
| 306 | 1 /* Name: main.c |
| 2 * Author: <insert your name here> | |
| 3 * Copyright: <insert your copyright message here> | |
| 4 * License: <insert your license reference here> | |
| 5 */ | |
| 6 | |
| 7 #include <stdio.h> | |
| 8 #include <string.h> | |
| 319 | 9 #include <stddef.h> |
| 307 | 10 #include <avr/io.h> |
| 11 #include <avr/interrupt.h> | |
| 12 #include <avr/sleep.h> | |
| 313 | 13 #include <util/delay.h> |
| 312 | 14 #include <avr/pgmspace.h> |
| 319 | 15 #include <avr/eeprom.h> |
| 306 | 16 #include <util/crc16.h> |
| 17 | |
| 318 | 18 // for DWORD of get_fattime() |
| 309 | 19 #include "integer.h" |
| 318 | 20 |
| 21 #include "simple_ds18b20.h" | |
| 319 | 22 #include "onewire.h" |
| 309 | 23 |
| 306 | 24 // configuration params |
| 25 // - measurement interval | |
| 26 // - transmit interval | |
| 27 // - bluetooth params | |
| 28 // - number of sensors (and range?) | |
| 29 | |
| 307 | 30 // 1 second. we have 1024 prescaler, 32768 crystal. |
| 308 | 31 #define SLEEP_COMPARE 32 |
| 320 | 32 #define MEASURE_WAKE 10 |
|
310
0a64532c1de1
Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents:
309
diff
changeset
|
33 |
| 319 | 34 #define VALUE_NOSENSOR -9000 |
| 35 #define VALUE_BROKEN -8000 | |
| 36 | |
|
310
0a64532c1de1
Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents:
309
diff
changeset
|
37 #define COMMS_WAKE 3600 |
|
322
840f51824254
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
321
diff
changeset
|
38 #define WAKE_SECS 30 |
| 308 | 39 |
| 316 | 40 #define BAUD 19200 |
| 313 | 41 #define UBRR ((F_CPU)/8/(BAUD)-1) |
| 42 | |
| 43 #define PORT_LED PORTC | |
| 44 #define DDR_LED DDRC | |
| 45 #define PIN_LED PC4 | |
| 307 | 46 |
|
321
df7384336798
Add shutdown handling, print sensors in "fetch" output
Matt Johnston <matt@ucc.asn.au>
parents:
320
diff
changeset
|
47 #define PORT_SHDN PORTD |
|
df7384336798
Add shutdown handling, print sensors in "fetch" output
Matt Johnston <matt@ucc.asn.au>
parents:
320
diff
changeset
|
48 #define DDR_SHDN DDRD |
|
df7384336798
Add shutdown handling, print sensors in "fetch" output
Matt Johnston <matt@ucc.asn.au>
parents:
320
diff
changeset
|
49 #define PIN_SHDN PD7 |
|
df7384336798
Add shutdown handling, print sensors in "fetch" output
Matt Johnston <matt@ucc.asn.au>
parents:
320
diff
changeset
|
50 |
| 319 | 51 #define NUM_MEASUREMENTS 100 |
| 52 #define MAX_SENSORS 5 | |
| 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 |
| 316 | 57 int uart_putchar(char c, FILE *stream); |
| 320 | 58 static void long_delay(int ms); |
| 59 | |
| 306 | 60 static FILE mystdout = FDEV_SETUP_STREAM(uart_putchar, NULL, |
| 61 _FDEV_SETUP_WRITE); | |
| 62 | |
| 323 | 63 static uint16_t n_measurements; |
| 319 | 64 // stored as decidegrees |
| 320 | 65 static int16_t measurements[NUM_MEASUREMENTS][MAX_SENSORS]; |
| 306 | 66 |
|
310
0a64532c1de1
Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents:
309
diff
changeset
|
67 // boolean flags |
| 323 | 68 static uint8_t need_measurement; |
| 69 static uint8_t need_comms; | |
|
322
840f51824254
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
321
diff
changeset
|
70 |
|
840f51824254
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
321
diff
changeset
|
71 // counts down from WAKE_SECS to 0, goes to deep sleep when hits 0 |
| 323 | 72 static uint8_t comms_timeout; |
| 307 | 73 |
| 323 | 74 static uint8_t readpos; |
| 306 | 75 static char readbuf[30]; |
| 76 | |
| 323 | 77 static uint8_t measure_count; |
| 78 static uint16_t comms_count; | |
| 79 | |
| 80 static uint32_t clock_epoch; | |
|
310
0a64532c1de1
Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents:
309
diff
changeset
|
81 |
| 319 | 82 // thanks to http://projectgus.com/2010/07/eeprom-access-with-arduino/ |
| 83 #define eeprom_read_to(dst_p, eeprom_field, dst_size) eeprom_read_block((dst_p), (void *)offsetof(struct __eeprom_data, eeprom_field), (dst_size)) | |
| 84 #define eeprom_read(dst, eeprom_field) eeprom_read_to((&dst), eeprom_field, sizeof(dst)) | |
| 85 #define eeprom_write_from(src_p, eeprom_field, src_size) eeprom_write_block((src_p), (void *)offsetof(struct __eeprom_data, eeprom_field), (src_size)) | |
| 86 #define eeprom_write(src, eeprom_field) { eeprom_write_from(&src, eeprom_field, sizeof(src)); } | |
| 87 | |
| 88 #define EXPECT_MAGIC 0x67c9 | |
| 89 | |
| 90 struct __attribute__ ((__packed__)) __eeprom_data { | |
| 91 uint16_t magic; | |
| 92 uint8_t n_sensors; | |
|
321
df7384336798
Add shutdown handling, print sensors in "fetch" output
Matt Johnston <matt@ucc.asn.au>
parents:
320
diff
changeset
|
93 uint8_t sensor_id[MAX_SENSORS][ID_LEN]; |
| 319 | 94 }; |
| 95 | |
| 314 | 96 #define DEBUG(str) printf_P(PSTR(str)) |
| 97 | |
|
310
0a64532c1de1
Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents:
309
diff
changeset
|
98 static void deep_sleep(); |
| 307 | 99 |
|
322
840f51824254
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
321
diff
changeset
|
100 // Very first setup |
|
840f51824254
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
321
diff
changeset
|
101 static void |
|
840f51824254
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
321
diff
changeset
|
102 setup_chip() |
|
840f51824254
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
321
diff
changeset
|
103 { |
|
840f51824254
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
321
diff
changeset
|
104 // Set clock to 2mhz |
|
840f51824254
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
321
diff
changeset
|
105 cli(); |
|
840f51824254
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
321
diff
changeset
|
106 CLKPR = _BV(CLKPCE); |
|
840f51824254
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
321
diff
changeset
|
107 // divide by 4 |
|
840f51824254
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
321
diff
changeset
|
108 CLKPR = _BV(CLKPS1); |
|
840f51824254
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
321
diff
changeset
|
109 sei(); |
|
840f51824254
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
321
diff
changeset
|
110 |
|
840f51824254
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
321
diff
changeset
|
111 DDR_LED |= _BV(PIN_LED); |
|
840f51824254
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
321
diff
changeset
|
112 DDR_SHDN |= _BV(PIN_SHDN); |
|
840f51824254
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
321
diff
changeset
|
113 } |
|
840f51824254
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
321
diff
changeset
|
114 |
|
840f51824254
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
321
diff
changeset
|
115 static void |
|
840f51824254
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
321
diff
changeset
|
116 set_aux_power(uint8_t on) |
|
840f51824254
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
321
diff
changeset
|
117 { |
|
840f51824254
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
321
diff
changeset
|
118 if (on) |
|
840f51824254
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
321
diff
changeset
|
119 { |
|
840f51824254
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
321
diff
changeset
|
120 PORT_SHDN &= ~_BV(PIN_SHDN); |
|
840f51824254
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
321
diff
changeset
|
121 } |
|
840f51824254
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
321
diff
changeset
|
122 else |
|
840f51824254
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
321
diff
changeset
|
123 { |
|
840f51824254
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
321
diff
changeset
|
124 PORT_SHDN |= _BV(PIN_SHDN); |
|
840f51824254
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
321
diff
changeset
|
125 } |
|
840f51824254
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
321
diff
changeset
|
126 } |
|
840f51824254
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
321
diff
changeset
|
127 |
|
840f51824254
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
321
diff
changeset
|
128 static void |
|
840f51824254
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
321
diff
changeset
|
129 setup_tick_counter() |
|
840f51824254
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
321
diff
changeset
|
130 { |
|
840f51824254
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
321
diff
changeset
|
131 // set up counter2. |
|
840f51824254
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
321
diff
changeset
|
132 // COM21 COM20 Set OC2 on Compare Match (p116) |
|
840f51824254
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
321
diff
changeset
|
133 // WGM21 Clear counter on compare |
|
840f51824254
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
321
diff
changeset
|
134 //TCCR2A = _BV(COM2A1) | _BV(COM2A0) | _BV(WGM21); |
|
840f51824254
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
321
diff
changeset
|
135 // toggle on match |
|
840f51824254
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
321
diff
changeset
|
136 TCCR2A = _BV(COM2A0); |
|
840f51824254
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
321
diff
changeset
|
137 // CS22 CS21 CS20 clk/1024 |
|
840f51824254
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
321
diff
changeset
|
138 TCCR2B = _BV(CS22) | _BV(CS21) | _BV(CS20); |
|
840f51824254
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
321
diff
changeset
|
139 // set async mode |
|
840f51824254
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
321
diff
changeset
|
140 ASSR |= _BV(AS2); |
|
840f51824254
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
321
diff
changeset
|
141 TCNT2 = 0; |
|
840f51824254
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
321
diff
changeset
|
142 OCR2A = SLEEP_COMPARE; |
|
840f51824254
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
321
diff
changeset
|
143 // interrupt |
|
840f51824254
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
321
diff
changeset
|
144 TIMSK2 = _BV(OCIE2A); |
|
840f51824254
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
321
diff
changeset
|
145 } |
|
840f51824254
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
321
diff
changeset
|
146 |
| 306 | 147 static void |
| 313 | 148 uart_on() |
| 306 | 149 { |
| 314 | 150 // Power reduction register |
| 151 //PRR &= ~_BV(PRUSART0); | |
| 152 | |
|
322
840f51824254
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
321
diff
changeset
|
153 // All of this needs to be done each time after turning off the PRR |
| 306 | 154 // baud rate |
| 313 | 155 UBRR0H = (unsigned char)(UBRR >> 8); |
| 156 UBRR0L = (unsigned char)UBRR; | |
| 157 // set 2x clock, improves accuracy of UBRR | |
| 158 UCSR0A |= _BV(U2X0); | |
| 312 | 159 UCSR0B = _BV(RXCIE0) | _BV(RXEN0) | _BV(TXEN0); |
| 306 | 160 //8N1 |
| 313 | 161 UCSR0C = _BV(UCSZ01) | _BV(UCSZ00); |
| 312 | 162 } |
| 163 | |
| 164 static void | |
| 165 uart_off() | |
| 166 { | |
| 167 // Turn of interrupts and disable tx/rx | |
| 168 UCSR0B = 0; | |
| 169 | |
| 170 // Power reduction register | |
| 314 | 171 //PRR |= _BV(PRUSART0); |
| 306 | 172 } |
| 173 | |
| 316 | 174 int |
| 306 | 175 uart_putchar(char c, FILE *stream) |
| 176 { | |
| 316 | 177 // XXX should sleep in the loop for power. |
| 314 | 178 if (c == '\n') |
| 179 { | |
| 316 | 180 loop_until_bit_is_set(UCSR0A, UDRE0); |
| 181 UDR0 = '\r';; | |
| 314 | 182 } |
| 308 | 183 loop_until_bit_is_set(UCSR0A, UDRE0); |
| 184 UDR0 = c; | |
| 316 | 185 if (c == '\r') |
| 186 { | |
| 187 loop_until_bit_is_set(UCSR0A, UDRE0); | |
| 188 UDR0 = '\n';; | |
| 189 } | |
| 306 | 190 return 0; |
| 191 } | |
| 192 | |
| 193 static void | |
| 323 | 194 update_crc(uint16_t *crc, const void *data, uint8_t len) |
| 195 { | |
| 196 for (uint8_t i = 0; i < len; i++) | |
| 197 { | |
| 198 *crc = _crc_ccitt_update(*crc, ((const uint8_t*)data)[i]); | |
| 199 } | |
| 200 } | |
| 201 | |
| 202 static void | |
| 306 | 203 cmd_fetch() |
| 204 { | |
| 205 uint16_t crc = 0; | |
|
321
df7384336798
Add shutdown handling, print sensors in "fetch" output
Matt Johnston <matt@ucc.asn.au>
parents:
320
diff
changeset
|
206 uint8_t n_sensors; |
|
df7384336798
Add shutdown handling, print sensors in "fetch" output
Matt Johnston <matt@ucc.asn.au>
parents:
320
diff
changeset
|
207 eeprom_read(n_sensors, n_sensors); |
| 319 | 208 |
| 323 | 209 printf_P(PSTR("Time %lu\n"), clock_epoch); |
| 210 update_crc(&crc, &clock_epoch, sizeof(clock_epoch)); | |
|
321
df7384336798
Add shutdown handling, print sensors in "fetch" output
Matt Johnston <matt@ucc.asn.au>
parents:
320
diff
changeset
|
211 printf_P(PSTR("%d sensors\n"), n_measurements); |
|
df7384336798
Add shutdown handling, print sensors in "fetch" output
Matt Johnston <matt@ucc.asn.au>
parents:
320
diff
changeset
|
212 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
|
213 { |
|
df7384336798
Add shutdown handling, print sensors in "fetch" output
Matt Johnston <matt@ucc.asn.au>
parents:
320
diff
changeset
|
214 uint8_t id[ID_LEN]; |
|
df7384336798
Add shutdown handling, print sensors in "fetch" output
Matt Johnston <matt@ucc.asn.au>
parents:
320
diff
changeset
|
215 printf_P(PSTR("%d : "), s); |
|
df7384336798
Add shutdown handling, print sensors in "fetch" output
Matt Johnston <matt@ucc.asn.au>
parents:
320
diff
changeset
|
216 eeprom_read_to(id, sensor_id[s], ID_LEN); |
|
df7384336798
Add shutdown handling, print sensors in "fetch" output
Matt Johnston <matt@ucc.asn.au>
parents:
320
diff
changeset
|
217 printhex(id, ID_LEN); |
|
df7384336798
Add shutdown handling, print sensors in "fetch" output
Matt Johnston <matt@ucc.asn.au>
parents:
320
diff
changeset
|
218 putchar('\n'); |
| 323 | 219 update_crc(&crc, id, ID_LEN); |
|
321
df7384336798
Add shutdown handling, print sensors in "fetch" output
Matt Johnston <matt@ucc.asn.au>
parents:
320
diff
changeset
|
220 } |
| 312 | 221 printf_P(PSTR("%d measurements\n"), n_measurements); |
| 320 | 222 for (uint16_t n = 0; n < n_measurements; n++) |
| 306 | 223 { |
| 320 | 224 printf_P(PSTR("%3d :"), n); |
|
321
df7384336798
Add shutdown handling, print sensors in "fetch" output
Matt Johnston <matt@ucc.asn.au>
parents:
320
diff
changeset
|
225 for (uint8_t s = 0; s < n_sensors; s++) |
| 319 | 226 { |
| 320 | 227 printf_P(PSTR(" %6d"), measurements[n][s]); |
| 323 | 228 update_crc(&crc, &measurements[n][s], sizeof(measurements[n][s])); |
| 319 | 229 } |
| 230 putchar('\n'); | |
| 306 | 231 } |
| 312 | 232 printf_P(PSTR("CRC : %d\n"), crc); |
| 306 | 233 } |
| 234 | |
| 235 static void | |
| 236 cmd_clear() | |
| 237 { | |
| 313 | 238 n_measurements = 0; |
| 239 printf_P(PSTR("Cleared\n")); | |
| 306 | 240 } |
| 241 | |
| 242 static void | |
| 243 cmd_btoff() | |
| 244 { | |
| 313 | 245 printf_P(PSTR("Turning off\n")); |
| 246 _delay_ms(50); | |
|
322
840f51824254
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
321
diff
changeset
|
247 comms_timeout = 0; |
| 306 | 248 } |
| 249 | |
| 250 static void | |
| 318 | 251 cmd_measure() |
| 252 { | |
| 253 printf_P(PSTR("Measuring\n")); | |
| 254 need_measurement = 1; | |
| 255 } | |
| 256 | |
| 257 static void | |
| 258 cmd_sensors() | |
| 259 { | |
| 260 uint8_t ret = simple_ds18b20_start_meas(NULL); | |
| 320 | 261 printf_P(PSTR("All sensors, ret %d, waiting...\n"), ret); |
| 262 long_delay(DS18B20_TCONV_12BIT); | |
| 318 | 263 simple_ds18b20_read_all(); |
| 264 } | |
| 265 | |
|
322
840f51824254
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
321
diff
changeset
|
266 #if 0 |
| 319 | 267 // 0 on success |
| 268 static uint8_t | |
| 269 get_hex_string(const char *hex, uint8_t *out, uint8_t size) | |
| 270 { | |
| 271 uint8_t upper; | |
| 272 uint8_t o; | |
| 273 for (uint8_t i = 0, z = 0; o < size; i++) | |
| 274 { | |
| 275 uint8_t h = hex[i]; | |
| 276 if (h >= 'A' && h <= 'F') | |
| 277 { | |
| 278 // lower case | |
| 279 h += 0x20; | |
| 280 } | |
| 281 uint8_t nibble; | |
| 282 if (h >= '0' && h <= '9') | |
| 283 { | |
| 284 nibble = h - '0'; | |
| 285 } | |
| 286 else if (h >= 'a' && h <= 'f') | |
| 287 { | |
| 288 nibble = 10 + h - 'a'; | |
| 289 } | |
| 290 else if (h == ' ' || h == ':') | |
| 291 { | |
| 292 continue; | |
| 293 } | |
| 294 else | |
| 295 { | |
| 296 printf_P(PSTR("Bad hex 0x%x '%c'\n"), hex[i], hex[i]); | |
| 297 return 1; | |
| 298 } | |
| 299 | |
| 300 if (z % 2 == 0) | |
| 301 { | |
| 302 upper = nibble << 4; | |
| 303 } | |
| 304 else | |
| 305 { | |
| 306 out[o] = upper | nibble; | |
| 307 o++; | |
| 308 } | |
| 309 | |
| 310 z++; | |
| 311 } | |
| 312 | |
| 313 if (o != size) | |
| 314 { | |
| 315 printf_P(PSTR("Short hex\n")); | |
| 316 return 1; | |
| 317 } | |
| 318 return 0; | |
| 319 } | |
|
322
840f51824254
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
321
diff
changeset
|
320 #endif |
| 319 | 321 |
| 322 static void | |
| 323 add_sensor(uint8_t *id) | |
| 324 { | |
| 325 uint8_t n; | |
| 326 eeprom_read(n, n_sensors); | |
| 327 if (n < MAX_SENSORS) | |
| 328 { | |
| 329 cli(); | |
|
321
df7384336798
Add shutdown handling, print sensors in "fetch" output
Matt Johnston <matt@ucc.asn.au>
parents:
320
diff
changeset
|
330 eeprom_write_from(id, sensor_id[n], ID_LEN); |
| 319 | 331 n++; |
| 332 eeprom_write(n, n_sensors); | |
| 333 sei(); | |
| 334 printf_P(PSTR("Added sensor %d : "), n); | |
|
321
df7384336798
Add shutdown handling, print sensors in "fetch" output
Matt Johnston <matt@ucc.asn.au>
parents:
320
diff
changeset
|
335 printhex(id, ID_LEN); |
| 319 | 336 putchar('\n'); |
| 337 } | |
| 338 else | |
| 339 { | |
| 340 printf_P(PSTR("Too many sensors\n")); | |
| 341 } | |
| 342 } | |
| 343 | |
| 344 static void | |
| 345 cmd_add_all() | |
| 346 { | |
| 347 uint8_t id[OW_ROMCODE_SIZE]; | |
| 348 printf_P("Adding all\n"); | |
| 349 ow_reset(); | |
| 350 for( uint8_t diff = OW_SEARCH_FIRST; diff != OW_LAST_DEVICE; ) | |
| 351 { | |
| 352 diff = ow_rom_search( diff, &id[0] ); | |
| 353 if( diff == OW_PRESENCE_ERR ) { | |
| 354 printf_P( PSTR("No Sensor found\r") ); | |
| 355 return; | |
| 356 } | |
| 357 | |
| 358 if( diff == OW_DATA_ERR ) { | |
| 359 printf_P( PSTR("Bus Error\r") ); | |
| 360 return; | |
| 361 } | |
| 362 add_sensor(id); | |
| 363 } | |
| 364 } | |
| 365 | |
| 366 static void | |
| 367 cmd_init() | |
| 368 { | |
| 369 printf_P(PSTR("Resetting sensor list\n")); | |
| 370 uint8_t zero = 0; | |
| 371 cli(); | |
| 372 eeprom_write(zero, n_sensors); | |
| 373 sei(); | |
| 374 printf_P(PSTR("Done.\n")); | |
| 375 } | |
| 376 | |
| 377 static void | |
| 323 | 378 cmd_settime(const char *str) |
| 379 { | |
| 380 clock_epoch = strtoul(str, NULL, 10); | |
| 381 printf_P(PSTR("Time set to %lu\n"), clock_epoch); | |
| 382 } | |
| 383 | |
| 384 static void | |
| 319 | 385 check_first_startup() |
| 386 { | |
| 387 uint16_t magic; | |
| 388 eeprom_read(magic, magic); | |
| 389 if (magic != EXPECT_MAGIC) | |
| 390 { | |
| 391 printf_P(PSTR("First boot, looking for sensors...\n")); | |
|
322
840f51824254
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
321
diff
changeset
|
392 // in case of power fumbles don't want to reset during eeprom write, |
|
840f51824254
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
321
diff
changeset
|
393 long_delay(2); |
| 319 | 394 cmd_init(); |
| 395 cmd_add_all(); | |
| 320 | 396 cli(); |
| 397 magic = EXPECT_MAGIC; | |
| 398 eeprom_write(magic, magic); | |
| 399 sei(); | |
| 319 | 400 } |
| 401 } | |
| 402 | |
| 318 | 403 static void |
| 306 | 404 read_handler() |
| 405 { | |
| 312 | 406 if (strcmp_P(readbuf, PSTR("fetch")) == 0) |
| 306 | 407 { |
| 408 cmd_fetch(); | |
| 409 } | |
| 312 | 410 else if (strcmp_P(readbuf, PSTR("clear")) == 0) |
| 306 | 411 { |
| 412 cmd_clear(); | |
| 413 } | |
| 312 | 414 else if (strcmp_P(readbuf, PSTR("btoff")) == 0) |
| 306 | 415 { |
| 416 cmd_btoff(); | |
| 417 } | |
| 318 | 418 else if (strcmp_P(readbuf, PSTR("measure")) == 0) |
| 419 { | |
| 420 cmd_measure(); | |
| 421 } | |
| 422 else if (strcmp_P(readbuf, PSTR("sensors")) == 0) | |
| 423 { | |
| 424 cmd_sensors(); | |
| 425 } | |
| 319 | 426 else if (strcmp_P(readbuf, PSTR("addall"))== 0) |
| 427 { | |
| 428 cmd_add_all(); | |
| 429 } | |
| 323 | 430 else if (strncmp_P(readbuf, PSTR("settime "), |
| 431 strlen("settime ") == 0)) | |
| 432 { | |
| 433 cmd_settime(&readbuf[strlen("settime ")]); | |
| 434 } | |
| 319 | 435 else if (strcmp_P(readbuf, PSTR("init")) == 0) |
| 436 { | |
| 437 cmd_init(); | |
| 438 } | |
| 306 | 439 else |
| 440 { | |
| 312 | 441 printf_P(PSTR("Bad command\n")); |
| 306 | 442 } |
| 443 } | |
| 444 | |
| 308 | 445 ISR(USART_RX_vect) |
| 306 | 446 { |
| 308 | 447 char c = UDR0; |
| 318 | 448 uart_putchar(c, NULL); |
| 449 if (c == '\r') | |
| 306 | 450 { |
| 451 readbuf[readpos] = '\0'; | |
| 452 read_handler(); | |
| 453 readpos = 0; | |
| 454 } | |
| 455 else | |
| 456 { | |
| 457 readbuf[readpos] = c; | |
| 458 readpos++; | |
| 459 if (readpos >= sizeof(readbuf)) | |
| 460 { | |
| 461 readpos = 0; | |
| 462 } | |
| 463 } | |
| 464 } | |
| 465 | |
| 308 | 466 ISR(TIMER2_COMPA_vect) |
| 307 | 467 { |
| 320 | 468 TCNT2 = 0; |
|
310
0a64532c1de1
Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents:
309
diff
changeset
|
469 measure_count ++; |
|
0a64532c1de1
Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents:
309
diff
changeset
|
470 comms_count ++; |
|
322
840f51824254
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
321
diff
changeset
|
471 |
| 323 | 472 clock_epoch ++; |
| 473 | |
|
322
840f51824254
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
321
diff
changeset
|
474 if (comms_timeout != 0) |
|
840f51824254
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
321
diff
changeset
|
475 { |
|
840f51824254
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
321
diff
changeset
|
476 comms_timeout--; |
|
840f51824254
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
321
diff
changeset
|
477 } |
|
840f51824254
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
321
diff
changeset
|
478 |
| 320 | 479 if (measure_count >= MEASURE_WAKE) |
| 307 | 480 { |
|
310
0a64532c1de1
Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents:
309
diff
changeset
|
481 measure_count = 0; |
| 307 | 482 need_measurement = 1; |
| 483 } | |
|
310
0a64532c1de1
Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents:
309
diff
changeset
|
484 |
|
322
840f51824254
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
321
diff
changeset
|
485 if (comms_count >= COMMS_WAKE) |
|
310
0a64532c1de1
Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents:
309
diff
changeset
|
486 { |
|
0a64532c1de1
Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents:
309
diff
changeset
|
487 comms_count = 0; |
|
0a64532c1de1
Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents:
309
diff
changeset
|
488 need_comms = 1; |
|
0a64532c1de1
Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents:
309
diff
changeset
|
489 } |
|
322
840f51824254
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
321
diff
changeset
|
490 |
| 307 | 491 } |
| 492 | |
| 309 | 493 DWORD get_fattime (void) |
| 494 { | |
| 495 return 0; | |
| 496 } | |
| 497 | |
| 307 | 498 static void |
| 499 deep_sleep() | |
| 500 { | |
| 501 // p119 of manual | |
| 308 | 502 OCR2A = SLEEP_COMPARE; |
| 503 loop_until_bit_is_clear(ASSR, OCR2AUB); | |
| 307 | 504 |
| 505 set_sleep_mode(SLEEP_MODE_PWR_SAVE); | |
| 506 sleep_mode(); | |
| 507 } | |
| 508 | |
| 509 static void | |
|
310
0a64532c1de1
Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents:
309
diff
changeset
|
510 idle_sleep() |
|
0a64532c1de1
Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents:
309
diff
changeset
|
511 { |
|
0a64532c1de1
Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents:
309
diff
changeset
|
512 set_sleep_mode(SLEEP_MODE_IDLE); |
|
0a64532c1de1
Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents:
309
diff
changeset
|
513 sleep_mode(); |
|
0a64532c1de1
Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents:
309
diff
changeset
|
514 } |
|
0a64532c1de1
Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents:
309
diff
changeset
|
515 |
| 320 | 516 #if 0 |
| 517 // untested | |
| 312 | 518 static void |
| 519 do_adc_335() | |
| 520 { | |
| 314 | 521 //PRR &= ~_BV(PRADC); |
| 312 | 522 |
| 523 ADMUX = _BV(ADLAR); | |
| 524 | |
| 525 // ADPS2 = /16 prescaler, 62khz at 1mhz clock | |
| 526 ADCSRA = _BV(ADEN) | _BV(ADPS2); | |
| 527 | |
| 528 // measure value | |
| 529 ADCSRA |= _BV(ADSC); | |
| 530 loop_until_bit_is_clear(ADCSRA, ADSC); | |
| 531 uint8_t low = ADCL; | |
| 532 uint8_t high = ADCH; | |
| 533 uint16_t f_measure = low + (high << 8); | |
| 534 | |
| 535 // set to measure 1.1 reference | |
| 536 ADMUX = _BV(ADLAR) | _BV(MUX3) | _BV(MUX2) | _BV(MUX1); | |
| 537 ADCSRA |= _BV(ADSC); | |
| 538 loop_until_bit_is_clear(ADCSRA, ADSC); | |
| 539 uint8_t low_11 = ADCL; | |
| 540 uint8_t high_11 = ADCH; | |
| 541 uint16_t f_11 = low_11 + (high_11 << 8); | |
| 542 | |
| 543 float res_volts = 1.1 * f_measure / f_11; | |
| 544 | |
| 545 // 10mV/degree | |
| 546 // scale to 1/5 degree units above 0C | |
| 547 int temp = (res_volts - 2.73) * 500; | |
| 319 | 548 // XXX fixme |
| 549 //measurements[n_measurements] = temp; | |
| 312 | 550 // XXX something if it hits the limit |
| 551 | |
| 552 // measure AVR internal temperature against 1.1 ref. | |
| 553 ADMUX = _BV(ADLAR) | _BV(MUX3) | _BV(REFS1) | _BV(REFS0); | |
| 554 ADCSRA |= _BV(ADSC); | |
| 555 loop_until_bit_is_clear(ADCSRA, ADSC); | |
| 556 uint16_t res_internal = ADCL; | |
| 557 res_internal |= ADCH << 8; | |
| 558 | |
| 559 float internal_volts = res_internal * (1.1 / 1024.0); | |
| 560 | |
| 561 // 1mV/degree | |
| 562 int internal_temp = (internal_volts - 2.73) * 5000; | |
| 319 | 563 // XXX fixme |
| 564 //internal_measurements[n_measurements] = internal_temp; | |
| 312 | 565 |
| 566 printf_P("measure %d: external %d, internal %d, 1.1 %d\n", | |
| 567 n_measurements, temp, internal_temp, f_11); | |
| 568 | |
| 569 n_measurements++; | |
| 314 | 570 //PRR |= _BV(PRADC); |
| 312 | 571 } |
| 320 | 572 #endif |
| 312 | 573 |
|
310
0a64532c1de1
Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents:
309
diff
changeset
|
574 static void |
| 307 | 575 do_measurement() |
| 576 { | |
| 319 | 577 uint8_t n_sensors; |
| 320 | 578 printf("do_measurement\n"); |
| 319 | 579 eeprom_read(n_sensors, n_sensors); |
| 320 | 580 printf("do_measurement sensors %d\n", n_sensors); |
| 319 | 581 |
| 582 uint8_t ret = simple_ds18b20_start_meas(NULL); | |
| 320 | 583 printf_P(PSTR("Read all sensors, ret %d, waiting...\n"), ret); |
| 319 | 584 _delay_ms(DS18B20_TCONV_12BIT); |
| 585 | |
| 586 if (n_measurements == NUM_MEASUREMENTS) | |
| 587 { | |
| 320 | 588 printf_P(PSTR("Measurements .overflow\n")); |
| 319 | 589 n_measurements = 0; |
| 590 } | |
| 312 | 591 |
| 320 | 592 for (uint8_t s = 0; s < MAX_SENSORS; s++) |
| 319 | 593 { |
| 594 int16_t decicelsius; | |
| 320 | 595 if (s >= n_sensors) |
| 319 | 596 { |
| 597 decicelsius = VALUE_NOSENSOR; | |
| 598 } | |
| 599 else | |
| 600 { | |
|
321
df7384336798
Add shutdown handling, print sensors in "fetch" output
Matt Johnston <matt@ucc.asn.au>
parents:
320
diff
changeset
|
601 uint8_t id[ID_LEN]; |
|
df7384336798
Add shutdown handling, print sensors in "fetch" output
Matt Johnston <matt@ucc.asn.au>
parents:
320
diff
changeset
|
602 eeprom_read_to(id, sensor_id[s], ID_LEN); |
| 319 | 603 |
| 604 uint8_t ret = simple_ds18b20_read_decicelsius(id, &decicelsius); | |
| 605 if (ret != DS18X20_OK) | |
| 606 { | |
| 607 decicelsius = VALUE_BROKEN; | |
| 608 } | |
| 609 } | |
| 320 | 610 measurements[n_measurements][s] = decicelsius; |
| 319 | 611 } |
| 320 | 612 n_measurements++; |
| 318 | 613 //do_adc_335(); |
| 307 | 614 } |
| 615 | |
|
310
0a64532c1de1
Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents:
309
diff
changeset
|
616 static void |
|
0a64532c1de1
Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents:
309
diff
changeset
|
617 do_comms() |
|
0a64532c1de1
Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents:
309
diff
changeset
|
618 { |
|
0a64532c1de1
Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents:
309
diff
changeset
|
619 // turn on bluetooth |
| 313 | 620 uart_on(); |
|
310
0a64532c1de1
Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents:
309
diff
changeset
|
621 |
|
0a64532c1de1
Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents:
309
diff
changeset
|
622 // write sd card here? same 3.3v regulator... |
|
0a64532c1de1
Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents:
309
diff
changeset
|
623 |
| 318 | 624 printf("ready> \n"); |
| 625 | |
|
322
840f51824254
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
321
diff
changeset
|
626 for (comms_timeout = WAKE_SECS; comms_timeout > 0; ) |
|
310
0a64532c1de1
Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents:
309
diff
changeset
|
627 { |
| 312 | 628 if (need_measurement) |
| 629 { | |
| 320 | 630 need_measurement = 0; |
| 631 printf("measure from do_comms\n"); | |
| 312 | 632 do_measurement(); |
| 633 } | |
| 634 | |
|
322
840f51824254
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
321
diff
changeset
|
635 // wait for commands from the master |
|
310
0a64532c1de1
Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents:
309
diff
changeset
|
636 idle_sleep(); |
|
0a64532c1de1
Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents:
309
diff
changeset
|
637 } |
|
0a64532c1de1
Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents:
309
diff
changeset
|
638 |
| 312 | 639 uart_off(); |
|
322
840f51824254
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
321
diff
changeset
|
640 set_aux_power(0); |
|
310
0a64532c1de1
Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents:
309
diff
changeset
|
641 } |
|
0a64532c1de1
Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents:
309
diff
changeset
|
642 |
| 313 | 643 static void |
| 644 blink() | |
| 645 { | |
| 646 PORT_LED &= ~_BV(PIN_LED); | |
| 315 | 647 _delay_ms(1); |
| 313 | 648 PORT_LED |= _BV(PIN_LED); |
| 649 } | |
| 650 | |
| 651 static void | |
| 652 long_delay(int ms) | |
| 653 { | |
| 654 int iter = ms / 100; | |
| 655 | |
| 656 for (int i = 0; i < iter; i++) | |
| 657 { | |
| 658 _delay_ms(100); | |
| 659 } | |
| 660 } | |
| 661 | |
| 314 | 662 ISR(BADISR_vect) |
| 663 { | |
| 320 | 664 //uart_on(); |
| 314 | 665 printf_P(PSTR("Bad interrupt\n")); |
| 666 } | |
| 667 | |
| 315 | 668 |
| 306 | 669 int main(void) |
| 670 { | |
|
322
840f51824254
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
321
diff
changeset
|
671 setup_chip(); |
|
840f51824254
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
321
diff
changeset
|
672 blink(); |
| 315 | 673 |
|
322
840f51824254
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
321
diff
changeset
|
674 set_aux_power(0); |
| 313 | 675 |
| 312 | 676 stdout = &mystdout; |
| 313 | 677 uart_on(); |
| 678 | |
|
322
840f51824254
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
321
diff
changeset
|
679 printf(PSTR("Started.\n")); |
| 319 | 680 |
| 681 check_first_startup(); | |
| 682 | |
| 314 | 683 uart_off(); |
| 306 | 684 |
| 312 | 685 // turn off everything except timer2 |
| 314 | 686 //PRR = _BV(PRTWI) | _BV(PRTIM0) | _BV(PRTIM1) | _BV(PRSPI) | _BV(PRUSART0) | _BV(PRADC); |
| 687 | |
| 688 // for testing | |
| 689 uart_on(); | |
| 690 | |
|
322
840f51824254
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
321
diff
changeset
|
691 setup_tick_counter(); |
|
840f51824254
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
321
diff
changeset
|
692 |
| 318 | 693 sei(); |
| 314 | 694 |
|
322
840f51824254
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
321
diff
changeset
|
695 #if 0 |
| 312 | 696 for (;;) |
| 697 { | |
| 318 | 698 do_comms(); |
| 312 | 699 } |
|
322
840f51824254
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
321
diff
changeset
|
700 #endif |
| 318 | 701 |
|
322
840f51824254
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
321
diff
changeset
|
702 for(;;) |
|
840f51824254
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
321
diff
changeset
|
703 { |
| 307 | 704 if (need_measurement) |
| 705 { | |
| 320 | 706 need_measurement = 0; |
| 307 | 707 do_measurement(); |
|
310
0a64532c1de1
Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents:
309
diff
changeset
|
708 continue; |
| 307 | 709 } |
|
310
0a64532c1de1
Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents:
309
diff
changeset
|
710 |
|
0a64532c1de1
Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents:
309
diff
changeset
|
711 if (need_comms) |
|
0a64532c1de1
Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents:
309
diff
changeset
|
712 { |
|
322
840f51824254
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
321
diff
changeset
|
713 need_comms = 0; |
|
310
0a64532c1de1
Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents:
309
diff
changeset
|
714 do_comms(); |
|
0a64532c1de1
Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents:
309
diff
changeset
|
715 continue; |
|
0a64532c1de1
Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents:
309
diff
changeset
|
716 } |
|
0a64532c1de1
Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents:
309
diff
changeset
|
717 |
|
0a64532c1de1
Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents:
309
diff
changeset
|
718 deep_sleep(); |
| 315 | 719 blink(); |
| 316 | 720 printf("."); |
| 306 | 721 } |
| 318 | 722 |
| 306 | 723 return 0; /* never reached */ |
| 724 } |