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