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