annotate main.c @ 80:1e2068c5413a

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