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