templog: main.c annotate

annotate main.c @ 130:66d5e15f40d0

simplify, only use the fridge temp if the wort's busted

author	Matt Johnston <matt@ucc.asn.au>
date	Sun, 14 Oct 2012 21:46:24 +0800
parents	fbb076bf2a59
children	405785632c78

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

Mercurial > templog

annotate main.c @ 130:66d5e15f40d0