annotate main.c @ 321:df7384336798

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