templog: main.c annotate

annotate main.c @ 420:d386bbab85cf

try and take account of the fridge temperature too

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

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

Mercurial > templog

annotate main.c @ 420:d386bbab85cf