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