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