annotate main.c @ 135:10d35b4370ef

make overshoot a parameter
author Matt Johnston <matt@ucc.asn.au>
date Mon, 15 Oct 2012 21:51:19 +0800
parents 405785632c78
children 08adc1fa02e8
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>
116
9afff8f29844 set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents: 115
diff changeset
4 #include <stdbool.h>
9afff8f29844 set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents: 115
diff changeset
5 #include <stdlib.h>
1
1d1897d66b03 Some counter2 bits
Matt Johnston <matt@ucc.asn.au>
parents: 0
diff changeset
6 #include <avr/io.h>
1d1897d66b03 Some counter2 bits
Matt Johnston <matt@ucc.asn.au>
parents: 0
diff changeset
7 #include <avr/interrupt.h>
1d1897d66b03 Some counter2 bits
Matt Johnston <matt@ucc.asn.au>
parents: 0
diff changeset
8 #include <avr/sleep.h>
7
52cb08a01171 serial prints something
Matt Johnston <matt@ucc.asn.au>
parents: 6
diff changeset
9 #include <util/delay.h>
6
9d538f674ff0 - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 5
diff changeset
10 #include <avr/pgmspace.h>
13
4838bfcb3504 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 12
diff changeset
11 #include <avr/eeprom.h>
54
0d3d14af55c2 add "awake" and "reset" functions
Matt Johnston <matt@ucc.asn.au>
parents: 52
diff changeset
12 #include <avr/wdt.h>
59
d5b269352ba0 - add some atomic guards
Matt Johnston <matt@ucc.asn.au>
parents: 58
diff changeset
13 #include <util/atomic.h>
0
c8b14b2950b9 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
14 #include <util/crc16.h>
c8b14b2950b9 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
15
12
3c27bfbd7f3a Add simple_ds18b20.c etc
Matt Johnston <matt@ucc.asn.au>
parents: 10
diff changeset
16 #include "simple_ds18b20.h"
13
4838bfcb3504 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 12
diff changeset
17 #include "onewire.h"
3
888be1b234b6 Add FatFS
Matt Johnston <matt@ucc.asn.au>
parents: 2
diff changeset
18
0
c8b14b2950b9 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
19 // configuration params
c8b14b2950b9 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
20 // - measurement interval
c8b14b2950b9 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
21 // - transmit interval
c8b14b2950b9 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
22 // - bluetooth params
c8b14b2950b9 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
23 // - number of sensors (and range?)
c8b14b2950b9 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
24
121
45c051a7db82 try and take account of the fridge temperature too
Matt Johnston <matt@ucc.asn.au>
parents: 118
diff changeset
25 #define MIN(X,Y) ((X) < (Y) ? (X) : (Y))
45c051a7db82 try and take account of the fridge temperature too
Matt Johnston <matt@ucc.asn.au>
parents: 118
diff changeset
26 #define MAX(X,Y) ((X) > (Y) ? (X) : (Y))
45c051a7db82 try and take account of the fridge temperature too
Matt Johnston <matt@ucc.asn.au>
parents: 118
diff changeset
27
80
1e2068c5413a - store settings in eeprom
Matt Johnston <matt@ucc.asn.au>
parents: 79
diff changeset
28 // 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
29 // to be a multiple.
1e2068c5413a - store settings in eeprom
Matt Johnston <matt@ucc.asn.au>
parents: 79
diff changeset
30
1e2068c5413a - store settings in eeprom
Matt Johnston <matt@ucc.asn.au>
parents: 79
diff changeset
31 #define TICK 6
1e2068c5413a - store settings in eeprom
Matt Johnston <matt@ucc.asn.au>
parents: 79
diff changeset
32 // we have 1024 prescaler, 32768 crystal.
1e2068c5413a - store settings in eeprom
Matt Johnston <matt@ucc.asn.au>
parents: 79
diff changeset
33 #define SLEEP_COMPARE (32*TICK-1)
4
54d369e3d689 Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents: 3
diff changeset
34
75
ca08442635ca report raw ds18b20 values instead
Matt Johnston <matt@ucc.asn.au>
parents: 62
diff changeset
35 #define VALUE_NOSENSOR 0x07D0 // 125 degrees
ca08442635ca report raw ds18b20 values instead
Matt Johnston <matt@ucc.asn.au>
parents: 62
diff changeset
36 #define VALUE_BROKEN 0x07D1 // 125.0625
13
4838bfcb3504 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 12
diff changeset
37
135
10d35b4370ef make overshoot a parameter
Matt Johnston <matt@ucc.asn.au>
parents: 134
diff changeset
38 #define OVERSHOOT_MAX_DIV 1800.0 // 30 mins
130
66d5e15f40d0 simplify, only use the fridge temp if the wort's busted
Matt Johnston <matt@ucc.asn.au>
parents: 128
diff changeset
39 #define WORT_INVALID_TIME 900 // 15 mins
66d5e15f40d0 simplify, only use the fridge temp if the wort's busted
Matt Johnston <matt@ucc.asn.au>
parents: 128
diff changeset
40 // fridge min/max are only used if the wort sensor is invalid
66d5e15f40d0 simplify, only use the fridge temp if the wort's busted
Matt Johnston <matt@ucc.asn.au>
parents: 128
diff changeset
41 #define FRIDGE_AIR_MIN_RANGE 40 // 4º
66d5e15f40d0 simplify, only use the fridge temp if the wort's busted
Matt Johnston <matt@ucc.asn.au>
parents: 128
diff changeset
42 #define FRIDGE_AIR_MAX_RANGE 40 // 4º
121
45c051a7db82 try and take account of the fridge temperature too
Matt Johnston <matt@ucc.asn.au>
parents: 118
diff changeset
43
10
1bfe28c348dd reading DS18B20 works
Matt Johnston <matt@ucc.asn.au>
parents: 9
diff changeset
44 #define BAUD 19200
7
52cb08a01171 serial prints something
Matt Johnston <matt@ucc.asn.au>
parents: 6
diff changeset
45 #define UBRR ((F_CPU)/8/(BAUD)-1)
52cb08a01171 serial prints something
Matt Johnston <matt@ucc.asn.au>
parents: 6
diff changeset
46
52cb08a01171 serial prints something
Matt Johnston <matt@ucc.asn.au>
parents: 6
diff changeset
47 #define PORT_LED PORTC
52cb08a01171 serial prints something
Matt Johnston <matt@ucc.asn.au>
parents: 6
diff changeset
48 #define DDR_LED DDRC
52cb08a01171 serial prints something
Matt Johnston <matt@ucc.asn.au>
parents: 6
diff changeset
49 #define PIN_LED PC4
1
1d1897d66b03 Some counter2 bits
Matt Johnston <matt@ucc.asn.au>
parents: 0
diff changeset
50
15
54b0fda9cba7 Add shutdown handling, print sensors in "fetch" output
Matt Johnston <matt@ucc.asn.au>
parents: 14
diff changeset
51 #define PORT_SHDN PORTD
54b0fda9cba7 Add shutdown handling, print sensors in "fetch" output
Matt Johnston <matt@ucc.asn.au>
parents: 14
diff changeset
52 #define DDR_SHDN DDRD
54b0fda9cba7 Add shutdown handling, print sensors in "fetch" output
Matt Johnston <matt@ucc.asn.au>
parents: 14
diff changeset
53 #define PIN_SHDN PD7
54b0fda9cba7 Add shutdown handling, print sensors in "fetch" output
Matt Johnston <matt@ucc.asn.au>
parents: 14
diff changeset
54
115
90d1ebb941ab untested fridge control
Matt Johnston <matt@ucc.asn.au>
parents: 114
diff changeset
55 #define PORT_FRIDGE PORTD
90d1ebb941ab untested fridge control
Matt Johnston <matt@ucc.asn.au>
parents: 114
diff changeset
56 #define DDR_FRIDGE DDRD
90d1ebb941ab untested fridge control
Matt Johnston <matt@ucc.asn.au>
parents: 114
diff changeset
57 #define PIN_FRIDGE PD6
90d1ebb941ab untested fridge control
Matt Johnston <matt@ucc.asn.au>
parents: 114
diff changeset
58
80
1e2068c5413a - store settings in eeprom
Matt Johnston <matt@ucc.asn.au>
parents: 79
diff changeset
59 // total amount of 16bit values available for measurements.
1e2068c5413a - store settings in eeprom
Matt Johnston <matt@ucc.asn.au>
parents: 79
diff changeset
60 // adjust emperically, be sure to allow enough stack space too
121
45c051a7db82 try and take account of the fridge temperature too
Matt Johnston <matt@ucc.asn.au>
parents: 118
diff changeset
61 #define TOTAL_MEASUREMENTS 800
80
1e2068c5413a - store settings in eeprom
Matt Johnston <matt@ucc.asn.au>
parents: 79
diff changeset
62
1e2068c5413a - store settings in eeprom
Matt Johnston <matt@ucc.asn.au>
parents: 79
diff changeset
63 // each sensor slot uses 8 bytes
1e2068c5413a - store settings in eeprom
Matt Johnston <matt@ucc.asn.au>
parents: 79
diff changeset
64 #define MAX_SENSORS 6
6
9d538f674ff0 - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 5
diff changeset
65
15
54b0fda9cba7 Add shutdown handling, print sensors in "fetch" output
Matt Johnston <matt@ucc.asn.au>
parents: 14
diff changeset
66 // 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
67 #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
68
33
024f5571df8c - Debug log file for server
Matt Johnston <matt@ucc.asn.au>
parents: 32
diff changeset
69 // #define HAVE_UART_ECHO
024f5571df8c - Debug log file for server
Matt Johnston <matt@ucc.asn.au>
parents: 32
diff changeset
70
90
a1c1c2d475b0 print the remainder of timers as well
Matt Johnston <matt@ucc.asn.au>
parents: 89
diff changeset
71 // stores a value of clock_epoch combined with the remainder of TCNT2,
a1c1c2d475b0 print the remainder of timers as well
Matt Johnston <matt@ucc.asn.au>
parents: 89
diff changeset
72 // for 1/32 second accuracy
a1c1c2d475b0 print the remainder of timers as well
Matt Johnston <matt@ucc.asn.au>
parents: 89
diff changeset
73 struct epoch_ticks
a1c1c2d475b0 print the remainder of timers as well
Matt Johnston <matt@ucc.asn.au>
parents: 89
diff changeset
74 {
a1c1c2d475b0 print the remainder of timers as well
Matt Johnston <matt@ucc.asn.au>
parents: 89
diff changeset
75 uint32_t ticks;
a1c1c2d475b0 print the remainder of timers as well
Matt Johnston <matt@ucc.asn.au>
parents: 89
diff changeset
76 // remainder
a1c1c2d475b0 print the remainder of timers as well
Matt Johnston <matt@ucc.asn.au>
parents: 89
diff changeset
77 uint8_t rem;
a1c1c2d475b0 print the remainder of timers as well
Matt Johnston <matt@ucc.asn.au>
parents: 89
diff changeset
78 };
a1c1c2d475b0 print the remainder of timers as well
Matt Johnston <matt@ucc.asn.au>
parents: 89
diff changeset
79
80
1e2068c5413a - store settings in eeprom
Matt Johnston <matt@ucc.asn.au>
parents: 79
diff changeset
80 // eeprom-settable parameters. all timeouts should
1e2068c5413a - store settings in eeprom
Matt Johnston <matt@ucc.asn.au>
parents: 79
diff changeset
81 // be a multiple of TICK (6 seconds probably)
115
90d1ebb941ab untested fridge control
Matt Johnston <matt@ucc.asn.au>
parents: 114
diff changeset
82 static uint16_t measure_wake = 61; // not a divisor of comms_wake
90d1ebb941ab untested fridge control
Matt Johnston <matt@ucc.asn.au>
parents: 114
diff changeset
83 static uint16_t comms_wake = 600;
80
1e2068c5413a - store settings in eeprom
Matt Johnston <matt@ucc.asn.au>
parents: 79
diff changeset
84 static uint8_t wake_secs = 30;
115
90d1ebb941ab untested fridge control
Matt Johnston <matt@ucc.asn.au>
parents: 114
diff changeset
85 // decidegrees
90d1ebb941ab untested fridge control
Matt Johnston <matt@ucc.asn.au>
parents: 114
diff changeset
86 static int16_t fridge_setpoint = 180; // 18.0ºC
121
45c051a7db82 try and take account of the fridge temperature too
Matt Johnston <matt@ucc.asn.au>
parents: 118
diff changeset
87 static int16_t fridge_difference = 3; // 0.3ºC
115
90d1ebb941ab untested fridge control
Matt Johnston <matt@ucc.asn.au>
parents: 114
diff changeset
88 static uint16_t fridge_delay = 600; // seconds
114
b0ec7b783c0b start of fridge bits
Matt Johnston <matt@ucc.asn.au>
parents: 105
diff changeset
89
135
10d35b4370ef make overshoot a parameter
Matt Johnston <matt@ucc.asn.au>
parents: 134
diff changeset
90 static uint16_t overshoot_delay = 720; // 12 mins
10d35b4370ef make overshoot a parameter
Matt Johnston <matt@ucc.asn.au>
parents: 134
diff changeset
91 static uint8_t overshoot_factor = 10; // 1.0ºC
10d35b4370ef make overshoot a parameter
Matt Johnston <matt@ucc.asn.au>
parents: 134
diff changeset
92
59
d5b269352ba0 - add some atomic guards
Matt Johnston <matt@ucc.asn.au>
parents: 58
diff changeset
93 // ---- Atomic guards required accessing these variables
121
45c051a7db82 try and take account of the fridge temperature too
Matt Johnston <matt@ucc.asn.au>
parents: 118
diff changeset
94 // clock_epoch in seconds
59
d5b269352ba0 - add some atomic guards
Matt Johnston <matt@ucc.asn.au>
parents: 58
diff changeset
95 static uint32_t clock_epoch;
d5b269352ba0 - add some atomic guards
Matt Johnston <matt@ucc.asn.au>
parents: 58
diff changeset
96 static uint16_t comms_count;
d5b269352ba0 - add some atomic guards
Matt Johnston <matt@ucc.asn.au>
parents: 58
diff changeset
97 static uint16_t measure_count;
d5b269352ba0 - add some atomic guards
Matt Johnston <matt@ucc.asn.au>
parents: 58
diff changeset
98 // ---- End atomic guards required
d5b269352ba0 - add some atomic guards
Matt Johnston <matt@ucc.asn.au>
parents: 58
diff changeset
99
17
a5e3b363675d Add clock_epoch
Matt Johnston <matt@ucc.asn.au>
parents: 16
diff changeset
100 static uint16_t n_measurements;
59
d5b269352ba0 - add some atomic guards
Matt Johnston <matt@ucc.asn.au>
parents: 58
diff changeset
101
80
1e2068c5413a - store settings in eeprom
Matt Johnston <matt@ucc.asn.au>
parents: 79
diff changeset
102 // calculated at startup as TOTAL_MEASUREMENTS/n_sensors
1e2068c5413a - store settings in eeprom
Matt Johnston <matt@ucc.asn.au>
parents: 79
diff changeset
103 static uint16_t max_measurements;
1e2068c5413a - store settings in eeprom
Matt Johnston <matt@ucc.asn.au>
parents: 79
diff changeset
104
1e2068c5413a - store settings in eeprom
Matt Johnston <matt@ucc.asn.au>
parents: 79
diff changeset
105 static uint16_t measurements[TOTAL_MEASUREMENTS];
90
a1c1c2d475b0 print the remainder of timers as well
Matt Johnston <matt@ucc.asn.au>
parents: 89
diff changeset
106
a1c1c2d475b0 print the remainder of timers as well
Matt Johnston <matt@ucc.asn.au>
parents: 89
diff changeset
107 static struct epoch_ticks first_measurement_clock;
22
885532437100 A bit of work on the server python
Matt Johnston <matt@ucc.asn.au>
parents: 20
diff changeset
108 // 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
109 // samples
90
a1c1c2d475b0 print the remainder of timers as well
Matt Johnston <matt@ucc.asn.au>
parents: 89
diff changeset
110 static struct epoch_ticks last_measurement_clock;
a1c1c2d475b0 print the remainder of timers as well
Matt Johnston <matt@ucc.asn.au>
parents: 89
diff changeset
111 static struct epoch_ticks last_comms_clock;
59
d5b269352ba0 - add some atomic guards
Matt Johnston <matt@ucc.asn.au>
parents: 58
diff changeset
112
4
54d369e3d689 Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents: 3
diff changeset
113 // boolean flags
17
a5e3b363675d Add clock_epoch
Matt Johnston <matt@ucc.asn.au>
parents: 16
diff changeset
114 static uint8_t need_measurement;
a5e3b363675d Add clock_epoch
Matt Johnston <matt@ucc.asn.au>
parents: 16
diff changeset
115 static uint8_t need_comms;
40
9b5b202129c3 main.c:
Matt Johnston <matt@ucc.asn.au>
parents: 36
diff changeset
116 static uint8_t uart_enabled;
80
1e2068c5413a - store settings in eeprom
Matt Johnston <matt@ucc.asn.au>
parents: 79
diff changeset
117 static uint8_t stay_awake;
90
a1c1c2d475b0 print the remainder of timers as well
Matt Johnston <matt@ucc.asn.au>
parents: 89
diff changeset
118 static uint8_t button_pressed;
1
1d1897d66b03 Some counter2 bits
Matt Johnston <matt@ucc.asn.au>
parents: 0
diff changeset
119
16
5075d8c428bd untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents: 15
diff changeset
120 // 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
121 static uint8_t comms_timeout;
1
1d1897d66b03 Some counter2 bits
Matt Johnston <matt@ucc.asn.au>
parents: 0
diff changeset
122
17
a5e3b363675d Add clock_epoch
Matt Johnston <matt@ucc.asn.au>
parents: 16
diff changeset
123 static uint8_t readpos;
0
c8b14b2950b9 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
124 static char readbuf[30];
27
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
125 static uint8_t have_cmd;
0
c8b14b2950b9 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
126
80
1e2068c5413a - store settings in eeprom
Matt Johnston <matt@ucc.asn.au>
parents: 79
diff changeset
127 static uint8_t n_sensors;
1e2068c5413a - store settings in eeprom
Matt Johnston <matt@ucc.asn.au>
parents: 79
diff changeset
128 static uint8_t sensor_id[MAX_SENSORS][ID_LEN];
1e2068c5413a - store settings in eeprom
Matt Johnston <matt@ucc.asn.au>
parents: 79
diff changeset
129
115
90d1ebb941ab untested fridge control
Matt Johnston <matt@ucc.asn.au>
parents: 114
diff changeset
130 static int16_t last_fridge = DS18X20_INVALID_DECICELSIUS;
90d1ebb941ab untested fridge control
Matt Johnston <matt@ucc.asn.au>
parents: 114
diff changeset
131 static int16_t last_wort = DS18X20_INVALID_DECICELSIUS;
90d1ebb941ab untested fridge control
Matt Johnston <matt@ucc.asn.au>
parents: 114
diff changeset
132 static struct epoch_ticks fridge_off_clock = {0};
121
45c051a7db82 try and take account of the fridge temperature too
Matt Johnston <matt@ucc.asn.au>
parents: 118
diff changeset
133 static struct epoch_ticks fridge_on_clock = {0};
130
66d5e15f40d0 simplify, only use the fridge temp if the wort's busted
Matt Johnston <matt@ucc.asn.au>
parents: 128
diff changeset
134 static struct epoch_ticks wort_valid_clock = {0};
80
1e2068c5413a - store settings in eeprom
Matt Johnston <matt@ucc.asn.au>
parents: 79
diff changeset
135
1e2068c5413a - store settings in eeprom
Matt Johnston <matt@ucc.asn.au>
parents: 79
diff changeset
136 int uart_putchar(char c, FILE *stream);
1e2068c5413a - store settings in eeprom
Matt Johnston <matt@ucc.asn.au>
parents: 79
diff changeset
137 static void long_delay(int ms);
1e2068c5413a - store settings in eeprom
Matt Johnston <matt@ucc.asn.au>
parents: 79
diff changeset
138 static void blink();
1e2068c5413a - store settings in eeprom
Matt Johnston <matt@ucc.asn.au>
parents: 79
diff changeset
139 static uint16_t adc_vcc();
1e2068c5413a - store settings in eeprom
Matt Johnston <matt@ucc.asn.au>
parents: 79
diff changeset
140
1e2068c5413a - store settings in eeprom
Matt Johnston <matt@ucc.asn.au>
parents: 79
diff changeset
141 static FILE mystdout = FDEV_SETUP_STREAM(uart_putchar, NULL,
1e2068c5413a - store settings in eeprom
Matt Johnston <matt@ucc.asn.au>
parents: 79
diff changeset
142 _FDEV_SETUP_WRITE);
1e2068c5413a - store settings in eeprom
Matt Johnston <matt@ucc.asn.au>
parents: 79
diff changeset
143
1e2068c5413a - store settings in eeprom
Matt Johnston <matt@ucc.asn.au>
parents: 79
diff changeset
144 static uint16_t crc_out;
1e2068c5413a - store settings in eeprom
Matt Johnston <matt@ucc.asn.au>
parents: 79
diff changeset
145 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
146 _FDEV_SETUP_WRITE);
1e2068c5413a - store settings in eeprom
Matt Johnston <matt@ucc.asn.au>
parents: 79
diff changeset
147 // convenience
1e2068c5413a - store settings in eeprom
Matt Johnston <matt@ucc.asn.au>
parents: 79
diff changeset
148 static FILE *crc_stdout = &_crc_stdout;
1e2068c5413a - store settings in eeprom
Matt Johnston <matt@ucc.asn.au>
parents: 79
diff changeset
149
4
54d369e3d689 Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents: 3
diff changeset
150
13
4838bfcb3504 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 12
diff changeset
151 // 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
152 #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
153 #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
154 #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
155 #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
156
4838bfcb3504 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 12
diff changeset
157 #define EXPECT_MAGIC 0x67c9
4838bfcb3504 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 12
diff changeset
158
4838bfcb3504 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 12
diff changeset
159 struct __attribute__ ((__packed__)) __eeprom_data {
4838bfcb3504 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 12
diff changeset
160 uint16_t magic;
80
1e2068c5413a - store settings in eeprom
Matt Johnston <matt@ucc.asn.au>
parents: 79
diff changeset
161 uint16_t measure_wake;
1e2068c5413a - store settings in eeprom
Matt Johnston <matt@ucc.asn.au>
parents: 79
diff changeset
162 uint16_t comms_wake;
1e2068c5413a - store settings in eeprom
Matt Johnston <matt@ucc.asn.au>
parents: 79
diff changeset
163 uint8_t wake_secs;
114
b0ec7b783c0b start of fridge bits
Matt Johnston <matt@ucc.asn.au>
parents: 105
diff changeset
164
115
90d1ebb941ab untested fridge control
Matt Johnston <matt@ucc.asn.au>
parents: 114
diff changeset
165 int16_t fridge_setpoint; // decidegrees
90d1ebb941ab untested fridge control
Matt Johnston <matt@ucc.asn.au>
parents: 114
diff changeset
166 uint8_t fridge_difference; // decidegrees
90d1ebb941ab untested fridge control
Matt Johnston <matt@ucc.asn.au>
parents: 114
diff changeset
167 uint16_t fridge_delay;
114
b0ec7b783c0b start of fridge bits
Matt Johnston <matt@ucc.asn.au>
parents: 105
diff changeset
168
135
10d35b4370ef make overshoot a parameter
Matt Johnston <matt@ucc.asn.au>
parents: 134
diff changeset
169 uint16_t overshoot_delay;
10d35b4370ef make overshoot a parameter
Matt Johnston <matt@ucc.asn.au>
parents: 134
diff changeset
170 uint8_t overshoot_factor; // decidegrees
10d35b4370ef make overshoot a parameter
Matt Johnston <matt@ucc.asn.au>
parents: 134
diff changeset
171
115
90d1ebb941ab untested fridge control
Matt Johnston <matt@ucc.asn.au>
parents: 114
diff changeset
172 #if 0
90d1ebb941ab untested fridge control
Matt Johnston <matt@ucc.asn.au>
parents: 114
diff changeset
173 static uint8_t wort_id[ID_LEN];
90d1ebb941ab untested fridge control
Matt Johnston <matt@ucc.asn.au>
parents: 114
diff changeset
174 static uint8_t fridge_id[ID_LEN];
90d1ebb941ab untested fridge control
Matt Johnston <matt@ucc.asn.au>
parents: 114
diff changeset
175 #endif
90d1ebb941ab untested fridge control
Matt Johnston <matt@ucc.asn.au>
parents: 114
diff changeset
176 };
114
b0ec7b783c0b start of fridge bits
Matt Johnston <matt@ucc.asn.au>
parents: 105
diff changeset
177
115
90d1ebb941ab untested fridge control
Matt Johnston <matt@ucc.asn.au>
parents: 114
diff changeset
178 static const uint8_t fridge_id[ID_LEN] =
90d1ebb941ab untested fridge control
Matt Johnston <matt@ucc.asn.au>
parents: 114
diff changeset
179 {0x28,0xCE,0xB2,0x1A,0x03,0x00,0x00,0x99};
90d1ebb941ab untested fridge control
Matt Johnston <matt@ucc.asn.au>
parents: 114
diff changeset
180 static const uint8_t wort_id[ID_LEN] =
90d1ebb941ab untested fridge control
Matt Johnston <matt@ucc.asn.au>
parents: 114
diff changeset
181 {0x28,0x49,0xBC,0x1A,0x03,0x00,0x00,0x54};
13
4838bfcb3504 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 12
diff changeset
182
4
54d369e3d689 Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents: 3
diff changeset
183 static void deep_sleep();
1
1d1897d66b03 Some counter2 bits
Matt Johnston <matt@ucc.asn.au>
parents: 0
diff changeset
184
117
eecd2612a68e stay on
Matt Johnston <matt@ucc.asn.au>
parents: 116
diff changeset
185 // 0 or 1
eecd2612a68e stay on
Matt Johnston <matt@ucc.asn.au>
parents: 116
diff changeset
186 static uint8_t
eecd2612a68e stay on
Matt Johnston <matt@ucc.asn.au>
parents: 116
diff changeset
187 is_fridge_on()
eecd2612a68e stay on
Matt Johnston <matt@ucc.asn.au>
parents: 116
diff changeset
188 {
eecd2612a68e stay on
Matt Johnston <matt@ucc.asn.au>
parents: 116
diff changeset
189 if (PORT_FRIDGE & _BV(PIN_FRIDGE))
eecd2612a68e stay on
Matt Johnston <matt@ucc.asn.au>
parents: 116
diff changeset
190 {
eecd2612a68e stay on
Matt Johnston <matt@ucc.asn.au>
parents: 116
diff changeset
191 return 1;
eecd2612a68e stay on
Matt Johnston <matt@ucc.asn.au>
parents: 116
diff changeset
192 }
eecd2612a68e stay on
Matt Johnston <matt@ucc.asn.au>
parents: 116
diff changeset
193 else
eecd2612a68e stay on
Matt Johnston <matt@ucc.asn.au>
parents: 116
diff changeset
194 {
eecd2612a68e stay on
Matt Johnston <matt@ucc.asn.au>
parents: 116
diff changeset
195 return 0;
eecd2612a68e stay on
Matt Johnston <matt@ucc.asn.au>
parents: 116
diff changeset
196 }
eecd2612a68e stay on
Matt Johnston <matt@ucc.asn.au>
parents: 116
diff changeset
197 }
eecd2612a68e stay on
Matt Johnston <matt@ucc.asn.au>
parents: 116
diff changeset
198
16
5075d8c428bd untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents: 15
diff changeset
199 // Very first setup
18
bf733e8e8cf0 Add INT0 button
Matt Johnston <matt@ucc.asn.au>
parents: 15
diff changeset
200 static void
16
5075d8c428bd untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents: 15
diff changeset
201 setup_chip()
18
bf733e8e8cf0 Add INT0 button
Matt Johnston <matt@ucc.asn.au>
parents: 15
diff changeset
202 {
54
0d3d14af55c2 add "awake" and "reset" functions
Matt Johnston <matt@ucc.asn.au>
parents: 52
diff changeset
203 cli();
0d3d14af55c2 add "awake" and "reset" functions
Matt Johnston <matt@ucc.asn.au>
parents: 52
diff changeset
204
0d3d14af55c2 add "awake" and "reset" functions
Matt Johnston <matt@ucc.asn.au>
parents: 52
diff changeset
205 // 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
206 wdt_reset();
0d3d14af55c2 add "awake" and "reset" functions
Matt Johnston <matt@ucc.asn.au>
parents: 52
diff changeset
207 MCUSR &= ~_BV(WDRF);
0d3d14af55c2 add "awake" and "reset" functions
Matt Johnston <matt@ucc.asn.au>
parents: 52
diff changeset
208 WDTCSR |= _BV(WDCE) | _BV(WDE);
0d3d14af55c2 add "awake" and "reset" functions
Matt Johnston <matt@ucc.asn.au>
parents: 52
diff changeset
209 WDTCSR = 0;
0d3d14af55c2 add "awake" and "reset" functions
Matt Johnston <matt@ucc.asn.au>
parents: 52
diff changeset
210
16
5075d8c428bd untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents: 15
diff changeset
211 // Set clock to 2mhz
5075d8c428bd untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents: 15
diff changeset
212 CLKPR = _BV(CLKPCE);
5075d8c428bd untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents: 15
diff changeset
213 // divide by 4
5075d8c428bd untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents: 15
diff changeset
214 CLKPR = _BV(CLKPS1);
52
c3f5e02c1c42 try a few more power saving measures, untested
Matt Johnston <matt@ucc.asn.au>
parents: 46
diff changeset
215
c3f5e02c1c42 try a few more power saving measures, untested
Matt Johnston <matt@ucc.asn.au>
parents: 46
diff changeset
216 // enable pullups
c3f5e02c1c42 try a few more power saving measures, untested
Matt Johnston <matt@ucc.asn.au>
parents: 46
diff changeset
217 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
218 PORTD = 0xff;
c3f5e02c1c42 try a few more power saving measures, untested
Matt Johnston <matt@ucc.asn.au>
parents: 46
diff changeset
219 PORTC = 0xff;
16
5075d8c428bd untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents: 15
diff changeset
220
19
Matt Johnston <matt@ucc.asn.au>
parents: 17 18
diff changeset
221 // 3.3v power for bluetooth and SD
16
5075d8c428bd untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents: 15
diff changeset
222 DDR_LED |= _BV(PIN_LED);
5075d8c428bd untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents: 15
diff changeset
223 DDR_SHDN |= _BV(PIN_SHDN);
19
Matt Johnston <matt@ucc.asn.au>
parents: 17 18
diff changeset
224
123
b2700c7e5492 turn off the fridge port first
Matt Johnston <matt@ucc.asn.au>
parents: 122
diff changeset
225 PORT_FRIDGE &= ~_BV(PIN_FRIDGE);
115
90d1ebb941ab untested fridge control
Matt Johnston <matt@ucc.asn.au>
parents: 114
diff changeset
226 DDR_FRIDGE |= _BV(PIN_FRIDGE);
90d1ebb941ab untested fridge control
Matt Johnston <matt@ucc.asn.au>
parents: 114
diff changeset
227
46
9ccd965d938a Use the PRR etc, set value to proper ones
Matt Johnston <matt@ucc.asn.au>
parents: 44
diff changeset
228 // set pullup
9ccd965d938a Use the PRR etc, set value to proper ones
Matt Johnston <matt@ucc.asn.au>
parents: 44
diff changeset
229 PORTD |= _BV(PD2);
41
1701457e6007 fix tabbing
Matt Johnston <matt@ucc.asn.au>
parents: 40
diff changeset
230 // INT0 setup
52
c3f5e02c1c42 try a few more power saving measures, untested
Matt Johnston <matt@ucc.asn.au>
parents: 46
diff changeset
231 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
232 EIMSK = _BV(INT0);
52
c3f5e02c1c42 try a few more power saving measures, untested
Matt Johnston <matt@ucc.asn.au>
parents: 46
diff changeset
233
c3f5e02c1c42 try a few more power saving measures, untested
Matt Johnston <matt@ucc.asn.au>
parents: 46
diff changeset
234 // comparator disable
c3f5e02c1c42 try a few more power saving measures, untested
Matt Johnston <matt@ucc.asn.au>
parents: 46
diff changeset
235 ACSR = _BV(ACD);
c3f5e02c1c42 try a few more power saving measures, untested
Matt Johnston <matt@ucc.asn.au>
parents: 46
diff changeset
236
c3f5e02c1c42 try a few more power saving measures, untested
Matt Johnston <matt@ucc.asn.au>
parents: 46
diff changeset
237 // disable adc pin input buffers
c3f5e02c1c42 try a few more power saving measures, untested
Matt Johnston <matt@ucc.asn.au>
parents: 46
diff changeset
238 DIDR0 = 0x3F; // acd0-adc5
c3f5e02c1c42 try a few more power saving measures, untested
Matt Johnston <matt@ucc.asn.au>
parents: 46
diff changeset
239 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
240
c3f5e02c1c42 try a few more power saving measures, untested
Matt Johnston <matt@ucc.asn.au>
parents: 46
diff changeset
241 sei();
18
bf733e8e8cf0 Add INT0 button
Matt Johnston <matt@ucc.asn.au>
parents: 15
diff changeset
242 }
bf733e8e8cf0 Add INT0 button
Matt Johnston <matt@ucc.asn.au>
parents: 15
diff changeset
243
16
5075d8c428bd untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents: 15
diff changeset
244 static void
5075d8c428bd untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents: 15
diff changeset
245 set_aux_power(uint8_t on)
5075d8c428bd untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents: 15
diff changeset
246 {
5075d8c428bd untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents: 15
diff changeset
247 if (on)
5075d8c428bd untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents: 15
diff changeset
248 {
5075d8c428bd untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents: 15
diff changeset
249 PORT_SHDN &= ~_BV(PIN_SHDN);
5075d8c428bd untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents: 15
diff changeset
250 }
5075d8c428bd untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents: 15
diff changeset
251 else
5075d8c428bd untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents: 15
diff changeset
252 {
44
96c336896201 mostly works for testing
Matt Johnston <matt@ucc.asn.au>
parents: 41
diff changeset
253 PORT_SHDN |= _BV(PIN_SHDN);
16
5075d8c428bd untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents: 15
diff changeset
254 }
5075d8c428bd untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents: 15
diff changeset
255 }
5075d8c428bd untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents: 15
diff changeset
256
90
a1c1c2d475b0 print the remainder of timers as well
Matt Johnston <matt@ucc.asn.au>
parents: 89
diff changeset
257 static void
a1c1c2d475b0 print the remainder of timers as well
Matt Johnston <matt@ucc.asn.au>
parents: 89
diff changeset
258 get_epoch_ticks(struct epoch_ticks *t)
a1c1c2d475b0 print the remainder of timers as well
Matt Johnston <matt@ucc.asn.au>
parents: 89
diff changeset
259 {
a1c1c2d475b0 print the remainder of timers as well
Matt Johnston <matt@ucc.asn.au>
parents: 89
diff changeset
260 ATOMIC_BLOCK(ATOMIC_RESTORESTATE)
a1c1c2d475b0 print the remainder of timers as well
Matt Johnston <matt@ucc.asn.au>
parents: 89
diff changeset
261 {
a1c1c2d475b0 print the remainder of timers as well
Matt Johnston <matt@ucc.asn.au>
parents: 89
diff changeset
262 t->ticks = clock_epoch;
a1c1c2d475b0 print the remainder of timers as well
Matt Johnston <matt@ucc.asn.au>
parents: 89
diff changeset
263 t->rem = TCNT2;
a1c1c2d475b0 print the remainder of timers as well
Matt Johnston <matt@ucc.asn.au>
parents: 89
diff changeset
264 }
a1c1c2d475b0 print the remainder of timers as well
Matt Johnston <matt@ucc.asn.au>
parents: 89
diff changeset
265 }
a1c1c2d475b0 print the remainder of timers as well
Matt Johnston <matt@ucc.asn.au>
parents: 89
diff changeset
266
80
1e2068c5413a - store settings in eeprom
Matt Johnston <matt@ucc.asn.au>
parents: 79
diff changeset
267 static void
1e2068c5413a - store settings in eeprom
Matt Johnston <matt@ucc.asn.au>
parents: 79
diff changeset
268 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
269 {
1e2068c5413a - store settings in eeprom
Matt Johnston <matt@ucc.asn.au>
parents: 79
diff changeset
270 measurements[sensor*max_measurements + measurement] = reading;
1e2068c5413a - store settings in eeprom
Matt Johnston <matt@ucc.asn.au>
parents: 79
diff changeset
271 }
1e2068c5413a - store settings in eeprom
Matt Johnston <matt@ucc.asn.au>
parents: 79
diff changeset
272
1e2068c5413a - store settings in eeprom
Matt Johnston <matt@ucc.asn.au>
parents: 79
diff changeset
273 static uint16_t
1e2068c5413a - store settings in eeprom
Matt Johnston <matt@ucc.asn.au>
parents: 79
diff changeset
274 get_measurement(uint8_t sensor, uint16_t measurement)
1e2068c5413a - store settings in eeprom
Matt Johnston <matt@ucc.asn.au>
parents: 79
diff changeset
275 {
1e2068c5413a - store settings in eeprom
Matt Johnston <matt@ucc.asn.au>
parents: 79
diff changeset
276 return measurements[sensor*max_measurements + measurement];
1e2068c5413a - store settings in eeprom
Matt Johnston <matt@ucc.asn.au>
parents: 79
diff changeset
277 }
1e2068c5413a - store settings in eeprom
Matt Johnston <matt@ucc.asn.au>
parents: 79
diff changeset
278
16
5075d8c428bd untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents: 15
diff changeset
279 static void
5075d8c428bd untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents: 15
diff changeset
280 setup_tick_counter()
5075d8c428bd untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents: 15
diff changeset
281 {
5075d8c428bd untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents: 15
diff changeset
282 // set up counter2.
5075d8c428bd untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents: 15
diff changeset
283 // COM21 COM20 Set OC2 on Compare Match (p116)
5075d8c428bd untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents: 15
diff changeset
284 // WGM21 Clear counter on compare
5075d8c428bd untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents: 15
diff changeset
285 //TCCR2A = _BV(COM2A1) | _BV(COM2A0) | _BV(WGM21);
5075d8c428bd untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents: 15
diff changeset
286 // toggle on match
5075d8c428bd untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents: 15
diff changeset
287 TCCR2A = _BV(COM2A0);
5075d8c428bd untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents: 15
diff changeset
288 // CS22 CS21 CS20 clk/1024
5075d8c428bd untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents: 15
diff changeset
289 TCCR2B = _BV(CS22) | _BV(CS21) | _BV(CS20);
5075d8c428bd untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents: 15
diff changeset
290 // set async mode
5075d8c428bd untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents: 15
diff changeset
291 ASSR |= _BV(AS2);
5075d8c428bd untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents: 15
diff changeset
292 TCNT2 = 0;
5075d8c428bd untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents: 15
diff changeset
293 OCR2A = SLEEP_COMPARE;
5075d8c428bd untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents: 15
diff changeset
294 // interrupt
5075d8c428bd untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents: 15
diff changeset
295 TIMSK2 = _BV(OCIE2A);
5075d8c428bd untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents: 15
diff changeset
296 }
18
bf733e8e8cf0 Add INT0 button
Matt Johnston <matt@ucc.asn.au>
parents: 15
diff changeset
297
0
c8b14b2950b9 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
298 static void
7
52cb08a01171 serial prints something
Matt Johnston <matt@ucc.asn.au>
parents: 6
diff changeset
299 uart_on()
0
c8b14b2950b9 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
300 {
8
c55321727d02 deep sleep works
Matt Johnston <matt@ucc.asn.au>
parents: 7
diff changeset
301 // Power reduction register
46
9ccd965d938a Use the PRR etc, set value to proper ones
Matt Johnston <matt@ucc.asn.au>
parents: 44
diff changeset
302 PRR &= ~_BV(PRUSART0);
8
c55321727d02 deep sleep works
Matt Johnston <matt@ucc.asn.au>
parents: 7
diff changeset
303
16
5075d8c428bd untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents: 15
diff changeset
304 // 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
305 // baud rate
7
52cb08a01171 serial prints something
Matt Johnston <matt@ucc.asn.au>
parents: 6
diff changeset
306 UBRR0H = (unsigned char)(UBRR >> 8);
52cb08a01171 serial prints something
Matt Johnston <matt@ucc.asn.au>
parents: 6
diff changeset
307 UBRR0L = (unsigned char)UBRR;
52cb08a01171 serial prints something
Matt Johnston <matt@ucc.asn.au>
parents: 6
diff changeset
308 // set 2x clock, improves accuracy of UBRR
52cb08a01171 serial prints something
Matt Johnston <matt@ucc.asn.au>
parents: 6
diff changeset
309 UCSR0A |= _BV(U2X0);
6
9d538f674ff0 - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 5
diff changeset
310 UCSR0B = _BV(RXCIE0) | _BV(RXEN0) | _BV(TXEN0);
0
c8b14b2950b9 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
311 //8N1
7
52cb08a01171 serial prints something
Matt Johnston <matt@ucc.asn.au>
parents: 6
diff changeset
312 UCSR0C = _BV(UCSZ01) | _BV(UCSZ00);
41
1701457e6007 fix tabbing
Matt Johnston <matt@ucc.asn.au>
parents: 40
diff changeset
313 uart_enabled = 1;
6
9d538f674ff0 - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 5
diff changeset
314 }
9d538f674ff0 - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 5
diff changeset
315
9d538f674ff0 - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 5
diff changeset
316 static void
9d538f674ff0 - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 5
diff changeset
317 uart_off()
9d538f674ff0 - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 5
diff changeset
318 {
89
51d889ad39a3 main.c : add a delay before turning on uart
Matt Johnston <matt@ucc.asn.au>
parents: 87
diff changeset
319 // Turn off interrupts and disable tx/rx
6
9d538f674ff0 - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 5
diff changeset
320 UCSR0B = 0;
41
1701457e6007 fix tabbing
Matt Johnston <matt@ucc.asn.au>
parents: 40
diff changeset
321 uart_enabled = 0;
6
9d538f674ff0 - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 5
diff changeset
322
9d538f674ff0 - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 5
diff changeset
323 // Power reduction register
46
9ccd965d938a Use the PRR etc, set value to proper ones
Matt Johnston <matt@ucc.asn.au>
parents: 44
diff changeset
324 PRR |= _BV(PRUSART0);
0
c8b14b2950b9 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
325 }
c8b14b2950b9 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
326
10
1bfe28c348dd reading DS18B20 works
Matt Johnston <matt@ucc.asn.au>
parents: 9
diff changeset
327 int
0
c8b14b2950b9 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
328 uart_putchar(char c, FILE *stream)
c8b14b2950b9 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
329 {
41
1701457e6007 fix tabbing
Matt Johnston <matt@ucc.asn.au>
parents: 40
diff changeset
330 if (!uart_enabled)
1701457e6007 fix tabbing
Matt Johnston <matt@ucc.asn.au>
parents: 40
diff changeset
331 {
1701457e6007 fix tabbing
Matt Johnston <matt@ucc.asn.au>
parents: 40
diff changeset
332 return EOF;
1701457e6007 fix tabbing
Matt Johnston <matt@ucc.asn.au>
parents: 40
diff changeset
333 }
20
878be5e353a0 Untested - calculate crc in uart_putchar
Matt Johnston <matt@ucc.asn.au>
parents: 19
diff changeset
334 // XXX could perhaps sleep in the loop for power.
8
c55321727d02 deep sleep works
Matt Johnston <matt@ucc.asn.au>
parents: 7
diff changeset
335 if (c == '\n')
c55321727d02 deep sleep works
Matt Johnston <matt@ucc.asn.au>
parents: 7
diff changeset
336 {
10
1bfe28c348dd reading DS18B20 works
Matt Johnston <matt@ucc.asn.au>
parents: 9
diff changeset
337 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
338 UDR0 = '\r';
8
c55321727d02 deep sleep works
Matt Johnston <matt@ucc.asn.au>
parents: 7
diff changeset
339 }
2
ab0e30c4b344 switch to atmega328
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
340 loop_until_bit_is_set(UCSR0A, UDRE0);
ab0e30c4b344 switch to atmega328
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
341 UDR0 = c;
20
878be5e353a0 Untested - calculate crc in uart_putchar
Matt Johnston <matt@ucc.asn.au>
parents: 19
diff changeset
342 if (stream == crc_stdout)
878be5e353a0 Untested - calculate crc in uart_putchar
Matt Johnston <matt@ucc.asn.au>
parents: 19
diff changeset
343 {
26
d3e5934fe55c - Move crc16 to utils and fix it
Matt Johnston <matt@ucc.asn.au>
parents: 25
diff changeset
344 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
345 }
10
1bfe28c348dd reading DS18B20 works
Matt Johnston <matt@ucc.asn.au>
parents: 9
diff changeset
346 if (c == '\r')
1bfe28c348dd reading DS18B20 works
Matt Johnston <matt@ucc.asn.au>
parents: 9
diff changeset
347 {
1bfe28c348dd reading DS18B20 works
Matt Johnston <matt@ucc.asn.au>
parents: 9
diff changeset
348 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
349 UDR0 = '\n';
878be5e353a0 Untested - calculate crc in uart_putchar
Matt Johnston <matt@ucc.asn.au>
parents: 19
diff changeset
350 if (stream == crc_stdout)
878be5e353a0 Untested - calculate crc in uart_putchar
Matt Johnston <matt@ucc.asn.au>
parents: 19
diff changeset
351 {
878be5e353a0 Untested - calculate crc in uart_putchar
Matt Johnston <matt@ucc.asn.au>
parents: 19
diff changeset
352 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
353 }
10
1bfe28c348dd reading DS18B20 works
Matt Johnston <matt@ucc.asn.au>
parents: 9
diff changeset
354 }
40
9b5b202129c3 main.c:
Matt Johnston <matt@ucc.asn.au>
parents: 36
diff changeset
355 return (unsigned char)c;
0
c8b14b2950b9 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
356 }
c8b14b2950b9 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
357
c8b14b2950b9 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
358 static void
c8b14b2950b9 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
359 cmd_fetch()
c8b14b2950b9 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
360 {
20
878be5e353a0 Untested - calculate crc in uart_putchar
Matt Johnston <matt@ucc.asn.au>
parents: 19
diff changeset
361 crc_out = 0;
55
8e897a682208 untested code to log voltage and internal temperature
Matt Johnston <matt@ucc.asn.au>
parents: 54
diff changeset
362
81
4a2a82d6302c try and be a bit more frugal with stack
Matt Johnston <matt@ucc.asn.au>
parents: 80
diff changeset
363 fprintf_P(crc_stdout, PSTR("START\n"));
59
d5b269352ba0 - add some atomic guards
Matt Johnston <matt@ucc.asn.au>
parents: 58
diff changeset
364 {
90
a1c1c2d475b0 print the remainder of timers as well
Matt Johnston <matt@ucc.asn.au>
parents: 89
diff changeset
365 struct epoch_ticks now;
a1c1c2d475b0 print the remainder of timers as well
Matt Johnston <matt@ucc.asn.au>
parents: 89
diff changeset
366 get_epoch_ticks(&now);
a1c1c2d475b0 print the remainder of timers as well
Matt Johnston <matt@ucc.asn.au>
parents: 89
diff changeset
367 fprintf_P(crc_stdout, PSTR("now=%lu\n"), now.ticks);
a1c1c2d475b0 print the remainder of timers as well
Matt Johnston <matt@ucc.asn.au>
parents: 89
diff changeset
368 fprintf_P(crc_stdout, PSTR("now_rem=%hhu\n"), now.rem);
59
d5b269352ba0 - add some atomic guards
Matt Johnston <matt@ucc.asn.au>
parents: 58
diff changeset
369 }
81
4a2a82d6302c try and be a bit more frugal with stack
Matt Johnston <matt@ucc.asn.au>
parents: 80
diff changeset
370 fprintf_P(crc_stdout, PSTR("time_step=%hu\n"), measure_wake);
90
a1c1c2d475b0 print the remainder of timers as well
Matt Johnston <matt@ucc.asn.au>
parents: 89
diff changeset
371 fprintf_P(crc_stdout, PSTR("first_time=%lu\n"), first_measurement_clock.ticks);
a1c1c2d475b0 print the remainder of timers as well
Matt Johnston <matt@ucc.asn.au>
parents: 89
diff changeset
372 fprintf_P(crc_stdout, PSTR("first_time_rem=%hhu\n"), first_measurement_clock.rem);
a1c1c2d475b0 print the remainder of timers as well
Matt Johnston <matt@ucc.asn.au>
parents: 89
diff changeset
373 fprintf_P(crc_stdout, PSTR("last_time=%lu\n"), last_measurement_clock.ticks);
a1c1c2d475b0 print the remainder of timers as well
Matt Johnston <matt@ucc.asn.au>
parents: 89
diff changeset
374 fprintf_P(crc_stdout, PSTR("last_time_rem=%hhu\n"), last_measurement_clock.rem);
a1c1c2d475b0 print the remainder of timers as well
Matt Johnston <matt@ucc.asn.au>
parents: 89
diff changeset
375 fprintf_P(crc_stdout, PSTR("comms_time=%lu\n"), last_comms_clock.ticks);
a1c1c2d475b0 print the remainder of timers as well
Matt Johnston <matt@ucc.asn.au>
parents: 89
diff changeset
376 fprintf_P(crc_stdout, PSTR("comms_time_rem=%hhu\n"), last_comms_clock.rem);
81
4a2a82d6302c try and be a bit more frugal with stack
Matt Johnston <matt@ucc.asn.au>
parents: 80
diff changeset
377 fprintf_P(crc_stdout, PSTR("voltage=%hu\n"), adc_vcc());
87
81b8c84344c4 - log more details
Matt Johnston <matt@ucc.asn.au>
parents: 83
diff changeset
378 fprintf_P(crc_stdout, PSTR("measure=%hu\n"), measure_wake);
81b8c84344c4 - log more details
Matt Johnston <matt@ucc.asn.au>
parents: 83
diff changeset
379 fprintf_P(crc_stdout, PSTR("comms=%hu\n"), comms_wake);
81b8c84344c4 - log more details
Matt Johnston <matt@ucc.asn.au>
parents: 83
diff changeset
380 fprintf_P(crc_stdout, PSTR("wake=%hhu\n"), wake_secs);
115
90d1ebb941ab untested fridge control
Matt Johnston <matt@ucc.asn.au>
parents: 114
diff changeset
381 fprintf_P(crc_stdout, PSTR("fridge=%.1f\n"), fridge_setpoint/10.0);
90d1ebb941ab untested fridge control
Matt Johnston <matt@ucc.asn.au>
parents: 114
diff changeset
382 fprintf_P(crc_stdout, PSTR("fridge_diff=%.1f\n"), fridge_difference/10.0);
90d1ebb941ab untested fridge control
Matt Johnston <matt@ucc.asn.au>
parents: 114
diff changeset
383 fprintf_P(crc_stdout, PSTR("fridge_delay=%hu\n"), fridge_delay);
135
10d35b4370ef make overshoot a parameter
Matt Johnston <matt@ucc.asn.au>
parents: 134
diff changeset
384 fprintf_P(crc_stdout, PSTR("overshoot_factor=%.1f\n"), overshoot_factor/10.0);
10d35b4370ef make overshoot a parameter
Matt Johnston <matt@ucc.asn.au>
parents: 134
diff changeset
385 fprintf_P(crc_stdout, PSTR("overshoot_delay=%hu\n"), overshoot_delay);
117
eecd2612a68e stay on
Matt Johnston <matt@ucc.asn.au>
parents: 116
diff changeset
386 fprintf_P(crc_stdout, PSTR("fridge_status=%hhu\n"), is_fridge_on());
128
fbb076bf2a59 fix stupid bugs - lack of PSTR, MIN not MAX
Matt Johnston <matt@ucc.asn.au>
parents: 127
diff changeset
387 fprintf_P(crc_stdout, PSTR("fridge_last_on=%lu\n"), fridge_on_clock.ticks);
fbb076bf2a59 fix stupid bugs - lack of PSTR, MIN not MAX
Matt Johnston <matt@ucc.asn.au>
parents: 127
diff changeset
388 fprintf_P(crc_stdout, PSTR("fridge_last_off=%lu\n"), fridge_off_clock.ticks);
fbb076bf2a59 fix stupid bugs - lack of PSTR, MIN not MAX
Matt Johnston <matt@ucc.asn.au>
parents: 127
diff changeset
389 fprintf_P(crc_stdout, PSTR("last_fridge=%hu\n"), last_fridge);
fbb076bf2a59 fix stupid bugs - lack of PSTR, MIN not MAX
Matt Johnston <matt@ucc.asn.au>
parents: 127
diff changeset
390 fprintf_P(crc_stdout, PSTR("last_wort=%hu\n"), last_wort);
90
a1c1c2d475b0 print the remainder of timers as well
Matt Johnston <matt@ucc.asn.au>
parents: 89
diff changeset
391 fprintf_P(crc_stdout, PSTR("tick_secs=%d\n"), TICK);
a1c1c2d475b0 print the remainder of timers as well
Matt Johnston <matt@ucc.asn.au>
parents: 89
diff changeset
392 fprintf_P(crc_stdout, PSTR("tick_wake=%d\n"), SLEEP_COMPARE);
87
81b8c84344c4 - log more details
Matt Johnston <matt@ucc.asn.au>
parents: 83
diff changeset
393 fprintf_P(crc_stdout, PSTR("maxsens=%hhu\n"), MAX_SENSORS);
81b8c84344c4 - log more details
Matt Johnston <matt@ucc.asn.au>
parents: 83
diff changeset
394 fprintf_P(crc_stdout, PSTR("totalmeas=%hu\n"), TOTAL_MEASUREMENTS);
81
4a2a82d6302c try and be a bit more frugal with stack
Matt Johnston <matt@ucc.asn.au>
parents: 80
diff changeset
395 fprintf_P(crc_stdout, PSTR("sensors=%hhu\n"), n_sensors);
15
54b0fda9cba7 Add shutdown handling, print sensors in "fetch" output
Matt Johnston <matt@ucc.asn.au>
parents: 14
diff changeset
396 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
397 {
81
4a2a82d6302c try and be a bit more frugal with stack
Matt Johnston <matt@ucc.asn.au>
parents: 80
diff changeset
398 fprintf_P(crc_stdout, PSTR("sensor_id%hhu="), s);
76
6e47a61edc47 don't store sensors in eeprom, scan at startup instead
Matt Johnston <matt@ucc.asn.au>
parents: 75
diff changeset
399 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
400 fputc('\n', crc_stdout);
15
54b0fda9cba7 Add shutdown handling, print sensors in "fetch" output
Matt Johnston <matt@ucc.asn.au>
parents: 14
diff changeset
401 }
36
a670a67ba489 - decrease measurement interval, measure at start
Matt Johnston <matt@ucc.asn.au>
parents: 33
diff changeset
402 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
403 for (uint16_t n = 0; n < n_measurements; n++)
0
c8b14b2950b9 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
404 {
46
9ccd965d938a Use the PRR etc, set value to proper ones
Matt Johnston <matt@ucc.asn.au>
parents: 44
diff changeset
405 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
406 for (uint8_t s = 0; s < n_sensors; s++)
13
4838bfcb3504 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 12
diff changeset
407 {
80
1e2068c5413a - store settings in eeprom
Matt Johnston <matt@ucc.asn.au>
parents: 79
diff changeset
408 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
409 }
20
878be5e353a0 Untested - calculate crc in uart_putchar
Matt Johnston <matt@ucc.asn.au>
parents: 19
diff changeset
410 fputc('\n', crc_stdout);
0
c8b14b2950b9 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
411 }
20
878be5e353a0 Untested - calculate crc in uart_putchar
Matt Johnston <matt@ucc.asn.au>
parents: 19
diff changeset
412 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
413 fprintf_P(stdout, PSTR("CRC=%hu\n"), crc_out);
0
c8b14b2950b9 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
414 }
c8b14b2950b9 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
415
c8b14b2950b9 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
416 static void
c8b14b2950b9 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
417 cmd_clear()
c8b14b2950b9 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
418 {
7
52cb08a01171 serial prints something
Matt Johnston <matt@ucc.asn.au>
parents: 6
diff changeset
419 n_measurements = 0;
32
e18d7e89c17d More minor work
Matt Johnston <matt@ucc.asn.au>
parents: 27
diff changeset
420 printf_P(PSTR("cleared\n"));
0
c8b14b2950b9 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
421 }
c8b14b2950b9 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
422
c8b14b2950b9 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
423 static void
c8b14b2950b9 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
424 cmd_btoff()
c8b14b2950b9 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
425 {
93
f18fd4257296 don't reset the wake time when btoff happens
Matt Johnston <matt@ucc.asn.au>
parents: 90
diff changeset
426 uint8_t rem;
f18fd4257296 don't reset the wake time when btoff happens
Matt Johnston <matt@ucc.asn.au>
parents: 90
diff changeset
427 uint16_t count_copy;
59
d5b269352ba0 - add some atomic guards
Matt Johnston <matt@ucc.asn.au>
parents: 58
diff changeset
428 ATOMIC_BLOCK(ATOMIC_RESTORESTATE)
d5b269352ba0 - add some atomic guards
Matt Johnston <matt@ucc.asn.au>
parents: 58
diff changeset
429 {
93
f18fd4257296 don't reset the wake time when btoff happens
Matt Johnston <matt@ucc.asn.au>
parents: 90
diff changeset
430 count_copy = comms_count;
f18fd4257296 don't reset the wake time when btoff happens
Matt Johnston <matt@ucc.asn.au>
parents: 90
diff changeset
431 rem = TCNT2;
59
d5b269352ba0 - add some atomic guards
Matt Johnston <matt@ucc.asn.au>
parents: 58
diff changeset
432 }
93
f18fd4257296 don't reset the wake time when btoff happens
Matt Johnston <matt@ucc.asn.au>
parents: 90
diff changeset
433 printf_P(PSTR("next_wake=%hu,"), comms_wake-count_copy);
90
a1c1c2d475b0 print the remainder of timers as well
Matt Johnston <matt@ucc.asn.au>
parents: 89
diff changeset
434 printf_P(PSTR("rem=%hhu,"), rem);
a1c1c2d475b0 print the remainder of timers as well
Matt Johnston <matt@ucc.asn.au>
parents: 89
diff changeset
435 printf_P(PSTR("tick_secs=%hhu,"), TICK);
a1c1c2d475b0 print the remainder of timers as well
Matt Johnston <matt@ucc.asn.au>
parents: 89
diff changeset
436 printf_P(PSTR("tick_wake=%hhu\n"), SLEEP_COMPARE);
46
9ccd965d938a Use the PRR etc, set value to proper ones
Matt Johnston <matt@ucc.asn.au>
parents: 44
diff changeset
437 _delay_ms(100);
16
5075d8c428bd untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents: 15
diff changeset
438 comms_timeout = 0;
117
eecd2612a68e stay on
Matt Johnston <matt@ucc.asn.au>
parents: 116
diff changeset
439 stay_awake = 0;
0
c8b14b2950b9 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
440 }
c8b14b2950b9 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
441
c8b14b2950b9 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
442 static void
54
0d3d14af55c2 add "awake" and "reset" functions
Matt Johnston <matt@ucc.asn.au>
parents: 52
diff changeset
443 cmd_reset()
0d3d14af55c2 add "awake" and "reset" functions
Matt Johnston <matt@ucc.asn.au>
parents: 52
diff changeset
444 {
0d3d14af55c2 add "awake" and "reset" functions
Matt Johnston <matt@ucc.asn.au>
parents: 52
diff changeset
445 printf_P(PSTR("reset\n"));
0d3d14af55c2 add "awake" and "reset" functions
Matt Johnston <matt@ucc.asn.au>
parents: 52
diff changeset
446 _delay_ms(100);
0d3d14af55c2 add "awake" and "reset" functions
Matt Johnston <matt@ucc.asn.au>
parents: 52
diff changeset
447 cli(); // disable interrupts
0d3d14af55c2 add "awake" and "reset" functions
Matt Johnston <matt@ucc.asn.au>
parents: 52
diff changeset
448 wdt_enable(WDTO_15MS); // enable watchdog
0d3d14af55c2 add "awake" and "reset" functions
Matt Johnston <matt@ucc.asn.au>
parents: 52
diff changeset
449 while(1); // wait for watchdog to reset processor
0d3d14af55c2 add "awake" and "reset" functions
Matt Johnston <matt@ucc.asn.au>
parents: 52
diff changeset
450 }
0d3d14af55c2 add "awake" and "reset" functions
Matt Johnston <matt@ucc.asn.au>
parents: 52
diff changeset
451
0d3d14af55c2 add "awake" and "reset" functions
Matt Johnston <matt@ucc.asn.au>
parents: 52
diff changeset
452 static void
12
3c27bfbd7f3a Add simple_ds18b20.c etc
Matt Johnston <matt@ucc.asn.au>
parents: 10
diff changeset
453 cmd_measure()
3c27bfbd7f3a Add simple_ds18b20.c etc
Matt Johnston <matt@ucc.asn.au>
parents: 10
diff changeset
454 {
33
024f5571df8c - Debug log file for server
Matt Johnston <matt@ucc.asn.au>
parents: 32
diff changeset
455 printf_P(PSTR("measuring\n"));
12
3c27bfbd7f3a Add simple_ds18b20.c etc
Matt Johnston <matt@ucc.asn.au>
parents: 10
diff changeset
456 need_measurement = 1;
3c27bfbd7f3a Add simple_ds18b20.c etc
Matt Johnston <matt@ucc.asn.au>
parents: 10
diff changeset
457 }
3c27bfbd7f3a Add simple_ds18b20.c etc
Matt Johnston <matt@ucc.asn.au>
parents: 10
diff changeset
458
3c27bfbd7f3a Add simple_ds18b20.c etc
Matt Johnston <matt@ucc.asn.au>
parents: 10
diff changeset
459 static void
3c27bfbd7f3a Add simple_ds18b20.c etc
Matt Johnston <matt@ucc.asn.au>
parents: 10
diff changeset
460 cmd_sensors()
3c27bfbd7f3a Add simple_ds18b20.c etc
Matt Johnston <matt@ucc.asn.au>
parents: 10
diff changeset
461 {
3c27bfbd7f3a Add simple_ds18b20.c etc
Matt Johnston <matt@ucc.asn.au>
parents: 10
diff changeset
462 uint8_t ret = simple_ds18b20_start_meas(NULL);
81
4a2a82d6302c try and be a bit more frugal with stack
Matt Johnston <matt@ucc.asn.au>
parents: 80
diff changeset
463 printf_P(PSTR("All sensors, ret %hhu, waiting...\n"), ret);
14
426fb44ece3f Lots of it works now.
Matt Johnston <matt@ucc.asn.au>
parents: 13
diff changeset
464 long_delay(DS18B20_TCONV_12BIT);
12
3c27bfbd7f3a Add simple_ds18b20.c etc
Matt Johnston <matt@ucc.asn.au>
parents: 10
diff changeset
465 simple_ds18b20_read_all();
3c27bfbd7f3a Add simple_ds18b20.c etc
Matt Johnston <matt@ucc.asn.au>
parents: 10
diff changeset
466 }
3c27bfbd7f3a Add simple_ds18b20.c etc
Matt Johnston <matt@ucc.asn.au>
parents: 10
diff changeset
467
13
4838bfcb3504 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 12
diff changeset
468 static void
76
6e47a61edc47 don't store sensors in eeprom, scan at startup instead
Matt Johnston <matt@ucc.asn.au>
parents: 75
diff changeset
469 init_sensors()
13
4838bfcb3504 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 12
diff changeset
470 {
41
1701457e6007 fix tabbing
Matt Johnston <matt@ucc.asn.au>
parents: 40
diff changeset
471 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
472 printf_P(PSTR("init sensors\n"));
13
4838bfcb3504 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 12
diff changeset
473 ow_reset();
41
1701457e6007 fix tabbing
Matt Johnston <matt@ucc.asn.au>
parents: 40
diff changeset
474 for( uint8_t diff = OW_SEARCH_FIRST; diff != OW_LAST_DEVICE; )
1701457e6007 fix tabbing
Matt Johnston <matt@ucc.asn.au>
parents: 40
diff changeset
475 {
1701457e6007 fix tabbing
Matt Johnston <matt@ucc.asn.au>
parents: 40
diff changeset
476 diff = ow_rom_search( diff, &id[0] );
1701457e6007 fix tabbing
Matt Johnston <matt@ucc.asn.au>
parents: 40
diff changeset
477 if( diff == OW_PRESENCE_ERR ) {
1701457e6007 fix tabbing
Matt Johnston <matt@ucc.asn.au>
parents: 40
diff changeset
478 printf_P( PSTR("No Sensor found\r") );
1701457e6007 fix tabbing
Matt Johnston <matt@ucc.asn.au>
parents: 40
diff changeset
479 return;
1701457e6007 fix tabbing
Matt Johnston <matt@ucc.asn.au>
parents: 40
diff changeset
480 }
1701457e6007 fix tabbing
Matt Johnston <matt@ucc.asn.au>
parents: 40
diff changeset
481
1701457e6007 fix tabbing
Matt Johnston <matt@ucc.asn.au>
parents: 40
diff changeset
482 if( diff == OW_DATA_ERR ) {
1701457e6007 fix tabbing
Matt Johnston <matt@ucc.asn.au>
parents: 40
diff changeset
483 printf_P( PSTR("Bus Error\r") );
1701457e6007 fix tabbing
Matt Johnston <matt@ucc.asn.au>
parents: 40
diff changeset
484 return;
1701457e6007 fix tabbing
Matt Johnston <matt@ucc.asn.au>
parents: 40
diff changeset
485 }
76
6e47a61edc47 don't store sensors in eeprom, scan at startup instead
Matt Johnston <matt@ucc.asn.au>
parents: 75
diff changeset
486
6e47a61edc47 don't store sensors in eeprom, scan at startup instead
Matt Johnston <matt@ucc.asn.au>
parents: 75
diff changeset
487 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
488 {
6e47a61edc47 don't store sensors in eeprom, scan at startup instead
Matt Johnston <matt@ucc.asn.au>
parents: 75
diff changeset
489 memcpy(sensor_id[n_sensors], id, ID_LEN);
81
4a2a82d6302c try and be a bit more frugal with stack
Matt Johnston <matt@ucc.asn.au>
parents: 80
diff changeset
490 printf_P(PSTR("Added sensor %hhu : "), n_sensors);
76
6e47a61edc47 don't store sensors in eeprom, scan at startup instead
Matt Johnston <matt@ucc.asn.au>
parents: 75
diff changeset
491 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
492 putchar('\n');
6e47a61edc47 don't store sensors in eeprom, scan at startup instead
Matt Johnston <matt@ucc.asn.au>
parents: 75
diff changeset
493 n_sensors++;
6e47a61edc47 don't store sensors in eeprom, scan at startup instead
Matt Johnston <matt@ucc.asn.au>
parents: 75
diff changeset
494 }
6e47a61edc47 don't store sensors in eeprom, scan at startup instead
Matt Johnston <matt@ucc.asn.au>
parents: 75
diff changeset
495 else
6e47a61edc47 don't store sensors in eeprom, scan at startup instead
Matt Johnston <matt@ucc.asn.au>
parents: 75
diff changeset
496 {
6e47a61edc47 don't store sensors in eeprom, scan at startup instead
Matt Johnston <matt@ucc.asn.au>
parents: 75
diff changeset
497 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
498 }
13
4838bfcb3504 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 12
diff changeset
499 }
80
1e2068c5413a - store settings in eeprom
Matt Johnston <matt@ucc.asn.au>
parents: 79
diff changeset
500
1e2068c5413a - store settings in eeprom
Matt Johnston <matt@ucc.asn.au>
parents: 79
diff changeset
501 max_measurements = TOTAL_MEASUREMENTS / n_sensors;
1e2068c5413a - store settings in eeprom
Matt Johnston <matt@ucc.asn.au>
parents: 79
diff changeset
502 }
1e2068c5413a - store settings in eeprom
Matt Johnston <matt@ucc.asn.au>
parents: 79
diff changeset
503
1e2068c5413a - store settings in eeprom
Matt Johnston <matt@ucc.asn.au>
parents: 79
diff changeset
504 static void
1e2068c5413a - store settings in eeprom
Matt Johnston <matt@ucc.asn.au>
parents: 79
diff changeset
505 load_params()
1e2068c5413a - store settings in eeprom
Matt Johnston <matt@ucc.asn.au>
parents: 79
diff changeset
506 {
1e2068c5413a - store settings in eeprom
Matt Johnston <matt@ucc.asn.au>
parents: 79
diff changeset
507 uint16_t magic;
1e2068c5413a - store settings in eeprom
Matt Johnston <matt@ucc.asn.au>
parents: 79
diff changeset
508 eeprom_read(magic, magic);
1e2068c5413a - store settings in eeprom
Matt Johnston <matt@ucc.asn.au>
parents: 79
diff changeset
509 if (magic == EXPECT_MAGIC)
1e2068c5413a - store settings in eeprom
Matt Johnston <matt@ucc.asn.au>
parents: 79
diff changeset
510 {
1e2068c5413a - store settings in eeprom
Matt Johnston <matt@ucc.asn.au>
parents: 79
diff changeset
511 eeprom_read(measure_wake, measure_wake);
1e2068c5413a - store settings in eeprom
Matt Johnston <matt@ucc.asn.au>
parents: 79
diff changeset
512 eeprom_read(comms_wake, comms_wake);
1e2068c5413a - store settings in eeprom
Matt Johnston <matt@ucc.asn.au>
parents: 79
diff changeset
513 eeprom_read(wake_secs, wake_secs);
115
90d1ebb941ab untested fridge control
Matt Johnston <matt@ucc.asn.au>
parents: 114
diff changeset
514 eeprom_read(fridge_setpoint, fridge_setpoint);
90d1ebb941ab untested fridge control
Matt Johnston <matt@ucc.asn.au>
parents: 114
diff changeset
515 eeprom_read(fridge_difference, fridge_difference);
90d1ebb941ab untested fridge control
Matt Johnston <matt@ucc.asn.au>
parents: 114
diff changeset
516 eeprom_read(fridge_delay, fridge_delay);
135
10d35b4370ef make overshoot a parameter
Matt Johnston <matt@ucc.asn.au>
parents: 134
diff changeset
517 eeprom_read(overshoot_delay, overshoot_delay);
10d35b4370ef make overshoot a parameter
Matt Johnston <matt@ucc.asn.au>
parents: 134
diff changeset
518 eeprom_read(overshoot_factor, overshoot_factor);
80
1e2068c5413a - store settings in eeprom
Matt Johnston <matt@ucc.asn.au>
parents: 79
diff changeset
519 }
1e2068c5413a - store settings in eeprom
Matt Johnston <matt@ucc.asn.au>
parents: 79
diff changeset
520 }
1e2068c5413a - store settings in eeprom
Matt Johnston <matt@ucc.asn.au>
parents: 79
diff changeset
521
1e2068c5413a - store settings in eeprom
Matt Johnston <matt@ucc.asn.au>
parents: 79
diff changeset
522 static void
1e2068c5413a - store settings in eeprom
Matt Johnston <matt@ucc.asn.au>
parents: 79
diff changeset
523 cmd_get_params()
1e2068c5413a - store settings in eeprom
Matt Johnston <matt@ucc.asn.au>
parents: 79
diff changeset
524 {
81
4a2a82d6302c try and be a bit more frugal with stack
Matt Johnston <matt@ucc.asn.au>
parents: 80
diff changeset
525 printf_P(PSTR("measure %hu\n"), measure_wake);
4a2a82d6302c try and be a bit more frugal with stack
Matt Johnston <matt@ucc.asn.au>
parents: 80
diff changeset
526 printf_P(PSTR("comms %hu\n"), comms_wake);
4a2a82d6302c try and be a bit more frugal with stack
Matt Johnston <matt@ucc.asn.au>
parents: 80
diff changeset
527 printf_P(PSTR("wake %hhu\n"), wake_secs);
4a2a82d6302c try and be a bit more frugal with stack
Matt Johnston <matt@ucc.asn.au>
parents: 80
diff changeset
528 printf_P(PSTR("tick %d\n"), TICK);
116
9afff8f29844 set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents: 115
diff changeset
529 printf_P(PSTR("fridge %.1fº\n"), fridge_setpoint / 10.0f);
9afff8f29844 set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents: 115
diff changeset
530 printf_P(PSTR("fridge difference %.1fº\n"), fridge_difference / 10.0f);
115
90d1ebb941ab untested fridge control
Matt Johnston <matt@ucc.asn.au>
parents: 114
diff changeset
531 printf_P(PSTR("fridge_delay %hu\n"), fridge_delay);
135
10d35b4370ef make overshoot a parameter
Matt Johnston <matt@ucc.asn.au>
parents: 134
diff changeset
532 printf_P(PSTR("overshoot factor %.1fº\n"), overshoot_factor / 10.0f);
10d35b4370ef make overshoot a parameter
Matt Johnston <matt@ucc.asn.au>
parents: 134
diff changeset
533 printf_P(PSTR("overshoot delay %hu\n"), overshoot_delay);
81
4a2a82d6302c try and be a bit more frugal with stack
Matt Johnston <matt@ucc.asn.au>
parents: 80
diff changeset
534 printf_P(PSTR("sensors %hhu (%hhu)\n"),
4a2a82d6302c try and be a bit more frugal with stack
Matt Johnston <matt@ucc.asn.au>
parents: 80
diff changeset
535 n_sensors, MAX_SENSORS);
4a2a82d6302c try and be a bit more frugal with stack
Matt Johnston <matt@ucc.asn.au>
parents: 80
diff changeset
536 printf_P(PSTR("meas %hu (%hu)\n"),
80
1e2068c5413a - store settings in eeprom
Matt Johnston <matt@ucc.asn.au>
parents: 79
diff changeset
537 max_measurements, TOTAL_MEASUREMENTS);
13
4838bfcb3504 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 12
diff changeset
538 }
4838bfcb3504 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 12
diff changeset
539
4838bfcb3504 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 12
diff changeset
540 static void
80
1e2068c5413a - store settings in eeprom
Matt Johnston <matt@ucc.asn.au>
parents: 79
diff changeset
541 cmd_set_params(const char *params)
13
4838bfcb3504 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 12
diff changeset
542 {
80
1e2068c5413a - store settings in eeprom
Matt Johnston <matt@ucc.asn.au>
parents: 79
diff changeset
543 uint16_t new_measure_wake;
1e2068c5413a - store settings in eeprom
Matt Johnston <matt@ucc.asn.au>
parents: 79
diff changeset
544 uint16_t new_comms_wake;
1e2068c5413a - store settings in eeprom
Matt Johnston <matt@ucc.asn.au>
parents: 79
diff changeset
545 uint8_t new_wake_secs;
116
9afff8f29844 set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents: 115
diff changeset
546 int ret = sscanf_P(params, PSTR("%hu %hu %hhu"),
9afff8f29844 set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents: 115
diff changeset
547 &new_measure_wake, &new_comms_wake, &new_wake_secs);
80
1e2068c5413a - store settings in eeprom
Matt Johnston <matt@ucc.asn.au>
parents: 79
diff changeset
548
116
9afff8f29844 set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents: 115
diff changeset
549 if (ret != 3)
13
4838bfcb3504 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 12
diff changeset
550 {
80
1e2068c5413a - store settings in eeprom
Matt Johnston <matt@ucc.asn.au>
parents: 79
diff changeset
551 printf_P(PSTR("Bad values\n"));
1e2068c5413a - store settings in eeprom
Matt Johnston <matt@ucc.asn.au>
parents: 79
diff changeset
552 }
1e2068c5413a - store settings in eeprom
Matt Johnston <matt@ucc.asn.au>
parents: 79
diff changeset
553 else
1e2068c5413a - store settings in eeprom
Matt Johnston <matt@ucc.asn.au>
parents: 79
diff changeset
554 {
115
90d1ebb941ab untested fridge control
Matt Johnston <matt@ucc.asn.au>
parents: 114
diff changeset
555 ATOMIC_BLOCK(ATOMIC_RESTORESTATE)
90d1ebb941ab untested fridge control
Matt Johnston <matt@ucc.asn.au>
parents: 114
diff changeset
556 {
90d1ebb941ab untested fridge control
Matt Johnston <matt@ucc.asn.au>
parents: 114
diff changeset
557 eeprom_write(new_measure_wake, measure_wake);
90d1ebb941ab untested fridge control
Matt Johnston <matt@ucc.asn.au>
parents: 114
diff changeset
558 eeprom_write(new_comms_wake, comms_wake);
90d1ebb941ab untested fridge control
Matt Johnston <matt@ucc.asn.au>
parents: 114
diff changeset
559 eeprom_write(new_wake_secs, wake_secs);
90d1ebb941ab untested fridge control
Matt Johnston <matt@ucc.asn.au>
parents: 114
diff changeset
560 uint16_t magic = EXPECT_MAGIC;
90d1ebb941ab untested fridge control
Matt Johnston <matt@ucc.asn.au>
parents: 114
diff changeset
561 eeprom_write(magic, magic);
90d1ebb941ab untested fridge control
Matt Johnston <matt@ucc.asn.au>
parents: 114
diff changeset
562 }
80
1e2068c5413a - store settings in eeprom
Matt Johnston <matt@ucc.asn.au>
parents: 79
diff changeset
563 printf_P(PSTR("set_params for next boot\n"));
116
9afff8f29844 set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents: 115
diff changeset
564 printf_P(PSTR("measure %hu comms %hu wake %hhu\n"),
9afff8f29844 set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents: 115
diff changeset
565 new_measure_wake, new_comms_wake, new_wake_secs);
9afff8f29844 set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents: 115
diff changeset
566 }
9afff8f29844 set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents: 115
diff changeset
567 }
9afff8f29844 set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents: 115
diff changeset
568
9afff8f29844 set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents: 115
diff changeset
569 // returns true if eeprom was written
9afff8f29844 set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents: 115
diff changeset
570 static bool
9afff8f29844 set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents: 115
diff changeset
571 set_initial_eeprom()
9afff8f29844 set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents: 115
diff changeset
572 {
9afff8f29844 set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents: 115
diff changeset
573 uint16_t magic;
9afff8f29844 set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents: 115
diff changeset
574 eeprom_read(magic, magic);
9afff8f29844 set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents: 115
diff changeset
575 if (magic == EXPECT_MAGIC)
9afff8f29844 set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents: 115
diff changeset
576 {
9afff8f29844 set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents: 115
diff changeset
577 return false;
9afff8f29844 set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents: 115
diff changeset
578 }
9afff8f29844 set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents: 115
diff changeset
579
9afff8f29844 set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents: 115
diff changeset
580 ATOMIC_BLOCK(ATOMIC_RESTORESTATE)
9afff8f29844 set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents: 115
diff changeset
581 {
9afff8f29844 set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents: 115
diff changeset
582 eeprom_write(measure_wake, measure_wake);
9afff8f29844 set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents: 115
diff changeset
583 eeprom_write(comms_wake, comms_wake);
9afff8f29844 set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents: 115
diff changeset
584 eeprom_write(wake_secs, wake_secs);
9afff8f29844 set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents: 115
diff changeset
585 eeprom_write(fridge_setpoint, fridge_setpoint);
9afff8f29844 set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents: 115
diff changeset
586 eeprom_write(fridge_difference, fridge_difference);
9afff8f29844 set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents: 115
diff changeset
587 eeprom_write(fridge_delay, fridge_delay);
135
10d35b4370ef make overshoot a parameter
Matt Johnston <matt@ucc.asn.au>
parents: 134
diff changeset
588 eeprom_write(overshoot_delay, overshoot_delay);
10d35b4370ef make overshoot a parameter
Matt Johnston <matt@ucc.asn.au>
parents: 134
diff changeset
589 eeprom_write(overshoot_factor, overshoot_factor);
116
9afff8f29844 set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents: 115
diff changeset
590 magic = EXPECT_MAGIC;
9afff8f29844 set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents: 115
diff changeset
591 eeprom_write(magic, magic);
9afff8f29844 set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents: 115
diff changeset
592 }
9afff8f29844 set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents: 115
diff changeset
593
9afff8f29844 set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents: 115
diff changeset
594 return true;
9afff8f29844 set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents: 115
diff changeset
595 }
9afff8f29844 set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents: 115
diff changeset
596
9afff8f29844 set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents: 115
diff changeset
597 static void
9afff8f29844 set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents: 115
diff changeset
598 cmd_set_fridge_setpoint(char *params)
9afff8f29844 set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents: 115
diff changeset
599 {
9afff8f29844 set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents: 115
diff changeset
600 float new_f = atof(params);
9afff8f29844 set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents: 115
diff changeset
601 if (new_f < 2 || new_f > 30)
9afff8f29844 set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents: 115
diff changeset
602 {
9afff8f29844 set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents: 115
diff changeset
603 printf_P(PSTR("Bad fridge value %f\n"), new_f);
9afff8f29844 set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents: 115
diff changeset
604 return;
9afff8f29844 set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents: 115
diff changeset
605 }
114
b0ec7b783c0b start of fridge bits
Matt Johnston <matt@ucc.asn.au>
parents: 105
diff changeset
606
121
45c051a7db82 try and take account of the fridge temperature too
Matt Johnston <matt@ucc.asn.au>
parents: 118
diff changeset
607 int16_t old_setpoint = fridge_setpoint;
45c051a7db82 try and take account of the fridge temperature too
Matt Johnston <matt@ucc.asn.au>
parents: 118
diff changeset
608
116
9afff8f29844 set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents: 115
diff changeset
609 fridge_setpoint = new_f * 10;
9afff8f29844 set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents: 115
diff changeset
610 bool written = set_initial_eeprom();
9afff8f29844 set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents: 115
diff changeset
611 if (!written)
9afff8f29844 set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents: 115
diff changeset
612 {
121
45c051a7db82 try and take account of the fridge temperature too
Matt Johnston <matt@ucc.asn.au>
parents: 118
diff changeset
613 if (old_setpoint != fridge_setpoint)
116
9afff8f29844 set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents: 115
diff changeset
614 {
121
45c051a7db82 try and take account of the fridge temperature too
Matt Johnston <matt@ucc.asn.au>
parents: 118
diff changeset
615 ATOMIC_BLOCK(ATOMIC_RESTORESTATE)
45c051a7db82 try and take account of the fridge temperature too
Matt Johnston <matt@ucc.asn.au>
parents: 118
diff changeset
616 {
45c051a7db82 try and take account of the fridge temperature too
Matt Johnston <matt@ucc.asn.au>
parents: 118
diff changeset
617 eeprom_write(fridge_setpoint, fridge_setpoint);
45c051a7db82 try and take account of the fridge temperature too
Matt Johnston <matt@ucc.asn.au>
parents: 118
diff changeset
618 }
116
9afff8f29844 set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents: 115
diff changeset
619 }
9afff8f29844 set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents: 115
diff changeset
620 }
121
45c051a7db82 try and take account of the fridge temperature too
Matt Johnston <matt@ucc.asn.au>
parents: 118
diff changeset
621 printf_P(PSTR("old fridge %.1fº new fridge %.1fº\n"),
45c051a7db82 try and take account of the fridge temperature too
Matt Johnston <matt@ucc.asn.au>
parents: 118
diff changeset
622 old_setpoint / 10.0f, fridge_setpoint / 10.0f);
116
9afff8f29844 set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents: 115
diff changeset
623 }
9afff8f29844 set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents: 115
diff changeset
624
9afff8f29844 set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents: 115
diff changeset
625 static void
9afff8f29844 set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents: 115
diff changeset
626 cmd_set_fridge_difference(char *params)
9afff8f29844 set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents: 115
diff changeset
627 {
9afff8f29844 set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents: 115
diff changeset
628 float new_f = atof(params);
9afff8f29844 set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents: 115
diff changeset
629 if (new_f < 0 || new_f > 30)
9afff8f29844 set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents: 115
diff changeset
630 {
9afff8f29844 set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents: 115
diff changeset
631 printf_P(PSTR("Bad fridge value %f\n"), new_f);
9afff8f29844 set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents: 115
diff changeset
632 return;
9afff8f29844 set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents: 115
diff changeset
633 }
9afff8f29844 set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents: 115
diff changeset
634
9afff8f29844 set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents: 115
diff changeset
635 fridge_difference = new_f * 10;
9afff8f29844 set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents: 115
diff changeset
636 bool written = set_initial_eeprom();
9afff8f29844 set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents: 115
diff changeset
637 if (!written)
9afff8f29844 set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents: 115
diff changeset
638 {
9afff8f29844 set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents: 115
diff changeset
639 ATOMIC_BLOCK(ATOMIC_RESTORESTATE)
9afff8f29844 set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents: 115
diff changeset
640 {
9afff8f29844 set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents: 115
diff changeset
641 eeprom_write(fridge_difference, fridge_difference);
9afff8f29844 set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents: 115
diff changeset
642 }
9afff8f29844 set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents: 115
diff changeset
643 }
118
bb0c946460f3 a bit more logging. make printf floats work
Matt Johnston <matt@ucc.asn.au>
parents: 117
diff changeset
644 printf_P(PSTR("new fridge difference %.1fº\n"), fridge_difference / 10.0f);
116
9afff8f29844 set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents: 115
diff changeset
645 }
9afff8f29844 set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents: 115
diff changeset
646
9afff8f29844 set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents: 115
diff changeset
647 static void
9afff8f29844 set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents: 115
diff changeset
648 cmd_set_fridge_delay(char *params)
9afff8f29844 set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents: 115
diff changeset
649 {
9afff8f29844 set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents: 115
diff changeset
650 uint16_t new_delay = atoi(params);
9afff8f29844 set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents: 115
diff changeset
651 if (new_delay < 5)
9afff8f29844 set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents: 115
diff changeset
652 {
9afff8f29844 set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents: 115
diff changeset
653 printf_P(PSTR("Bad fridge delay %d\n"), new_delay);
9afff8f29844 set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents: 115
diff changeset
654 return;
9afff8f29844 set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents: 115
diff changeset
655 }
9afff8f29844 set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents: 115
diff changeset
656
9afff8f29844 set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents: 115
diff changeset
657 fridge_delay = new_delay;
9afff8f29844 set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents: 115
diff changeset
658 bool written = set_initial_eeprom();
9afff8f29844 set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents: 115
diff changeset
659 if (!written)
9afff8f29844 set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents: 115
diff changeset
660 {
9afff8f29844 set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents: 115
diff changeset
661 ATOMIC_BLOCK(ATOMIC_RESTORESTATE)
9afff8f29844 set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents: 115
diff changeset
662 {
9afff8f29844 set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents: 115
diff changeset
663 eeprom_write(fridge_delay, fridge_delay);
9afff8f29844 set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents: 115
diff changeset
664 }
114
b0ec7b783c0b start of fridge bits
Matt Johnston <matt@ucc.asn.au>
parents: 105
diff changeset
665 }
118
bb0c946460f3 a bit more logging. make printf floats work
Matt Johnston <matt@ucc.asn.au>
parents: 117
diff changeset
666 printf_P(PSTR("new fridge delay %hu\n"), fridge_delay);
80
1e2068c5413a - store settings in eeprom
Matt Johnston <matt@ucc.asn.au>
parents: 79
diff changeset
667 }
135
10d35b4370ef make overshoot a parameter
Matt Johnston <matt@ucc.asn.au>
parents: 134
diff changeset
668
10d35b4370ef make overshoot a parameter
Matt Johnston <matt@ucc.asn.au>
parents: 134
diff changeset
669 static void
10d35b4370ef make overshoot a parameter
Matt Johnston <matt@ucc.asn.au>
parents: 134
diff changeset
670 cmd_set_overshoot_factor(char *params)
10d35b4370ef make overshoot a parameter
Matt Johnston <matt@ucc.asn.au>
parents: 134
diff changeset
671 {
10d35b4370ef make overshoot a parameter
Matt Johnston <matt@ucc.asn.au>
parents: 134
diff changeset
672 float new_f = atof(params);
10d35b4370ef make overshoot a parameter
Matt Johnston <matt@ucc.asn.au>
parents: 134
diff changeset
673 if (new_f <= 0 || new_f > 20)
10d35b4370ef make overshoot a parameter
Matt Johnston <matt@ucc.asn.au>
parents: 134
diff changeset
674 {
10d35b4370ef make overshoot a parameter
Matt Johnston <matt@ucc.asn.au>
parents: 134
diff changeset
675 printf_P(PSTR("Bad overshoot factor %f\n"), new_f);
10d35b4370ef make overshoot a parameter
Matt Johnston <matt@ucc.asn.au>
parents: 134
diff changeset
676 return;
10d35b4370ef make overshoot a parameter
Matt Johnston <matt@ucc.asn.au>
parents: 134
diff changeset
677 }
10d35b4370ef make overshoot a parameter
Matt Johnston <matt@ucc.asn.au>
parents: 134
diff changeset
678
10d35b4370ef make overshoot a parameter
Matt Johnston <matt@ucc.asn.au>
parents: 134
diff changeset
679 uint8_t old = overshoot_delay;
10d35b4370ef make overshoot a parameter
Matt Johnston <matt@ucc.asn.au>
parents: 134
diff changeset
680
10d35b4370ef make overshoot a parameter
Matt Johnston <matt@ucc.asn.au>
parents: 134
diff changeset
681 overshoot_delay = new_f * 10;
10d35b4370ef make overshoot a parameter
Matt Johnston <matt@ucc.asn.au>
parents: 134
diff changeset
682 bool written = set_initial_eeprom();
10d35b4370ef make overshoot a parameter
Matt Johnston <matt@ucc.asn.au>
parents: 134
diff changeset
683 if (!written)
10d35b4370ef make overshoot a parameter
Matt Johnston <matt@ucc.asn.au>
parents: 134
diff changeset
684 {
10d35b4370ef make overshoot a parameter
Matt Johnston <matt@ucc.asn.au>
parents: 134
diff changeset
685 if (old != overshoot_factor)
10d35b4370ef make overshoot a parameter
Matt Johnston <matt@ucc.asn.au>
parents: 134
diff changeset
686 {
10d35b4370ef make overshoot a parameter
Matt Johnston <matt@ucc.asn.au>
parents: 134
diff changeset
687 ATOMIC_BLOCK(ATOMIC_RESTORESTATE)
10d35b4370ef make overshoot a parameter
Matt Johnston <matt@ucc.asn.au>
parents: 134
diff changeset
688 {
10d35b4370ef make overshoot a parameter
Matt Johnston <matt@ucc.asn.au>
parents: 134
diff changeset
689 eeprom_write(overshoot_factor, overshoot_factor);
10d35b4370ef make overshoot a parameter
Matt Johnston <matt@ucc.asn.au>
parents: 134
diff changeset
690 }
10d35b4370ef make overshoot a parameter
Matt Johnston <matt@ucc.asn.au>
parents: 134
diff changeset
691 }
10d35b4370ef make overshoot a parameter
Matt Johnston <matt@ucc.asn.au>
parents: 134
diff changeset
692 }
10d35b4370ef make overshoot a parameter
Matt Johnston <matt@ucc.asn.au>
parents: 134
diff changeset
693 printf_P(PSTR("old factor %.1fº new factor %.1fº\n"),
10d35b4370ef make overshoot a parameter
Matt Johnston <matt@ucc.asn.au>
parents: 134
diff changeset
694 old / 10.0f, overshoot_factor / 10.0f);
10d35b4370ef make overshoot a parameter
Matt Johnston <matt@ucc.asn.au>
parents: 134
diff changeset
695 }
115
90d1ebb941ab untested fridge control
Matt Johnston <matt@ucc.asn.au>
parents: 114
diff changeset
696
80
1e2068c5413a - store settings in eeprom
Matt Johnston <matt@ucc.asn.au>
parents: 79
diff changeset
697 static void
135
10d35b4370ef make overshoot a parameter
Matt Johnston <matt@ucc.asn.au>
parents: 134
diff changeset
698 cmd_set_overshoot_delay(char *params)
10d35b4370ef make overshoot a parameter
Matt Johnston <matt@ucc.asn.au>
parents: 134
diff changeset
699 {
10d35b4370ef make overshoot a parameter
Matt Johnston <matt@ucc.asn.au>
parents: 134
diff changeset
700 uint16_t new_delay = atoi(params);
10d35b4370ef make overshoot a parameter
Matt Johnston <matt@ucc.asn.au>
parents: 134
diff changeset
701 if (new_delay < 5)
10d35b4370ef make overshoot a parameter
Matt Johnston <matt@ucc.asn.au>
parents: 134
diff changeset
702 {
10d35b4370ef make overshoot a parameter
Matt Johnston <matt@ucc.asn.au>
parents: 134
diff changeset
703 printf_P(PSTR("Bad overshoot delay %d\n"), new_delay);
10d35b4370ef make overshoot a parameter
Matt Johnston <matt@ucc.asn.au>
parents: 134
diff changeset
704 return;
10d35b4370ef make overshoot a parameter
Matt Johnston <matt@ucc.asn.au>
parents: 134
diff changeset
705 }
10d35b4370ef make overshoot a parameter
Matt Johnston <matt@ucc.asn.au>
parents: 134
diff changeset
706
10d35b4370ef make overshoot a parameter
Matt Johnston <matt@ucc.asn.au>
parents: 134
diff changeset
707 overshoot_delay = new_delay;
10d35b4370ef make overshoot a parameter
Matt Johnston <matt@ucc.asn.au>
parents: 134
diff changeset
708 bool written = set_initial_eeprom();
10d35b4370ef make overshoot a parameter
Matt Johnston <matt@ucc.asn.au>
parents: 134
diff changeset
709 if (!written)
10d35b4370ef make overshoot a parameter
Matt Johnston <matt@ucc.asn.au>
parents: 134
diff changeset
710 {
10d35b4370ef make overshoot a parameter
Matt Johnston <matt@ucc.asn.au>
parents: 134
diff changeset
711 ATOMIC_BLOCK(ATOMIC_RESTORESTATE)
10d35b4370ef make overshoot a parameter
Matt Johnston <matt@ucc.asn.au>
parents: 134
diff changeset
712 {
10d35b4370ef make overshoot a parameter
Matt Johnston <matt@ucc.asn.au>
parents: 134
diff changeset
713 eeprom_write(overshoot_delay, overshoot_delay);
10d35b4370ef make overshoot a parameter
Matt Johnston <matt@ucc.asn.au>
parents: 134
diff changeset
714 }
10d35b4370ef make overshoot a parameter
Matt Johnston <matt@ucc.asn.au>
parents: 134
diff changeset
715 }
10d35b4370ef make overshoot a parameter
Matt Johnston <matt@ucc.asn.au>
parents: 134
diff changeset
716 printf_P(PSTR("new overshoot delay %hu\n"), overshoot_delay);
10d35b4370ef make overshoot a parameter
Matt Johnston <matt@ucc.asn.au>
parents: 134
diff changeset
717 }
10d35b4370ef make overshoot a parameter
Matt Johnston <matt@ucc.asn.au>
parents: 134
diff changeset
718
10d35b4370ef make overshoot a parameter
Matt Johnston <matt@ucc.asn.au>
parents: 134
diff changeset
719 static void
80
1e2068c5413a - store settings in eeprom
Matt Johnston <matt@ucc.asn.au>
parents: 79
diff changeset
720 cmd_awake()
1e2068c5413a - store settings in eeprom
Matt Johnston <matt@ucc.asn.au>
parents: 79
diff changeset
721 {
1e2068c5413a - store settings in eeprom
Matt Johnston <matt@ucc.asn.au>
parents: 79
diff changeset
722 stay_awake = 1;
1e2068c5413a - store settings in eeprom
Matt Johnston <matt@ucc.asn.au>
parents: 79
diff changeset
723 printf_P(PSTR("awake\n"));
13
4838bfcb3504 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 12
diff changeset
724 }
4838bfcb3504 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 12
diff changeset
725
12
3c27bfbd7f3a Add simple_ds18b20.c etc
Matt Johnston <matt@ucc.asn.au>
parents: 10
diff changeset
726 static void
0
c8b14b2950b9 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
727 read_handler()
c8b14b2950b9 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
728 {
6
9d538f674ff0 - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 5
diff changeset
729 if (strcmp_P(readbuf, PSTR("fetch")) == 0)
0
c8b14b2950b9 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
730 {
c8b14b2950b9 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
731 cmd_fetch();
c8b14b2950b9 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
732 }
6
9d538f674ff0 - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 5
diff changeset
733 else if (strcmp_P(readbuf, PSTR("clear")) == 0)
0
c8b14b2950b9 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
734 {
c8b14b2950b9 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
735 cmd_clear();
c8b14b2950b9 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
736 }
6
9d538f674ff0 - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 5
diff changeset
737 else if (strcmp_P(readbuf, PSTR("btoff")) == 0)
0
c8b14b2950b9 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
738 {
c8b14b2950b9 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
739 cmd_btoff();
c8b14b2950b9 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
740 }
12
3c27bfbd7f3a Add simple_ds18b20.c etc
Matt Johnston <matt@ucc.asn.au>
parents: 10
diff changeset
741 else if (strcmp_P(readbuf, PSTR("measure")) == 0)
3c27bfbd7f3a Add simple_ds18b20.c etc
Matt Johnston <matt@ucc.asn.au>
parents: 10
diff changeset
742 {
3c27bfbd7f3a Add simple_ds18b20.c etc
Matt Johnston <matt@ucc.asn.au>
parents: 10
diff changeset
743 cmd_measure();
3c27bfbd7f3a Add simple_ds18b20.c etc
Matt Johnston <matt@ucc.asn.au>
parents: 10
diff changeset
744 }
3c27bfbd7f3a Add simple_ds18b20.c etc
Matt Johnston <matt@ucc.asn.au>
parents: 10
diff changeset
745 else if (strcmp_P(readbuf, PSTR("sensors")) == 0)
3c27bfbd7f3a Add simple_ds18b20.c etc
Matt Johnston <matt@ucc.asn.au>
parents: 10
diff changeset
746 {
3c27bfbd7f3a Add simple_ds18b20.c etc
Matt Johnston <matt@ucc.asn.au>
parents: 10
diff changeset
747 cmd_sensors();
3c27bfbd7f3a Add simple_ds18b20.c etc
Matt Johnston <matt@ucc.asn.au>
parents: 10
diff changeset
748 }
80
1e2068c5413a - store settings in eeprom
Matt Johnston <matt@ucc.asn.au>
parents: 79
diff changeset
749 else if (strcmp_P(readbuf, PSTR("get_params")) == 0)
1e2068c5413a - store settings in eeprom
Matt Johnston <matt@ucc.asn.au>
parents: 79
diff changeset
750 {
1e2068c5413a - store settings in eeprom
Matt Johnston <matt@ucc.asn.au>
parents: 79
diff changeset
751 cmd_get_params();
1e2068c5413a - store settings in eeprom
Matt Johnston <matt@ucc.asn.au>
parents: 79
diff changeset
752 }
83
b9179968a272 - fix set_params (strange)
Matt Johnston <matt@ucc.asn.au>
parents: 81
diff changeset
753 else if (strncmp_P(readbuf, PSTR("set_params "), 11) == 0)
80
1e2068c5413a - store settings in eeprom
Matt Johnston <matt@ucc.asn.au>
parents: 79
diff changeset
754 {
83
b9179968a272 - fix set_params (strange)
Matt Johnston <matt@ucc.asn.au>
parents: 81
diff changeset
755 cmd_set_params(&readbuf[11]);
80
1e2068c5413a - store settings in eeprom
Matt Johnston <matt@ucc.asn.au>
parents: 79
diff changeset
756 }
1e2068c5413a - store settings in eeprom
Matt Johnston <matt@ucc.asn.au>
parents: 79
diff changeset
757 else if (strcmp_P(readbuf, PSTR("awake")) == 0)
1e2068c5413a - store settings in eeprom
Matt Johnston <matt@ucc.asn.au>
parents: 79
diff changeset
758 {
1e2068c5413a - store settings in eeprom
Matt Johnston <matt@ucc.asn.au>
parents: 79
diff changeset
759 cmd_awake();
1e2068c5413a - store settings in eeprom
Matt Johnston <matt@ucc.asn.au>
parents: 79
diff changeset
760 }
116
9afff8f29844 set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents: 115
diff changeset
761 else if (strncmp_P(readbuf, PSTR("fridge_setpoint "), 16) == 0)
9afff8f29844 set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents: 115
diff changeset
762 {
9afff8f29844 set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents: 115
diff changeset
763 cmd_set_fridge_setpoint(&readbuf[16]);
9afff8f29844 set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents: 115
diff changeset
764 }
9afff8f29844 set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents: 115
diff changeset
765 else if (strncmp_P(readbuf, PSTR("fridge_diff "), 12) == 0)
9afff8f29844 set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents: 115
diff changeset
766 {
9afff8f29844 set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents: 115
diff changeset
767 cmd_set_fridge_difference(&readbuf[12]);
9afff8f29844 set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents: 115
diff changeset
768 }
9afff8f29844 set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents: 115
diff changeset
769 else if (strncmp_P(readbuf, PSTR("fridge_delay "), 13) == 0)
9afff8f29844 set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents: 115
diff changeset
770 {
9afff8f29844 set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents: 115
diff changeset
771 cmd_set_fridge_delay(&readbuf[13]);
9afff8f29844 set fridge params separatelly
Matt Johnston <matt@ucc.asn.au>
parents: 115
diff changeset
772 }
135
10d35b4370ef make overshoot a parameter
Matt Johnston <matt@ucc.asn.au>
parents: 134
diff changeset
773 else if (strncmp_P(readbuf, PSTR("overshoot_delay "), 16) == 0)
10d35b4370ef make overshoot a parameter
Matt Johnston <matt@ucc.asn.au>
parents: 134
diff changeset
774 {
10d35b4370ef make overshoot a parameter
Matt Johnston <matt@ucc.asn.au>
parents: 134
diff changeset
775 cmd_set_overshoot_delay(&readbuf[16]);
10d35b4370ef make overshoot a parameter
Matt Johnston <matt@ucc.asn.au>
parents: 134
diff changeset
776 }
10d35b4370ef make overshoot a parameter
Matt Johnston <matt@ucc.asn.au>
parents: 134
diff changeset
777 else if (strncmp_P(readbuf, PSTR("overshoot_factor "), 17) == 0)
10d35b4370ef make overshoot a parameter
Matt Johnston <matt@ucc.asn.au>
parents: 134
diff changeset
778 {
10d35b4370ef make overshoot a parameter
Matt Johnston <matt@ucc.asn.au>
parents: 134
diff changeset
779 cmd_set_overshoot_factor(&readbuf[17]);
10d35b4370ef make overshoot a parameter
Matt Johnston <matt@ucc.asn.au>
parents: 134
diff changeset
780 }
54
0d3d14af55c2 add "awake" and "reset" functions
Matt Johnston <matt@ucc.asn.au>
parents: 52
diff changeset
781 else if (strcmp_P(readbuf, PSTR("reset")) == 0)
0d3d14af55c2 add "awake" and "reset" functions
Matt Johnston <matt@ucc.asn.au>
parents: 52
diff changeset
782 {
0d3d14af55c2 add "awake" and "reset" functions
Matt Johnston <matt@ucc.asn.au>
parents: 52
diff changeset
783 cmd_reset();
0d3d14af55c2 add "awake" and "reset" functions
Matt Johnston <matt@ucc.asn.au>
parents: 52
diff changeset
784 }
0
c8b14b2950b9 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
785 else
c8b14b2950b9 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
786 {
83
b9179968a272 - fix set_params (strange)
Matt Johnston <matt@ucc.asn.au>
parents: 81
diff changeset
787 printf_P(PSTR("Bad command '%s'\n"), readbuf);
0
c8b14b2950b9 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
788 }
c8b14b2950b9 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
789 }
c8b14b2950b9 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
790
20
878be5e353a0 Untested - calculate crc in uart_putchar
Matt Johnston <matt@ucc.asn.au>
parents: 19
diff changeset
791 ISR(INT0_vect)
18
bf733e8e8cf0 Add INT0 button
Matt Johnston <matt@ucc.asn.au>
parents: 15
diff changeset
792 {
90
a1c1c2d475b0 print the remainder of timers as well
Matt Johnston <matt@ucc.asn.au>
parents: 89
diff changeset
793 button_pressed = 1;
24
44c5ab5ea879 - some fixes for server code
Matt Johnston <matt@ucc.asn.au>
parents: 22
diff changeset
794 blink();
44c5ab5ea879 - some fixes for server code
Matt Johnston <matt@ucc.asn.au>
parents: 22
diff changeset
795 _delay_ms(100);
44c5ab5ea879 - some fixes for server code
Matt Johnston <matt@ucc.asn.au>
parents: 22
diff changeset
796 blink();
18
bf733e8e8cf0 Add INT0 button
Matt Johnston <matt@ucc.asn.au>
parents: 15
diff changeset
797 }
bf733e8e8cf0 Add INT0 button
Matt Johnston <matt@ucc.asn.au>
parents: 15
diff changeset
798
bf733e8e8cf0 Add INT0 button
Matt Johnston <matt@ucc.asn.au>
parents: 15
diff changeset
799
2
ab0e30c4b344 switch to atmega328
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
800 ISR(USART_RX_vect)
0
c8b14b2950b9 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
801 {
2
ab0e30c4b344 switch to atmega328
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
802 char c = UDR0;
33
024f5571df8c - Debug log file for server
Matt Johnston <matt@ucc.asn.au>
parents: 32
diff changeset
803 #ifdef HAVE_UART_ECHO
12
3c27bfbd7f3a Add simple_ds18b20.c etc
Matt Johnston <matt@ucc.asn.au>
parents: 10
diff changeset
804 uart_putchar(c, NULL);
33
024f5571df8c - Debug log file for server
Matt Johnston <matt@ucc.asn.au>
parents: 32
diff changeset
805 #endif
22
885532437100 A bit of work on the server python
Matt Johnston <matt@ucc.asn.au>
parents: 20
diff changeset
806 if (c == '\r' || c == '\n')
0
c8b14b2950b9 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
807 {
22
885532437100 A bit of work on the server python
Matt Johnston <matt@ucc.asn.au>
parents: 20
diff changeset
808 if (readpos > 0)
885532437100 A bit of work on the server python
Matt Johnston <matt@ucc.asn.au>
parents: 20
diff changeset
809 {
885532437100 A bit of work on the server python
Matt Johnston <matt@ucc.asn.au>
parents: 20
diff changeset
810 readbuf[readpos] = '\0';
27
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
811 have_cmd = 1;
22
885532437100 A bit of work on the server python
Matt Johnston <matt@ucc.asn.au>
parents: 20
diff changeset
812 readpos = 0;
885532437100 A bit of work on the server python
Matt Johnston <matt@ucc.asn.au>
parents: 20
diff changeset
813 }
0
c8b14b2950b9 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
814 }
c8b14b2950b9 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
815 else
c8b14b2950b9 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
816 {
c8b14b2950b9 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
817 readbuf[readpos] = c;
c8b14b2950b9 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
818 readpos++;
c8b14b2950b9 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
819 if (readpos >= sizeof(readbuf))
c8b14b2950b9 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
820 {
c8b14b2950b9 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
821 readpos = 0;
c8b14b2950b9 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
822 }
c8b14b2950b9 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
823 }
c8b14b2950b9 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
824 }
c8b14b2950b9 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
825
2
ab0e30c4b344 switch to atmega328
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
826 ISR(TIMER2_COMPA_vect)
1
1d1897d66b03 Some counter2 bits
Matt Johnston <matt@ucc.asn.au>
parents: 0
diff changeset
827 {
14
426fb44ece3f Lots of it works now.
Matt Johnston <matt@ucc.asn.au>
parents: 13
diff changeset
828 TCNT2 = 0;
80
1e2068c5413a - store settings in eeprom
Matt Johnston <matt@ucc.asn.au>
parents: 79
diff changeset
829 measure_count += TICK;
1e2068c5413a - store settings in eeprom
Matt Johnston <matt@ucc.asn.au>
parents: 79
diff changeset
830 comms_count += TICK;
16
5075d8c428bd untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents: 15
diff changeset
831
80
1e2068c5413a - store settings in eeprom
Matt Johnston <matt@ucc.asn.au>
parents: 79
diff changeset
832 clock_epoch += TICK;
17
a5e3b363675d Add clock_epoch
Matt Johnston <matt@ucc.asn.au>
parents: 16
diff changeset
833
16
5075d8c428bd untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents: 15
diff changeset
834 if (comms_timeout != 0)
5075d8c428bd untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents: 15
diff changeset
835 {
80
1e2068c5413a - store settings in eeprom
Matt Johnston <matt@ucc.asn.au>
parents: 79
diff changeset
836 comms_timeout -= TICK;
16
5075d8c428bd untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents: 15
diff changeset
837 }
5075d8c428bd untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents: 15
diff changeset
838
80
1e2068c5413a - store settings in eeprom
Matt Johnston <matt@ucc.asn.au>
parents: 79
diff changeset
839 if (measure_count >= measure_wake)
1
1d1897d66b03 Some counter2 bits
Matt Johnston <matt@ucc.asn.au>
parents: 0
diff changeset
840 {
4
54d369e3d689 Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents: 3
diff changeset
841 measure_count = 0;
1
1d1897d66b03 Some counter2 bits
Matt Johnston <matt@ucc.asn.au>
parents: 0
diff changeset
842 need_measurement = 1;
1d1897d66b03 Some counter2 bits
Matt Johnston <matt@ucc.asn.au>
parents: 0
diff changeset
843 }
4
54d369e3d689 Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents: 3
diff changeset
844
80
1e2068c5413a - store settings in eeprom
Matt Johnston <matt@ucc.asn.au>
parents: 79
diff changeset
845 if (comms_count >= comms_wake)
41
1701457e6007 fix tabbing
Matt Johnston <matt@ucc.asn.au>
parents: 40
diff changeset
846 {
1701457e6007 fix tabbing
Matt Johnston <matt@ucc.asn.au>
parents: 40
diff changeset
847 comms_count = 0;
1701457e6007 fix tabbing
Matt Johnston <matt@ucc.asn.au>
parents: 40
diff changeset
848 need_comms = 1;
1701457e6007 fix tabbing
Matt Johnston <matt@ucc.asn.au>
parents: 40
diff changeset
849 }
1
1d1897d66b03 Some counter2 bits
Matt Johnston <matt@ucc.asn.au>
parents: 0
diff changeset
850 }
1d1897d66b03 Some counter2 bits
Matt Johnston <matt@ucc.asn.au>
parents: 0
diff changeset
851
1d1897d66b03 Some counter2 bits
Matt Johnston <matt@ucc.asn.au>
parents: 0
diff changeset
852 static void
1d1897d66b03 Some counter2 bits
Matt Johnston <matt@ucc.asn.au>
parents: 0
diff changeset
853 deep_sleep()
1d1897d66b03 Some counter2 bits
Matt Johnston <matt@ucc.asn.au>
parents: 0
diff changeset
854 {
1d1897d66b03 Some counter2 bits
Matt Johnston <matt@ucc.asn.au>
parents: 0
diff changeset
855 // p119 of manual
2
ab0e30c4b344 switch to atmega328
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
856 OCR2A = SLEEP_COMPARE;
ab0e30c4b344 switch to atmega328
Matt Johnston <matt@ucc.asn.au>
parents: 1
diff changeset
857 loop_until_bit_is_clear(ASSR, OCR2AUB);
1
1d1897d66b03 Some counter2 bits
Matt Johnston <matt@ucc.asn.au>
parents: 0
diff changeset
858
1d1897d66b03 Some counter2 bits
Matt Johnston <matt@ucc.asn.au>
parents: 0
diff changeset
859 set_sleep_mode(SLEEP_MODE_PWR_SAVE);
1d1897d66b03 Some counter2 bits
Matt Johnston <matt@ucc.asn.au>
parents: 0
diff changeset
860 sleep_mode();
1d1897d66b03 Some counter2 bits
Matt Johnston <matt@ucc.asn.au>
parents: 0
diff changeset
861 }
1d1897d66b03 Some counter2 bits
Matt Johnston <matt@ucc.asn.au>
parents: 0
diff changeset
862
1d1897d66b03 Some counter2 bits
Matt Johnston <matt@ucc.asn.au>
parents: 0
diff changeset
863 static void
4
54d369e3d689 Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents: 3
diff changeset
864 idle_sleep()
54d369e3d689 Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents: 3
diff changeset
865 {
54d369e3d689 Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents: 3
diff changeset
866 set_sleep_mode(SLEEP_MODE_IDLE);
54d369e3d689 Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents: 3
diff changeset
867 sleep_mode();
54d369e3d689 Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents: 3
diff changeset
868 }
54d369e3d689 Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents: 3
diff changeset
869
59
d5b269352ba0 - add some atomic guards
Matt Johnston <matt@ucc.asn.au>
parents: 58
diff changeset
870 static uint16_t
d5b269352ba0 - add some atomic guards
Matt Johnston <matt@ucc.asn.au>
parents: 58
diff changeset
871 adc_vcc()
55
8e897a682208 untested code to log voltage and internal temperature
Matt Johnston <matt@ucc.asn.au>
parents: 54
diff changeset
872 {
8e897a682208 untested code to log voltage and internal temperature
Matt Johnston <matt@ucc.asn.au>
parents: 54
diff changeset
873 PRR &= ~_BV(PRADC);
8e897a682208 untested code to log voltage and internal temperature
Matt Johnston <matt@ucc.asn.au>
parents: 54
diff changeset
874
62
Matt Johnston <matt@ucc.asn.au>
parents: 60 61
diff changeset
875 // /16 prescaler
55
8e897a682208 untested code to log voltage and internal temperature
Matt Johnston <matt@ucc.asn.au>
parents: 54
diff changeset
876 ADCSRA = _BV(ADEN) | _BV(ADPS2);
8e897a682208 untested code to log voltage and internal temperature
Matt Johnston <matt@ucc.asn.au>
parents: 54
diff changeset
877
8e897a682208 untested code to log voltage and internal temperature
Matt Johnston <matt@ucc.asn.au>
parents: 54
diff changeset
878 // set to measure 1.1 reference
58
5100e0bdadad fix voltage
Matt Johnston <matt@ucc.asn.au>
parents: 55
diff changeset
879 ADMUX = _BV(REFS0) | _BV(MUX3) | _BV(MUX2) | _BV(MUX1);
60
2ebe33714989 average voltages
Matt Johnston <matt@ucc.asn.au>
parents: 59
diff changeset
880 // average a number of samples
2ebe33714989 average voltages
Matt Johnston <matt@ucc.asn.au>
parents: 59
diff changeset
881 uint16_t sum = 0;
2ebe33714989 average voltages
Matt Johnston <matt@ucc.asn.au>
parents: 59
diff changeset
882 uint8_t num = 0;
2ebe33714989 average voltages
Matt Johnston <matt@ucc.asn.au>
parents: 59
diff changeset
883 for (uint8_t n = 0; n < 20; n++)
59
d5b269352ba0 - add some atomic guards
Matt Johnston <matt@ucc.asn.au>
parents: 58
diff changeset
884 {
d5b269352ba0 - add some atomic guards
Matt Johnston <matt@ucc.asn.au>
parents: 58
diff changeset
885 ADCSRA |= _BV(ADSC);
d5b269352ba0 - add some atomic guards
Matt Johnston <matt@ucc.asn.au>
parents: 58
diff changeset
886 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
887
60
2ebe33714989 average voltages
Matt Johnston <matt@ucc.asn.au>
parents: 59
diff changeset
888 uint8_t low_11 = ADCL;
2ebe33714989 average voltages
Matt Johnston <matt@ucc.asn.au>
parents: 59
diff changeset
889 uint8_t high_11 = ADCH;
2ebe33714989 average voltages
Matt Johnston <matt@ucc.asn.au>
parents: 59
diff changeset
890 uint16_t val = low_11 + (high_11 << 8);
6
9d538f674ff0 - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 5
diff changeset
891
60
2ebe33714989 average voltages
Matt Johnston <matt@ucc.asn.au>
parents: 59
diff changeset
892 if (n >= 4)
2ebe33714989 average voltages
Matt Johnston <matt@ucc.asn.au>
parents: 59
diff changeset
893 {
2ebe33714989 average voltages
Matt Johnston <matt@ucc.asn.au>
parents: 59
diff changeset
894 sum += val;
2ebe33714989 average voltages
Matt Johnston <matt@ucc.asn.au>
parents: 59
diff changeset
895 num++;
2ebe33714989 average voltages
Matt Johnston <matt@ucc.asn.au>
parents: 59
diff changeset
896 }
2ebe33714989 average voltages
Matt Johnston <matt@ucc.asn.au>
parents: 59
diff changeset
897 }
2ebe33714989 average voltages
Matt Johnston <matt@ucc.asn.au>
parents: 59
diff changeset
898 ADCSRA = 0;
2ebe33714989 average voltages
Matt Johnston <matt@ucc.asn.au>
parents: 59
diff changeset
899 PRR |= _BV(PRADC);
6
9d538f674ff0 - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 5
diff changeset
900
80
1e2068c5413a - store settings in eeprom
Matt Johnston <matt@ucc.asn.au>
parents: 79
diff changeset
901 //float res_volts = 1.1 * 1024 * num / sum;
1e2068c5413a - store settings in eeprom
Matt Johnston <matt@ucc.asn.au>
parents: 79
diff changeset
902 //return 1000 * res_volts;
1e2068c5413a - store settings in eeprom
Matt Johnston <matt@ucc.asn.au>
parents: 79
diff changeset
903 return ((uint32_t)1100*1024*num) / sum;
6
9d538f674ff0 - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 5
diff changeset
904 }
9d538f674ff0 - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 5
diff changeset
905
4
54d369e3d689 Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents: 3
diff changeset
906 static void
115
90d1ebb941ab untested fridge control
Matt Johnston <matt@ucc.asn.au>
parents: 114
diff changeset
907 do_fridge()
90d1ebb941ab untested fridge control
Matt Johnston <matt@ucc.asn.au>
parents: 114
diff changeset
908 {
90d1ebb941ab untested fridge control
Matt Johnston <matt@ucc.asn.au>
parents: 114
diff changeset
909 struct epoch_ticks now;
90d1ebb941ab untested fridge control
Matt Johnston <matt@ucc.asn.au>
parents: 114
diff changeset
910 get_epoch_ticks(&now);
130
66d5e15f40d0 simplify, only use the fridge temp if the wort's busted
Matt Johnston <matt@ucc.asn.au>
parents: 128
diff changeset
911 uint32_t off_time = now.ticks - fridge_off_clock.ticks;
121
45c051a7db82 try and take account of the fridge temperature too
Matt Johnston <matt@ucc.asn.au>
parents: 118
diff changeset
912 bool wort_valid = last_wort != DS18X20_INVALID_DECICELSIUS;
45c051a7db82 try and take account of the fridge temperature too
Matt Johnston <matt@ucc.asn.au>
parents: 118
diff changeset
913 bool fridge_valid = last_fridge != DS18X20_INVALID_DECICELSIUS;
45c051a7db82 try and take account of the fridge temperature too
Matt Johnston <matt@ucc.asn.au>
parents: 118
diff changeset
914
45c051a7db82 try and take account of the fridge temperature too
Matt Johnston <matt@ucc.asn.au>
parents: 118
diff changeset
915 int16_t wort_max = fridge_setpoint + fridge_difference;
45c051a7db82 try and take account of the fridge temperature too
Matt Johnston <matt@ucc.asn.au>
parents: 118
diff changeset
916 int16_t wort_min = fridge_setpoint;
45c051a7db82 try and take account of the fridge temperature too
Matt Johnston <matt@ucc.asn.au>
parents: 118
diff changeset
917
130
66d5e15f40d0 simplify, only use the fridge temp if the wort's busted
Matt Johnston <matt@ucc.asn.au>
parents: 128
diff changeset
918 // the fridge min/max only apply if the wort sensor is broken
121
45c051a7db82 try and take account of the fridge temperature too
Matt Johnston <matt@ucc.asn.au>
parents: 118
diff changeset
919 int16_t fridge_min = fridge_setpoint - FRIDGE_AIR_MIN_RANGE;
45c051a7db82 try and take account of the fridge temperature too
Matt Johnston <matt@ucc.asn.au>
parents: 118
diff changeset
920 int16_t fridge_max = fridge_setpoint + FRIDGE_AIR_MAX_RANGE;
45c051a7db82 try and take account of the fridge temperature too
Matt Johnston <matt@ucc.asn.au>
parents: 118
diff changeset
921
45c051a7db82 try and take account of the fridge temperature too
Matt Johnston <matt@ucc.asn.au>
parents: 118
diff changeset
922 uint8_t fridge_on = PORT_FRIDGE & _BV(PIN_FRIDGE);
130
66d5e15f40d0 simplify, only use the fridge temp if the wort's busted
Matt Johnston <matt@ucc.asn.au>
parents: 128
diff changeset
923 printf_P(PSTR("last_wort %hd (%hd, %hd), last_fridge %hd (%hd, %hd), setpoint %hd, diff %hd, fridge_on %hhu\n"),
121
45c051a7db82 try and take account of the fridge temperature too
Matt Johnston <matt@ucc.asn.au>
parents: 118
diff changeset
924 last_wort, wort_min, wort_max,
130
66d5e15f40d0 simplify, only use the fridge temp if the wort's busted
Matt Johnston <matt@ucc.asn.au>
parents: 128
diff changeset
925 last_fridge, fridge_min, fridge_max,
66d5e15f40d0 simplify, only use the fridge temp if the wort's busted
Matt Johnston <matt@ucc.asn.au>
parents: 128
diff changeset
926 fridge_setpoint, fridge_difference, fridge_on);
121
45c051a7db82 try and take account of the fridge temperature too
Matt Johnston <matt@ucc.asn.au>
parents: 118
diff changeset
927
45c051a7db82 try and take account of the fridge temperature too
Matt Johnston <matt@ucc.asn.au>
parents: 118
diff changeset
928 if (off_time < fridge_delay)
115
90d1ebb941ab untested fridge control
Matt Johnston <matt@ucc.asn.au>
parents: 114
diff changeset
929 {
118
bb0c946460f3 a bit more logging. make printf floats work
Matt Johnston <matt@ucc.asn.au>
parents: 117
diff changeset
930 printf_P(PSTR("waiting for fridge delay current %hu, wait %hu\n"),
121
45c051a7db82 try and take account of the fridge temperature too
Matt Johnston <matt@ucc.asn.au>
parents: 118
diff changeset
931 off_time, fridge_delay);
115
90d1ebb941ab untested fridge control
Matt Johnston <matt@ucc.asn.au>
parents: 114
diff changeset
932 return;
90d1ebb941ab untested fridge control
Matt Johnston <matt@ucc.asn.au>
parents: 114
diff changeset
933 }
90d1ebb941ab untested fridge control
Matt Johnston <matt@ucc.asn.au>
parents: 114
diff changeset
934
130
66d5e15f40d0 simplify, only use the fridge temp if the wort's busted
Matt Johnston <matt@ucc.asn.au>
parents: 128
diff changeset
935 // handle failure of the wort sensor. if it is a short (intermittent?)
66d5e15f40d0 simplify, only use the fridge temp if the wort's busted
Matt Johnston <matt@ucc.asn.au>
parents: 128
diff changeset
936 // failure we wait until it has been broken for a period of time
66d5e15f40d0 simplify, only use the fridge temp if the wort's busted
Matt Johnston <matt@ucc.asn.au>
parents: 128
diff changeset
937 // (WORT_INVALID_TIME) before doing anything.
66d5e15f40d0 simplify, only use the fridge temp if the wort's busted
Matt Johnston <matt@ucc.asn.au>
parents: 128
diff changeset
938 if (wort_valid)
66d5e15f40d0 simplify, only use the fridge temp if the wort's busted
Matt Johnston <matt@ucc.asn.au>
parents: 128
diff changeset
939 {
66d5e15f40d0 simplify, only use the fridge temp if the wort's busted
Matt Johnston <matt@ucc.asn.au>
parents: 128
diff changeset
940 wort_valid_clock = now;
66d5e15f40d0 simplify, only use the fridge temp if the wort's busted
Matt Johnston <matt@ucc.asn.au>
parents: 128
diff changeset
941 }
66d5e15f40d0 simplify, only use the fridge temp if the wort's busted
Matt Johnston <matt@ucc.asn.au>
parents: 128
diff changeset
942 else
66d5e15f40d0 simplify, only use the fridge temp if the wort's busted
Matt Johnston <matt@ucc.asn.au>
parents: 128
diff changeset
943 {
66d5e15f40d0 simplify, only use the fridge temp if the wort's busted
Matt Johnston <matt@ucc.asn.au>
parents: 128
diff changeset
944 printf_P(PSTR("wort sensor is invalid\n"));
66d5e15f40d0 simplify, only use the fridge temp if the wort's busted
Matt Johnston <matt@ucc.asn.au>
parents: 128
diff changeset
945 uint32_t invalid_time = now.ticks - wort_valid_clock.ticks;
66d5e15f40d0 simplify, only use the fridge temp if the wort's busted
Matt Johnston <matt@ucc.asn.au>
parents: 128
diff changeset
946 if (invalid_time < WORT_INVALID_TIME)
66d5e15f40d0 simplify, only use the fridge temp if the wort's busted
Matt Johnston <matt@ucc.asn.au>
parents: 128
diff changeset
947 {
66d5e15f40d0 simplify, only use the fridge temp if the wort's busted
Matt Johnston <matt@ucc.asn.au>
parents: 128
diff changeset
948 printf("only been invalid for %ld, waiting\n", invalid_time);
66d5e15f40d0 simplify, only use the fridge temp if the wort's busted
Matt Johnston <matt@ucc.asn.au>
parents: 128
diff changeset
949 return;
66d5e15f40d0 simplify, only use the fridge temp if the wort's busted
Matt Johnston <matt@ucc.asn.au>
parents: 128
diff changeset
950 }
66d5e15f40d0 simplify, only use the fridge temp if the wort's busted
Matt Johnston <matt@ucc.asn.au>
parents: 128
diff changeset
951 }
66d5e15f40d0 simplify, only use the fridge temp if the wort's busted
Matt Johnston <matt@ucc.asn.au>
parents: 128
diff changeset
952
66d5e15f40d0 simplify, only use the fridge temp if the wort's busted
Matt Johnston <matt@ucc.asn.au>
parents: 128
diff changeset
953 if (!fridge_valid)
66d5e15f40d0 simplify, only use the fridge temp if the wort's busted
Matt Johnston <matt@ucc.asn.au>
parents: 128
diff changeset
954 {
66d5e15f40d0 simplify, only use the fridge temp if the wort's busted
Matt Johnston <matt@ucc.asn.au>
parents: 128
diff changeset
955 printf_P(PSTR("fridge sensor is invalid\n"));
66d5e15f40d0 simplify, only use the fridge temp if the wort's busted
Matt Johnston <matt@ucc.asn.au>
parents: 128
diff changeset
956 }
115
90d1ebb941ab untested fridge control
Matt Johnston <matt@ucc.asn.au>
parents: 114
diff changeset
957
90d1ebb941ab untested fridge control
Matt Johnston <matt@ucc.asn.au>
parents: 114
diff changeset
958 if (fridge_on)
90d1ebb941ab untested fridge control
Matt Johnston <matt@ucc.asn.au>
parents: 114
diff changeset
959 {
121
45c051a7db82 try and take account of the fridge temperature too
Matt Johnston <matt@ucc.asn.au>
parents: 118
diff changeset
960 bool turn_off = false;
45c051a7db82 try and take account of the fridge temperature too
Matt Johnston <matt@ucc.asn.au>
parents: 118
diff changeset
961 uint16_t on_time = now.ticks - fridge_on_clock.ticks;
45c051a7db82 try and take account of the fridge temperature too
Matt Johnston <matt@ucc.asn.au>
parents: 118
diff changeset
962
130
66d5e15f40d0 simplify, only use the fridge temp if the wort's busted
Matt Johnston <matt@ucc.asn.au>
parents: 128
diff changeset
963 uint16_t overshoot = 0;
135
10d35b4370ef make overshoot a parameter
Matt Johnston <matt@ucc.asn.au>
parents: 134
diff changeset
964 if (on_time > overshoot_delay)
130
66d5e15f40d0 simplify, only use the fridge temp if the wort's busted
Matt Johnston <matt@ucc.asn.au>
parents: 128
diff changeset
965 {
135
10d35b4370ef make overshoot a parameter
Matt Johnston <matt@ucc.asn.au>
parents: 134
diff changeset
966 overshoot = overshoot_factor * MIN(OVERSHOOT_MAX_DIV, on_time) / OVERSHOOT_MAX_DIV;
130
66d5e15f40d0 simplify, only use the fridge temp if the wort's busted
Matt Johnston <matt@ucc.asn.au>
parents: 128
diff changeset
967 }
128
fbb076bf2a59 fix stupid bugs - lack of PSTR, MIN not MAX
Matt Johnston <matt@ucc.asn.au>
parents: 127
diff changeset
968
fbb076bf2a59 fix stupid bugs - lack of PSTR, MIN not MAX
Matt Johnston <matt@ucc.asn.au>
parents: 127
diff changeset
969 printf_P(PSTR("on_time %hu, overshoot %hu\n"), on_time, overshoot);
121
45c051a7db82 try and take account of the fridge temperature too
Matt Johnston <matt@ucc.asn.au>
parents: 118
diff changeset
970
45c051a7db82 try and take account of the fridge temperature too
Matt Johnston <matt@ucc.asn.au>
parents: 118
diff changeset
971 // wort has cooled enough. will probably cool a bit more by itself
130
66d5e15f40d0 simplify, only use the fridge temp if the wort's busted
Matt Johnston <matt@ucc.asn.au>
parents: 128
diff changeset
972 if (wort_valid)
121
45c051a7db82 try and take account of the fridge temperature too
Matt Johnston <matt@ucc.asn.au>
parents: 118
diff changeset
973 {
130
66d5e15f40d0 simplify, only use the fridge temp if the wort's busted
Matt Johnston <matt@ucc.asn.au>
parents: 128
diff changeset
974 if ((last_wort - overshoot) < fridge_setpoint)
66d5e15f40d0 simplify, only use the fridge temp if the wort's busted
Matt Johnston <matt@ucc.asn.au>
parents: 128
diff changeset
975 {
66d5e15f40d0 simplify, only use the fridge temp if the wort's busted
Matt Johnston <matt@ucc.asn.au>
parents: 128
diff changeset
976 printf_P(PSTR("wort has cooled enough, overshoot %hu on_time %hu\n"), overshoot, on_time);
66d5e15f40d0 simplify, only use the fridge temp if the wort's busted
Matt Johnston <matt@ucc.asn.au>
parents: 128
diff changeset
977 turn_off = true;
66d5e15f40d0 simplify, only use the fridge temp if the wort's busted
Matt Johnston <matt@ucc.asn.au>
parents: 128
diff changeset
978 }
121
45c051a7db82 try and take account of the fridge temperature too
Matt Johnston <matt@ucc.asn.au>
parents: 118
diff changeset
979 }
130
66d5e15f40d0 simplify, only use the fridge temp if the wort's busted
Matt Johnston <matt@ucc.asn.au>
parents: 128
diff changeset
980 else
121
45c051a7db82 try and take account of the fridge temperature too
Matt Johnston <matt@ucc.asn.au>
parents: 118
diff changeset
981 {
130
66d5e15f40d0 simplify, only use the fridge temp if the wort's busted
Matt Johnston <matt@ucc.asn.au>
parents: 128
diff changeset
982 if (fridge_valid && last_fridge < fridge_min)
66d5e15f40d0 simplify, only use the fridge temp if the wort's busted
Matt Johnston <matt@ucc.asn.au>
parents: 128
diff changeset
983 {
66d5e15f40d0 simplify, only use the fridge temp if the wort's busted
Matt Johnston <matt@ucc.asn.au>
parents: 128
diff changeset
984 printf_P(PSTR("fridge off fallback\n"));
66d5e15f40d0 simplify, only use the fridge temp if the wort's busted
Matt Johnston <matt@ucc.asn.au>
parents: 128
diff changeset
985 turn_off = true;
66d5e15f40d0 simplify, only use the fridge temp if the wort's busted
Matt Johnston <matt@ucc.asn.au>
parents: 128
diff changeset
986 }
121
45c051a7db82 try and take account of the fridge temperature too
Matt Johnston <matt@ucc.asn.au>
parents: 118
diff changeset
987 }
45c051a7db82 try and take account of the fridge temperature too
Matt Johnston <matt@ucc.asn.au>
parents: 118
diff changeset
988
45c051a7db82 try and take account of the fridge temperature too
Matt Johnston <matt@ucc.asn.au>
parents: 118
diff changeset
989 if (turn_off)
115
90d1ebb941ab untested fridge control
Matt Johnston <matt@ucc.asn.au>
parents: 114
diff changeset
990 {
90d1ebb941ab untested fridge control
Matt Johnston <matt@ucc.asn.au>
parents: 114
diff changeset
991 // too cold, turn off
118
bb0c946460f3 a bit more logging. make printf floats work
Matt Johnston <matt@ucc.asn.au>
parents: 117
diff changeset
992 printf_P(PSTR("Turning fridge off\n"));
115
90d1ebb941ab untested fridge control
Matt Johnston <matt@ucc.asn.au>
parents: 114
diff changeset
993 PORT_FRIDGE &= ~_BV(PIN_FRIDGE);
90d1ebb941ab untested fridge control
Matt Johnston <matt@ucc.asn.au>
parents: 114
diff changeset
994 fridge_off_clock = now;
90d1ebb941ab untested fridge control
Matt Johnston <matt@ucc.asn.au>
parents: 114
diff changeset
995 }
90d1ebb941ab untested fridge control
Matt Johnston <matt@ucc.asn.au>
parents: 114
diff changeset
996 }
90d1ebb941ab untested fridge control
Matt Johnston <matt@ucc.asn.au>
parents: 114
diff changeset
997 else
90d1ebb941ab untested fridge control
Matt Johnston <matt@ucc.asn.au>
parents: 114
diff changeset
998 {
121
45c051a7db82 try and take account of the fridge temperature too
Matt Johnston <matt@ucc.asn.au>
parents: 118
diff changeset
999 bool turn_on = false;
45c051a7db82 try and take account of the fridge temperature too
Matt Johnston <matt@ucc.asn.au>
parents: 118
diff changeset
1000
130
66d5e15f40d0 simplify, only use the fridge temp if the wort's busted
Matt Johnston <matt@ucc.asn.au>
parents: 128
diff changeset
1001 if (wort_valid)
127
b32ddec655c5 fridge-too-hot mode
Matt Johnston <matt@ucc.asn.au>
parents: 123
diff changeset
1002 {
130
66d5e15f40d0 simplify, only use the fridge temp if the wort's busted
Matt Johnston <matt@ucc.asn.au>
parents: 128
diff changeset
1003 if (last_wort >= wort_max)
66d5e15f40d0 simplify, only use the fridge temp if the wort's busted
Matt Johnston <matt@ucc.asn.au>
parents: 128
diff changeset
1004 {
66d5e15f40d0 simplify, only use the fridge temp if the wort's busted
Matt Johnston <matt@ucc.asn.au>
parents: 128
diff changeset
1005 printf_P(PSTR("wort is too hot\n"));
66d5e15f40d0 simplify, only use the fridge temp if the wort's busted
Matt Johnston <matt@ucc.asn.au>
parents: 128
diff changeset
1006 turn_on = true;
66d5e15f40d0 simplify, only use the fridge temp if the wort's busted
Matt Johnston <matt@ucc.asn.au>
parents: 128
diff changeset
1007 }
127
b32ddec655c5 fridge-too-hot mode
Matt Johnston <matt@ucc.asn.au>
parents: 123
diff changeset
1008 }
130
66d5e15f40d0 simplify, only use the fridge temp if the wort's busted
Matt Johnston <matt@ucc.asn.au>
parents: 128
diff changeset
1009 else
121
45c051a7db82 try and take account of the fridge temperature too
Matt Johnston <matt@ucc.asn.au>
parents: 118
diff changeset
1010 {
130
66d5e15f40d0 simplify, only use the fridge temp if the wort's busted
Matt Johnston <matt@ucc.asn.au>
parents: 128
diff changeset
1011 if (fridge_valid && last_fridge >= fridge_max)
66d5e15f40d0 simplify, only use the fridge temp if the wort's busted
Matt Johnston <matt@ucc.asn.au>
parents: 128
diff changeset
1012 {
66d5e15f40d0 simplify, only use the fridge temp if the wort's busted
Matt Johnston <matt@ucc.asn.au>
parents: 128
diff changeset
1013 printf_P(PSTR("fridge on fallback\n"));
66d5e15f40d0 simplify, only use the fridge temp if the wort's busted
Matt Johnston <matt@ucc.asn.au>
parents: 128
diff changeset
1014 turn_on = true;
66d5e15f40d0 simplify, only use the fridge temp if the wort's busted
Matt Johnston <matt@ucc.asn.au>
parents: 128
diff changeset
1015 }
121
45c051a7db82 try and take account of the fridge temperature too
Matt Johnston <matt@ucc.asn.au>
parents: 118
diff changeset
1016 }
45c051a7db82 try and take account of the fridge temperature too
Matt Johnston <matt@ucc.asn.au>
parents: 118
diff changeset
1017
45c051a7db82 try and take account of the fridge temperature too
Matt Johnston <matt@ucc.asn.au>
parents: 118
diff changeset
1018 if (turn_on)
115
90d1ebb941ab untested fridge control
Matt Johnston <matt@ucc.asn.au>
parents: 114
diff changeset
1019 {
90d1ebb941ab untested fridge control
Matt Johnston <matt@ucc.asn.au>
parents: 114
diff changeset
1020 // too hot, turn on
118
bb0c946460f3 a bit more logging. make printf floats work
Matt Johnston <matt@ucc.asn.au>
parents: 117
diff changeset
1021 printf_P(PSTR("Turning fridge on\n"));
115
90d1ebb941ab untested fridge control
Matt Johnston <matt@ucc.asn.au>
parents: 114
diff changeset
1022 PORT_FRIDGE |= _BV(PIN_FRIDGE);
121
45c051a7db82 try and take account of the fridge temperature too
Matt Johnston <matt@ucc.asn.au>
parents: 118
diff changeset
1023 fridge_on_clock = now;
115
90d1ebb941ab untested fridge control
Matt Johnston <matt@ucc.asn.au>
parents: 114
diff changeset
1024 }
90d1ebb941ab untested fridge control
Matt Johnston <matt@ucc.asn.au>
parents: 114
diff changeset
1025 }
90d1ebb941ab untested fridge control
Matt Johnston <matt@ucc.asn.au>
parents: 114
diff changeset
1026 }
90d1ebb941ab untested fridge control
Matt Johnston <matt@ucc.asn.au>
parents: 114
diff changeset
1027
90d1ebb941ab untested fridge control
Matt Johnston <matt@ucc.asn.au>
parents: 114
diff changeset
1028 static void
1
1d1897d66b03 Some counter2 bits
Matt Johnston <matt@ucc.asn.au>
parents: 0
diff changeset
1029 do_measurement()
1d1897d66b03 Some counter2 bits
Matt Johnston <matt@ucc.asn.au>
parents: 0
diff changeset
1030 {
75
ca08442635ca report raw ds18b20 values instead
Matt Johnston <matt@ucc.asn.au>
parents: 62
diff changeset
1031 blink();
ca08442635ca report raw ds18b20 values instead
Matt Johnston <matt@ucc.asn.au>
parents: 62
diff changeset
1032
90
a1c1c2d475b0 print the remainder of timers as well
Matt Johnston <matt@ucc.asn.au>
parents: 89
diff changeset
1033 /* Take the timer here since deep_sleep() below could take 6 seconds */
a1c1c2d475b0 print the remainder of timers as well
Matt Johnston <matt@ucc.asn.au>
parents: 89
diff changeset
1034 get_epoch_ticks(&last_measurement_clock);
a1c1c2d475b0 print the remainder of timers as well
Matt Johnston <matt@ucc.asn.au>
parents: 89
diff changeset
1035 if (n_measurements == 0)
a1c1c2d475b0 print the remainder of timers as well
Matt Johnston <matt@ucc.asn.au>
parents: 89
diff changeset
1036 {
a1c1c2d475b0 print the remainder of timers as well
Matt Johnston <matt@ucc.asn.au>
parents: 89
diff changeset
1037 first_measurement_clock = last_measurement_clock;
a1c1c2d475b0 print the remainder of timers as well
Matt Johnston <matt@ucc.asn.au>
parents: 89
diff changeset
1038 }
a1c1c2d475b0 print the remainder of timers as well
Matt Johnston <matt@ucc.asn.au>
parents: 89
diff changeset
1039
55
8e897a682208 untested code to log voltage and internal temperature
Matt Johnston <matt@ucc.asn.au>
parents: 54
diff changeset
1040 simple_ds18b20_start_meas(NULL);
134
405785632c78 use delay_ms not timer tick - more robust
Matt Johnston <matt@ucc.asn.au>
parents: 130
diff changeset
1041 _delay_ms(DS18B20_TCONV_12BIT);
13
4838bfcb3504 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 12
diff changeset
1042
80
1e2068c5413a - store settings in eeprom
Matt Johnston <matt@ucc.asn.au>
parents: 79
diff changeset
1043 if (n_measurements == max_measurements)
13
4838bfcb3504 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 12
diff changeset
1044 {
4838bfcb3504 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 12
diff changeset
1045 n_measurements = 0;
4838bfcb3504 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 12
diff changeset
1046 }
6
9d538f674ff0 - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 5
diff changeset
1047
80
1e2068c5413a - store settings in eeprom
Matt Johnston <matt@ucc.asn.au>
parents: 79
diff changeset
1048 for (uint8_t s = 0; s < n_sensors; s++)
13
4838bfcb3504 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 12
diff changeset
1049 {
75
ca08442635ca report raw ds18b20 values instead
Matt Johnston <matt@ucc.asn.au>
parents: 62
diff changeset
1050 uint16_t reading;
80
1e2068c5413a - store settings in eeprom
Matt Johnston <matt@ucc.asn.au>
parents: 79
diff changeset
1051 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
1052 if (ret != DS18X20_OK)
13
4838bfcb3504 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 12
diff changeset
1053 {
80
1e2068c5413a - store settings in eeprom
Matt Johnston <matt@ucc.asn.au>
parents: 79
diff changeset
1054 reading = VALUE_BROKEN;
13
4838bfcb3504 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 12
diff changeset
1055 }
80
1e2068c5413a - store settings in eeprom
Matt Johnston <matt@ucc.asn.au>
parents: 79
diff changeset
1056 set_measurement(s, n_measurements, reading);
115
90d1ebb941ab untested fridge control
Matt Johnston <matt@ucc.asn.au>
parents: 114
diff changeset
1057
90d1ebb941ab untested fridge control
Matt Johnston <matt@ucc.asn.au>
parents: 114
diff changeset
1058 if (memcmp(sensor_id[s], fridge_id, sizeof(fridge_id)) == 0)
90d1ebb941ab untested fridge control
Matt Johnston <matt@ucc.asn.au>
parents: 114
diff changeset
1059 {
121
45c051a7db82 try and take account of the fridge temperature too
Matt Johnston <matt@ucc.asn.au>
parents: 118
diff changeset
1060 last_fridge = ds18b20_raw16_to_decicelsius(reading);
115
90d1ebb941ab untested fridge control
Matt Johnston <matt@ucc.asn.au>
parents: 114
diff changeset
1061 }
90d1ebb941ab untested fridge control
Matt Johnston <matt@ucc.asn.au>
parents: 114
diff changeset
1062 if (memcmp(sensor_id[s], wort_id, sizeof(wort_id)) == 0)
90d1ebb941ab untested fridge control
Matt Johnston <matt@ucc.asn.au>
parents: 114
diff changeset
1063 {
121
45c051a7db82 try and take account of the fridge temperature too
Matt Johnston <matt@ucc.asn.au>
parents: 118
diff changeset
1064 last_wort = ds18b20_raw16_to_decicelsius(reading);
115
90d1ebb941ab untested fridge control
Matt Johnston <matt@ucc.asn.au>
parents: 114
diff changeset
1065 }
13
4838bfcb3504 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 12
diff changeset
1066 }
22
885532437100 A bit of work on the server python
Matt Johnston <matt@ucc.asn.au>
parents: 20
diff changeset
1067
14
426fb44ece3f Lots of it works now.
Matt Johnston <matt@ucc.asn.au>
parents: 13
diff changeset
1068 n_measurements++;
1
1d1897d66b03 Some counter2 bits
Matt Johnston <matt@ucc.asn.au>
parents: 0
diff changeset
1069 }
1d1897d66b03 Some counter2 bits
Matt Johnston <matt@ucc.asn.au>
parents: 0
diff changeset
1070
4
54d369e3d689 Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents: 3
diff changeset
1071 static void
54d369e3d689 Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents: 3
diff changeset
1072 do_comms()
54d369e3d689 Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents: 3
diff changeset
1073 {
90
a1c1c2d475b0 print the remainder of timers as well
Matt Johnston <matt@ucc.asn.au>
parents: 89
diff changeset
1074 get_epoch_ticks(&last_comms_clock);
a1c1c2d475b0 print the remainder of timers as well
Matt Johnston <matt@ucc.asn.au>
parents: 89
diff changeset
1075
41
1701457e6007 fix tabbing
Matt Johnston <matt@ucc.asn.au>
parents: 40
diff changeset
1076 // turn on bluetooth
24
44c5ab5ea879 - some fixes for server code
Matt Johnston <matt@ucc.asn.au>
parents: 22
diff changeset
1077 set_aux_power(1);
89
51d889ad39a3 main.c : add a delay before turning on uart
Matt Johnston <matt@ucc.asn.au>
parents: 87
diff changeset
1078 // avoid receiving rubbish, perhaps
51d889ad39a3 main.c : add a delay before turning on uart
Matt Johnston <matt@ucc.asn.au>
parents: 87
diff changeset
1079 _delay_ms(50);
7
52cb08a01171 serial prints something
Matt Johnston <matt@ucc.asn.au>
parents: 6
diff changeset
1080 uart_on();
41
1701457e6007 fix tabbing
Matt Johnston <matt@ucc.asn.au>
parents: 40
diff changeset
1081
1701457e6007 fix tabbing
Matt Johnston <matt@ucc.asn.au>
parents: 40
diff changeset
1082 // write sd card here? same 3.3v regulator...
1701457e6007 fix tabbing
Matt Johnston <matt@ucc.asn.au>
parents: 40
diff changeset
1083
80
1e2068c5413a - store settings in eeprom
Matt Johnston <matt@ucc.asn.au>
parents: 79
diff changeset
1084 for (comms_timeout = wake_secs;
1e2068c5413a - store settings in eeprom
Matt Johnston <matt@ucc.asn.au>
parents: 79
diff changeset
1085 comms_timeout > 0 || stay_awake;
1e2068c5413a - store settings in eeprom
Matt Johnston <matt@ucc.asn.au>
parents: 79
diff changeset
1086 )
41
1701457e6007 fix tabbing
Matt Johnston <matt@ucc.asn.au>
parents: 40
diff changeset
1087 {
6
9d538f674ff0 - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 5
diff changeset
1088 if (need_measurement)
9d538f674ff0 - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 5
diff changeset
1089 {
14
426fb44ece3f Lots of it works now.
Matt Johnston <matt@ucc.asn.au>
parents: 13
diff changeset
1090 need_measurement = 0;
6
9d538f674ff0 - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 5
diff changeset
1091 do_measurement();
115
90d1ebb941ab untested fridge control
Matt Johnston <matt@ucc.asn.au>
parents: 114
diff changeset
1092 do_fridge();
44
96c336896201 mostly works for testing
Matt Johnston <matt@ucc.asn.au>
parents: 41
diff changeset
1093 continue;
6
9d538f674ff0 - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 5
diff changeset
1094 }
9d538f674ff0 - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 5
diff changeset
1095
27
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
1096 if (have_cmd)
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
1097 {
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
1098 have_cmd = 0;
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
1099 read_handler();
44
96c336896201 mostly works for testing
Matt Johnston <matt@ucc.asn.au>
parents: 41
diff changeset
1100 continue;
27
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
1101 }
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents: 26
diff changeset
1102
16
5075d8c428bd untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents: 15
diff changeset
1103 // wait for commands from the master
41
1701457e6007 fix tabbing
Matt Johnston <matt@ucc.asn.au>
parents: 40
diff changeset
1104 idle_sleep();
1701457e6007 fix tabbing
Matt Johnston <matt@ucc.asn.au>
parents: 40
diff changeset
1105 }
4
54d369e3d689 Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents: 3
diff changeset
1106
6
9d538f674ff0 - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 5
diff changeset
1107 uart_off();
46
9ccd965d938a Use the PRR etc, set value to proper ones
Matt Johnston <matt@ucc.asn.au>
parents: 44
diff changeset
1108 // 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
1109 _delay_ms(100);
16
5075d8c428bd untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents: 15
diff changeset
1110 set_aux_power(0);
4
54d369e3d689 Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents: 3
diff changeset
1111 }
54d369e3d689 Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents: 3
diff changeset
1112
7
52cb08a01171 serial prints something
Matt Johnston <matt@ucc.asn.au>
parents: 6
diff changeset
1113 static void
52cb08a01171 serial prints something
Matt Johnston <matt@ucc.asn.au>
parents: 6
diff changeset
1114 blink()
52cb08a01171 serial prints something
Matt Johnston <matt@ucc.asn.au>
parents: 6
diff changeset
1115 {
52cb08a01171 serial prints something
Matt Johnston <matt@ucc.asn.au>
parents: 6
diff changeset
1116 PORT_LED &= ~_BV(PIN_LED);
9
7da9a3f23592 Import ds18x20 code
Matt Johnston <matt@ucc.asn.au>
parents: 8
diff changeset
1117 _delay_ms(1);
7
52cb08a01171 serial prints something
Matt Johnston <matt@ucc.asn.au>
parents: 6
diff changeset
1118 PORT_LED |= _BV(PIN_LED);
52cb08a01171 serial prints something
Matt Johnston <matt@ucc.asn.au>
parents: 6
diff changeset
1119 }
52cb08a01171 serial prints something
Matt Johnston <matt@ucc.asn.au>
parents: 6
diff changeset
1120
52cb08a01171 serial prints something
Matt Johnston <matt@ucc.asn.au>
parents: 6
diff changeset
1121 static void
52cb08a01171 serial prints something
Matt Johnston <matt@ucc.asn.au>
parents: 6
diff changeset
1122 long_delay(int ms)
52cb08a01171 serial prints something
Matt Johnston <matt@ucc.asn.au>
parents: 6
diff changeset
1123 {
52cb08a01171 serial prints something
Matt Johnston <matt@ucc.asn.au>
parents: 6
diff changeset
1124 int iter = ms / 100;
52cb08a01171 serial prints something
Matt Johnston <matt@ucc.asn.au>
parents: 6
diff changeset
1125
52cb08a01171 serial prints something
Matt Johnston <matt@ucc.asn.au>
parents: 6
diff changeset
1126 for (int i = 0; i < iter; i++)
52cb08a01171 serial prints something
Matt Johnston <matt@ucc.asn.au>
parents: 6
diff changeset
1127 {
52cb08a01171 serial prints something
Matt Johnston <matt@ucc.asn.au>
parents: 6
diff changeset
1128 _delay_ms(100);
52cb08a01171 serial prints something
Matt Johnston <matt@ucc.asn.au>
parents: 6
diff changeset
1129 }
52cb08a01171 serial prints something
Matt Johnston <matt@ucc.asn.au>
parents: 6
diff changeset
1130 }
52cb08a01171 serial prints something
Matt Johnston <matt@ucc.asn.au>
parents: 6
diff changeset
1131
8
c55321727d02 deep sleep works
Matt Johnston <matt@ucc.asn.au>
parents: 7
diff changeset
1132 ISR(BADISR_vect)
c55321727d02 deep sleep works
Matt Johnston <matt@ucc.asn.au>
parents: 7
diff changeset
1133 {
14
426fb44ece3f Lots of it works now.
Matt Johnston <matt@ucc.asn.au>
parents: 13
diff changeset
1134 //uart_on();
8
c55321727d02 deep sleep works
Matt Johnston <matt@ucc.asn.au>
parents: 7
diff changeset
1135 printf_P(PSTR("Bad interrupt\n"));
c55321727d02 deep sleep works
Matt Johnston <matt@ucc.asn.au>
parents: 7
diff changeset
1136 }
c55321727d02 deep sleep works
Matt Johnston <matt@ucc.asn.au>
parents: 7
diff changeset
1137
0
c8b14b2950b9 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
1138 int main(void)
c8b14b2950b9 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
1139 {
16
5075d8c428bd untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents: 15
diff changeset
1140 setup_chip();
5075d8c428bd untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents: 15
diff changeset
1141 blink();
9
7da9a3f23592 Import ds18x20 code
Matt Johnston <matt@ucc.asn.au>
parents: 8
diff changeset
1142
16
5075d8c428bd untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents: 15
diff changeset
1143 set_aux_power(0);
7
52cb08a01171 serial prints something
Matt Johnston <matt@ucc.asn.au>
parents: 6
diff changeset
1144
6
9d538f674ff0 - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 5
diff changeset
1145 stdout = &mystdout;
7
52cb08a01171 serial prints something
Matt Johnston <matt@ucc.asn.au>
parents: 6
diff changeset
1146 uart_on();
52cb08a01171 serial prints something
Matt Johnston <matt@ucc.asn.au>
parents: 6
diff changeset
1147
16
5075d8c428bd untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents: 15
diff changeset
1148 printf(PSTR("Started.\n"));
13
4838bfcb3504 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 12
diff changeset
1149
80
1e2068c5413a - store settings in eeprom
Matt Johnston <matt@ucc.asn.au>
parents: 79
diff changeset
1150 load_params();
13
4838bfcb3504 Add eeprom stuff
Matt Johnston <matt@ucc.asn.au>
parents: 12
diff changeset
1151
76
6e47a61edc47 don't store sensors in eeprom, scan at startup instead
Matt Johnston <matt@ucc.asn.au>
parents: 75
diff changeset
1152 init_sensors();
6e47a61edc47 don't store sensors in eeprom, scan at startup instead
Matt Johnston <matt@ucc.asn.au>
parents: 75
diff changeset
1153
8
c55321727d02 deep sleep works
Matt Johnston <matt@ucc.asn.au>
parents: 7
diff changeset
1154 uart_off();
0
c8b14b2950b9 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
1155
6
9d538f674ff0 - Some basic ADC code
Matt Johnston <matt@ucc.asn.au>
parents: 5
diff changeset
1156 // 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
1157 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
1158
16
5075d8c428bd untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents: 15
diff changeset
1159 setup_tick_counter();
5075d8c428bd untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents: 15
diff changeset
1160
12
3c27bfbd7f3a Add simple_ds18b20.c etc
Matt Johnston <matt@ucc.asn.au>
parents: 10
diff changeset
1161 sei();
8
c55321727d02 deep sleep works
Matt Johnston <matt@ucc.asn.au>
parents: 7
diff changeset
1162
25
2943f62c8e62 - Make the python work on openwrt
Matt Johnston <matt@ucc.asn.au>
parents: 24
diff changeset
1163 need_comms = 1;
36
a670a67ba489 - decrease measurement interval, measure at start
Matt Johnston <matt@ucc.asn.au>
parents: 33
diff changeset
1164 need_measurement = 1;
25
2943f62c8e62 - Make the python work on openwrt
Matt Johnston <matt@ucc.asn.au>
parents: 24
diff changeset
1165
117
eecd2612a68e stay on
Matt Johnston <matt@ucc.asn.au>
parents: 116
diff changeset
1166 stay_awake = 1;
eecd2612a68e stay on
Matt Johnston <matt@ucc.asn.au>
parents: 116
diff changeset
1167
16
5075d8c428bd untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents: 15
diff changeset
1168 for(;;)
5075d8c428bd untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents: 15
diff changeset
1169 {
90
a1c1c2d475b0 print the remainder of timers as well
Matt Johnston <matt@ucc.asn.au>
parents: 89
diff changeset
1170 if (button_pressed)
a1c1c2d475b0 print the remainder of timers as well
Matt Johnston <matt@ucc.asn.au>
parents: 89
diff changeset
1171 {
a1c1c2d475b0 print the remainder of timers as well
Matt Johnston <matt@ucc.asn.au>
parents: 89
diff changeset
1172 // debounce
a1c1c2d475b0 print the remainder of timers as well
Matt Johnston <matt@ucc.asn.au>
parents: 89
diff changeset
1173 _delay_ms(200);
a1c1c2d475b0 print the remainder of timers as well
Matt Johnston <matt@ucc.asn.au>
parents: 89
diff changeset
1174 need_comms = 1;
a1c1c2d475b0 print the remainder of timers as well
Matt Johnston <matt@ucc.asn.au>
parents: 89
diff changeset
1175 comms_timeout = wake_secs;
a1c1c2d475b0 print the remainder of timers as well
Matt Johnston <matt@ucc.asn.au>
parents: 89
diff changeset
1176 button_pressed = 0;
41
1701457e6007 fix tabbing
Matt Johnston <matt@ucc.asn.au>
parents: 40
diff changeset
1177 continue;
1
1d1897d66b03 Some counter2 bits
Matt Johnston <matt@ucc.asn.au>
parents: 0
diff changeset
1178 }
4
54d369e3d689 Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents: 3
diff changeset
1179
54d369e3d689 Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents: 3
diff changeset
1180 if (need_comms)
54d369e3d689 Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents: 3
diff changeset
1181 {
16
5075d8c428bd untested, add comms timeout code
Matt Johnston <matt@ucc.asn.au>
parents: 15
diff changeset
1182 need_comms = 0;
4
54d369e3d689 Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents: 3
diff changeset
1183 do_comms();
41
1701457e6007 fix tabbing
Matt Johnston <matt@ucc.asn.au>
parents: 40
diff changeset
1184 continue;
4
54d369e3d689 Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents: 3
diff changeset
1185 }
54d369e3d689 Fill out more main.c structure
Matt Johnston <matt@ucc.asn.au>
parents: 3
diff changeset
1186
97
bf707a3775d2 change default comms_wake
Matt Johnston <matt@ucc.asn.au>
parents: 93
diff changeset
1187 if (need_measurement)
bf707a3775d2 change default comms_wake
Matt Johnston <matt@ucc.asn.au>
parents: 93
diff changeset
1188 {
bf707a3775d2 change default comms_wake
Matt Johnston <matt@ucc.asn.au>
parents: 93
diff changeset
1189 need_measurement = 0;
bf707a3775d2 change default comms_wake
Matt Johnston <matt@ucc.asn.au>
parents: 93
diff changeset
1190 do_measurement();
115
90d1ebb941ab untested fridge control
Matt Johnston <matt@ucc.asn.au>
parents: 114
diff changeset
1191 do_fridge();
97
bf707a3775d2 change default comms_wake
Matt Johnston <matt@ucc.asn.au>
parents: 93
diff changeset
1192 continue;
bf707a3775d2 change default comms_wake
Matt Johnston <matt@ucc.asn.au>
parents: 93
diff changeset
1193 }
bf707a3775d2 change default comms_wake
Matt Johnston <matt@ucc.asn.au>
parents: 93
diff changeset
1194
41
1701457e6007 fix tabbing
Matt Johnston <matt@ucc.asn.au>
parents: 40
diff changeset
1195 deep_sleep();
0
c8b14b2950b9 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
1196 }
12
3c27bfbd7f3a Add simple_ds18b20.c etc
Matt Johnston <matt@ucc.asn.au>
parents: 10
diff changeset
1197
0
c8b14b2950b9 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
1198 return 0; /* never reached */
c8b14b2950b9 Some basic bits
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
1199 }