templog: main.c annotate

annotate main.c @ 417:b73ea78317dc

a bit more logging. make printf floats work

author	Matt Johnston <matt@ucc.asn.au>
date	Sat, 06 Oct 2012 23:53:28 +0800
parents	99ef51dd1f61
children	45c051a7db82

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

Mercurial > templog

annotate main.c @ 417:b73ea78317dc