annotate main.c @ 352:99f8b97a9449

Use the PRR etc, set value to proper ones
author Matt Johnston <matt@ucc.asn.au>
date Sun, 24 Jun 2012 00:44:28 +0800
parents e7f070855a22
children c3f5e02c1c42
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
306
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
1 #include <stdio.h>
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
2 #include <string.h>
319
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
3 #include <stddef.h>
307
e50091063890 Some counter2 bits
Matt Johnston <matt@ucc.asn.au>
parents: 306
diff changeset
4 #include <avr/io.h>
e50091063890 Some counter2 bits
Matt Johnston <matt@ucc.asn.au>
parents: 306
diff changeset
5 #include <avr/interrupt.h>
e50091063890 Some counter2 bits
Matt Johnston <matt@ucc.asn.au>
parents: 306
diff changeset
6 #include <avr/sleep.h>
313
139ecb1840fd serial prints something
Matt Johnston <matt@ucc.asn.au>
parents: 312
diff changeset
7 #include <util/delay.h>
312
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
8 #include <avr/pgmspace.h>
319
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
9 #include <avr/eeprom.h>
306
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
10 #include <util/crc16.h>
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
11
318
31199b2941f6 Add simple_ds18b20.c etc
Matt Johnston <matt@ucc.asn.au>
parents: 316
diff changeset
12 // for DWORD of get_fattime()
309
49e83333e546 Add FatFS
Matt Johnston <matt@ucc.asn.au>
parents: 308
diff changeset
13 #include "integer.h"
318
31199b2941f6 Add simple_ds18b20.c etc
Matt Johnston <matt@ucc.asn.au>
parents: 316
diff changeset
14
31199b2941f6 Add simple_ds18b20.c etc
Matt Johnston <matt@ucc.asn.au>
parents: 316
diff changeset
15 #include "simple_ds18b20.h"
319
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
16 #include "onewire.h"
309
49e83333e546 Add FatFS
Matt Johnston <matt@ucc.asn.au>
parents: 308
diff changeset
17
306
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
18 // configuration params
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
19 // - measurement interval
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
20 // - transmit interval
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
21 // - bluetooth params
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
22 // - number of sensors (and range?)
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
23
307
e50091063890 Some counter2 bits
Matt Johnston <matt@ucc.asn.au>
parents: 306
diff changeset
24 // 1 second. we have 1024 prescaler, 32768 crystal.
308
e36ee3e156c1 switch to atmega328
Matt Johnston <matt@ucc.asn.au>
parents: 307
diff changeset
25 #define SLEEP_COMPARE 32
339
449272fc63a3 - Debug log file for server
Matt Johnston <matt@ucc.asn.au>
parents: 338
diff changeset
26 // limited to uint16_t
352
99f8b97a9449 Use the PRR etc, set value to proper ones
Matt Johnston <matt@ucc.asn.au>
parents: 349
diff changeset
27 #define MEASURE_WAKE 60
310
0a64532c1de1 Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents: 309
diff changeset
28
319
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
29 #define VALUE_NOSENSOR -9000
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
30 #define VALUE_BROKEN -8000
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
31
339
449272fc63a3 - Debug log file for server
Matt Johnston <matt@ucc.asn.au>
parents: 338
diff changeset
32 // limited to uint16_t
352
99f8b97a9449 Use the PRR etc, set value to proper ones
Matt Johnston <matt@ucc.asn.au>
parents: 349
diff changeset
33 #define COMMS_WAKE 3600 // XXX testing
339
449272fc63a3 - Debug log file for server
Matt Johnston <matt@ucc.asn.au>
parents: 338
diff changeset
34 // limited to uint8_t
352
99f8b97a9449 Use the PRR etc, set value to proper ones
Matt Johnston <matt@ucc.asn.au>
parents: 349
diff changeset
35 #define WAKE_SECS 60 // XXX testing
308
e36ee3e156c1 switch to atmega328
Matt Johnston <matt@ucc.asn.au>
parents: 307
diff changeset
36
316
8f32eb67a279 reading DS18B20 works
Matt Johnston <matt@ucc.asn.au>
parents: 315
diff changeset
37 #define BAUD 19200
313
139ecb1840fd serial prints something
Matt Johnston <matt@ucc.asn.au>
parents: 312
diff changeset
38 #define UBRR ((F_CPU)/8/(BAUD)-1)
139ecb1840fd serial prints something
Matt Johnston <matt@ucc.asn.au>
parents: 312
diff changeset
39
139ecb1840fd serial prints something
Matt Johnston <matt@ucc.asn.au>
parents: 312
diff changeset
40 #define PORT_LED PORTC
139ecb1840fd serial prints something
Matt Johnston <matt@ucc.asn.au>
parents: 312
diff changeset
41 #define DDR_LED DDRC
139ecb1840fd serial prints something
Matt Johnston <matt@ucc.asn.au>
parents: 312
diff changeset
42 #define PIN_LED PC4
307
e50091063890 Some counter2 bits
Matt Johnston <matt@ucc.asn.au>
parents: 306
diff changeset
43
321
df7384336798 Add shutdown handling, print sensors in "fetch" output
Matt Johnston <matt@ucc.asn.au>
parents: 320
diff changeset
44 #define PORT_SHDN PORTD
df7384336798 Add shutdown handling, print sensors in "fetch" output
Matt Johnston <matt@ucc.asn.au>
parents: 320
diff changeset
45 #define DDR_SHDN DDRD
df7384336798 Add shutdown handling, print sensors in "fetch" output
Matt Johnston <matt@ucc.asn.au>
parents: 320
diff changeset
46 #define PIN_SHDN PD7
df7384336798 Add shutdown handling, print sensors in "fetch" output
Matt Johnston <matt@ucc.asn.au>
parents: 320
diff changeset
47
339
449272fc63a3 - Debug log file for server
Matt Johnston <matt@ucc.asn.au>
parents: 338
diff changeset
48 // limited to uint16_t
352
99f8b97a9449 Use the PRR etc, set value to proper ones
Matt Johnston <matt@ucc.asn.au>
parents: 349
diff changeset
49 #define NUM_MEASUREMENTS 280
339
449272fc63a3 - Debug log file for server
Matt Johnston <matt@ucc.asn.au>
parents: 338
diff changeset
50 // limited to uint8_t
352
99f8b97a9449 Use the PRR etc, set value to proper ones
Matt Johnston <matt@ucc.asn.au>
parents: 349
diff changeset
51 #define MAX_SENSORS 3
312
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
52
321
df7384336798 Add shutdown handling, print sensors in "fetch" output
Matt Johnston <matt@ucc.asn.au>
parents: 320
diff changeset
53 // fixed at 8, have a shorter name
df7384336798 Add shutdown handling, print sensors in "fetch" output
Matt Johnston <matt@ucc.asn.au>
parents: 320
diff changeset
54 #define ID_LEN OW_ROMCODE_SIZE
df7384336798 Add shutdown handling, print sensors in "fetch" output
Matt Johnston <matt@ucc.asn.au>
parents: 320
diff changeset
55
339
449272fc63a3 - Debug log file for server
Matt Johnston <matt@ucc.asn.au>
parents: 338
diff changeset
56 // #define HAVE_UART_ECHO
449272fc63a3 - Debug log file for server
Matt Johnston <matt@ucc.asn.au>
parents: 338
diff changeset
57
316
8f32eb67a279 reading DS18B20 works
Matt Johnston <matt@ucc.asn.au>
parents: 315
diff changeset
58 int uart_putchar(char c, FILE *stream);
320
cff7a4459dc9 Lots of it works now.
Matt Johnston <matt@ucc.asn.au>
parents: 319
diff changeset
59 static void long_delay(int ms);
330
7ac6b8846eea - some fixes for server code
Matt Johnston <matt@ucc.asn.au>
parents: 328
diff changeset
60 static void blink();
320
cff7a4459dc9 Lots of it works now.
Matt Johnston <matt@ucc.asn.au>
parents: 319
diff changeset
61
306
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
62 static FILE mystdout = FDEV_SETUP_STREAM(uart_putchar, NULL,
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
63 _FDEV_SETUP_WRITE);
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
64
326
f6b5941b4c34 Untested - calculate crc in uart_putchar
Matt Johnston <matt@ucc.asn.au>
parents: 325
diff changeset
65 uint16_t crc_out;
f6b5941b4c34 Untested - calculate crc in uart_putchar
Matt Johnston <matt@ucc.asn.au>
parents: 325
diff changeset
66 static FILE _crc_stdout = FDEV_SETUP_STREAM(uart_putchar, NULL,
f6b5941b4c34 Untested - calculate crc in uart_putchar
Matt Johnston <matt@ucc.asn.au>
parents: 325
diff changeset
67 _FDEV_SETUP_WRITE);
f6b5941b4c34 Untested - calculate crc in uart_putchar
Matt Johnston <matt@ucc.asn.au>
parents: 325
diff changeset
68 // convenience
f6b5941b4c34 Untested - calculate crc in uart_putchar
Matt Johnston <matt@ucc.asn.au>
parents: 325
diff changeset
69 static FILE *crc_stdout = &_crc_stdout;
f6b5941b4c34 Untested - calculate crc in uart_putchar
Matt Johnston <matt@ucc.asn.au>
parents: 325
diff changeset
70
323
5181ea55ea77 Add clock_epoch
Matt Johnston <matt@ucc.asn.au>
parents: 322
diff changeset
71 static uint16_t n_measurements;
319
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
72 // stored as decidegrees
320
cff7a4459dc9 Lots of it works now.
Matt Johnston <matt@ucc.asn.au>
parents: 319
diff changeset
73 static int16_t measurements[NUM_MEASUREMENTS][MAX_SENSORS];
328
46070aaf29ea A bit of work on the server python
Matt Johnston <matt@ucc.asn.au>
parents: 326
diff changeset
74 static uint32_t first_measurement_clock;
46070aaf29ea A bit of work on the server python
Matt Johnston <matt@ucc.asn.au>
parents: 326
diff changeset
75 // last_measurement_clock is redundant but checks that we're not missing
46070aaf29ea A bit of work on the server python
Matt Johnston <matt@ucc.asn.au>
parents: 326
diff changeset
76 // samples
46070aaf29ea A bit of work on the server python
Matt Johnston <matt@ucc.asn.au>
parents: 326
diff changeset
77 static uint32_t last_measurement_clock;
306
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
78
310
0a64532c1de1 Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents: 309
diff changeset
79 // boolean flags
323
5181ea55ea77 Add clock_epoch
Matt Johnston <matt@ucc.asn.au>
parents: 322
diff changeset
80 static uint8_t need_measurement;
5181ea55ea77 Add clock_epoch
Matt Johnston <matt@ucc.asn.au>
parents: 322
diff changeset
81 static uint8_t need_comms;
346
d6219df77c41 main.c:
Matt Johnston <matt@ucc.asn.au>
parents: 341
diff changeset
82 static uint8_t uart_enabled;
307
e50091063890 Some counter2 bits
Matt Johnston <matt@ucc.asn.au>
parents: 306
diff changeset
83
322
840f51824254 untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents: 321
diff changeset
84 // counts down from WAKE_SECS to 0, goes to deep sleep when hits 0
323
5181ea55ea77 Add clock_epoch
Matt Johnston <matt@ucc.asn.au>
parents: 322
diff changeset
85 static uint8_t comms_timeout;
307
e50091063890 Some counter2 bits
Matt Johnston <matt@ucc.asn.au>
parents: 306
diff changeset
86
323
5181ea55ea77 Add clock_epoch
Matt Johnston <matt@ucc.asn.au>
parents: 322
diff changeset
87 static uint8_t readpos;
306
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
88 static char readbuf[30];
333
298e502fdcd4 Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents: 332
diff changeset
89 static uint8_t have_cmd;
306
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
90
339
449272fc63a3 - Debug log file for server
Matt Johnston <matt@ucc.asn.au>
parents: 338
diff changeset
91 static uint16_t measure_count;
323
5181ea55ea77 Add clock_epoch
Matt Johnston <matt@ucc.asn.au>
parents: 322
diff changeset
92 static uint16_t comms_count;
5181ea55ea77 Add clock_epoch
Matt Johnston <matt@ucc.asn.au>
parents: 322
diff changeset
93
5181ea55ea77 Add clock_epoch
Matt Johnston <matt@ucc.asn.au>
parents: 322
diff changeset
94 static uint32_t clock_epoch;
310
0a64532c1de1 Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents: 309
diff changeset
95
319
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
96 // thanks to http://projectgus.com/2010/07/eeprom-access-with-arduino/
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
97 #define eeprom_read_to(dst_p, eeprom_field, dst_size) eeprom_read_block((dst_p), (void *)offsetof(struct __eeprom_data, eeprom_field), (dst_size))
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
98 #define eeprom_read(dst, eeprom_field) eeprom_read_to((&dst), eeprom_field, sizeof(dst))
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
99 #define eeprom_write_from(src_p, eeprom_field, src_size) eeprom_write_block((src_p), (void *)offsetof(struct __eeprom_data, eeprom_field), (src_size))
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
100 #define eeprom_write(src, eeprom_field) { eeprom_write_from(&src, eeprom_field, sizeof(src)); }
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
101
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
102 #define EXPECT_MAGIC 0x67c9
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
103
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
104 struct __attribute__ ((__packed__)) __eeprom_data {
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
105 uint16_t magic;
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
106 uint8_t n_sensors;
321
df7384336798 Add shutdown handling, print sensors in "fetch" output
Matt Johnston <matt@ucc.asn.au>
parents: 320
diff changeset
107 uint8_t sensor_id[MAX_SENSORS][ID_LEN];
319
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
108 };
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
109
314
7aebb1452422 deep sleep works
Matt Johnston <matt@ucc.asn.au>
parents: 313
diff changeset
110 #define DEBUG(str) printf_P(PSTR(str))
7aebb1452422 deep sleep works
Matt Johnston <matt@ucc.asn.au>
parents: 313
diff changeset
111
310
0a64532c1de1 Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents: 309
diff changeset
112 static void deep_sleep();
307
e50091063890 Some counter2 bits
Matt Johnston <matt@ucc.asn.au>
parents: 306
diff changeset
113
322
840f51824254 untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents: 321
diff changeset
114 // Very first setup
324
e3664732f11f Add INT0 button
Matt Johnston <matt@ucc.asn.au>
parents: 321
diff changeset
115 static void
322
840f51824254 untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents: 321
diff changeset
116 setup_chip()
324
e3664732f11f Add INT0 button
Matt Johnston <matt@ucc.asn.au>
parents: 321
diff changeset
117 {
322
840f51824254 untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents: 321
diff changeset
118 // Set clock to 2mhz
840f51824254 untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents: 321
diff changeset
119 cli();
840f51824254 untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents: 321
diff changeset
120 CLKPR = _BV(CLKPCE);
840f51824254 untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents: 321
diff changeset
121 // divide by 4
840f51824254 untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents: 321
diff changeset
122 CLKPR = _BV(CLKPS1);
840f51824254 untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents: 321
diff changeset
123 sei();
840f51824254 untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents: 321
diff changeset
124
325
Matt Johnston <matt@ucc.asn.au>
parents: 323 324
diff changeset
125 // 3.3v power for bluetooth and SD
322
840f51824254 untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents: 321
diff changeset
126 DDR_LED |= _BV(PIN_LED);
840f51824254 untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents: 321
diff changeset
127 DDR_SHDN |= _BV(PIN_SHDN);
325
Matt Johnston <matt@ucc.asn.au>
parents: 323 324
diff changeset
128
352
99f8b97a9449 Use the PRR etc, set value to proper ones
Matt Johnston <matt@ucc.asn.au>
parents: 349
diff changeset
129 // set pullup
99f8b97a9449 Use the PRR etc, set value to proper ones
Matt Johnston <matt@ucc.asn.au>
parents: 349
diff changeset
130 PORTD |= _BV(PD2);
347
56f22e29582a fix tabbing
Matt Johnston <matt@ucc.asn.au>
parents: 346
diff changeset
131 // INT0 setup
56f22e29582a fix tabbing
Matt Johnston <matt@ucc.asn.au>
parents: 346
diff changeset
132 EIMSK = _BV(INT0);
324
e3664732f11f Add INT0 button
Matt Johnston <matt@ucc.asn.au>
parents: 321
diff changeset
133 }
e3664732f11f Add INT0 button
Matt Johnston <matt@ucc.asn.au>
parents: 321
diff changeset
134
322
840f51824254 untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents: 321
diff changeset
135 static void
840f51824254 untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents: 321
diff changeset
136 set_aux_power(uint8_t on)
840f51824254 untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents: 321
diff changeset
137 {
840f51824254 untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents: 321
diff changeset
138 if (on)
840f51824254 untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents: 321
diff changeset
139 {
840f51824254 untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents: 321
diff changeset
140 PORT_SHDN &= ~_BV(PIN_SHDN);
840f51824254 untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents: 321
diff changeset
141 }
840f51824254 untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents: 321
diff changeset
142 else
840f51824254 untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents: 321
diff changeset
143 {
349
e7f070855a22 mostly works for testing
Matt Johnston <matt@ucc.asn.au>
parents: 347
diff changeset
144 PORT_SHDN |= _BV(PIN_SHDN);
322
840f51824254 untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents: 321
diff changeset
145 }
840f51824254 untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents: 321
diff changeset
146 }
840f51824254 untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents: 321
diff changeset
147
840f51824254 untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents: 321
diff changeset
148 static void
840f51824254 untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents: 321
diff changeset
149 setup_tick_counter()
840f51824254 untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents: 321
diff changeset
150 {
840f51824254 untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents: 321
diff changeset
151 // set up counter2.
840f51824254 untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents: 321
diff changeset
152 // COM21 COM20 Set OC2 on Compare Match (p116)
840f51824254 untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents: 321
diff changeset
153 // WGM21 Clear counter on compare
840f51824254 untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents: 321
diff changeset
154 //TCCR2A = _BV(COM2A1) | _BV(COM2A0) | _BV(WGM21);
840f51824254 untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents: 321
diff changeset
155 // toggle on match
840f51824254 untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents: 321
diff changeset
156 TCCR2A = _BV(COM2A0);
840f51824254 untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents: 321
diff changeset
157 // CS22 CS21 CS20 clk/1024
840f51824254 untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents: 321
diff changeset
158 TCCR2B = _BV(CS22) | _BV(CS21) | _BV(CS20);
840f51824254 untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents: 321
diff changeset
159 // set async mode
840f51824254 untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents: 321
diff changeset
160 ASSR |= _BV(AS2);
840f51824254 untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents: 321
diff changeset
161 TCNT2 = 0;
840f51824254 untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents: 321
diff changeset
162 OCR2A = SLEEP_COMPARE;
840f51824254 untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents: 321
diff changeset
163 // interrupt
840f51824254 untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents: 321
diff changeset
164 TIMSK2 = _BV(OCIE2A);
840f51824254 untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents: 321
diff changeset
165 }
324
e3664732f11f Add INT0 button
Matt Johnston <matt@ucc.asn.au>
parents: 321
diff changeset
166
306
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
167 static void
313
139ecb1840fd serial prints something
Matt Johnston <matt@ucc.asn.au>
parents: 312
diff changeset
168 uart_on()
306
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
169 {
314
7aebb1452422 deep sleep works
Matt Johnston <matt@ucc.asn.au>
parents: 313
diff changeset
170 // Power reduction register
352
99f8b97a9449 Use the PRR etc, set value to proper ones
Matt Johnston <matt@ucc.asn.au>
parents: 349
diff changeset
171 PRR &= ~_BV(PRUSART0);
314
7aebb1452422 deep sleep works
Matt Johnston <matt@ucc.asn.au>
parents: 313
diff changeset
172
322
840f51824254 untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents: 321
diff changeset
173 // All of this needs to be done each time after turning off the PRR
306
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
174 // baud rate
313
139ecb1840fd serial prints something
Matt Johnston <matt@ucc.asn.au>
parents: 312
diff changeset
175 UBRR0H = (unsigned char)(UBRR >> 8);
139ecb1840fd serial prints something
Matt Johnston <matt@ucc.asn.au>
parents: 312
diff changeset
176 UBRR0L = (unsigned char)UBRR;
139ecb1840fd serial prints something
Matt Johnston <matt@ucc.asn.au>
parents: 312
diff changeset
177 // set 2x clock, improves accuracy of UBRR
139ecb1840fd serial prints something
Matt Johnston <matt@ucc.asn.au>
parents: 312
diff changeset
178 UCSR0A |= _BV(U2X0);
312
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
179 UCSR0B = _BV(RXCIE0) | _BV(RXEN0) | _BV(TXEN0);
306
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
180 //8N1
313
139ecb1840fd serial prints something
Matt Johnston <matt@ucc.asn.au>
parents: 312
diff changeset
181 UCSR0C = _BV(UCSZ01) | _BV(UCSZ00);
347
56f22e29582a fix tabbing
Matt Johnston <matt@ucc.asn.au>
parents: 346
diff changeset
182 uart_enabled = 1;
312
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
183 }
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
184
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
185 static void
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
186 uart_off()
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
187 {
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
188 // Turn of interrupts and disable tx/rx
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
189 UCSR0B = 0;
347
56f22e29582a fix tabbing
Matt Johnston <matt@ucc.asn.au>
parents: 346
diff changeset
190 uart_enabled = 0;
312
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
191
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
192 // Power reduction register
352
99f8b97a9449 Use the PRR etc, set value to proper ones
Matt Johnston <matt@ucc.asn.au>
parents: 349
diff changeset
193 PRR |= _BV(PRUSART0);
306
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
194 }
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
195
316
8f32eb67a279 reading DS18B20 works
Matt Johnston <matt@ucc.asn.au>
parents: 315
diff changeset
196 int
306
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
197 uart_putchar(char c, FILE *stream)
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
198 {
347
56f22e29582a fix tabbing
Matt Johnston <matt@ucc.asn.au>
parents: 346
diff changeset
199 if (!uart_enabled)
56f22e29582a fix tabbing
Matt Johnston <matt@ucc.asn.au>
parents: 346
diff changeset
200 {
56f22e29582a fix tabbing
Matt Johnston <matt@ucc.asn.au>
parents: 346
diff changeset
201 return EOF;
56f22e29582a fix tabbing
Matt Johnston <matt@ucc.asn.au>
parents: 346
diff changeset
202 }
326
f6b5941b4c34 Untested - calculate crc in uart_putchar
Matt Johnston <matt@ucc.asn.au>
parents: 325
diff changeset
203 // XXX could perhaps sleep in the loop for power.
314
7aebb1452422 deep sleep works
Matt Johnston <matt@ucc.asn.au>
parents: 313
diff changeset
204 if (c == '\n')
7aebb1452422 deep sleep works
Matt Johnston <matt@ucc.asn.au>
parents: 313
diff changeset
205 {
316
8f32eb67a279 reading DS18B20 works
Matt Johnston <matt@ucc.asn.au>
parents: 315
diff changeset
206 loop_until_bit_is_set(UCSR0A, UDRE0);
326
f6b5941b4c34 Untested - calculate crc in uart_putchar
Matt Johnston <matt@ucc.asn.au>
parents: 325
diff changeset
207 UDR0 = '\r';
314
7aebb1452422 deep sleep works
Matt Johnston <matt@ucc.asn.au>
parents: 313
diff changeset
208 }
308
e36ee3e156c1 switch to atmega328
Matt Johnston <matt@ucc.asn.au>
parents: 307
diff changeset
209 loop_until_bit_is_set(UCSR0A, UDRE0);
e36ee3e156c1 switch to atmega328
Matt Johnston <matt@ucc.asn.au>
parents: 307
diff changeset
210 UDR0 = c;
326
f6b5941b4c34 Untested - calculate crc in uart_putchar
Matt Johnston <matt@ucc.asn.au>
parents: 325
diff changeset
211 if (stream == crc_stdout)
f6b5941b4c34 Untested - calculate crc in uart_putchar
Matt Johnston <matt@ucc.asn.au>
parents: 325
diff changeset
212 {
332
05c1249da994 - Move crc16 to utils and fix it
Matt Johnston <matt@ucc.asn.au>
parents: 331
diff changeset
213 crc_out = _crc_ccitt_update(crc_out, c);
326
f6b5941b4c34 Untested - calculate crc in uart_putchar
Matt Johnston <matt@ucc.asn.au>
parents: 325
diff changeset
214 }
316
8f32eb67a279 reading DS18B20 works
Matt Johnston <matt@ucc.asn.au>
parents: 315
diff changeset
215 if (c == '\r')
8f32eb67a279 reading DS18B20 works
Matt Johnston <matt@ucc.asn.au>
parents: 315
diff changeset
216 {
8f32eb67a279 reading DS18B20 works
Matt Johnston <matt@ucc.asn.au>
parents: 315
diff changeset
217 loop_until_bit_is_set(UCSR0A, UDRE0);
326
f6b5941b4c34 Untested - calculate crc in uart_putchar
Matt Johnston <matt@ucc.asn.au>
parents: 325
diff changeset
218 UDR0 = '\n';
f6b5941b4c34 Untested - calculate crc in uart_putchar
Matt Johnston <matt@ucc.asn.au>
parents: 325
diff changeset
219 if (stream == crc_stdout)
f6b5941b4c34 Untested - calculate crc in uart_putchar
Matt Johnston <matt@ucc.asn.au>
parents: 325
diff changeset
220 {
f6b5941b4c34 Untested - calculate crc in uart_putchar
Matt Johnston <matt@ucc.asn.au>
parents: 325
diff changeset
221 crc_out = _crc_ccitt_update(crc_out, '\n');
f6b5941b4c34 Untested - calculate crc in uart_putchar
Matt Johnston <matt@ucc.asn.au>
parents: 325
diff changeset
222 }
316
8f32eb67a279 reading DS18B20 works
Matt Johnston <matt@ucc.asn.au>
parents: 315
diff changeset
223 }
346
d6219df77c41 main.c:
Matt Johnston <matt@ucc.asn.au>
parents: 341
diff changeset
224 return (unsigned char)c;
306
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
225 }
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
226
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
227 static void
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
228 cmd_fetch()
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
229 {
326
f6b5941b4c34 Untested - calculate crc in uart_putchar
Matt Johnston <matt@ucc.asn.au>
parents: 325
diff changeset
230 crc_out = 0;
321
df7384336798 Add shutdown handling, print sensors in "fetch" output
Matt Johnston <matt@ucc.asn.au>
parents: 320
diff changeset
231 uint8_t n_sensors;
df7384336798 Add shutdown handling, print sensors in "fetch" output
Matt Johnston <matt@ucc.asn.au>
parents: 320
diff changeset
232 eeprom_read(n_sensors, n_sensors);
319
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
233
326
f6b5941b4c34 Untested - calculate crc in uart_putchar
Matt Johnston <matt@ucc.asn.au>
parents: 325
diff changeset
234 fprintf_P(crc_stdout, PSTR("START\n"));
333
298e502fdcd4 Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents: 332
diff changeset
235 fprintf_P(crc_stdout, PSTR("now=%lu\n"
341
ccab04e2f601 - decrease measurement interval, measure at start
Matt Johnston <matt@ucc.asn.au>
parents: 339
diff changeset
236 "time_step=%hu\n"
333
298e502fdcd4 Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents: 332
diff changeset
237 "first_time=%lu\n"
298e502fdcd4 Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents: 332
diff changeset
238 "last_time=%lu\n"),
298e502fdcd4 Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents: 332
diff changeset
239 clock_epoch,
341
ccab04e2f601 - decrease measurement interval, measure at start
Matt Johnston <matt@ucc.asn.au>
parents: 339
diff changeset
240 (uint16_t)MEASURE_WAKE,
333
298e502fdcd4 Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents: 332
diff changeset
241 first_measurement_clock,
298e502fdcd4 Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents: 332
diff changeset
242 last_measurement_clock);
298e502fdcd4 Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents: 332
diff changeset
243 fprintf_P(crc_stdout, PSTR("sensors=%u\n"), n_sensors);
321
df7384336798 Add shutdown handling, print sensors in "fetch" output
Matt Johnston <matt@ucc.asn.au>
parents: 320
diff changeset
244 for (uint8_t s = 0; s < n_sensors; s++)
df7384336798 Add shutdown handling, print sensors in "fetch" output
Matt Johnston <matt@ucc.asn.au>
parents: 320
diff changeset
245 {
df7384336798 Add shutdown handling, print sensors in "fetch" output
Matt Johnston <matt@ucc.asn.au>
parents: 320
diff changeset
246 uint8_t id[ID_LEN];
333
298e502fdcd4 Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents: 332
diff changeset
247 fprintf_P(crc_stdout, PSTR("sensor_id%u="), s);
321
df7384336798 Add shutdown handling, print sensors in "fetch" output
Matt Johnston <matt@ucc.asn.au>
parents: 320
diff changeset
248 eeprom_read_to(id, sensor_id[s], ID_LEN);
326
f6b5941b4c34 Untested - calculate crc in uart_putchar
Matt Johnston <matt@ucc.asn.au>
parents: 325
diff changeset
249 printhex(id, ID_LEN, crc_stdout);
f6b5941b4c34 Untested - calculate crc in uart_putchar
Matt Johnston <matt@ucc.asn.au>
parents: 325
diff changeset
250 fputc('\n', crc_stdout);
321
df7384336798 Add shutdown handling, print sensors in "fetch" output
Matt Johnston <matt@ucc.asn.au>
parents: 320
diff changeset
251 }
341
ccab04e2f601 - decrease measurement interval, measure at start
Matt Johnston <matt@ucc.asn.au>
parents: 339
diff changeset
252 fprintf_P(crc_stdout, PSTR("measurements=%hu\n"), n_measurements);
320
cff7a4459dc9 Lots of it works now.
Matt Johnston <matt@ucc.asn.au>
parents: 319
diff changeset
253 for (uint16_t n = 0; n < n_measurements; n++)
306
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
254 {
352
99f8b97a9449 Use the PRR etc, set value to proper ones
Matt Johnston <matt@ucc.asn.au>
parents: 349
diff changeset
255 fprintf_P(crc_stdout, PSTR("meas%hu="), n);
321
df7384336798 Add shutdown handling, print sensors in "fetch" output
Matt Johnston <matt@ucc.asn.au>
parents: 320
diff changeset
256 for (uint8_t s = 0; s < n_sensors; s++)
319
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
257 {
341
ccab04e2f601 - decrease measurement interval, measure at start
Matt Johnston <matt@ucc.asn.au>
parents: 339
diff changeset
258 fprintf_P(crc_stdout, PSTR(" %hu"), measurements[n][s]);
319
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
259 }
326
f6b5941b4c34 Untested - calculate crc in uart_putchar
Matt Johnston <matt@ucc.asn.au>
parents: 325
diff changeset
260 fputc('\n', crc_stdout);
306
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
261 }
326
f6b5941b4c34 Untested - calculate crc in uart_putchar
Matt Johnston <matt@ucc.asn.au>
parents: 325
diff changeset
262 fprintf_P(crc_stdout, PSTR("END\n"));
331
5de3fc71ce48 - Make the python work on openwrt
Matt Johnston <matt@ucc.asn.au>
parents: 330
diff changeset
263 fprintf_P(stdout, PSTR("CRC=%hu\n"), crc_out);
306
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
264 }
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
265
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
266 static void
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
267 cmd_clear()
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
268 {
313
139ecb1840fd serial prints something
Matt Johnston <matt@ucc.asn.au>
parents: 312
diff changeset
269 n_measurements = 0;
338
12123e390169 More minor work
Matt Johnston <matt@ucc.asn.au>
parents: 333
diff changeset
270 printf_P(PSTR("cleared\n"));
306
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
271 }
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
272
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
273 static void
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
274 cmd_btoff()
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
275 {
352
99f8b97a9449 Use the PRR etc, set value to proper ones
Matt Johnston <matt@ucc.asn.au>
parents: 349
diff changeset
276 comms_count = 0;
99f8b97a9449 Use the PRR etc, set value to proper ones
Matt Johnston <matt@ucc.asn.au>
parents: 349
diff changeset
277 printf_P(PSTR("off:%hu\n"), COMMS_WAKE);
99f8b97a9449 Use the PRR etc, set value to proper ones
Matt Johnston <matt@ucc.asn.au>
parents: 349
diff changeset
278 _delay_ms(100);
322
840f51824254 untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents: 321
diff changeset
279 comms_timeout = 0;
306
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
280 }
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
281
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
282 static void
318
31199b2941f6 Add simple_ds18b20.c etc
Matt Johnston <matt@ucc.asn.au>
parents: 316
diff changeset
283 cmd_measure()
31199b2941f6 Add simple_ds18b20.c etc
Matt Johnston <matt@ucc.asn.au>
parents: 316
diff changeset
284 {
339
449272fc63a3 - Debug log file for server
Matt Johnston <matt@ucc.asn.au>
parents: 338
diff changeset
285 printf_P(PSTR("measuring\n"));
318
31199b2941f6 Add simple_ds18b20.c etc
Matt Johnston <matt@ucc.asn.au>
parents: 316
diff changeset
286 need_measurement = 1;
31199b2941f6 Add simple_ds18b20.c etc
Matt Johnston <matt@ucc.asn.au>
parents: 316
diff changeset
287 }
31199b2941f6 Add simple_ds18b20.c etc
Matt Johnston <matt@ucc.asn.au>
parents: 316
diff changeset
288
31199b2941f6 Add simple_ds18b20.c etc
Matt Johnston <matt@ucc.asn.au>
parents: 316
diff changeset
289 static void
31199b2941f6 Add simple_ds18b20.c etc
Matt Johnston <matt@ucc.asn.au>
parents: 316
diff changeset
290 cmd_sensors()
31199b2941f6 Add simple_ds18b20.c etc
Matt Johnston <matt@ucc.asn.au>
parents: 316
diff changeset
291 {
31199b2941f6 Add simple_ds18b20.c etc
Matt Johnston <matt@ucc.asn.au>
parents: 316
diff changeset
292 uint8_t ret = simple_ds18b20_start_meas(NULL);
320
cff7a4459dc9 Lots of it works now.
Matt Johnston <matt@ucc.asn.au>
parents: 319
diff changeset
293 printf_P(PSTR("All sensors, ret %d, waiting...\n"), ret);
cff7a4459dc9 Lots of it works now.
Matt Johnston <matt@ucc.asn.au>
parents: 319
diff changeset
294 long_delay(DS18B20_TCONV_12BIT);
318
31199b2941f6 Add simple_ds18b20.c etc
Matt Johnston <matt@ucc.asn.au>
parents: 316
diff changeset
295 simple_ds18b20_read_all();
31199b2941f6 Add simple_ds18b20.c etc
Matt Johnston <matt@ucc.asn.au>
parents: 316
diff changeset
296 }
31199b2941f6 Add simple_ds18b20.c etc
Matt Johnston <matt@ucc.asn.au>
parents: 316
diff changeset
297
322
840f51824254 untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents: 321
diff changeset
298 #if 0
319
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
299 // 0 on success
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
300 static uint8_t
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
301 get_hex_string(const char *hex, uint8_t *out, uint8_t size)
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
302 {
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
303 uint8_t upper;
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
304 uint8_t o;
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
305 for (uint8_t i = 0, z = 0; o < size; i++)
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
306 {
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
307 uint8_t h = hex[i];
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
308 if (h >= 'A' && h <= 'F')
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
309 {
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
310 // lower case
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
311 h += 0x20;
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
312 }
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
313 uint8_t nibble;
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
314 if (h >= '0' && h <= '9')
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
315 {
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
316 nibble = h - '0';
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
317 }
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
318 else if (h >= 'a' && h <= 'f')
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
319 {
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
320 nibble = 10 + h - 'a';
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
321 }
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
322 else if (h == ' ' || h == ':')
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
323 {
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
324 continue;
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
325 }
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
326 else
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
327 {
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
328 printf_P(PSTR("Bad hex 0x%x '%c'\n"), hex[i], hex[i]);
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
329 return 1;
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
330 }
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
331
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
332 if (z % 2 == 0)
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
333 {
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
334 upper = nibble << 4;
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
335 }
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
336 else
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
337 {
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
338 out[o] = upper | nibble;
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
339 o++;
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
340 }
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
341
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
342 z++;
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
343 }
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
344
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
345 if (o != size)
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
346 {
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
347 printf_P(PSTR("Short hex\n"));
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
348 return 1;
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
349 }
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
350 return 0;
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
351 }
322
840f51824254 untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents: 321
diff changeset
352 #endif
319
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
353
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
354 static void
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
355 add_sensor(uint8_t *id)
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
356 {
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
357 uint8_t n;
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
358 eeprom_read(n, n_sensors);
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
359 if (n < MAX_SENSORS)
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
360 {
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
361 cli();
321
df7384336798 Add shutdown handling, print sensors in "fetch" output
Matt Johnston <matt@ucc.asn.au>
parents: 320
diff changeset
362 eeprom_write_from(id, sensor_id[n], ID_LEN);
319
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
363 n++;
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
364 eeprom_write(n, n_sensors);
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
365 sei();
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
366 printf_P(PSTR("Added sensor %d : "), n);
326
f6b5941b4c34 Untested - calculate crc in uart_putchar
Matt Johnston <matt@ucc.asn.au>
parents: 325
diff changeset
367 printhex(id, ID_LEN, stdout);
319
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
368 putchar('\n');
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
369 }
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
370 else
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
371 {
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
372 printf_P(PSTR("Too many sensors\n"));
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
373 }
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
374 }
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
375
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
376 static void
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
377 cmd_add_all()
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
378 {
347
56f22e29582a fix tabbing
Matt Johnston <matt@ucc.asn.au>
parents: 346
diff changeset
379 uint8_t id[OW_ROMCODE_SIZE];
319
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
380 printf_P("Adding all\n");
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
381 ow_reset();
347
56f22e29582a fix tabbing
Matt Johnston <matt@ucc.asn.au>
parents: 346
diff changeset
382 for( uint8_t diff = OW_SEARCH_FIRST; diff != OW_LAST_DEVICE; )
56f22e29582a fix tabbing
Matt Johnston <matt@ucc.asn.au>
parents: 346
diff changeset
383 {
56f22e29582a fix tabbing
Matt Johnston <matt@ucc.asn.au>
parents: 346
diff changeset
384 diff = ow_rom_search( diff, &id[0] );
56f22e29582a fix tabbing
Matt Johnston <matt@ucc.asn.au>
parents: 346
diff changeset
385 if( diff == OW_PRESENCE_ERR ) {
56f22e29582a fix tabbing
Matt Johnston <matt@ucc.asn.au>
parents: 346
diff changeset
386 printf_P( PSTR("No Sensor found\r") );
56f22e29582a fix tabbing
Matt Johnston <matt@ucc.asn.au>
parents: 346
diff changeset
387 return;
56f22e29582a fix tabbing
Matt Johnston <matt@ucc.asn.au>
parents: 346
diff changeset
388 }
56f22e29582a fix tabbing
Matt Johnston <matt@ucc.asn.au>
parents: 346
diff changeset
389
56f22e29582a fix tabbing
Matt Johnston <matt@ucc.asn.au>
parents: 346
diff changeset
390 if( diff == OW_DATA_ERR ) {
56f22e29582a fix tabbing
Matt Johnston <matt@ucc.asn.au>
parents: 346
diff changeset
391 printf_P( PSTR("Bus Error\r") );
56f22e29582a fix tabbing
Matt Johnston <matt@ucc.asn.au>
parents: 346
diff changeset
392 return;
56f22e29582a fix tabbing
Matt Johnston <matt@ucc.asn.au>
parents: 346
diff changeset
393 }
319
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
394 add_sensor(id);
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
395 }
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
396 }
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
397
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
398 static void
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
399 cmd_init()
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
400 {
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
401 printf_P(PSTR("Resetting sensor list\n"));
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
402 uint8_t zero = 0;
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
403 cli();
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
404 eeprom_write(zero, n_sensors);
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
405 sei();
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
406 printf_P(PSTR("Done.\n"));
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
407 }
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
408
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
409 static void
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
410 check_first_startup()
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
411 {
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
412 uint16_t magic;
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
413 eeprom_read(magic, magic);
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
414 if (magic != EXPECT_MAGIC)
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
415 {
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
416 printf_P(PSTR("First boot, looking for sensors...\n"));
322
840f51824254 untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents: 321
diff changeset
417 // in case of power fumbles don't want to reset during eeprom write,
840f51824254 untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents: 321
diff changeset
418 long_delay(2);
319
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
419 cmd_init();
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
420 cmd_add_all();
320
cff7a4459dc9 Lots of it works now.
Matt Johnston <matt@ucc.asn.au>
parents: 319
diff changeset
421 cli();
cff7a4459dc9 Lots of it works now.
Matt Johnston <matt@ucc.asn.au>
parents: 319
diff changeset
422 magic = EXPECT_MAGIC;
cff7a4459dc9 Lots of it works now.
Matt Johnston <matt@ucc.asn.au>
parents: 319
diff changeset
423 eeprom_write(magic, magic);
cff7a4459dc9 Lots of it works now.
Matt Johnston <matt@ucc.asn.au>
parents: 319
diff changeset
424 sei();
319
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
425 }
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
426 }
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
427
318
31199b2941f6 Add simple_ds18b20.c etc
Matt Johnston <matt@ucc.asn.au>
parents: 316
diff changeset
428 static void
306
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
429 read_handler()
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
430 {
312
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
431 if (strcmp_P(readbuf, PSTR("fetch")) == 0)
306
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
432 {
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
433 cmd_fetch();
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
434 }
312
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
435 else if (strcmp_P(readbuf, PSTR("clear")) == 0)
306
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
436 {
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
437 cmd_clear();
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
438 }
312
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
439 else if (strcmp_P(readbuf, PSTR("btoff")) == 0)
306
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
440 {
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
441 cmd_btoff();
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
442 }
318
31199b2941f6 Add simple_ds18b20.c etc
Matt Johnston <matt@ucc.asn.au>
parents: 316
diff changeset
443 else if (strcmp_P(readbuf, PSTR("measure")) == 0)
31199b2941f6 Add simple_ds18b20.c etc
Matt Johnston <matt@ucc.asn.au>
parents: 316
diff changeset
444 {
31199b2941f6 Add simple_ds18b20.c etc
Matt Johnston <matt@ucc.asn.au>
parents: 316
diff changeset
445 cmd_measure();
31199b2941f6 Add simple_ds18b20.c etc
Matt Johnston <matt@ucc.asn.au>
parents: 316
diff changeset
446 }
31199b2941f6 Add simple_ds18b20.c etc
Matt Johnston <matt@ucc.asn.au>
parents: 316
diff changeset
447 else if (strcmp_P(readbuf, PSTR("sensors")) == 0)
31199b2941f6 Add simple_ds18b20.c etc
Matt Johnston <matt@ucc.asn.au>
parents: 316
diff changeset
448 {
31199b2941f6 Add simple_ds18b20.c etc
Matt Johnston <matt@ucc.asn.au>
parents: 316
diff changeset
449 cmd_sensors();
31199b2941f6 Add simple_ds18b20.c etc
Matt Johnston <matt@ucc.asn.au>
parents: 316
diff changeset
450 }
319
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
451 else if (strcmp_P(readbuf, PSTR("addall"))== 0)
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
452 {
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
453 cmd_add_all();
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
454 }
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
455 else if (strcmp_P(readbuf, PSTR("init")) == 0)
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
456 {
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
457 cmd_init();
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
458 }
306
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
459 else
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
460 {
312
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
461 printf_P(PSTR("Bad command\n"));
306
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
462 }
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
463 }
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
464
326
f6b5941b4c34 Untested - calculate crc in uart_putchar
Matt Johnston <matt@ucc.asn.au>
parents: 325
diff changeset
465 ISR(INT0_vect)
324
e3664732f11f Add INT0 button
Matt Johnston <matt@ucc.asn.au>
parents: 321
diff changeset
466 {
347
56f22e29582a fix tabbing
Matt Johnston <matt@ucc.asn.au>
parents: 346
diff changeset
467 need_comms = 1;
330
7ac6b8846eea - some fixes for server code
Matt Johnston <matt@ucc.asn.au>
parents: 328
diff changeset
468 blink();
7ac6b8846eea - some fixes for server code
Matt Johnston <matt@ucc.asn.au>
parents: 328
diff changeset
469 _delay_ms(100);
7ac6b8846eea - some fixes for server code
Matt Johnston <matt@ucc.asn.au>
parents: 328
diff changeset
470 blink();
324
e3664732f11f Add INT0 button
Matt Johnston <matt@ucc.asn.au>
parents: 321
diff changeset
471 }
e3664732f11f Add INT0 button
Matt Johnston <matt@ucc.asn.au>
parents: 321
diff changeset
472
e3664732f11f Add INT0 button
Matt Johnston <matt@ucc.asn.au>
parents: 321
diff changeset
473
308
e36ee3e156c1 switch to atmega328
Matt Johnston <matt@ucc.asn.au>
parents: 307
diff changeset
474 ISR(USART_RX_vect)
306
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
475 {
308
e36ee3e156c1 switch to atmega328
Matt Johnston <matt@ucc.asn.au>
parents: 307
diff changeset
476 char c = UDR0;
339
449272fc63a3 - Debug log file for server
Matt Johnston <matt@ucc.asn.au>
parents: 338
diff changeset
477 #ifdef HAVE_UART_ECHO
318
31199b2941f6 Add simple_ds18b20.c etc
Matt Johnston <matt@ucc.asn.au>
parents: 316
diff changeset
478 uart_putchar(c, NULL);
339
449272fc63a3 - Debug log file for server
Matt Johnston <matt@ucc.asn.au>
parents: 338
diff changeset
479 #endif
328
46070aaf29ea A bit of work on the server python
Matt Johnston <matt@ucc.asn.au>
parents: 326
diff changeset
480 if (c == '\r' || c == '\n')
306
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
481 {
328
46070aaf29ea A bit of work on the server python
Matt Johnston <matt@ucc.asn.au>
parents: 326
diff changeset
482 if (readpos > 0)
46070aaf29ea A bit of work on the server python
Matt Johnston <matt@ucc.asn.au>
parents: 326
diff changeset
483 {
46070aaf29ea A bit of work on the server python
Matt Johnston <matt@ucc.asn.au>
parents: 326
diff changeset
484 readbuf[readpos] = '\0';
333
298e502fdcd4 Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents: 332
diff changeset
485 have_cmd = 1;
328
46070aaf29ea A bit of work on the server python
Matt Johnston <matt@ucc.asn.au>
parents: 326
diff changeset
486 readpos = 0;
46070aaf29ea A bit of work on the server python
Matt Johnston <matt@ucc.asn.au>
parents: 326
diff changeset
487 }
306
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
488 }
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
489 else
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
490 {
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
491 readbuf[readpos] = c;
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
492 readpos++;
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
493 if (readpos >= sizeof(readbuf))
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
494 {
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
495 readpos = 0;
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
496 }
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
497 }
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
498 }
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
499
308
e36ee3e156c1 switch to atmega328
Matt Johnston <matt@ucc.asn.au>
parents: 307
diff changeset
500 ISR(TIMER2_COMPA_vect)
307
e50091063890 Some counter2 bits
Matt Johnston <matt@ucc.asn.au>
parents: 306
diff changeset
501 {
320
cff7a4459dc9 Lots of it works now.
Matt Johnston <matt@ucc.asn.au>
parents: 319
diff changeset
502 TCNT2 = 0;
310
0a64532c1de1 Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents: 309
diff changeset
503 measure_count ++;
347
56f22e29582a fix tabbing
Matt Johnston <matt@ucc.asn.au>
parents: 346
diff changeset
504 comms_count ++;
322
840f51824254 untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents: 321
diff changeset
505
323
5181ea55ea77 Add clock_epoch
Matt Johnston <matt@ucc.asn.au>
parents: 322
diff changeset
506 clock_epoch ++;
5181ea55ea77 Add clock_epoch
Matt Johnston <matt@ucc.asn.au>
parents: 322
diff changeset
507
322
840f51824254 untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents: 321
diff changeset
508 if (comms_timeout != 0)
840f51824254 untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents: 321
diff changeset
509 {
349
e7f070855a22 mostly works for testing
Matt Johnston <matt@ucc.asn.au>
parents: 347
diff changeset
510 comms_timeout--;
322
840f51824254 untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents: 321
diff changeset
511 }
840f51824254 untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents: 321
diff changeset
512
320
cff7a4459dc9 Lots of it works now.
Matt Johnston <matt@ucc.asn.au>
parents: 319
diff changeset
513 if (measure_count >= MEASURE_WAKE)
307
e50091063890 Some counter2 bits
Matt Johnston <matt@ucc.asn.au>
parents: 306
diff changeset
514 {
310
0a64532c1de1 Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents: 309
diff changeset
515 measure_count = 0;
307
e50091063890 Some counter2 bits
Matt Johnston <matt@ucc.asn.au>
parents: 306
diff changeset
516 need_measurement = 1;
e50091063890 Some counter2 bits
Matt Johnston <matt@ucc.asn.au>
parents: 306
diff changeset
517 }
310
0a64532c1de1 Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents: 309
diff changeset
518
347
56f22e29582a fix tabbing
Matt Johnston <matt@ucc.asn.au>
parents: 346
diff changeset
519 if (comms_count >= COMMS_WAKE)
56f22e29582a fix tabbing
Matt Johnston <matt@ucc.asn.au>
parents: 346
diff changeset
520 {
56f22e29582a fix tabbing
Matt Johnston <matt@ucc.asn.au>
parents: 346
diff changeset
521 comms_count = 0;
56f22e29582a fix tabbing
Matt Johnston <matt@ucc.asn.au>
parents: 346
diff changeset
522 need_comms = 1;
56f22e29582a fix tabbing
Matt Johnston <matt@ucc.asn.au>
parents: 346
diff changeset
523 }
322
840f51824254 untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents: 321
diff changeset
524
307
e50091063890 Some counter2 bits
Matt Johnston <matt@ucc.asn.au>
parents: 306
diff changeset
525 }
e50091063890 Some counter2 bits
Matt Johnston <matt@ucc.asn.au>
parents: 306
diff changeset
526
309
49e83333e546 Add FatFS
Matt Johnston <matt@ucc.asn.au>
parents: 308
diff changeset
527 DWORD get_fattime (void)
49e83333e546 Add FatFS
Matt Johnston <matt@ucc.asn.au>
parents: 308
diff changeset
528 {
49e83333e546 Add FatFS
Matt Johnston <matt@ucc.asn.au>
parents: 308
diff changeset
529 return 0;
49e83333e546 Add FatFS
Matt Johnston <matt@ucc.asn.au>
parents: 308
diff changeset
530 }
49e83333e546 Add FatFS
Matt Johnston <matt@ucc.asn.au>
parents: 308
diff changeset
531
307
e50091063890 Some counter2 bits
Matt Johnston <matt@ucc.asn.au>
parents: 306
diff changeset
532 static void
e50091063890 Some counter2 bits
Matt Johnston <matt@ucc.asn.au>
parents: 306
diff changeset
533 deep_sleep()
e50091063890 Some counter2 bits
Matt Johnston <matt@ucc.asn.au>
parents: 306
diff changeset
534 {
e50091063890 Some counter2 bits
Matt Johnston <matt@ucc.asn.au>
parents: 306
diff changeset
535 // p119 of manual
308
e36ee3e156c1 switch to atmega328
Matt Johnston <matt@ucc.asn.au>
parents: 307
diff changeset
536 OCR2A = SLEEP_COMPARE;
e36ee3e156c1 switch to atmega328
Matt Johnston <matt@ucc.asn.au>
parents: 307
diff changeset
537 loop_until_bit_is_clear(ASSR, OCR2AUB);
307
e50091063890 Some counter2 bits
Matt Johnston <matt@ucc.asn.au>
parents: 306
diff changeset
538
e50091063890 Some counter2 bits
Matt Johnston <matt@ucc.asn.au>
parents: 306
diff changeset
539 set_sleep_mode(SLEEP_MODE_PWR_SAVE);
e50091063890 Some counter2 bits
Matt Johnston <matt@ucc.asn.au>
parents: 306
diff changeset
540 sleep_mode();
e50091063890 Some counter2 bits
Matt Johnston <matt@ucc.asn.au>
parents: 306
diff changeset
541 }
e50091063890 Some counter2 bits
Matt Johnston <matt@ucc.asn.au>
parents: 306
diff changeset
542
e50091063890 Some counter2 bits
Matt Johnston <matt@ucc.asn.au>
parents: 306
diff changeset
543 static void
310
0a64532c1de1 Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents: 309
diff changeset
544 idle_sleep()
0a64532c1de1 Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents: 309
diff changeset
545 {
0a64532c1de1 Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents: 309
diff changeset
546 set_sleep_mode(SLEEP_MODE_IDLE);
0a64532c1de1 Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents: 309
diff changeset
547 sleep_mode();
0a64532c1de1 Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents: 309
diff changeset
548 }
0a64532c1de1 Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents: 309
diff changeset
549
320
cff7a4459dc9 Lots of it works now.
Matt Johnston <matt@ucc.asn.au>
parents: 319
diff changeset
550 #if 0
cff7a4459dc9 Lots of it works now.
Matt Johnston <matt@ucc.asn.au>
parents: 319
diff changeset
551 // untested
312
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
552 static void
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
553 do_adc_335()
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
554 {
314
7aebb1452422 deep sleep works
Matt Johnston <matt@ucc.asn.au>
parents: 313
diff changeset
555 //PRR &= ~_BV(PRADC);
312
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
556
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
557 ADMUX = _BV(ADLAR);
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
558
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
559 // ADPS2 = /16 prescaler, 62khz at 1mhz clock
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
560 ADCSRA = _BV(ADEN) | _BV(ADPS2);
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
561
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
562 // measure value
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
563 ADCSRA |= _BV(ADSC);
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
564 loop_until_bit_is_clear(ADCSRA, ADSC);
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
565 uint8_t low = ADCL;
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
566 uint8_t high = ADCH;
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
567 uint16_t f_measure = low + (high << 8);
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
568
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
569 // set to measure 1.1 reference
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
570 ADMUX = _BV(ADLAR) | _BV(MUX3) | _BV(MUX2) | _BV(MUX1);
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
571 ADCSRA |= _BV(ADSC);
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
572 loop_until_bit_is_clear(ADCSRA, ADSC);
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
573 uint8_t low_11 = ADCL;
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
574 uint8_t high_11 = ADCH;
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
575 uint16_t f_11 = low_11 + (high_11 << 8);
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
576
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
577 float res_volts = 1.1 * f_measure / f_11;
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
578
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
579 // 10mV/degree
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
580 // scale to 1/5 degree units above 0C
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
581 int temp = (res_volts - 2.73) * 500;
319
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
582 // XXX fixme
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
583 //measurements[n_measurements] = temp;
312
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
584 // XXX something if it hits the limit
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
585
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
586 // measure AVR internal temperature against 1.1 ref.
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
587 ADMUX = _BV(ADLAR) | _BV(MUX3) | _BV(REFS1) | _BV(REFS0);
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
588 ADCSRA |= _BV(ADSC);
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
589 loop_until_bit_is_clear(ADCSRA, ADSC);
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
590 uint16_t res_internal = ADCL;
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
591 res_internal |= ADCH << 8;
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
592
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
593 float internal_volts = res_internal * (1.1 / 1024.0);
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
594
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
595 // 1mV/degree
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
596 int internal_temp = (internal_volts - 2.73) * 5000;
319
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
597 // XXX fixme
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
598 //internal_measurements[n_measurements] = internal_temp;
312
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
599
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
600 printf_P("measure %d: external %d, internal %d, 1.1 %d\n",
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
601 n_measurements, temp, internal_temp, f_11);
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
602
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
603 n_measurements++;
314
7aebb1452422 deep sleep works
Matt Johnston <matt@ucc.asn.au>
parents: 313
diff changeset
604 //PRR |= _BV(PRADC);
312
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
605 }
320
cff7a4459dc9 Lots of it works now.
Matt Johnston <matt@ucc.asn.au>
parents: 319
diff changeset
606 #endif
312
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
607
310
0a64532c1de1 Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents: 309
diff changeset
608 static void
307
e50091063890 Some counter2 bits
Matt Johnston <matt@ucc.asn.au>
parents: 306
diff changeset
609 do_measurement()
e50091063890 Some counter2 bits
Matt Johnston <matt@ucc.asn.au>
parents: 306
diff changeset
610 {
319
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
611 uint8_t n_sensors;
320
cff7a4459dc9 Lots of it works now.
Matt Johnston <matt@ucc.asn.au>
parents: 319
diff changeset
612 printf("do_measurement\n");
319
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
613 eeprom_read(n_sensors, n_sensors);
320
cff7a4459dc9 Lots of it works now.
Matt Johnston <matt@ucc.asn.au>
parents: 319
diff changeset
614 printf("do_measurement sensors %d\n", n_sensors);
319
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
615
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
616 uint8_t ret = simple_ds18b20_start_meas(NULL);
320
cff7a4459dc9 Lots of it works now.
Matt Johnston <matt@ucc.asn.au>
parents: 319
diff changeset
617 printf_P(PSTR("Read all sensors, ret %d, waiting...\n"), ret);
319
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
618 _delay_ms(DS18B20_TCONV_12BIT);
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
619
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
620 if (n_measurements == NUM_MEASUREMENTS)
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
621 {
352
99f8b97a9449 Use the PRR etc, set value to proper ones
Matt Johnston <matt@ucc.asn.au>
parents: 349
diff changeset
622 printf_P(PSTR("Measurements overflow\n"));
319
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
623 n_measurements = 0;
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
624 }
312
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
625
320
cff7a4459dc9 Lots of it works now.
Matt Johnston <matt@ucc.asn.au>
parents: 319
diff changeset
626 for (uint8_t s = 0; s < MAX_SENSORS; s++)
319
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
627 {
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
628 int16_t decicelsius;
320
cff7a4459dc9 Lots of it works now.
Matt Johnston <matt@ucc.asn.au>
parents: 319
diff changeset
629 if (s >= n_sensors)
319
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
630 {
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
631 decicelsius = VALUE_NOSENSOR;
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
632 }
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
633 else
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
634 {
321
df7384336798 Add shutdown handling, print sensors in "fetch" output
Matt Johnston <matt@ucc.asn.au>
parents: 320
diff changeset
635 uint8_t id[ID_LEN];
df7384336798 Add shutdown handling, print sensors in "fetch" output
Matt Johnston <matt@ucc.asn.au>
parents: 320
diff changeset
636 eeprom_read_to(id, sensor_id[s], ID_LEN);
319
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
637
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
638 uint8_t ret = simple_ds18b20_read_decicelsius(id, &decicelsius);
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
639 if (ret != DS18X20_OK)
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
640 {
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
641 decicelsius = VALUE_BROKEN;
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
642 }
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
643 }
320
cff7a4459dc9 Lots of it works now.
Matt Johnston <matt@ucc.asn.au>
parents: 319
diff changeset
644 measurements[n_measurements][s] = decicelsius;
319
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
645 }
328
46070aaf29ea A bit of work on the server python
Matt Johnston <matt@ucc.asn.au>
parents: 326
diff changeset
646
46070aaf29ea A bit of work on the server python
Matt Johnston <matt@ucc.asn.au>
parents: 326
diff changeset
647 if (n_measurements == 0)
46070aaf29ea A bit of work on the server python
Matt Johnston <matt@ucc.asn.au>
parents: 326
diff changeset
648 {
46070aaf29ea A bit of work on the server python
Matt Johnston <matt@ucc.asn.au>
parents: 326
diff changeset
649 first_measurement_clock = clock_epoch;
46070aaf29ea A bit of work on the server python
Matt Johnston <matt@ucc.asn.au>
parents: 326
diff changeset
650 }
46070aaf29ea A bit of work on the server python
Matt Johnston <matt@ucc.asn.au>
parents: 326
diff changeset
651 last_measurement_clock = clock_epoch;
46070aaf29ea A bit of work on the server python
Matt Johnston <matt@ucc.asn.au>
parents: 326
diff changeset
652
320
cff7a4459dc9 Lots of it works now.
Matt Johnston <matt@ucc.asn.au>
parents: 319
diff changeset
653 n_measurements++;
318
31199b2941f6 Add simple_ds18b20.c etc
Matt Johnston <matt@ucc.asn.au>
parents: 316
diff changeset
654 //do_adc_335();
307
e50091063890 Some counter2 bits
Matt Johnston <matt@ucc.asn.au>
parents: 306
diff changeset
655 }
e50091063890 Some counter2 bits
Matt Johnston <matt@ucc.asn.au>
parents: 306
diff changeset
656
310
0a64532c1de1 Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents: 309
diff changeset
657 static void
0a64532c1de1 Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents: 309
diff changeset
658 do_comms()
0a64532c1de1 Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents: 309
diff changeset
659 {
347
56f22e29582a fix tabbing
Matt Johnston <matt@ucc.asn.au>
parents: 346
diff changeset
660 // turn on bluetooth
330
7ac6b8846eea - some fixes for server code
Matt Johnston <matt@ucc.asn.au>
parents: 328
diff changeset
661 set_aux_power(1);
313
139ecb1840fd serial prints something
Matt Johnston <matt@ucc.asn.au>
parents: 312
diff changeset
662 uart_on();
347
56f22e29582a fix tabbing
Matt Johnston <matt@ucc.asn.au>
parents: 346
diff changeset
663
56f22e29582a fix tabbing
Matt Johnston <matt@ucc.asn.au>
parents: 346
diff changeset
664 // write sd card here? same 3.3v regulator...
56f22e29582a fix tabbing
Matt Johnston <matt@ucc.asn.au>
parents: 346
diff changeset
665
56f22e29582a fix tabbing
Matt Johnston <matt@ucc.asn.au>
parents: 346
diff changeset
666 for (comms_timeout = WAKE_SECS; comms_timeout > 0; )
56f22e29582a fix tabbing
Matt Johnston <matt@ucc.asn.au>
parents: 346
diff changeset
667 {
312
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
668 if (need_measurement)
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
669 {
320
cff7a4459dc9 Lots of it works now.
Matt Johnston <matt@ucc.asn.au>
parents: 319
diff changeset
670 need_measurement = 0;
312
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
671 do_measurement();
349
e7f070855a22 mostly works for testing
Matt Johnston <matt@ucc.asn.au>
parents: 347
diff changeset
672 continue;
312
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
673 }
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
674
333
298e502fdcd4 Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents: 332
diff changeset
675 if (have_cmd)
298e502fdcd4 Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents: 332
diff changeset
676 {
298e502fdcd4 Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents: 332
diff changeset
677 have_cmd = 0;
298e502fdcd4 Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents: 332
diff changeset
678 read_handler();
349
e7f070855a22 mostly works for testing
Matt Johnston <matt@ucc.asn.au>
parents: 347
diff changeset
679 continue;
333
298e502fdcd4 Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents: 332
diff changeset
680 }
298e502fdcd4 Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents: 332
diff changeset
681
322
840f51824254 untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents: 321
diff changeset
682 // wait for commands from the master
347
56f22e29582a fix tabbing
Matt Johnston <matt@ucc.asn.au>
parents: 346
diff changeset
683 idle_sleep();
56f22e29582a fix tabbing
Matt Johnston <matt@ucc.asn.au>
parents: 346
diff changeset
684 }
310
0a64532c1de1 Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents: 309
diff changeset
685
312
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
686 uart_off();
352
99f8b97a9449 Use the PRR etc, set value to proper ones
Matt Johnston <matt@ucc.asn.au>
parents: 349
diff changeset
687 // in case bluetooth takes time to flush
99f8b97a9449 Use the PRR etc, set value to proper ones
Matt Johnston <matt@ucc.asn.au>
parents: 349
diff changeset
688 _delay_ms(100);
322
840f51824254 untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents: 321
diff changeset
689 set_aux_power(0);
310
0a64532c1de1 Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents: 309
diff changeset
690 }
0a64532c1de1 Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents: 309
diff changeset
691
313
139ecb1840fd serial prints something
Matt Johnston <matt@ucc.asn.au>
parents: 312
diff changeset
692 static void
139ecb1840fd serial prints something
Matt Johnston <matt@ucc.asn.au>
parents: 312
diff changeset
693 blink()
139ecb1840fd serial prints something
Matt Johnston <matt@ucc.asn.au>
parents: 312
diff changeset
694 {
139ecb1840fd serial prints something
Matt Johnston <matt@ucc.asn.au>
parents: 312
diff changeset
695 PORT_LED &= ~_BV(PIN_LED);
315
7d409dded901 Import ds18x20 code
Matt Johnston <matt@ucc.asn.au>
parents: 314
diff changeset
696 _delay_ms(1);
313
139ecb1840fd serial prints something
Matt Johnston <matt@ucc.asn.au>
parents: 312
diff changeset
697 PORT_LED |= _BV(PIN_LED);
139ecb1840fd serial prints something
Matt Johnston <matt@ucc.asn.au>
parents: 312
diff changeset
698 }
139ecb1840fd serial prints something
Matt Johnston <matt@ucc.asn.au>
parents: 312
diff changeset
699
139ecb1840fd serial prints something
Matt Johnston <matt@ucc.asn.au>
parents: 312
diff changeset
700 static void
139ecb1840fd serial prints something
Matt Johnston <matt@ucc.asn.au>
parents: 312
diff changeset
701 long_delay(int ms)
139ecb1840fd serial prints something
Matt Johnston <matt@ucc.asn.au>
parents: 312
diff changeset
702 {
139ecb1840fd serial prints something
Matt Johnston <matt@ucc.asn.au>
parents: 312
diff changeset
703 int iter = ms / 100;
139ecb1840fd serial prints something
Matt Johnston <matt@ucc.asn.au>
parents: 312
diff changeset
704
139ecb1840fd serial prints something
Matt Johnston <matt@ucc.asn.au>
parents: 312
diff changeset
705 for (int i = 0; i < iter; i++)
139ecb1840fd serial prints something
Matt Johnston <matt@ucc.asn.au>
parents: 312
diff changeset
706 {
139ecb1840fd serial prints something
Matt Johnston <matt@ucc.asn.au>
parents: 312
diff changeset
707 _delay_ms(100);
139ecb1840fd serial prints something
Matt Johnston <matt@ucc.asn.au>
parents: 312
diff changeset
708 }
139ecb1840fd serial prints something
Matt Johnston <matt@ucc.asn.au>
parents: 312
diff changeset
709 }
139ecb1840fd serial prints something
Matt Johnston <matt@ucc.asn.au>
parents: 312
diff changeset
710
314
7aebb1452422 deep sleep works
Matt Johnston <matt@ucc.asn.au>
parents: 313
diff changeset
711 ISR(BADISR_vect)
7aebb1452422 deep sleep works
Matt Johnston <matt@ucc.asn.au>
parents: 313
diff changeset
712 {
320
cff7a4459dc9 Lots of it works now.
Matt Johnston <matt@ucc.asn.au>
parents: 319
diff changeset
713 //uart_on();
314
7aebb1452422 deep sleep works
Matt Johnston <matt@ucc.asn.au>
parents: 313
diff changeset
714 printf_P(PSTR("Bad interrupt\n"));
7aebb1452422 deep sleep works
Matt Johnston <matt@ucc.asn.au>
parents: 313
diff changeset
715 }
7aebb1452422 deep sleep works
Matt Johnston <matt@ucc.asn.au>
parents: 313
diff changeset
716
315
7d409dded901 Import ds18x20 code
Matt Johnston <matt@ucc.asn.au>
parents: 314
diff changeset
717
306
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
718 int main(void)
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
719 {
322
840f51824254 untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents: 321
diff changeset
720 setup_chip();
840f51824254 untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents: 321
diff changeset
721 blink();
315
7d409dded901 Import ds18x20 code
Matt Johnston <matt@ucc.asn.au>
parents: 314
diff changeset
722
322
840f51824254 untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents: 321
diff changeset
723 set_aux_power(0);
313
139ecb1840fd serial prints something
Matt Johnston <matt@ucc.asn.au>
parents: 312
diff changeset
724
312
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
725 stdout = &mystdout;
313
139ecb1840fd serial prints something
Matt Johnston <matt@ucc.asn.au>
parents: 312
diff changeset
726 uart_on();
139ecb1840fd serial prints something
Matt Johnston <matt@ucc.asn.au>
parents: 312
diff changeset
727
322
840f51824254 untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents: 321
diff changeset
728 printf(PSTR("Started.\n"));
319
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
729
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
730 check_first_startup();
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
731
314
7aebb1452422 deep sleep works
Matt Johnston <matt@ucc.asn.au>
parents: 313
diff changeset
732 uart_off();
306
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
733
312
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
734 // turn off everything except timer2
352
99f8b97a9449 Use the PRR etc, set value to proper ones
Matt Johnston <matt@ucc.asn.au>
parents: 349
diff changeset
735 PRR = _BV(PRTWI) | _BV(PRTIM0) | _BV(PRTIM1) | _BV(PRSPI) | _BV(PRUSART0) | _BV(PRADC);
314
7aebb1452422 deep sleep works
Matt Johnston <matt@ucc.asn.au>
parents: 313
diff changeset
736
7aebb1452422 deep sleep works
Matt Johnston <matt@ucc.asn.au>
parents: 313
diff changeset
737 // for testing
7aebb1452422 deep sleep works
Matt Johnston <matt@ucc.asn.au>
parents: 313
diff changeset
738 uart_on();
7aebb1452422 deep sleep works
Matt Johnston <matt@ucc.asn.au>
parents: 313
diff changeset
739
322
840f51824254 untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents: 321
diff changeset
740 setup_tick_counter();
840f51824254 untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents: 321
diff changeset
741
318
31199b2941f6 Add simple_ds18b20.c etc
Matt Johnston <matt@ucc.asn.au>
parents: 316
diff changeset
742 sei();
314
7aebb1452422 deep sleep works
Matt Johnston <matt@ucc.asn.au>
parents: 313
diff changeset
743
331
5de3fc71ce48 - Make the python work on openwrt
Matt Johnston <matt@ucc.asn.au>
parents: 330
diff changeset
744 need_comms = 1;
341
ccab04e2f601 - decrease measurement interval, measure at start
Matt Johnston <matt@ucc.asn.au>
parents: 339
diff changeset
745 need_measurement = 1;
331
5de3fc71ce48 - Make the python work on openwrt
Matt Johnston <matt@ucc.asn.au>
parents: 330
diff changeset
746
322
840f51824254 untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents: 321
diff changeset
747 for(;;)
840f51824254 untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents: 321
diff changeset
748 {
307
e50091063890 Some counter2 bits
Matt Johnston <matt@ucc.asn.au>
parents: 306
diff changeset
749 if (need_measurement)
e50091063890 Some counter2 bits
Matt Johnston <matt@ucc.asn.au>
parents: 306
diff changeset
750 {
320
cff7a4459dc9 Lots of it works now.
Matt Johnston <matt@ucc.asn.au>
parents: 319
diff changeset
751 need_measurement = 0;
307
e50091063890 Some counter2 bits
Matt Johnston <matt@ucc.asn.au>
parents: 306
diff changeset
752 do_measurement();
347
56f22e29582a fix tabbing
Matt Johnston <matt@ucc.asn.au>
parents: 346
diff changeset
753 continue;
307
e50091063890 Some counter2 bits
Matt Johnston <matt@ucc.asn.au>
parents: 306
diff changeset
754 }
310
0a64532c1de1 Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents: 309
diff changeset
755
0a64532c1de1 Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents: 309
diff changeset
756 if (need_comms)
0a64532c1de1 Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents: 309
diff changeset
757 {
322
840f51824254 untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents: 321
diff changeset
758 need_comms = 0;
310
0a64532c1de1 Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents: 309
diff changeset
759 do_comms();
347
56f22e29582a fix tabbing
Matt Johnston <matt@ucc.asn.au>
parents: 346
diff changeset
760 continue;
310
0a64532c1de1 Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents: 309
diff changeset
761 }
0a64532c1de1 Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents: 309
diff changeset
762
347
56f22e29582a fix tabbing
Matt Johnston <matt@ucc.asn.au>
parents: 346
diff changeset
763 deep_sleep();
352
99f8b97a9449 Use the PRR etc, set value to proper ones
Matt Johnston <matt@ucc.asn.au>
parents: 349
diff changeset
764 if (clock_epoch % 60 == 0)
99f8b97a9449 Use the PRR etc, set value to proper ones
Matt Johnston <matt@ucc.asn.au>
parents: 349
diff changeset
765 {
99f8b97a9449 Use the PRR etc, set value to proper ones
Matt Johnston <matt@ucc.asn.au>
parents: 349
diff changeset
766 blink();
99f8b97a9449 Use the PRR etc, set value to proper ones
Matt Johnston <matt@ucc.asn.au>
parents: 349
diff changeset
767 }
306
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
768 }
318
31199b2941f6 Add simple_ds18b20.c etc
Matt Johnston <matt@ucc.asn.au>
parents: 316
diff changeset
769
306
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
770 return 0; /* never reached */
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
771 }