annotate old/main.c @ 203:11a1b59b0624

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