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