templog: main.c annotate

annotate main.c @ 121:45c051a7db82

try and take account of the fridge temperature too

author	Matt Johnston <matt@ucc.asn.au>
date	Wed, 10 Oct 2012 21:04:13 +0800
parents	bb0c946460f3
children	30c2c3341a4a

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

Mercurial > templog

annotate main.c @ 121:45c051a7db82