templog: main.c annotate

annotate main.c @ 437:7d7e7f961eae

merge

author	Matt Johnston <matt@ucc.asn.au>
date	Mon, 22 Oct 2012 21:09:17 +0800
parents	bde6cd6cbdc4 c95737913174
children	9091411be841

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

Mercurial > templog

annotate main.c @ 437:7d7e7f961eae