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