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