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