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