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