Mercurial > templog
annotate main.c @ 47:340a14fcbaeb
change timeout for readline
author | Matt Johnston <matt@ucc.asn.au> |
---|---|
date | Sun, 24 Jun 2012 10:36:12 +0800 |
parents | 96c336896201 |
children | 9ccd965d938a |
rev | line source |
---|---|
0 | 1 #include <stdio.h> |
2 #include <string.h> | |
13 | 3 #include <stddef.h> |
1 | 4 #include <avr/io.h> |
5 #include <avr/interrupt.h> | |
6 #include <avr/sleep.h> | |
7 | 7 #include <util/delay.h> |
6 | 8 #include <avr/pgmspace.h> |
13 | 9 #include <avr/eeprom.h> |
0 | 10 #include <util/crc16.h> |
11 | |
12 | 12 // for DWORD of get_fattime() |
3 | 13 #include "integer.h" |
12 | 14 |
15 #include "simple_ds18b20.h" | |
13 | 16 #include "onewire.h" |
3 | 17 |
0 | 18 // configuration params |
19 // - measurement interval | |
20 // - transmit interval | |
21 // - bluetooth params | |
22 // - number of sensors (and range?) | |
23 | |
1 | 24 // 1 second. we have 1024 prescaler, 32768 crystal. |
2 | 25 #define SLEEP_COMPARE 32 |
33 | 26 // limited to uint16_t |
44 | 27 #define MEASURE_WAKE 5 // testing |
4
54d369e3d689
Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents:
3
diff
changeset
|
28 |
13 | 29 #define VALUE_NOSENSOR -9000 |
30 #define VALUE_BROKEN -8000 | |
31 | |
33 | 32 // limited to uint16_t |
44 | 33 #define COMMS_WAKE 40 // XXX testing |
33 | 34 // limited to uint8_t |
44 | 35 #define WAKE_SECS 30 // XXX testing |
2 | 36 |
10 | 37 #define BAUD 19200 |
7 | 38 #define UBRR ((F_CPU)/8/(BAUD)-1) |
39 | |
40 #define PORT_LED PORTC | |
41 #define DDR_LED DDRC | |
42 #define PIN_LED PC4 | |
1 | 43 |
15
54b0fda9cba7
Add shutdown handling, print sensors in "fetch" output
Matt Johnston <matt@ucc.asn.au>
parents:
14
diff
changeset
|
44 #define PORT_SHDN PORTD |
54b0fda9cba7
Add shutdown handling, print sensors in "fetch" output
Matt Johnston <matt@ucc.asn.au>
parents:
14
diff
changeset
|
45 #define DDR_SHDN DDRD |
54b0fda9cba7
Add shutdown handling, print sensors in "fetch" output
Matt Johnston <matt@ucc.asn.au>
parents:
14
diff
changeset
|
46 #define PIN_SHDN PD7 |
54b0fda9cba7
Add shutdown handling, print sensors in "fetch" output
Matt Johnston <matt@ucc.asn.au>
parents:
14
diff
changeset
|
47 |
33 | 48 // limited to uint16_t |
13 | 49 #define NUM_MEASUREMENTS 100 |
33 | 50 // limited to uint8_t |
13 | 51 #define MAX_SENSORS 5 |
6 | 52 |
15
54b0fda9cba7
Add shutdown handling, print sensors in "fetch" output
Matt Johnston <matt@ucc.asn.au>
parents:
14
diff
changeset
|
53 // fixed at 8, have a shorter name |
54b0fda9cba7
Add shutdown handling, print sensors in "fetch" output
Matt Johnston <matt@ucc.asn.au>
parents:
14
diff
changeset
|
54 #define ID_LEN OW_ROMCODE_SIZE |
54b0fda9cba7
Add shutdown handling, print sensors in "fetch" output
Matt Johnston <matt@ucc.asn.au>
parents:
14
diff
changeset
|
55 |
33 | 56 // #define HAVE_UART_ECHO |
57 | |
10 | 58 int uart_putchar(char c, FILE *stream); |
14 | 59 static void long_delay(int ms); |
24
44c5ab5ea879
- some fixes for server code
Matt Johnston <matt@ucc.asn.au>
parents:
22
diff
changeset
|
60 static void blink(); |
14 | 61 |
0 | 62 static FILE mystdout = FDEV_SETUP_STREAM(uart_putchar, NULL, |
63 _FDEV_SETUP_WRITE); | |
64 | |
20
878be5e353a0
Untested - calculate crc in uart_putchar
Matt Johnston <matt@ucc.asn.au>
parents:
19
diff
changeset
|
65 uint16_t crc_out; |
878be5e353a0
Untested - calculate crc in uart_putchar
Matt Johnston <matt@ucc.asn.au>
parents:
19
diff
changeset
|
66 static FILE _crc_stdout = FDEV_SETUP_STREAM(uart_putchar, NULL, |
878be5e353a0
Untested - calculate crc in uart_putchar
Matt Johnston <matt@ucc.asn.au>
parents:
19
diff
changeset
|
67 _FDEV_SETUP_WRITE); |
878be5e353a0
Untested - calculate crc in uart_putchar
Matt Johnston <matt@ucc.asn.au>
parents:
19
diff
changeset
|
68 // convenience |
878be5e353a0
Untested - calculate crc in uart_putchar
Matt Johnston <matt@ucc.asn.au>
parents:
19
diff
changeset
|
69 static FILE *crc_stdout = &_crc_stdout; |
878be5e353a0
Untested - calculate crc in uart_putchar
Matt Johnston <matt@ucc.asn.au>
parents:
19
diff
changeset
|
70 |
17 | 71 static uint16_t n_measurements; |
13 | 72 // stored as decidegrees |
14 | 73 static int16_t measurements[NUM_MEASUREMENTS][MAX_SENSORS]; |
22
885532437100
A bit of work on the server python
Matt Johnston <matt@ucc.asn.au>
parents:
20
diff
changeset
|
74 static uint32_t first_measurement_clock; |
885532437100
A bit of work on the server python
Matt Johnston <matt@ucc.asn.au>
parents:
20
diff
changeset
|
75 // last_measurement_clock is redundant but checks that we're not missing |
885532437100
A bit of work on the server python
Matt Johnston <matt@ucc.asn.au>
parents:
20
diff
changeset
|
76 // samples |
885532437100
A bit of work on the server python
Matt Johnston <matt@ucc.asn.au>
parents:
20
diff
changeset
|
77 static uint32_t last_measurement_clock; |
0 | 78 |
4
54d369e3d689
Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents:
3
diff
changeset
|
79 // boolean flags |
17 | 80 static uint8_t need_measurement; |
81 static uint8_t need_comms; | |
40 | 82 static uint8_t uart_enabled; |
1 | 83 |
16
5075d8c428bd
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
15
diff
changeset
|
84 // counts down from WAKE_SECS to 0, goes to deep sleep when hits 0 |
17 | 85 static uint8_t comms_timeout; |
1 | 86 |
17 | 87 static uint8_t readpos; |
0 | 88 static char readbuf[30]; |
27
dbbd503119ba
Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
26
diff
changeset
|
89 static uint8_t have_cmd; |
0 | 90 |
33 | 91 static uint16_t measure_count; |
17 | 92 static uint16_t comms_count; |
93 | |
94 static uint32_t clock_epoch; | |
4
54d369e3d689
Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents:
3
diff
changeset
|
95 |
13 | 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; | |
15
54b0fda9cba7
Add shutdown handling, print sensors in "fetch" output
Matt Johnston <matt@ucc.asn.au>
parents:
14
diff
changeset
|
107 uint8_t sensor_id[MAX_SENSORS][ID_LEN]; |
13 | 108 }; |
109 | |
8 | 110 #define DEBUG(str) printf_P(PSTR(str)) |
111 | |
4
54d369e3d689
Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents:
3
diff
changeset
|
112 static void deep_sleep(); |
1 | 113 |
16
5075d8c428bd
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
15
diff
changeset
|
114 // Very first setup |
18 | 115 static void |
16
5075d8c428bd
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
15
diff
changeset
|
116 setup_chip() |
18 | 117 { |
16
5075d8c428bd
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
15
diff
changeset
|
118 // Set clock to 2mhz |
5075d8c428bd
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
15
diff
changeset
|
119 cli(); |
5075d8c428bd
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
15
diff
changeset
|
120 CLKPR = _BV(CLKPCE); |
5075d8c428bd
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
15
diff
changeset
|
121 // divide by 4 |
5075d8c428bd
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
15
diff
changeset
|
122 CLKPR = _BV(CLKPS1); |
5075d8c428bd
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
15
diff
changeset
|
123 sei(); |
5075d8c428bd
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
15
diff
changeset
|
124 |
19 | 125 // 3.3v power for bluetooth and SD |
16
5075d8c428bd
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
15
diff
changeset
|
126 DDR_LED |= _BV(PIN_LED); |
5075d8c428bd
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
15
diff
changeset
|
127 DDR_SHDN |= _BV(PIN_SHDN); |
19 | 128 |
41 | 129 // INT0 setup |
130 EIMSK = _BV(INT0); | |
131 // set pullup | |
132 PORTD |= _BV(PD2); | |
18 | 133 } |
134 | |
16
5075d8c428bd
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
15
diff
changeset
|
135 static void |
5075d8c428bd
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
15
diff
changeset
|
136 set_aux_power(uint8_t on) |
5075d8c428bd
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
15
diff
changeset
|
137 { |
5075d8c428bd
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
15
diff
changeset
|
138 if (on) |
5075d8c428bd
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
15
diff
changeset
|
139 { |
5075d8c428bd
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
15
diff
changeset
|
140 PORT_SHDN &= ~_BV(PIN_SHDN); |
5075d8c428bd
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
15
diff
changeset
|
141 } |
5075d8c428bd
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
15
diff
changeset
|
142 else |
5075d8c428bd
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
15
diff
changeset
|
143 { |
44 | 144 PORT_SHDN |= _BV(PIN_SHDN); |
16
5075d8c428bd
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
15
diff
changeset
|
145 } |
5075d8c428bd
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
15
diff
changeset
|
146 } |
5075d8c428bd
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
15
diff
changeset
|
147 |
5075d8c428bd
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
15
diff
changeset
|
148 static void |
5075d8c428bd
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
15
diff
changeset
|
149 setup_tick_counter() |
5075d8c428bd
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
15
diff
changeset
|
150 { |
5075d8c428bd
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
15
diff
changeset
|
151 // set up counter2. |
5075d8c428bd
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
15
diff
changeset
|
152 // COM21 COM20 Set OC2 on Compare Match (p116) |
5075d8c428bd
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
15
diff
changeset
|
153 // WGM21 Clear counter on compare |
5075d8c428bd
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
15
diff
changeset
|
154 //TCCR2A = _BV(COM2A1) | _BV(COM2A0) | _BV(WGM21); |
5075d8c428bd
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
15
diff
changeset
|
155 // toggle on match |
5075d8c428bd
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
15
diff
changeset
|
156 TCCR2A = _BV(COM2A0); |
5075d8c428bd
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
15
diff
changeset
|
157 // CS22 CS21 CS20 clk/1024 |
5075d8c428bd
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
15
diff
changeset
|
158 TCCR2B = _BV(CS22) | _BV(CS21) | _BV(CS20); |
5075d8c428bd
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
15
diff
changeset
|
159 // set async mode |
5075d8c428bd
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
15
diff
changeset
|
160 ASSR |= _BV(AS2); |
5075d8c428bd
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
15
diff
changeset
|
161 TCNT2 = 0; |
5075d8c428bd
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
15
diff
changeset
|
162 OCR2A = SLEEP_COMPARE; |
5075d8c428bd
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
15
diff
changeset
|
163 // interrupt |
5075d8c428bd
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
15
diff
changeset
|
164 TIMSK2 = _BV(OCIE2A); |
5075d8c428bd
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
15
diff
changeset
|
165 } |
18 | 166 |
0 | 167 static void |
7 | 168 uart_on() |
0 | 169 { |
8 | 170 // Power reduction register |
171 //PRR &= ~_BV(PRUSART0); | |
172 | |
16
5075d8c428bd
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
15
diff
changeset
|
173 // All of this needs to be done each time after turning off the PRR |
0 | 174 // baud rate |
7 | 175 UBRR0H = (unsigned char)(UBRR >> 8); |
176 UBRR0L = (unsigned char)UBRR; | |
177 // set 2x clock, improves accuracy of UBRR | |
178 UCSR0A |= _BV(U2X0); | |
6 | 179 UCSR0B = _BV(RXCIE0) | _BV(RXEN0) | _BV(TXEN0); |
0 | 180 //8N1 |
7 | 181 UCSR0C = _BV(UCSZ01) | _BV(UCSZ00); |
41 | 182 uart_enabled = 1; |
6 | 183 } |
184 | |
185 static void | |
186 uart_off() | |
187 { | |
188 // Turn of interrupts and disable tx/rx | |
189 UCSR0B = 0; | |
41 | 190 uart_enabled = 0; |
6 | 191 |
192 // Power reduction register | |
8 | 193 //PRR |= _BV(PRUSART0); |
0 | 194 } |
195 | |
10 | 196 int |
0 | 197 uart_putchar(char c, FILE *stream) |
198 { | |
41 | 199 if (!uart_enabled) |
200 { | |
201 return EOF; | |
202 } | |
20
878be5e353a0
Untested - calculate crc in uart_putchar
Matt Johnston <matt@ucc.asn.au>
parents:
19
diff
changeset
|
203 // XXX could perhaps sleep in the loop for power. |
8 | 204 if (c == '\n') |
205 { | |
10 | 206 loop_until_bit_is_set(UCSR0A, UDRE0); |
20
878be5e353a0
Untested - calculate crc in uart_putchar
Matt Johnston <matt@ucc.asn.au>
parents:
19
diff
changeset
|
207 UDR0 = '\r'; |
8 | 208 } |
2 | 209 loop_until_bit_is_set(UCSR0A, UDRE0); |
210 UDR0 = c; | |
20
878be5e353a0
Untested - calculate crc in uart_putchar
Matt Johnston <matt@ucc.asn.au>
parents:
19
diff
changeset
|
211 if (stream == crc_stdout) |
878be5e353a0
Untested - calculate crc in uart_putchar
Matt Johnston <matt@ucc.asn.au>
parents:
19
diff
changeset
|
212 { |
26
d3e5934fe55c
- Move crc16 to utils and fix it
Matt Johnston <matt@ucc.asn.au>
parents:
25
diff
changeset
|
213 crc_out = _crc_ccitt_update(crc_out, c); |
20
878be5e353a0
Untested - calculate crc in uart_putchar
Matt Johnston <matt@ucc.asn.au>
parents:
19
diff
changeset
|
214 } |
10 | 215 if (c == '\r') |
216 { | |
217 loop_until_bit_is_set(UCSR0A, UDRE0); | |
20
878be5e353a0
Untested - calculate crc in uart_putchar
Matt Johnston <matt@ucc.asn.au>
parents:
19
diff
changeset
|
218 UDR0 = '\n'; |
878be5e353a0
Untested - calculate crc in uart_putchar
Matt Johnston <matt@ucc.asn.au>
parents:
19
diff
changeset
|
219 if (stream == crc_stdout) |
878be5e353a0
Untested - calculate crc in uart_putchar
Matt Johnston <matt@ucc.asn.au>
parents:
19
diff
changeset
|
220 { |
878be5e353a0
Untested - calculate crc in uart_putchar
Matt Johnston <matt@ucc.asn.au>
parents:
19
diff
changeset
|
221 crc_out = _crc_ccitt_update(crc_out, '\n'); |
878be5e353a0
Untested - calculate crc in uart_putchar
Matt Johnston <matt@ucc.asn.au>
parents:
19
diff
changeset
|
222 } |
10 | 223 } |
40 | 224 return (unsigned char)c; |
0 | 225 } |
226 | |
227 static void | |
228 cmd_fetch() | |
229 { | |
20
878be5e353a0
Untested - calculate crc in uart_putchar
Matt Johnston <matt@ucc.asn.au>
parents:
19
diff
changeset
|
230 crc_out = 0; |
15
54b0fda9cba7
Add shutdown handling, print sensors in "fetch" output
Matt Johnston <matt@ucc.asn.au>
parents:
14
diff
changeset
|
231 uint8_t n_sensors; |
54b0fda9cba7
Add shutdown handling, print sensors in "fetch" output
Matt Johnston <matt@ucc.asn.au>
parents:
14
diff
changeset
|
232 eeprom_read(n_sensors, n_sensors); |
13 | 233 |
20
878be5e353a0
Untested - calculate crc in uart_putchar
Matt Johnston <matt@ucc.asn.au>
parents:
19
diff
changeset
|
234 fprintf_P(crc_stdout, PSTR("START\n")); |
27
dbbd503119ba
Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
26
diff
changeset
|
235 fprintf_P(crc_stdout, PSTR("now=%lu\n" |
36
a670a67ba489
- decrease measurement interval, measure at start
Matt Johnston <matt@ucc.asn.au>
parents:
33
diff
changeset
|
236 "time_step=%hu\n" |
27
dbbd503119ba
Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
26
diff
changeset
|
237 "first_time=%lu\n" |
dbbd503119ba
Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
26
diff
changeset
|
238 "last_time=%lu\n"), |
dbbd503119ba
Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
26
diff
changeset
|
239 clock_epoch, |
36
a670a67ba489
- decrease measurement interval, measure at start
Matt Johnston <matt@ucc.asn.au>
parents:
33
diff
changeset
|
240 (uint16_t)MEASURE_WAKE, |
27
dbbd503119ba
Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
26
diff
changeset
|
241 first_measurement_clock, |
dbbd503119ba
Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
26
diff
changeset
|
242 last_measurement_clock); |
dbbd503119ba
Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
26
diff
changeset
|
243 fprintf_P(crc_stdout, PSTR("sensors=%u\n"), n_sensors); |
15
54b0fda9cba7
Add shutdown handling, print sensors in "fetch" output
Matt Johnston <matt@ucc.asn.au>
parents:
14
diff
changeset
|
244 for (uint8_t s = 0; s < n_sensors; s++) |
54b0fda9cba7
Add shutdown handling, print sensors in "fetch" output
Matt Johnston <matt@ucc.asn.au>
parents:
14
diff
changeset
|
245 { |
54b0fda9cba7
Add shutdown handling, print sensors in "fetch" output
Matt Johnston <matt@ucc.asn.au>
parents:
14
diff
changeset
|
246 uint8_t id[ID_LEN]; |
27
dbbd503119ba
Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
26
diff
changeset
|
247 fprintf_P(crc_stdout, PSTR("sensor_id%u="), s); |
15
54b0fda9cba7
Add shutdown handling, print sensors in "fetch" output
Matt Johnston <matt@ucc.asn.au>
parents:
14
diff
changeset
|
248 eeprom_read_to(id, sensor_id[s], ID_LEN); |
20
878be5e353a0
Untested - calculate crc in uart_putchar
Matt Johnston <matt@ucc.asn.au>
parents:
19
diff
changeset
|
249 printhex(id, ID_LEN, crc_stdout); |
878be5e353a0
Untested - calculate crc in uart_putchar
Matt Johnston <matt@ucc.asn.au>
parents:
19
diff
changeset
|
250 fputc('\n', crc_stdout); |
15
54b0fda9cba7
Add shutdown handling, print sensors in "fetch" output
Matt Johnston <matt@ucc.asn.au>
parents:
14
diff
changeset
|
251 } |
36
a670a67ba489
- decrease measurement interval, measure at start
Matt Johnston <matt@ucc.asn.au>
parents:
33
diff
changeset
|
252 fprintf_P(crc_stdout, PSTR("measurements=%hu\n"), n_measurements); |
14 | 253 for (uint16_t n = 0; n < n_measurements; n++) |
0 | 254 { |
27
dbbd503119ba
Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
26
diff
changeset
|
255 fprintf_P(crc_stdout, PSTR("meas%u="), n); |
15
54b0fda9cba7
Add shutdown handling, print sensors in "fetch" output
Matt Johnston <matt@ucc.asn.au>
parents:
14
diff
changeset
|
256 for (uint8_t s = 0; s < n_sensors; s++) |
13 | 257 { |
36
a670a67ba489
- decrease measurement interval, measure at start
Matt Johnston <matt@ucc.asn.au>
parents:
33
diff
changeset
|
258 fprintf_P(crc_stdout, PSTR(" %hu"), measurements[n][s]); |
13 | 259 } |
20
878be5e353a0
Untested - calculate crc in uart_putchar
Matt Johnston <matt@ucc.asn.au>
parents:
19
diff
changeset
|
260 fputc('\n', crc_stdout); |
0 | 261 } |
20
878be5e353a0
Untested - calculate crc in uart_putchar
Matt Johnston <matt@ucc.asn.au>
parents:
19
diff
changeset
|
262 fprintf_P(crc_stdout, PSTR("END\n")); |
25
2943f62c8e62
- Make the python work on openwrt
Matt Johnston <matt@ucc.asn.au>
parents:
24
diff
changeset
|
263 fprintf_P(stdout, PSTR("CRC=%hu\n"), crc_out); |
0 | 264 } |
265 | |
266 static void | |
267 cmd_clear() | |
268 { | |
7 | 269 n_measurements = 0; |
32 | 270 printf_P(PSTR("cleared\n")); |
0 | 271 } |
272 | |
273 static void | |
274 cmd_btoff() | |
275 { | |
22
885532437100
A bit of work on the server python
Matt Johnston <matt@ucc.asn.au>
parents:
20
diff
changeset
|
276 uint16_t next_wake = COMMS_WAKE - comms_count; |
885532437100
A bit of work on the server python
Matt Johnston <matt@ucc.asn.au>
parents:
20
diff
changeset
|
277 printf_P(PSTR("off:%d\n"), next_wake); |
7 | 278 _delay_ms(50); |
16
5075d8c428bd
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
15
diff
changeset
|
279 comms_timeout = 0; |
0 | 280 } |
281 | |
282 static void | |
12 | 283 cmd_measure() |
284 { | |
33 | 285 printf_P(PSTR("measuring\n")); |
12 | 286 need_measurement = 1; |
287 } | |
288 | |
289 static void | |
290 cmd_sensors() | |
291 { | |
292 uint8_t ret = simple_ds18b20_start_meas(NULL); | |
14 | 293 printf_P(PSTR("All sensors, ret %d, waiting...\n"), ret); |
294 long_delay(DS18B20_TCONV_12BIT); | |
12 | 295 simple_ds18b20_read_all(); |
296 } | |
297 | |
16
5075d8c428bd
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
15
diff
changeset
|
298 #if 0 |
13 | 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 } | |
16
5075d8c428bd
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
15
diff
changeset
|
352 #endif |
13 | 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(); | |
15
54b0fda9cba7
Add shutdown handling, print sensors in "fetch" output
Matt Johnston <matt@ucc.asn.au>
parents:
14
diff
changeset
|
362 eeprom_write_from(id, sensor_id[n], ID_LEN); |
13 | 363 n++; |
364 eeprom_write(n, n_sensors); | |
365 sei(); | |
366 printf_P(PSTR("Added sensor %d : "), n); | |
20
878be5e353a0
Untested - calculate crc in uart_putchar
Matt Johnston <matt@ucc.asn.au>
parents:
19
diff
changeset
|
367 printhex(id, ID_LEN, stdout); |
13 | 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 { | |
41 | 379 uint8_t id[OW_ROMCODE_SIZE]; |
13 | 380 printf_P("Adding all\n"); |
381 ow_reset(); | |
41 | 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 } | |
13 | 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")); | |
16
5075d8c428bd
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
15
diff
changeset
|
417 // in case of power fumbles don't want to reset during eeprom write, |
5075d8c428bd
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
15
diff
changeset
|
418 long_delay(2); |
13 | 419 cmd_init(); |
420 cmd_add_all(); | |
14 | 421 cli(); |
422 magic = EXPECT_MAGIC; | |
423 eeprom_write(magic, magic); | |
424 sei(); | |
13 | 425 } |
426 } | |
427 | |
12 | 428 static void |
0 | 429 read_handler() |
430 { | |
6 | 431 if (strcmp_P(readbuf, PSTR("fetch")) == 0) |
0 | 432 { |
433 cmd_fetch(); | |
434 } | |
6 | 435 else if (strcmp_P(readbuf, PSTR("clear")) == 0) |
0 | 436 { |
437 cmd_clear(); | |
438 } | |
6 | 439 else if (strcmp_P(readbuf, PSTR("btoff")) == 0) |
0 | 440 { |
441 cmd_btoff(); | |
442 } | |
12 | 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 } | |
13 | 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 } | |
0 | 459 else |
460 { | |
6 | 461 printf_P(PSTR("Bad command\n")); |
0 | 462 } |
463 } | |
464 | |
20
878be5e353a0
Untested - calculate crc in uart_putchar
Matt Johnston <matt@ucc.asn.au>
parents:
19
diff
changeset
|
465 ISR(INT0_vect) |
18 | 466 { |
41 | 467 need_comms = 1; |
24
44c5ab5ea879
- some fixes for server code
Matt Johnston <matt@ucc.asn.au>
parents:
22
diff
changeset
|
468 blink(); |
44c5ab5ea879
- some fixes for server code
Matt Johnston <matt@ucc.asn.au>
parents:
22
diff
changeset
|
469 _delay_ms(100); |
44c5ab5ea879
- some fixes for server code
Matt Johnston <matt@ucc.asn.au>
parents:
22
diff
changeset
|
470 blink(); |
18 | 471 } |
472 | |
473 | |
2 | 474 ISR(USART_RX_vect) |
0 | 475 { |
2 | 476 char c = UDR0; |
33 | 477 #ifdef HAVE_UART_ECHO |
12 | 478 uart_putchar(c, NULL); |
33 | 479 #endif |
22
885532437100
A bit of work on the server python
Matt Johnston <matt@ucc.asn.au>
parents:
20
diff
changeset
|
480 if (c == '\r' || c == '\n') |
0 | 481 { |
22
885532437100
A bit of work on the server python
Matt Johnston <matt@ucc.asn.au>
parents:
20
diff
changeset
|
482 if (readpos > 0) |
885532437100
A bit of work on the server python
Matt Johnston <matt@ucc.asn.au>
parents:
20
diff
changeset
|
483 { |
885532437100
A bit of work on the server python
Matt Johnston <matt@ucc.asn.au>
parents:
20
diff
changeset
|
484 readbuf[readpos] = '\0'; |
27
dbbd503119ba
Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
26
diff
changeset
|
485 have_cmd = 1; |
22
885532437100
A bit of work on the server python
Matt Johnston <matt@ucc.asn.au>
parents:
20
diff
changeset
|
486 readpos = 0; |
885532437100
A bit of work on the server python
Matt Johnston <matt@ucc.asn.au>
parents:
20
diff
changeset
|
487 } |
0 | 488 } |
489 else | |
490 { | |
491 readbuf[readpos] = c; | |
492 readpos++; | |
493 if (readpos >= sizeof(readbuf)) | |
494 { | |
495 readpos = 0; | |
496 } | |
497 } | |
498 } | |
499 | |
2 | 500 ISR(TIMER2_COMPA_vect) |
1 | 501 { |
14 | 502 TCNT2 = 0; |
4
54d369e3d689
Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents:
3
diff
changeset
|
503 measure_count ++; |
41 | 504 comms_count ++; |
16
5075d8c428bd
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
15
diff
changeset
|
505 |
17 | 506 clock_epoch ++; |
507 | |
16
5075d8c428bd
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
15
diff
changeset
|
508 if (comms_timeout != 0) |
5075d8c428bd
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
15
diff
changeset
|
509 { |
44 | 510 comms_timeout--; |
16
5075d8c428bd
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
15
diff
changeset
|
511 } |
5075d8c428bd
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
15
diff
changeset
|
512 |
14 | 513 if (measure_count >= MEASURE_WAKE) |
1 | 514 { |
4
54d369e3d689
Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents:
3
diff
changeset
|
515 measure_count = 0; |
1 | 516 need_measurement = 1; |
517 } | |
4
54d369e3d689
Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents:
3
diff
changeset
|
518 |
41 | 519 if (comms_count >= COMMS_WAKE) |
520 { | |
521 comms_count = 0; | |
522 need_comms = 1; | |
523 } | |
16
5075d8c428bd
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
15
diff
changeset
|
524 |
1 | 525 } |
526 | |
3 | 527 DWORD get_fattime (void) |
528 { | |
529 return 0; | |
530 } | |
531 | |
1 | 532 static void |
533 deep_sleep() | |
534 { | |
535 // p119 of manual | |
2 | 536 OCR2A = SLEEP_COMPARE; |
537 loop_until_bit_is_clear(ASSR, OCR2AUB); | |
1 | 538 |
539 set_sleep_mode(SLEEP_MODE_PWR_SAVE); | |
540 sleep_mode(); | |
541 } | |
542 | |
543 static void | |
4
54d369e3d689
Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents:
3
diff
changeset
|
544 idle_sleep() |
54d369e3d689
Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents:
3
diff
changeset
|
545 { |
54d369e3d689
Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents:
3
diff
changeset
|
546 set_sleep_mode(SLEEP_MODE_IDLE); |
54d369e3d689
Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents:
3
diff
changeset
|
547 sleep_mode(); |
54d369e3d689
Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents:
3
diff
changeset
|
548 } |
54d369e3d689
Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents:
3
diff
changeset
|
549 |
14 | 550 #if 0 |
551 // untested | |
6 | 552 static void |
553 do_adc_335() | |
554 { | |
8 | 555 //PRR &= ~_BV(PRADC); |
6 | 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; | |
13 | 582 // XXX fixme |
583 //measurements[n_measurements] = temp; | |
6 | 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; | |
13 | 597 // XXX fixme |
598 //internal_measurements[n_measurements] = internal_temp; | |
6 | 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++; | |
8 | 604 //PRR |= _BV(PRADC); |
6 | 605 } |
14 | 606 #endif |
6 | 607 |
4
54d369e3d689
Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents:
3
diff
changeset
|
608 static void |
1 | 609 do_measurement() |
610 { | |
13 | 611 uint8_t n_sensors; |
14 | 612 printf("do_measurement\n"); |
13 | 613 eeprom_read(n_sensors, n_sensors); |
14 | 614 printf("do_measurement sensors %d\n", n_sensors); |
13 | 615 |
616 uint8_t ret = simple_ds18b20_start_meas(NULL); | |
14 | 617 printf_P(PSTR("Read all sensors, ret %d, waiting...\n"), ret); |
13 | 618 _delay_ms(DS18B20_TCONV_12BIT); |
619 | |
620 if (n_measurements == NUM_MEASUREMENTS) | |
621 { | |
14 | 622 printf_P(PSTR("Measurements .overflow\n")); |
13 | 623 n_measurements = 0; |
624 } | |
6 | 625 |
14 | 626 for (uint8_t s = 0; s < MAX_SENSORS; s++) |
13 | 627 { |
628 int16_t decicelsius; | |
14 | 629 if (s >= n_sensors) |
13 | 630 { |
631 decicelsius = VALUE_NOSENSOR; | |
632 } | |
633 else | |
634 { | |
15
54b0fda9cba7
Add shutdown handling, print sensors in "fetch" output
Matt Johnston <matt@ucc.asn.au>
parents:
14
diff
changeset
|
635 uint8_t id[ID_LEN]; |
54b0fda9cba7
Add shutdown handling, print sensors in "fetch" output
Matt Johnston <matt@ucc.asn.au>
parents:
14
diff
changeset
|
636 eeprom_read_to(id, sensor_id[s], ID_LEN); |
13 | 637 |
638 uint8_t ret = simple_ds18b20_read_decicelsius(id, &decicelsius); | |
639 if (ret != DS18X20_OK) | |
640 { | |
641 decicelsius = VALUE_BROKEN; | |
642 } | |
643 } | |
14 | 644 measurements[n_measurements][s] = decicelsius; |
13 | 645 } |
22
885532437100
A bit of work on the server python
Matt Johnston <matt@ucc.asn.au>
parents:
20
diff
changeset
|
646 |
885532437100
A bit of work on the server python
Matt Johnston <matt@ucc.asn.au>
parents:
20
diff
changeset
|
647 if (n_measurements == 0) |
885532437100
A bit of work on the server python
Matt Johnston <matt@ucc.asn.au>
parents:
20
diff
changeset
|
648 { |
885532437100
A bit of work on the server python
Matt Johnston <matt@ucc.asn.au>
parents:
20
diff
changeset
|
649 first_measurement_clock = clock_epoch; |
885532437100
A bit of work on the server python
Matt Johnston <matt@ucc.asn.au>
parents:
20
diff
changeset
|
650 } |
885532437100
A bit of work on the server python
Matt Johnston <matt@ucc.asn.au>
parents:
20
diff
changeset
|
651 last_measurement_clock = clock_epoch; |
885532437100
A bit of work on the server python
Matt Johnston <matt@ucc.asn.au>
parents:
20
diff
changeset
|
652 |
14 | 653 n_measurements++; |
12 | 654 //do_adc_335(); |
1 | 655 } |
656 | |
4
54d369e3d689
Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents:
3
diff
changeset
|
657 static void |
54d369e3d689
Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents:
3
diff
changeset
|
658 do_comms() |
54d369e3d689
Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents:
3
diff
changeset
|
659 { |
41 | 660 // turn on bluetooth |
24
44c5ab5ea879
- some fixes for server code
Matt Johnston <matt@ucc.asn.au>
parents:
22
diff
changeset
|
661 set_aux_power(1); |
7 | 662 uart_on(); |
41 | 663 |
664 // write sd card here? same 3.3v regulator... | |
665 | |
666 for (comms_timeout = WAKE_SECS; comms_timeout > 0; ) | |
667 { | |
6 | 668 if (need_measurement) |
669 { | |
14 | 670 need_measurement = 0; |
6 | 671 do_measurement(); |
44 | 672 continue; |
6 | 673 } |
674 | |
27
dbbd503119ba
Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
26
diff
changeset
|
675 if (have_cmd) |
dbbd503119ba
Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
26
diff
changeset
|
676 { |
dbbd503119ba
Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
26
diff
changeset
|
677 have_cmd = 0; |
dbbd503119ba
Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
26
diff
changeset
|
678 read_handler(); |
44 | 679 continue; |
27
dbbd503119ba
Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
26
diff
changeset
|
680 } |
dbbd503119ba
Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
26
diff
changeset
|
681 |
16
5075d8c428bd
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
15
diff
changeset
|
682 // wait for commands from the master |
41 | 683 idle_sleep(); |
684 } | |
4
54d369e3d689
Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents:
3
diff
changeset
|
685 |
6 | 686 uart_off(); |
16
5075d8c428bd
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
15
diff
changeset
|
687 set_aux_power(0); |
4
54d369e3d689
Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents:
3
diff
changeset
|
688 } |
54d369e3d689
Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents:
3
diff
changeset
|
689 |
7 | 690 static void |
691 blink() | |
692 { | |
693 PORT_LED &= ~_BV(PIN_LED); | |
9 | 694 _delay_ms(1); |
7 | 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 | |
8 | 709 ISR(BADISR_vect) |
710 { | |
14 | 711 //uart_on(); |
8 | 712 printf_P(PSTR("Bad interrupt\n")); |
713 } | |
714 | |
9 | 715 |
0 | 716 int main(void) |
717 { | |
16
5075d8c428bd
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
15
diff
changeset
|
718 setup_chip(); |
5075d8c428bd
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
15
diff
changeset
|
719 blink(); |
9 | 720 |
16
5075d8c428bd
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
15
diff
changeset
|
721 set_aux_power(0); |
7 | 722 |
6 | 723 stdout = &mystdout; |
7 | 724 uart_on(); |
725 | |
16
5075d8c428bd
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
15
diff
changeset
|
726 printf(PSTR("Started.\n")); |
13 | 727 |
728 check_first_startup(); | |
729 | |
8 | 730 uart_off(); |
0 | 731 |
6 | 732 // turn off everything except timer2 |
8 | 733 //PRR = _BV(PRTWI) | _BV(PRTIM0) | _BV(PRTIM1) | _BV(PRSPI) | _BV(PRUSART0) | _BV(PRADC); |
734 | |
735 // for testing | |
736 uart_on(); | |
737 | |
16
5075d8c428bd
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
15
diff
changeset
|
738 setup_tick_counter(); |
5075d8c428bd
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
15
diff
changeset
|
739 |
12 | 740 sei(); |
8 | 741 |
25
2943f62c8e62
- Make the python work on openwrt
Matt Johnston <matt@ucc.asn.au>
parents:
24
diff
changeset
|
742 need_comms = 1; |
36
a670a67ba489
- decrease measurement interval, measure at start
Matt Johnston <matt@ucc.asn.au>
parents:
33
diff
changeset
|
743 need_measurement = 1; |
25
2943f62c8e62
- Make the python work on openwrt
Matt Johnston <matt@ucc.asn.au>
parents:
24
diff
changeset
|
744 |
16
5075d8c428bd
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
15
diff
changeset
|
745 for(;;) |
5075d8c428bd
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
15
diff
changeset
|
746 { |
1 | 747 if (need_measurement) |
748 { | |
14 | 749 need_measurement = 0; |
1 | 750 do_measurement(); |
41 | 751 continue; |
1 | 752 } |
4
54d369e3d689
Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents:
3
diff
changeset
|
753 |
54d369e3d689
Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents:
3
diff
changeset
|
754 if (need_comms) |
54d369e3d689
Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents:
3
diff
changeset
|
755 { |
16
5075d8c428bd
untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents:
15
diff
changeset
|
756 need_comms = 0; |
4
54d369e3d689
Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents:
3
diff
changeset
|
757 do_comms(); |
41 | 758 continue; |
4
54d369e3d689
Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents:
3
diff
changeset
|
759 } |
54d369e3d689
Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents:
3
diff
changeset
|
760 |
41 | 761 deep_sleep(); |
9 | 762 blink(); |
0 | 763 } |
12 | 764 |
0 | 765 return 0; /* never reached */ |
766 } |