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