annotate main.c @ 320:cff7a4459dc9

Lots of it works now.
author Matt Johnston <matt@ucc.asn.au>
date Sun, 20 May 2012 00:36:52 +0800
parents 9621436cfa07
children 54b0fda9cba7
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 /* Name: main.c
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
2 * Author: <insert your name here>
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
3 * Copyright: <insert your copyright message here>
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
4 * License: <insert your license reference here>
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
5 */
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
6
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
7 #include <stdio.h>
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
8 #include <string.h>
319
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
9 #include <stddef.h>
307
e50091063890 Some counter2 bits
Matt Johnston <matt@ucc.asn.au>
parents: 306
diff changeset
10 #include <avr/io.h>
e50091063890 Some counter2 bits
Matt Johnston <matt@ucc.asn.au>
parents: 306
diff changeset
11 #include <avr/interrupt.h>
e50091063890 Some counter2 bits
Matt Johnston <matt@ucc.asn.au>
parents: 306
diff changeset
12 #include <avr/sleep.h>
313
139ecb1840fd serial prints something
Matt Johnston <matt@ucc.asn.au>
parents: 312
diff changeset
13 #include <util/delay.h>
312
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
14 #include <avr/pgmspace.h>
319
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
15 #include <avr/eeprom.h>
306
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
16 #include <util/crc16.h>
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
17
318
31199b2941f6 Add simple_ds18b20.c etc
Matt Johnston <matt@ucc.asn.au>
parents: 316
diff changeset
18 // for DWORD of get_fattime()
309
49e83333e546 Add FatFS
Matt Johnston <matt@ucc.asn.au>
parents: 308
diff changeset
19 #include "integer.h"
318
31199b2941f6 Add simple_ds18b20.c etc
Matt Johnston <matt@ucc.asn.au>
parents: 316
diff changeset
20
31199b2941f6 Add simple_ds18b20.c etc
Matt Johnston <matt@ucc.asn.au>
parents: 316
diff changeset
21 #include "simple_ds18b20.h"
319
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
22 #include "onewire.h"
309
49e83333e546 Add FatFS
Matt Johnston <matt@ucc.asn.au>
parents: 308
diff changeset
23
306
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
24 // configuration params
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
25 // - measurement interval
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
26 // - transmit interval
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
27 // - bluetooth params
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
28 // - number of sensors (and range?)
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
29
307
e50091063890 Some counter2 bits
Matt Johnston <matt@ucc.asn.au>
parents: 306
diff changeset
30 // 1 second. we have 1024 prescaler, 32768 crystal.
308
e36ee3e156c1 switch to atmega328
Matt Johnston <matt@ucc.asn.au>
parents: 307
diff changeset
31 #define SLEEP_COMPARE 32
320
cff7a4459dc9 Lots of it works now.
Matt Johnston <matt@ucc.asn.au>
parents: 319
diff changeset
32 #define MEASURE_WAKE 10
310
0a64532c1de1 Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents: 309
diff changeset
33
319
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
34 #define VALUE_NOSENSOR -9000
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
35 #define VALUE_BROKEN -8000
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
36
310
0a64532c1de1 Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents: 309
diff changeset
37 #define COMMS_WAKE 3600
308
e36ee3e156c1 switch to atmega328
Matt Johnston <matt@ucc.asn.au>
parents: 307
diff changeset
38
316
8f32eb67a279 reading DS18B20 works
Matt Johnston <matt@ucc.asn.au>
parents: 315
diff changeset
39 #define BAUD 19200
313
139ecb1840fd serial prints something
Matt Johnston <matt@ucc.asn.au>
parents: 312
diff changeset
40 #define UBRR ((F_CPU)/8/(BAUD)-1)
139ecb1840fd serial prints something
Matt Johnston <matt@ucc.asn.au>
parents: 312
diff changeset
41
139ecb1840fd serial prints something
Matt Johnston <matt@ucc.asn.au>
parents: 312
diff changeset
42 #define PORT_LED PORTC
139ecb1840fd serial prints something
Matt Johnston <matt@ucc.asn.au>
parents: 312
diff changeset
43 #define DDR_LED DDRC
139ecb1840fd serial prints something
Matt Johnston <matt@ucc.asn.au>
parents: 312
diff changeset
44 #define PIN_LED PC4
307
e50091063890 Some counter2 bits
Matt Johnston <matt@ucc.asn.au>
parents: 306
diff changeset
45
319
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
46 #define NUM_MEASUREMENTS 100
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
47 #define MAX_SENSORS 5
312
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
48
316
8f32eb67a279 reading DS18B20 works
Matt Johnston <matt@ucc.asn.au>
parents: 315
diff changeset
49 int uart_putchar(char c, FILE *stream);
320
cff7a4459dc9 Lots of it works now.
Matt Johnston <matt@ucc.asn.au>
parents: 319
diff changeset
50 static void long_delay(int ms);
cff7a4459dc9 Lots of it works now.
Matt Johnston <matt@ucc.asn.au>
parents: 319
diff changeset
51
306
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
52 static FILE mystdout = FDEV_SETUP_STREAM(uart_putchar, NULL,
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
53 _FDEV_SETUP_WRITE);
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
54
319
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
55 static uint16_t n_measurements = 0;
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
56 // stored as decidegrees
320
cff7a4459dc9 Lots of it works now.
Matt Johnston <matt@ucc.asn.au>
parents: 319
diff changeset
57 static int16_t measurements[NUM_MEASUREMENTS][MAX_SENSORS];
306
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
58
310
0a64532c1de1 Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents: 309
diff changeset
59 // boolean flags
313
139ecb1840fd serial prints something
Matt Johnston <matt@ucc.asn.au>
parents: 312
diff changeset
60 static uint8_t need_measurement = 0;
139ecb1840fd serial prints something
Matt Johnston <matt@ucc.asn.au>
parents: 312
diff changeset
61 static uint8_t need_comms = 0;
139ecb1840fd serial prints something
Matt Johnston <matt@ucc.asn.au>
parents: 312
diff changeset
62 static uint8_t comms_done = 0;
307
e50091063890 Some counter2 bits
Matt Johnston <matt@ucc.asn.au>
parents: 306
diff changeset
63
313
139ecb1840fd serial prints something
Matt Johnston <matt@ucc.asn.au>
parents: 312
diff changeset
64 static uint8_t readpos = 0;
306
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
65 static char readbuf[30];
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
66
313
139ecb1840fd serial prints something
Matt Johnston <matt@ucc.asn.au>
parents: 312
diff changeset
67 static uint8_t measure_count = 0;
139ecb1840fd serial prints something
Matt Johnston <matt@ucc.asn.au>
parents: 312
diff changeset
68 static uint16_t comms_count = 0;
310
0a64532c1de1 Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents: 309
diff changeset
69
319
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
70 // 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
71 #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
72 #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
73 #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
74 #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
75
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
76 #define EXPECT_MAGIC 0x67c9
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
77
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
78 struct __attribute__ ((__packed__)) __eeprom_data {
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
79 uint16_t magic;
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
80 uint8_t n_sensors;
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
81 uint8_t sensor_id[MAX_SENSORS][8];
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
82 };
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
83
314
7aebb1452422 deep sleep works
Matt Johnston <matt@ucc.asn.au>
parents: 313
diff changeset
84 #define DEBUG(str) printf_P(PSTR(str))
7aebb1452422 deep sleep works
Matt Johnston <matt@ucc.asn.au>
parents: 313
diff changeset
85
310
0a64532c1de1 Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents: 309
diff changeset
86 static void deep_sleep();
307
e50091063890 Some counter2 bits
Matt Johnston <matt@ucc.asn.au>
parents: 306
diff changeset
87
306
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
88 static void
313
139ecb1840fd serial prints something
Matt Johnston <matt@ucc.asn.au>
parents: 312
diff changeset
89 uart_on()
306
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
90 {
314
7aebb1452422 deep sleep works
Matt Johnston <matt@ucc.asn.au>
parents: 313
diff changeset
91 // Power reduction register
7aebb1452422 deep sleep works
Matt Johnston <matt@ucc.asn.au>
parents: 313
diff changeset
92 //PRR &= ~_BV(PRUSART0);
7aebb1452422 deep sleep works
Matt Johnston <matt@ucc.asn.au>
parents: 313
diff changeset
93
306
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
94 // baud rate
313
139ecb1840fd serial prints something
Matt Johnston <matt@ucc.asn.au>
parents: 312
diff changeset
95 UBRR0H = (unsigned char)(UBRR >> 8);
139ecb1840fd serial prints something
Matt Johnston <matt@ucc.asn.au>
parents: 312
diff changeset
96 UBRR0L = (unsigned char)UBRR;
139ecb1840fd serial prints something
Matt Johnston <matt@ucc.asn.au>
parents: 312
diff changeset
97 // set 2x clock, improves accuracy of UBRR
139ecb1840fd serial prints something
Matt Johnston <matt@ucc.asn.au>
parents: 312
diff changeset
98 UCSR0A |= _BV(U2X0);
312
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
99 UCSR0B = _BV(RXCIE0) | _BV(RXEN0) | _BV(TXEN0);
306
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
100 //8N1
313
139ecb1840fd serial prints something
Matt Johnston <matt@ucc.asn.au>
parents: 312
diff changeset
101 UCSR0C = _BV(UCSZ01) | _BV(UCSZ00);
312
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
102 }
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
103
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
104 static void
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
105 uart_off()
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
106 {
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
107 // Turn of interrupts and disable tx/rx
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
108 UCSR0B = 0;
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
109
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
110 // Power reduction register
314
7aebb1452422 deep sleep works
Matt Johnston <matt@ucc.asn.au>
parents: 313
diff changeset
111 //PRR |= _BV(PRUSART0);
306
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
112 }
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
113
316
8f32eb67a279 reading DS18B20 works
Matt Johnston <matt@ucc.asn.au>
parents: 315
diff changeset
114 int
306
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
115 uart_putchar(char c, FILE *stream)
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
116 {
316
8f32eb67a279 reading DS18B20 works
Matt Johnston <matt@ucc.asn.au>
parents: 315
diff changeset
117 // XXX should sleep in the loop for power.
314
7aebb1452422 deep sleep works
Matt Johnston <matt@ucc.asn.au>
parents: 313
diff changeset
118 if (c == '\n')
7aebb1452422 deep sleep works
Matt Johnston <matt@ucc.asn.au>
parents: 313
diff changeset
119 {
316
8f32eb67a279 reading DS18B20 works
Matt Johnston <matt@ucc.asn.au>
parents: 315
diff changeset
120 loop_until_bit_is_set(UCSR0A, UDRE0);
8f32eb67a279 reading DS18B20 works
Matt Johnston <matt@ucc.asn.au>
parents: 315
diff changeset
121 UDR0 = '\r';;
314
7aebb1452422 deep sleep works
Matt Johnston <matt@ucc.asn.au>
parents: 313
diff changeset
122 }
308
e36ee3e156c1 switch to atmega328
Matt Johnston <matt@ucc.asn.au>
parents: 307
diff changeset
123 loop_until_bit_is_set(UCSR0A, UDRE0);
e36ee3e156c1 switch to atmega328
Matt Johnston <matt@ucc.asn.au>
parents: 307
diff changeset
124 UDR0 = c;
316
8f32eb67a279 reading DS18B20 works
Matt Johnston <matt@ucc.asn.au>
parents: 315
diff changeset
125 if (c == '\r')
8f32eb67a279 reading DS18B20 works
Matt Johnston <matt@ucc.asn.au>
parents: 315
diff changeset
126 {
8f32eb67a279 reading DS18B20 works
Matt Johnston <matt@ucc.asn.au>
parents: 315
diff changeset
127 loop_until_bit_is_set(UCSR0A, UDRE0);
8f32eb67a279 reading DS18B20 works
Matt Johnston <matt@ucc.asn.au>
parents: 315
diff changeset
128 UDR0 = '\n';;
8f32eb67a279 reading DS18B20 works
Matt Johnston <matt@ucc.asn.au>
parents: 315
diff changeset
129 }
306
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
130 return 0;
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
131 }
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
132
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
133 static void
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
134 cmd_fetch()
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
135 {
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
136 uint16_t crc = 0;
320
cff7a4459dc9 Lots of it works now.
Matt Johnston <matt@ucc.asn.au>
parents: 319
diff changeset
137 uint8_t sens;
319
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
138 eeprom_read(sens, n_sensors);
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
139
312
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
140 printf_P(PSTR("%d measurements\n"), n_measurements);
320
cff7a4459dc9 Lots of it works now.
Matt Johnston <matt@ucc.asn.au>
parents: 319
diff changeset
141 for (uint16_t n = 0; n < n_measurements; n++)
306
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
142 {
320
cff7a4459dc9 Lots of it works now.
Matt Johnston <matt@ucc.asn.au>
parents: 319
diff changeset
143 printf_P(PSTR("%3d :"), n);
319
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
144 for (uint8_t s = 0; s < sens; s++)
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
145 {
320
cff7a4459dc9 Lots of it works now.
Matt Johnston <matt@ucc.asn.au>
parents: 319
diff changeset
146 printf_P(PSTR(" %6d"), measurements[n][s]);
cff7a4459dc9 Lots of it works now.
Matt Johnston <matt@ucc.asn.au>
parents: 319
diff changeset
147 crc = _crc_ccitt_update(crc, measurements[n][s]);
319
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
148 }
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
149 putchar('\n');
306
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
150 }
312
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
151 printf_P(PSTR("CRC : %d\n"), crc);
306
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
152 }
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
153
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
154 static void
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
155 cmd_clear()
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
156 {
313
139ecb1840fd serial prints something
Matt Johnston <matt@ucc.asn.au>
parents: 312
diff changeset
157 n_measurements = 0;
139ecb1840fd serial prints something
Matt Johnston <matt@ucc.asn.au>
parents: 312
diff changeset
158 printf_P(PSTR("Cleared\n"));
306
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
159 }
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
160
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
161 static void
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
162 cmd_btoff()
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
163 {
313
139ecb1840fd serial prints something
Matt Johnston <matt@ucc.asn.au>
parents: 312
diff changeset
164 printf_P(PSTR("Turning off\n"));
139ecb1840fd serial prints something
Matt Johnston <matt@ucc.asn.au>
parents: 312
diff changeset
165 _delay_ms(50);
310
0a64532c1de1 Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents: 309
diff changeset
166 comms_done = 1;
306
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
167 }
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
168
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
169 static void
318
31199b2941f6 Add simple_ds18b20.c etc
Matt Johnston <matt@ucc.asn.au>
parents: 316
diff changeset
170 cmd_measure()
31199b2941f6 Add simple_ds18b20.c etc
Matt Johnston <matt@ucc.asn.au>
parents: 316
diff changeset
171 {
31199b2941f6 Add simple_ds18b20.c etc
Matt Johnston <matt@ucc.asn.au>
parents: 316
diff changeset
172 printf_P(PSTR("Measuring\n"));
31199b2941f6 Add simple_ds18b20.c etc
Matt Johnston <matt@ucc.asn.au>
parents: 316
diff changeset
173 need_measurement = 1;
31199b2941f6 Add simple_ds18b20.c etc
Matt Johnston <matt@ucc.asn.au>
parents: 316
diff changeset
174 }
31199b2941f6 Add simple_ds18b20.c etc
Matt Johnston <matt@ucc.asn.au>
parents: 316
diff changeset
175
31199b2941f6 Add simple_ds18b20.c etc
Matt Johnston <matt@ucc.asn.au>
parents: 316
diff changeset
176 static void
31199b2941f6 Add simple_ds18b20.c etc
Matt Johnston <matt@ucc.asn.au>
parents: 316
diff changeset
177 cmd_sensors()
31199b2941f6 Add simple_ds18b20.c etc
Matt Johnston <matt@ucc.asn.au>
parents: 316
diff changeset
178 {
31199b2941f6 Add simple_ds18b20.c etc
Matt Johnston <matt@ucc.asn.au>
parents: 316
diff changeset
179 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
180 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
181 long_delay(DS18B20_TCONV_12BIT);
318
31199b2941f6 Add simple_ds18b20.c etc
Matt Johnston <matt@ucc.asn.au>
parents: 316
diff changeset
182 simple_ds18b20_read_all();
31199b2941f6 Add simple_ds18b20.c etc
Matt Johnston <matt@ucc.asn.au>
parents: 316
diff changeset
183 }
31199b2941f6 Add simple_ds18b20.c etc
Matt Johnston <matt@ucc.asn.au>
parents: 316
diff changeset
184
319
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
185 // 0 on success
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
186 static uint8_t
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
187 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
188 {
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
189 uint8_t upper;
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
190 uint8_t o;
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
191 for (uint8_t i = 0, z = 0; o < size; i++)
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
192 {
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
193 uint8_t h = hex[i];
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
194 if (h >= 'A' && h <= 'F')
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
195 {
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
196 // lower case
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
197 h += 0x20;
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
198 }
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
199 uint8_t nibble;
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
200 if (h >= '0' && h <= '9')
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
201 {
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
202 nibble = h - '0';
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
203 }
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
204 else if (h >= 'a' && h <= 'f')
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
205 {
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
206 nibble = 10 + h - 'a';
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
207 }
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
208 else if (h == ' ' || h == ':')
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
209 {
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
210 continue;
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
211 }
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
212 else
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
213 {
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
214 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
215 return 1;
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
216 }
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
217
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
218 if (z % 2 == 0)
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
219 {
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
220 upper = nibble << 4;
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
221 }
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
222 else
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
223 {
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
224 out[o] = upper | nibble;
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
225 o++;
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
226 }
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
227
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
228 z++;
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
229 }
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
230
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
231 if (o != size)
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
232 {
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
233 printf_P(PSTR("Short hex\n"));
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
234 return 1;
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
235 }
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
236 return 0;
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
237 }
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
238
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
239 static void
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
240 add_sensor(uint8_t *id)
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
241 {
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
242 uint8_t n;
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
243 eeprom_read(n, n_sensors);
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
244 if (n < MAX_SENSORS)
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
245 {
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
246 cli();
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
247 eeprom_write_from(id, sensor_id[n], 8);
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
248 n++;
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
249 eeprom_write(n, n_sensors);
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
250 sei();
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
251 printf_P(PSTR("Added sensor %d : "), n);
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
252 printhex(id, 8);
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
253 putchar('\n');
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
254 }
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
255 else
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
256 {
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
257 printf_P(PSTR("Too many sensors\n"));
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
258 }
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
259 }
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
260
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
261 static void
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
262 cmd_add_all()
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
263 {
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
264 uint8_t id[OW_ROMCODE_SIZE];
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
265 printf_P("Adding all\n");
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
266 ow_reset();
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
267 for( uint8_t diff = OW_SEARCH_FIRST; diff != OW_LAST_DEVICE; )
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
268 {
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
269 diff = ow_rom_search( diff, &id[0] );
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
270 if( diff == OW_PRESENCE_ERR ) {
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
271 printf_P( PSTR("No Sensor found\r") );
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
272 return;
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
273 }
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
274
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
275 if( diff == OW_DATA_ERR ) {
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
276 printf_P( PSTR("Bus Error\r") );
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
277 return;
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
278 }
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
279 add_sensor(id);
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
280 }
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
281 }
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
282
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
283 static void
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
284 cmd_add_sensor(const char* hex_addr)
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
285 {
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
286 uint8_t id[8];
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
287 uint8_t ret = get_hex_string(hex_addr, id, 8);
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
288 if (ret)
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
289 {
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
290 return;
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
291 }
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
292 add_sensor(id);
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
293
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
294 }
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
295
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
296 static void
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
297 cmd_init()
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
298 {
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
299 printf_P(PSTR("Resetting sensor list\n"));
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
300 uint8_t zero = 0;
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
301 cli();
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
302 eeprom_write(zero, n_sensors);
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
303 sei();
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
304 printf_P(PSTR("Done.\n"));
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
305 }
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 static void
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
308 check_first_startup()
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 uint16_t magic;
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
311 eeprom_read(magic, magic);
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
312 if (magic != EXPECT_MAGIC)
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
313 {
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
314 printf_P(PSTR("First boot, looking for sensors...\n"));
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
315 cmd_init();
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
316 cmd_add_all();
320
cff7a4459dc9 Lots of it works now.
Matt Johnston <matt@ucc.asn.au>
parents: 319
diff changeset
317 cli();
cff7a4459dc9 Lots of it works now.
Matt Johnston <matt@ucc.asn.au>
parents: 319
diff changeset
318 magic = EXPECT_MAGIC;
cff7a4459dc9 Lots of it works now.
Matt Johnston <matt@ucc.asn.au>
parents: 319
diff changeset
319 eeprom_write(magic, magic);
cff7a4459dc9 Lots of it works now.
Matt Johnston <matt@ucc.asn.au>
parents: 319
diff changeset
320 sei();
319
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 }
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
323
318
31199b2941f6 Add simple_ds18b20.c etc
Matt Johnston <matt@ucc.asn.au>
parents: 316
diff changeset
324 static void
306
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
325 read_handler()
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
326 {
312
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
327 if (strcmp_P(readbuf, PSTR("fetch")) == 0)
306
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
328 {
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
329 cmd_fetch();
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
330 }
312
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
331 else if (strcmp_P(readbuf, PSTR("clear")) == 0)
306
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
332 {
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
333 cmd_clear();
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
334 }
312
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
335 else if (strcmp_P(readbuf, PSTR("btoff")) == 0)
306
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
336 {
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
337 cmd_btoff();
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
338 }
318
31199b2941f6 Add simple_ds18b20.c etc
Matt Johnston <matt@ucc.asn.au>
parents: 316
diff changeset
339 else if (strcmp_P(readbuf, PSTR("measure")) == 0)
31199b2941f6 Add simple_ds18b20.c etc
Matt Johnston <matt@ucc.asn.au>
parents: 316
diff changeset
340 {
31199b2941f6 Add simple_ds18b20.c etc
Matt Johnston <matt@ucc.asn.au>
parents: 316
diff changeset
341 cmd_measure();
31199b2941f6 Add simple_ds18b20.c etc
Matt Johnston <matt@ucc.asn.au>
parents: 316
diff changeset
342 }
31199b2941f6 Add simple_ds18b20.c etc
Matt Johnston <matt@ucc.asn.au>
parents: 316
diff changeset
343 else if (strcmp_P(readbuf, PSTR("sensors")) == 0)
31199b2941f6 Add simple_ds18b20.c etc
Matt Johnston <matt@ucc.asn.au>
parents: 316
diff changeset
344 {
31199b2941f6 Add simple_ds18b20.c etc
Matt Johnston <matt@ucc.asn.au>
parents: 316
diff changeset
345 cmd_sensors();
31199b2941f6 Add simple_ds18b20.c etc
Matt Johnston <matt@ucc.asn.au>
parents: 316
diff changeset
346 }
319
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
347 else if (strncmp_P(readbuf, PSTR("adds "), strlen("adds ")) == 0)
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
348 {
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
349 cmd_add_sensor(readbuf + strlen("adds "));
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
350 }
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
351 else if (strcmp_P(readbuf, PSTR("addall"))== 0)
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
352 {
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
353 cmd_add_all();
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
354 }
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
355 else if (strcmp_P(readbuf, PSTR("init")) == 0)
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 cmd_init();
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
358 }
306
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
359 else
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
360 {
312
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
361 printf_P(PSTR("Bad command\n"));
306
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
362 }
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
363 }
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
364
308
e36ee3e156c1 switch to atmega328
Matt Johnston <matt@ucc.asn.au>
parents: 307
diff changeset
365 ISR(USART_RX_vect)
306
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
366 {
308
e36ee3e156c1 switch to atmega328
Matt Johnston <matt@ucc.asn.au>
parents: 307
diff changeset
367 char c = UDR0;
318
31199b2941f6 Add simple_ds18b20.c etc
Matt Johnston <matt@ucc.asn.au>
parents: 316
diff changeset
368 uart_putchar(c, NULL);
31199b2941f6 Add simple_ds18b20.c etc
Matt Johnston <matt@ucc.asn.au>
parents: 316
diff changeset
369 if (c == '\r')
306
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
370 {
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
371 readbuf[readpos] = '\0';
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
372 read_handler();
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
373 readpos = 0;
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
374 }
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
375 else
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
376 {
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
377 readbuf[readpos] = c;
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
378 readpos++;
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
379 if (readpos >= sizeof(readbuf))
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
380 {
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
381 readpos = 0;
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
382 }
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
383 }
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
384 }
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
385
308
e36ee3e156c1 switch to atmega328
Matt Johnston <matt@ucc.asn.au>
parents: 307
diff changeset
386 ISR(TIMER2_COMPA_vect)
307
e50091063890 Some counter2 bits
Matt Johnston <matt@ucc.asn.au>
parents: 306
diff changeset
387 {
320
cff7a4459dc9 Lots of it works now.
Matt Johnston <matt@ucc.asn.au>
parents: 319
diff changeset
388 TCNT2 = 0;
310
0a64532c1de1 Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents: 309
diff changeset
389 measure_count ++;
0a64532c1de1 Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents: 309
diff changeset
390 comms_count ++;
318
31199b2941f6 Add simple_ds18b20.c etc
Matt Johnston <matt@ucc.asn.au>
parents: 316
diff changeset
391 printf("measure_count %d\n", measure_count);
320
cff7a4459dc9 Lots of it works now.
Matt Johnston <matt@ucc.asn.au>
parents: 319
diff changeset
392 if (measure_count >= MEASURE_WAKE)
307
e50091063890 Some counter2 bits
Matt Johnston <matt@ucc.asn.au>
parents: 306
diff changeset
393 {
310
0a64532c1de1 Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents: 309
diff changeset
394 measure_count = 0;
318
31199b2941f6 Add simple_ds18b20.c etc
Matt Johnston <matt@ucc.asn.au>
parents: 316
diff changeset
395 printf("need_measurement = 1\n");
307
e50091063890 Some counter2 bits
Matt Johnston <matt@ucc.asn.au>
parents: 306
diff changeset
396 need_measurement = 1;
e50091063890 Some counter2 bits
Matt Johnston <matt@ucc.asn.au>
parents: 306
diff changeset
397 }
310
0a64532c1de1 Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents: 309
diff changeset
398
0a64532c1de1 Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents: 309
diff changeset
399 if (comms_count == COMMS_WAKE)
0a64532c1de1 Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents: 309
diff changeset
400 {
0a64532c1de1 Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents: 309
diff changeset
401 comms_count = 0;
0a64532c1de1 Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents: 309
diff changeset
402 need_comms = 1;
0a64532c1de1 Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents: 309
diff changeset
403 }
307
e50091063890 Some counter2 bits
Matt Johnston <matt@ucc.asn.au>
parents: 306
diff changeset
404 }
e50091063890 Some counter2 bits
Matt Johnston <matt@ucc.asn.au>
parents: 306
diff changeset
405
309
49e83333e546 Add FatFS
Matt Johnston <matt@ucc.asn.au>
parents: 308
diff changeset
406 DWORD get_fattime (void)
49e83333e546 Add FatFS
Matt Johnston <matt@ucc.asn.au>
parents: 308
diff changeset
407 {
49e83333e546 Add FatFS
Matt Johnston <matt@ucc.asn.au>
parents: 308
diff changeset
408 return 0;
49e83333e546 Add FatFS
Matt Johnston <matt@ucc.asn.au>
parents: 308
diff changeset
409 }
49e83333e546 Add FatFS
Matt Johnston <matt@ucc.asn.au>
parents: 308
diff changeset
410
307
e50091063890 Some counter2 bits
Matt Johnston <matt@ucc.asn.au>
parents: 306
diff changeset
411 static void
e50091063890 Some counter2 bits
Matt Johnston <matt@ucc.asn.au>
parents: 306
diff changeset
412 deep_sleep()
e50091063890 Some counter2 bits
Matt Johnston <matt@ucc.asn.au>
parents: 306
diff changeset
413 {
e50091063890 Some counter2 bits
Matt Johnston <matt@ucc.asn.au>
parents: 306
diff changeset
414 // p119 of manual
308
e36ee3e156c1 switch to atmega328
Matt Johnston <matt@ucc.asn.au>
parents: 307
diff changeset
415 OCR2A = SLEEP_COMPARE;
e36ee3e156c1 switch to atmega328
Matt Johnston <matt@ucc.asn.au>
parents: 307
diff changeset
416 loop_until_bit_is_clear(ASSR, OCR2AUB);
307
e50091063890 Some counter2 bits
Matt Johnston <matt@ucc.asn.au>
parents: 306
diff changeset
417
e50091063890 Some counter2 bits
Matt Johnston <matt@ucc.asn.au>
parents: 306
diff changeset
418 set_sleep_mode(SLEEP_MODE_PWR_SAVE);
e50091063890 Some counter2 bits
Matt Johnston <matt@ucc.asn.au>
parents: 306
diff changeset
419 sleep_mode();
e50091063890 Some counter2 bits
Matt Johnston <matt@ucc.asn.au>
parents: 306
diff changeset
420 }
e50091063890 Some counter2 bits
Matt Johnston <matt@ucc.asn.au>
parents: 306
diff changeset
421
e50091063890 Some counter2 bits
Matt Johnston <matt@ucc.asn.au>
parents: 306
diff changeset
422 static void
310
0a64532c1de1 Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents: 309
diff changeset
423 idle_sleep()
0a64532c1de1 Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents: 309
diff changeset
424 {
0a64532c1de1 Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents: 309
diff changeset
425 set_sleep_mode(SLEEP_MODE_IDLE);
0a64532c1de1 Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents: 309
diff changeset
426 sleep_mode();
0a64532c1de1 Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents: 309
diff changeset
427 }
0a64532c1de1 Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents: 309
diff changeset
428
320
cff7a4459dc9 Lots of it works now.
Matt Johnston <matt@ucc.asn.au>
parents: 319
diff changeset
429 #if 0
cff7a4459dc9 Lots of it works now.
Matt Johnston <matt@ucc.asn.au>
parents: 319
diff changeset
430 // untested
312
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
431 static void
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
432 do_adc_335()
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
433 {
314
7aebb1452422 deep sleep works
Matt Johnston <matt@ucc.asn.au>
parents: 313
diff changeset
434 //PRR &= ~_BV(PRADC);
312
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
435
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
436 ADMUX = _BV(ADLAR);
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
437
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
438 // ADPS2 = /16 prescaler, 62khz at 1mhz clock
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
439 ADCSRA = _BV(ADEN) | _BV(ADPS2);
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
440
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
441 // measure value
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
442 ADCSRA |= _BV(ADSC);
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
443 loop_until_bit_is_clear(ADCSRA, ADSC);
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
444 uint8_t low = ADCL;
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
445 uint8_t high = ADCH;
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
446 uint16_t f_measure = low + (high << 8);
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
447
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
448 // set to measure 1.1 reference
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
449 ADMUX = _BV(ADLAR) | _BV(MUX3) | _BV(MUX2) | _BV(MUX1);
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
450 ADCSRA |= _BV(ADSC);
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
451 loop_until_bit_is_clear(ADCSRA, ADSC);
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
452 uint8_t low_11 = ADCL;
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
453 uint8_t high_11 = ADCH;
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
454 uint16_t f_11 = low_11 + (high_11 << 8);
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
455
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
456 float res_volts = 1.1 * f_measure / f_11;
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
457
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
458 // 10mV/degree
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
459 // scale to 1/5 degree units above 0C
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
460 int temp = (res_volts - 2.73) * 500;
319
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
461 // XXX fixme
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
462 //measurements[n_measurements] = temp;
312
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
463 // XXX something if it hits the limit
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
464
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
465 // measure AVR internal temperature against 1.1 ref.
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
466 ADMUX = _BV(ADLAR) | _BV(MUX3) | _BV(REFS1) | _BV(REFS0);
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
467 ADCSRA |= _BV(ADSC);
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
468 loop_until_bit_is_clear(ADCSRA, ADSC);
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
469 uint16_t res_internal = ADCL;
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
470 res_internal |= ADCH << 8;
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
471
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
472 float internal_volts = res_internal * (1.1 / 1024.0);
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
473
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
474 // 1mV/degree
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
475 int internal_temp = (internal_volts - 2.73) * 5000;
319
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
476 // XXX fixme
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
477 //internal_measurements[n_measurements] = internal_temp;
312
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
478
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
479 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
480 n_measurements, temp, internal_temp, f_11);
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
481
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
482 n_measurements++;
314
7aebb1452422 deep sleep works
Matt Johnston <matt@ucc.asn.au>
parents: 313
diff changeset
483 //PRR |= _BV(PRADC);
312
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
484 }
320
cff7a4459dc9 Lots of it works now.
Matt Johnston <matt@ucc.asn.au>
parents: 319
diff changeset
485 #endif
312
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
486
310
0a64532c1de1 Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents: 309
diff changeset
487 static void
307
e50091063890 Some counter2 bits
Matt Johnston <matt@ucc.asn.au>
parents: 306
diff changeset
488 do_measurement()
e50091063890 Some counter2 bits
Matt Johnston <matt@ucc.asn.au>
parents: 306
diff changeset
489 {
319
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
490 uint8_t n_sensors;
320
cff7a4459dc9 Lots of it works now.
Matt Johnston <matt@ucc.asn.au>
parents: 319
diff changeset
491 printf("do_measurement\n");
319
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
492 eeprom_read(n_sensors, n_sensors);
320
cff7a4459dc9 Lots of it works now.
Matt Johnston <matt@ucc.asn.au>
parents: 319
diff changeset
493 printf("do_measurement sensors %d\n", n_sensors);
319
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
494
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
495 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
496 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
497 _delay_ms(DS18B20_TCONV_12BIT);
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
498
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
499 if (n_measurements == NUM_MEASUREMENTS)
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
500 {
320
cff7a4459dc9 Lots of it works now.
Matt Johnston <matt@ucc.asn.au>
parents: 319
diff changeset
501 printf_P(PSTR("Measurements .overflow\n"));
319
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
502 n_measurements = 0;
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
503 }
312
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
504
320
cff7a4459dc9 Lots of it works now.
Matt Johnston <matt@ucc.asn.au>
parents: 319
diff changeset
505 for (uint8_t s = 0; s < MAX_SENSORS; s++)
319
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
506 {
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
507 int16_t decicelsius;
320
cff7a4459dc9 Lots of it works now.
Matt Johnston <matt@ucc.asn.au>
parents: 319
diff changeset
508 if (s >= n_sensors)
319
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
509 {
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
510 decicelsius = VALUE_NOSENSOR;
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
511 }
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
512 else
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
513 {
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
514 uint8_t id[8];
320
cff7a4459dc9 Lots of it works now.
Matt Johnston <matt@ucc.asn.au>
parents: 319
diff changeset
515 eeprom_read_to(id, sensor_id[s], 8);
319
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
516
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
517 uint8_t ret = simple_ds18b20_read_decicelsius(id, &decicelsius);
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
518 if (ret != DS18X20_OK)
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
519 {
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
520 decicelsius = VALUE_BROKEN;
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
521 }
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
522 }
320
cff7a4459dc9 Lots of it works now.
Matt Johnston <matt@ucc.asn.au>
parents: 319
diff changeset
523 measurements[n_measurements][s] = decicelsius;
319
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
524 }
320
cff7a4459dc9 Lots of it works now.
Matt Johnston <matt@ucc.asn.au>
parents: 319
diff changeset
525 n_measurements++;
318
31199b2941f6 Add simple_ds18b20.c etc
Matt Johnston <matt@ucc.asn.au>
parents: 316
diff changeset
526 //do_adc_335();
307
e50091063890 Some counter2 bits
Matt Johnston <matt@ucc.asn.au>
parents: 306
diff changeset
527 }
e50091063890 Some counter2 bits
Matt Johnston <matt@ucc.asn.au>
parents: 306
diff changeset
528
310
0a64532c1de1 Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents: 309
diff changeset
529 static void
0a64532c1de1 Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents: 309
diff changeset
530 do_comms()
0a64532c1de1 Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents: 309
diff changeset
531 {
0a64532c1de1 Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents: 309
diff changeset
532 need_comms = 0;
0a64532c1de1 Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents: 309
diff changeset
533
0a64532c1de1 Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents: 309
diff changeset
534 // turn on bluetooth
313
139ecb1840fd serial prints something
Matt Johnston <matt@ucc.asn.au>
parents: 312
diff changeset
535 uart_on();
310
0a64532c1de1 Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents: 309
diff changeset
536
0a64532c1de1 Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents: 309
diff changeset
537 // write sd card here? same 3.3v regulator...
0a64532c1de1 Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents: 309
diff changeset
538
318
31199b2941f6 Add simple_ds18b20.c etc
Matt Johnston <matt@ucc.asn.au>
parents: 316
diff changeset
539 printf("ready> \n");
31199b2941f6 Add simple_ds18b20.c etc
Matt Johnston <matt@ucc.asn.au>
parents: 316
diff changeset
540
310
0a64532c1de1 Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents: 309
diff changeset
541 comms_done = 0;
0a64532c1de1 Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents: 309
diff changeset
542 for (;;)
0a64532c1de1 Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents: 309
diff changeset
543 {
0a64532c1de1 Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents: 309
diff changeset
544 if (comms_done)
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 break;
0a64532c1de1 Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents: 309
diff changeset
547 }
312
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
548
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
549 if (need_measurement)
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
550 {
320
cff7a4459dc9 Lots of it works now.
Matt Johnston <matt@ucc.asn.au>
parents: 319
diff changeset
551 need_measurement = 0;
cff7a4459dc9 Lots of it works now.
Matt Johnston <matt@ucc.asn.au>
parents: 319
diff changeset
552 printf("measure from do_comms\n");
312
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
553 do_measurement();
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
554 }
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
555
310
0a64532c1de1 Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents: 309
diff changeset
556 idle_sleep();
0a64532c1de1 Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents: 309
diff changeset
557 }
0a64532c1de1 Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents: 309
diff changeset
558
312
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
559 uart_off();
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
560
310
0a64532c1de1 Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents: 309
diff changeset
561 // turn off bluetooth
0a64532c1de1 Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents: 309
diff changeset
562 }
0a64532c1de1 Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents: 309
diff changeset
563
313
139ecb1840fd serial prints something
Matt Johnston <matt@ucc.asn.au>
parents: 312
diff changeset
564 static void
139ecb1840fd serial prints something
Matt Johnston <matt@ucc.asn.au>
parents: 312
diff changeset
565 blink()
139ecb1840fd serial prints something
Matt Johnston <matt@ucc.asn.au>
parents: 312
diff changeset
566 {
139ecb1840fd serial prints something
Matt Johnston <matt@ucc.asn.au>
parents: 312
diff changeset
567 PORT_LED &= ~_BV(PIN_LED);
315
7d409dded901 Import ds18x20 code
Matt Johnston <matt@ucc.asn.au>
parents: 314
diff changeset
568 _delay_ms(1);
313
139ecb1840fd serial prints something
Matt Johnston <matt@ucc.asn.au>
parents: 312
diff changeset
569 PORT_LED |= _BV(PIN_LED);
139ecb1840fd serial prints something
Matt Johnston <matt@ucc.asn.au>
parents: 312
diff changeset
570 }
139ecb1840fd serial prints something
Matt Johnston <matt@ucc.asn.au>
parents: 312
diff changeset
571
139ecb1840fd serial prints something
Matt Johnston <matt@ucc.asn.au>
parents: 312
diff changeset
572 static void
139ecb1840fd serial prints something
Matt Johnston <matt@ucc.asn.au>
parents: 312
diff changeset
573 long_delay(int ms)
139ecb1840fd serial prints something
Matt Johnston <matt@ucc.asn.au>
parents: 312
diff changeset
574 {
139ecb1840fd serial prints something
Matt Johnston <matt@ucc.asn.au>
parents: 312
diff changeset
575 int iter = ms / 100;
139ecb1840fd serial prints something
Matt Johnston <matt@ucc.asn.au>
parents: 312
diff changeset
576
139ecb1840fd serial prints something
Matt Johnston <matt@ucc.asn.au>
parents: 312
diff changeset
577 for (int i = 0; i < iter; i++)
139ecb1840fd serial prints something
Matt Johnston <matt@ucc.asn.au>
parents: 312
diff changeset
578 {
139ecb1840fd serial prints something
Matt Johnston <matt@ucc.asn.au>
parents: 312
diff changeset
579 _delay_ms(100);
139ecb1840fd serial prints something
Matt Johnston <matt@ucc.asn.au>
parents: 312
diff changeset
580 }
139ecb1840fd serial prints something
Matt Johnston <matt@ucc.asn.au>
parents: 312
diff changeset
581 }
139ecb1840fd serial prints something
Matt Johnston <matt@ucc.asn.au>
parents: 312
diff changeset
582
314
7aebb1452422 deep sleep works
Matt Johnston <matt@ucc.asn.au>
parents: 313
diff changeset
583 ISR(BADISR_vect)
7aebb1452422 deep sleep works
Matt Johnston <matt@ucc.asn.au>
parents: 313
diff changeset
584 {
320
cff7a4459dc9 Lots of it works now.
Matt Johnston <matt@ucc.asn.au>
parents: 319
diff changeset
585 //uart_on();
314
7aebb1452422 deep sleep works
Matt Johnston <matt@ucc.asn.au>
parents: 313
diff changeset
586 printf_P(PSTR("Bad interrupt\n"));
7aebb1452422 deep sleep works
Matt Johnston <matt@ucc.asn.au>
parents: 313
diff changeset
587 }
7aebb1452422 deep sleep works
Matt Johnston <matt@ucc.asn.au>
parents: 313
diff changeset
588
315
7d409dded901 Import ds18x20 code
Matt Johnston <matt@ucc.asn.au>
parents: 314
diff changeset
589 static void
7d409dded901 Import ds18x20 code
Matt Johnston <matt@ucc.asn.au>
parents: 314
diff changeset
590 set_2mhz()
7d409dded901 Import ds18x20 code
Matt Johnston <matt@ucc.asn.au>
parents: 314
diff changeset
591 {
7d409dded901 Import ds18x20 code
Matt Johnston <matt@ucc.asn.au>
parents: 314
diff changeset
592 cli();
7d409dded901 Import ds18x20 code
Matt Johnston <matt@ucc.asn.au>
parents: 314
diff changeset
593 CLKPR = _BV(CLKPCE);
7d409dded901 Import ds18x20 code
Matt Johnston <matt@ucc.asn.au>
parents: 314
diff changeset
594 // divide by 4
7d409dded901 Import ds18x20 code
Matt Johnston <matt@ucc.asn.au>
parents: 314
diff changeset
595 CLKPR = _BV(CLKPS1);
7d409dded901 Import ds18x20 code
Matt Johnston <matt@ucc.asn.au>
parents: 314
diff changeset
596 sei();
7d409dded901 Import ds18x20 code
Matt Johnston <matt@ucc.asn.au>
parents: 314
diff changeset
597 }
7d409dded901 Import ds18x20 code
Matt Johnston <matt@ucc.asn.au>
parents: 314
diff changeset
598
306
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
599 int main(void)
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
600 {
315
7d409dded901 Import ds18x20 code
Matt Johnston <matt@ucc.asn.au>
parents: 314
diff changeset
601 set_2mhz();
7d409dded901 Import ds18x20 code
Matt Johnston <matt@ucc.asn.au>
parents: 314
diff changeset
602
313
139ecb1840fd serial prints something
Matt Johnston <matt@ucc.asn.au>
parents: 312
diff changeset
603 DDR_LED |= _BV(PIN_LED);
314
7aebb1452422 deep sleep works
Matt Johnston <matt@ucc.asn.au>
parents: 313
diff changeset
604 blink();
313
139ecb1840fd serial prints something
Matt Johnston <matt@ucc.asn.au>
parents: 312
diff changeset
605
312
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
606 stdout = &mystdout;
313
139ecb1840fd serial prints something
Matt Johnston <matt@ucc.asn.au>
parents: 312
diff changeset
607 uart_on();
139ecb1840fd serial prints something
Matt Johnston <matt@ucc.asn.au>
parents: 312
diff changeset
608
312
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
609 fprintf_P(&mystdout, PSTR("hello %d\n"), 12);
319
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
610
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
611 check_first_startup();
9621436cfa07 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 318
diff changeset
612
314
7aebb1452422 deep sleep works
Matt Johnston <matt@ucc.asn.au>
parents: 313
diff changeset
613 uart_off();
306
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
614
312
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
615 // turn off everything except timer2
314
7aebb1452422 deep sleep works
Matt Johnston <matt@ucc.asn.au>
parents: 313
diff changeset
616 //PRR = _BV(PRTWI) | _BV(PRTIM0) | _BV(PRTIM1) | _BV(PRSPI) | _BV(PRUSART0) | _BV(PRADC);
7aebb1452422 deep sleep works
Matt Johnston <matt@ucc.asn.au>
parents: 313
diff changeset
617
7aebb1452422 deep sleep works
Matt Johnston <matt@ucc.asn.au>
parents: 313
diff changeset
618 // for testing
7aebb1452422 deep sleep works
Matt Johnston <matt@ucc.asn.au>
parents: 313
diff changeset
619 uart_on();
7aebb1452422 deep sleep works
Matt Johnston <matt@ucc.asn.au>
parents: 313
diff changeset
620
318
31199b2941f6 Add simple_ds18b20.c etc
Matt Johnston <matt@ucc.asn.au>
parents: 316
diff changeset
621 sei();
314
7aebb1452422 deep sleep works
Matt Johnston <matt@ucc.asn.au>
parents: 313
diff changeset
622
307
e50091063890 Some counter2 bits
Matt Johnston <matt@ucc.asn.au>
parents: 306
diff changeset
623 // set up counter2.
e50091063890 Some counter2 bits
Matt Johnston <matt@ucc.asn.au>
parents: 306
diff changeset
624 // COM21 COM20 Set OC2 on Compare Match (p116)
e50091063890 Some counter2 bits
Matt Johnston <matt@ucc.asn.au>
parents: 306
diff changeset
625 // WGM21 Clear counter on compare
320
cff7a4459dc9 Lots of it works now.
Matt Johnston <matt@ucc.asn.au>
parents: 319
diff changeset
626 //TCCR2A = _BV(COM2A1) | _BV(COM2A0) | _BV(WGM21);
cff7a4459dc9 Lots of it works now.
Matt Johnston <matt@ucc.asn.au>
parents: 319
diff changeset
627 // toggle on match
cff7a4459dc9 Lots of it works now.
Matt Johnston <matt@ucc.asn.au>
parents: 319
diff changeset
628 TCCR2A = _BV(COM2A0);
307
e50091063890 Some counter2 bits
Matt Johnston <matt@ucc.asn.au>
parents: 306
diff changeset
629 // CS22 CS21 CS20 clk/1024
308
e36ee3e156c1 switch to atmega328
Matt Johnston <matt@ucc.asn.au>
parents: 307
diff changeset
630 TCCR2B = _BV(CS22) | _BV(CS21) | _BV(CS20);
307
e50091063890 Some counter2 bits
Matt Johnston <matt@ucc.asn.au>
parents: 306
diff changeset
631 // set async mode
e50091063890 Some counter2 bits
Matt Johnston <matt@ucc.asn.au>
parents: 306
diff changeset
632 ASSR |= _BV(AS2);
320
cff7a4459dc9 Lots of it works now.
Matt Johnston <matt@ucc.asn.au>
parents: 319
diff changeset
633 TCNT2 = 0;
cff7a4459dc9 Lots of it works now.
Matt Johnston <matt@ucc.asn.au>
parents: 319
diff changeset
634 OCR2A = SLEEP_COMPARE;
314
7aebb1452422 deep sleep works
Matt Johnston <matt@ucc.asn.au>
parents: 313
diff changeset
635 // interrupt
7aebb1452422 deep sleep works
Matt Johnston <matt@ucc.asn.au>
parents: 313
diff changeset
636 TIMSK2 = _BV(OCIE2A);
306
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
637
320
cff7a4459dc9 Lots of it works now.
Matt Johnston <matt@ucc.asn.au>
parents: 319
diff changeset
638 #if 0
312
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
639 for (;;)
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
640 {
318
31199b2941f6 Add simple_ds18b20.c etc
Matt Johnston <matt@ucc.asn.au>
parents: 316
diff changeset
641 do_comms();
312
ef64a178092f - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 311
diff changeset
642 }
320
cff7a4459dc9 Lots of it works now.
Matt Johnston <matt@ucc.asn.au>
parents: 319
diff changeset
643 #endif
318
31199b2941f6 Add simple_ds18b20.c etc
Matt Johnston <matt@ucc.asn.au>
parents: 316
diff changeset
644
306
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
645 for(;;){
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
646 /* insert your main loop code here */
307
e50091063890 Some counter2 bits
Matt Johnston <matt@ucc.asn.au>
parents: 306
diff changeset
647 if (need_measurement)
e50091063890 Some counter2 bits
Matt Johnston <matt@ucc.asn.au>
parents: 306
diff changeset
648 {
320
cff7a4459dc9 Lots of it works now.
Matt Johnston <matt@ucc.asn.au>
parents: 319
diff changeset
649 need_measurement = 0;
307
e50091063890 Some counter2 bits
Matt Johnston <matt@ucc.asn.au>
parents: 306
diff changeset
650 do_measurement();
320
cff7a4459dc9 Lots of it works now.
Matt Johnston <matt@ucc.asn.au>
parents: 319
diff changeset
651 // testing
cff7a4459dc9 Lots of it works now.
Matt Johnston <matt@ucc.asn.au>
parents: 319
diff changeset
652 cmd_fetch();
310
0a64532c1de1 Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents: 309
diff changeset
653 continue;
307
e50091063890 Some counter2 bits
Matt Johnston <matt@ucc.asn.au>
parents: 306
diff changeset
654 }
310
0a64532c1de1 Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents: 309
diff changeset
655
0a64532c1de1 Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents: 309
diff changeset
656 if (need_comms)
0a64532c1de1 Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents: 309
diff changeset
657 {
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 continue;
0a64532c1de1 Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents: 309
diff changeset
660 }
0a64532c1de1 Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents: 309
diff changeset
661
0a64532c1de1 Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents: 309
diff changeset
662 deep_sleep();
315
7d409dded901 Import ds18x20 code
Matt Johnston <matt@ucc.asn.au>
parents: 314
diff changeset
663 blink();
316
8f32eb67a279 reading DS18B20 works
Matt Johnston <matt@ucc.asn.au>
parents: 315
diff changeset
664 printf(".");
306
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
665 }
318
31199b2941f6 Add simple_ds18b20.c etc
Matt Johnston <matt@ucc.asn.au>
parents: 316
diff changeset
666
306
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
667 return 0; /* never reached */
848b0fe159d2 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
668 }