templog: main.c annotate

annotate main.c @ 393:afce71f829d6

- log more details - less silly way to load localconfig

author	Matt Johnston <matt@ucc.asn.au>
date	Thu, 12 Jul 2012 23:44:20 +0800
parents	5e3880342390
children	51d889ad39a3

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>
307 e50091063890 Some counter2 bits Matt Johnston <matt@ucc.asn.au> parents: 306 diff changeset	4 #include <avr/io.h>
e50091063890 Some counter2 bits Matt Johnston <matt@ucc.asn.au> parents: 306 diff changeset	5 #include <avr/interrupt.h>
e50091063890 Some counter2 bits Matt Johnston <matt@ucc.asn.au> parents: 306 diff changeset	6 #include <avr/sleep.h>
313 139ecb1840fd serial prints something Matt Johnston <matt@ucc.asn.au> parents: 312 diff changeset	7 #include <util/delay.h>
312 ef64a178092f - Some basic ADC code Matt Johnston <matt@ucc.asn.au> parents: 311 diff changeset	8 #include <avr/pgmspace.h>
319 9621436cfa07 Add eeprom stuff Matt Johnston <matt@ucc.asn.au> parents: 318 diff changeset	9 #include <avr/eeprom.h>
360 5d86f1182f62 add "awake" and "reset" functions Matt Johnston <matt@ucc.asn.au> parents: 358 diff changeset	10 #include <avr/wdt.h>
365 d31a6550d264 - add some atomic guards Matt Johnston <matt@ucc.asn.au> parents: 364 diff changeset	11 #include <util/atomic.h>
306 848b0fe159d2 Some basic bits Matt Johnston <matt@ucc.asn.au> parents: diff changeset	12 #include <util/crc16.h>
848b0fe159d2 Some basic bits Matt Johnston <matt@ucc.asn.au> parents: diff changeset	13
318 31199b2941f6 Add simple_ds18b20.c etc Matt Johnston <matt@ucc.asn.au> parents: 316 diff changeset	14 // for DWORD of get_fattime()
309 49e83333e546 Add FatFS Matt Johnston <matt@ucc.asn.au> parents: 308 diff changeset	15 #include "integer.h"
318 31199b2941f6 Add simple_ds18b20.c etc Matt Johnston <matt@ucc.asn.au> parents: 316 diff changeset	16
31199b2941f6 Add simple_ds18b20.c etc Matt Johnston <matt@ucc.asn.au> parents: 316 diff changeset	17 #include "simple_ds18b20.h"
319 9621436cfa07 Add eeprom stuff Matt Johnston <matt@ucc.asn.au> parents: 318 diff changeset	18 #include "onewire.h"
309 49e83333e546 Add FatFS Matt Johnston <matt@ucc.asn.au> parents: 308 diff changeset	19
306 848b0fe159d2 Some basic bits Matt Johnston <matt@ucc.asn.au> parents: diff changeset	20 // configuration params
848b0fe159d2 Some basic bits Matt Johnston <matt@ucc.asn.au> parents: diff changeset	21 // - measurement interval
848b0fe159d2 Some basic bits Matt Johnston <matt@ucc.asn.au> parents: diff changeset	22 // - transmit interval
848b0fe159d2 Some basic bits Matt Johnston <matt@ucc.asn.au> parents: diff changeset	23 // - bluetooth params
848b0fe159d2 Some basic bits Matt Johnston <matt@ucc.asn.au> parents: diff changeset	24 // - number of sensors (and range?)
848b0fe159d2 Some basic bits Matt Johnston <matt@ucc.asn.au> parents: diff changeset	25
386 f4f0780708d1 - store settings in eeprom Matt Johnston <matt@ucc.asn.au> parents: 385 diff changeset	26 // 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	27 // to be a multiple.
f4f0780708d1 - store settings in eeprom Matt Johnston <matt@ucc.asn.au> parents: 385 diff changeset	28
f4f0780708d1 - store settings in eeprom Matt Johnston <matt@ucc.asn.au> parents: 385 diff changeset	29 #define TICK 6
f4f0780708d1 - store settings in eeprom Matt Johnston <matt@ucc.asn.au> parents: 385 diff changeset	30 // we have 1024 prescaler, 32768 crystal.
f4f0780708d1 - store settings in eeprom Matt Johnston <matt@ucc.asn.au> parents: 385 diff changeset	31 #define SLEEP_COMPARE (32*TICK-1)
310 0a64532c1de1 Fill out more main.c structure Matt Johnston <matt@ucc.asn.au> parents: 309 diff changeset	32
381 83c83014e5e3 report raw ds18b20 values instead Matt Johnston <matt@ucc.asn.au> parents: 368 diff changeset	33 #define VALUE_NOSENSOR 0x07D0 // 125 degrees
83c83014e5e3 report raw ds18b20 values instead Matt Johnston <matt@ucc.asn.au> parents: 368 diff changeset	34 #define VALUE_BROKEN 0x07D1 // 125.0625
319 9621436cfa07 Add eeprom stuff Matt Johnston <matt@ucc.asn.au> parents: 318 diff changeset	35
316 8f32eb67a279 reading DS18B20 works Matt Johnston <matt@ucc.asn.au> parents: 315 diff changeset	36 #define BAUD 19200
313 139ecb1840fd serial prints something Matt Johnston <matt@ucc.asn.au> parents: 312 diff changeset	37 #define UBRR ((F_CPU)/8/(BAUD)-1)
139ecb1840fd serial prints something Matt Johnston <matt@ucc.asn.au> parents: 312 diff changeset	38
139ecb1840fd serial prints something Matt Johnston <matt@ucc.asn.au> parents: 312 diff changeset	39 #define PORT_LED PORTC
139ecb1840fd serial prints something Matt Johnston <matt@ucc.asn.au> parents: 312 diff changeset	40 #define DDR_LED DDRC
139ecb1840fd serial prints something Matt Johnston <matt@ucc.asn.au> parents: 312 diff changeset	41 #define PIN_LED PC4
307 e50091063890 Some counter2 bits Matt Johnston <matt@ucc.asn.au> parents: 306 diff changeset	42
321 df7384336798 Add shutdown handling, print sensors in "fetch" output Matt Johnston <matt@ucc.asn.au> parents: 320 diff changeset	43 #define PORT_SHDN PORTD
df7384336798 Add shutdown handling, print sensors in "fetch" output Matt Johnston <matt@ucc.asn.au> parents: 320 diff changeset	44 #define DDR_SHDN DDRD
df7384336798 Add shutdown handling, print sensors in "fetch" output Matt Johnston <matt@ucc.asn.au> parents: 320 diff changeset	45 #define PIN_SHDN PD7
df7384336798 Add shutdown handling, print sensors in "fetch" output Matt Johnston <matt@ucc.asn.au> parents: 320 diff changeset	46
386 f4f0780708d1 - store settings in eeprom Matt Johnston <matt@ucc.asn.au> parents: 385 diff changeset	47 // total amount of 16bit values available for measurements.
f4f0780708d1 - store settings in eeprom Matt Johnston <matt@ucc.asn.au> parents: 385 diff changeset	48 // 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	49 #define TOTAL_MEASUREMENTS 840
f4f0780708d1 - store settings in eeprom Matt Johnston <matt@ucc.asn.au> parents: 385 diff changeset	50
f4f0780708d1 - store settings in eeprom Matt Johnston <matt@ucc.asn.au> parents: 385 diff changeset	51 // each sensor slot uses 8 bytes
f4f0780708d1 - store settings in eeprom Matt Johnston <matt@ucc.asn.au> parents: 385 diff changeset	52 #define MAX_SENSORS 6
312 ef64a178092f - Some basic ADC code Matt Johnston <matt@ucc.asn.au> parents: 311 diff changeset	53
321 df7384336798 Add shutdown handling, print sensors in "fetch" output Matt Johnston <matt@ucc.asn.au> parents: 320 diff changeset	54 // 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	55 #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	56
339 449272fc63a3 - Debug log file for server Matt Johnston <matt@ucc.asn.au> parents: 338 diff changeset	57 // #define HAVE_UART_ECHO
449272fc63a3 - Debug log file for server Matt Johnston <matt@ucc.asn.au> parents: 338 diff changeset	58
386 f4f0780708d1 - store settings in eeprom Matt Johnston <matt@ucc.asn.au> parents: 385 diff changeset	59 // eeprom-settable parameters. all timeouts should
f4f0780708d1 - store settings in eeprom Matt Johnston <matt@ucc.asn.au> parents: 385 diff changeset	60 // be a multiple of TICK (6 seconds probably)
f4f0780708d1 - store settings in eeprom Matt Johnston <matt@ucc.asn.au> parents: 385 diff changeset	61 static uint16_t measure_wake = 120;
f4f0780708d1 - store settings in eeprom Matt Johnston <matt@ucc.asn.au> parents: 385 diff changeset	62 static uint16_t comms_wake = 3600;
f4f0780708d1 - store settings in eeprom Matt Johnston <matt@ucc.asn.au> parents: 385 diff changeset	63 static uint8_t wake_secs = 30;
326 f6b5941b4c34 Untested - calculate crc in uart_putchar Matt Johnston <matt@ucc.asn.au> parents: 325 diff changeset	64
365 d31a6550d264 - add some atomic guards Matt Johnston <matt@ucc.asn.au> parents: 364 diff changeset	65 // ---- Atomic guards required accessing these variables
d31a6550d264 - add some atomic guards Matt Johnston <matt@ucc.asn.au> parents: 364 diff changeset	66 static uint32_t clock_epoch;
d31a6550d264 - add some atomic guards Matt Johnston <matt@ucc.asn.au> parents: 364 diff changeset	67 static uint16_t comms_count;
d31a6550d264 - add some atomic guards Matt Johnston <matt@ucc.asn.au> parents: 364 diff changeset	68 static uint16_t measure_count;
d31a6550d264 - add some atomic guards Matt Johnston <matt@ucc.asn.au> parents: 364 diff changeset	69 // ---- End atomic guards required
d31a6550d264 - add some atomic guards Matt Johnston <matt@ucc.asn.au> parents: 364 diff changeset	70
323 5181ea55ea77 Add clock_epoch Matt Johnston <matt@ucc.asn.au> parents: 322 diff changeset	71 static uint16_t n_measurements;
365 d31a6550d264 - add some atomic guards Matt Johnston <matt@ucc.asn.au> parents: 364 diff changeset	72
386 f4f0780708d1 - store settings in eeprom Matt Johnston <matt@ucc.asn.au> parents: 385 diff changeset	73 // calculated at startup as TOTAL_MEASUREMENTS/n_sensors
f4f0780708d1 - store settings in eeprom Matt Johnston <matt@ucc.asn.au> parents: 385 diff changeset	74 static uint16_t max_measurements;
f4f0780708d1 - store settings in eeprom Matt Johnston <matt@ucc.asn.au> parents: 385 diff changeset	75
f4f0780708d1 - store settings in eeprom Matt Johnston <matt@ucc.asn.au> parents: 385 diff changeset	76 static uint16_t measurements[TOTAL_MEASUREMENTS];
328 46070aaf29ea A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 326 diff changeset	77 static uint32_t first_measurement_clock;
46070aaf29ea A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 326 diff changeset	78 // 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	79 // samples
46070aaf29ea A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 326 diff changeset	80 static uint32_t last_measurement_clock;
306 848b0fe159d2 Some basic bits Matt Johnston <matt@ucc.asn.au> parents: diff changeset	81
365 d31a6550d264 - add some atomic guards Matt Johnston <matt@ucc.asn.au> parents: 364 diff changeset	82 static uint32_t last_comms_clock;
d31a6550d264 - add some atomic guards Matt Johnston <matt@ucc.asn.au> parents: 364 diff changeset	83
310 0a64532c1de1 Fill out more main.c structure Matt Johnston <matt@ucc.asn.au> parents: 309 diff changeset	84 // boolean flags
323 5181ea55ea77 Add clock_epoch Matt Johnston <matt@ucc.asn.au> parents: 322 diff changeset	85 static uint8_t need_measurement;
5181ea55ea77 Add clock_epoch Matt Johnston <matt@ucc.asn.au> parents: 322 diff changeset	86 static uint8_t need_comms;
346 d6219df77c41 main.c: Matt Johnston <matt@ucc.asn.au> parents: 341 diff changeset	87 static uint8_t uart_enabled;
386 f4f0780708d1 - store settings in eeprom Matt Johnston <matt@ucc.asn.au> parents: 385 diff changeset	88 static uint8_t stay_awake;
307 e50091063890 Some counter2 bits Matt Johnston <matt@ucc.asn.au> parents: 306 diff changeset	89
322 840f51824254 untested, add comms timeout code Matt Johnston <matt@ucc.asn.au> parents: 321 diff changeset	90 // 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	91 static uint8_t comms_timeout;
307 e50091063890 Some counter2 bits Matt Johnston <matt@ucc.asn.au> parents: 306 diff changeset	92
323 5181ea55ea77 Add clock_epoch Matt Johnston <matt@ucc.asn.au> parents: 322 diff changeset	93 static uint8_t readpos;
306 848b0fe159d2 Some basic bits Matt Johnston <matt@ucc.asn.au> parents: diff changeset	94 static char readbuf[30];
333 298e502fdcd4 Add some web server handling Matt Johnston <matt@ucc.asn.au> parents: 332 diff changeset	95 static uint8_t have_cmd;
306 848b0fe159d2 Some basic bits Matt Johnston <matt@ucc.asn.au> parents: diff changeset	96
386 f4f0780708d1 - store settings in eeprom Matt Johnston <matt@ucc.asn.au> parents: 385 diff changeset	97 static uint8_t n_sensors;
f4f0780708d1 - store settings in eeprom Matt Johnston <matt@ucc.asn.au> parents: 385 diff changeset	98 static uint8_t sensor_id[MAX_SENSORS][ID_LEN];
f4f0780708d1 - store settings in eeprom Matt Johnston <matt@ucc.asn.au> parents: 385 diff changeset	99
f4f0780708d1 - store settings in eeprom Matt Johnston <matt@ucc.asn.au> parents: 385 diff changeset	100
f4f0780708d1 - store settings in eeprom Matt Johnston <matt@ucc.asn.au> parents: 385 diff changeset	101 int uart_putchar(char c, FILE *stream);
f4f0780708d1 - store settings in eeprom Matt Johnston <matt@ucc.asn.au> parents: 385 diff changeset	102 static void long_delay(int ms);
f4f0780708d1 - store settings in eeprom Matt Johnston <matt@ucc.asn.au> parents: 385 diff changeset	103 static void blink();
f4f0780708d1 - store settings in eeprom Matt Johnston <matt@ucc.asn.au> parents: 385 diff changeset	104 static uint16_t adc_vcc();
f4f0780708d1 - store settings in eeprom Matt Johnston <matt@ucc.asn.au> parents: 385 diff changeset	105
f4f0780708d1 - store settings in eeprom Matt Johnston <matt@ucc.asn.au> parents: 385 diff changeset	106 static FILE mystdout = FDEV_SETUP_STREAM(uart_putchar, NULL,
f4f0780708d1 - store settings in eeprom Matt Johnston <matt@ucc.asn.au> parents: 385 diff changeset	107 _FDEV_SETUP_WRITE);
f4f0780708d1 - store settings in eeprom Matt Johnston <matt@ucc.asn.au> parents: 385 diff changeset	108
f4f0780708d1 - store settings in eeprom Matt Johnston <matt@ucc.asn.au> parents: 385 diff changeset	109 static uint16_t crc_out;
f4f0780708d1 - store settings in eeprom Matt Johnston <matt@ucc.asn.au> parents: 385 diff changeset	110 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	111 _FDEV_SETUP_WRITE);
f4f0780708d1 - store settings in eeprom Matt Johnston <matt@ucc.asn.au> parents: 385 diff changeset	112 // convenience
f4f0780708d1 - store settings in eeprom Matt Johnston <matt@ucc.asn.au> parents: 385 diff changeset	113 static FILE *crc_stdout = &_crc_stdout;
f4f0780708d1 - store settings in eeprom Matt Johnston <matt@ucc.asn.au> parents: 385 diff changeset	114
310 0a64532c1de1 Fill out more main.c structure Matt Johnston <matt@ucc.asn.au> parents: 309 diff changeset	115
319 9621436cfa07 Add eeprom stuff Matt Johnston <matt@ucc.asn.au> parents: 318 diff changeset	116 // 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	117 #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	118 #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	119 #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	120 #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	121
9621436cfa07 Add eeprom stuff Matt Johnston <matt@ucc.asn.au> parents: 318 diff changeset	122 #define EXPECT_MAGIC 0x67c9
9621436cfa07 Add eeprom stuff Matt Johnston <matt@ucc.asn.au> parents: 318 diff changeset	123
9621436cfa07 Add eeprom stuff Matt Johnston <matt@ucc.asn.au> parents: 318 diff changeset	124 struct __attribute__ ((__packed__)) __eeprom_data {
382 f429169aa3cd don't store sensors in eeprom, scan at startup instead Matt Johnston <matt@ucc.asn.au> parents: 381 diff changeset	125 // XXX eeprom unused at present
319 9621436cfa07 Add eeprom stuff Matt Johnston <matt@ucc.asn.au> parents: 318 diff changeset	126 uint16_t magic;
386 f4f0780708d1 - store settings in eeprom Matt Johnston <matt@ucc.asn.au> parents: 385 diff changeset	127 uint16_t measure_wake;
f4f0780708d1 - store settings in eeprom Matt Johnston <matt@ucc.asn.au> parents: 385 diff changeset	128 uint16_t comms_wake;
f4f0780708d1 - store settings in eeprom Matt Johnston <matt@ucc.asn.au> parents: 385 diff changeset	129 uint8_t wake_secs;
319 9621436cfa07 Add eeprom stuff Matt Johnston <matt@ucc.asn.au> parents: 318 diff changeset	130 };
9621436cfa07 Add eeprom stuff Matt Johnston <matt@ucc.asn.au> parents: 318 diff changeset	131
310 0a64532c1de1 Fill out more main.c structure Matt Johnston <matt@ucc.asn.au> parents: 309 diff changeset	132 static void deep_sleep();
307 e50091063890 Some counter2 bits Matt Johnston <matt@ucc.asn.au> parents: 306 diff changeset	133
322 840f51824254 untested, add comms timeout code Matt Johnston <matt@ucc.asn.au> parents: 321 diff changeset	134 // Very first setup
324 e3664732f11f Add INT0 button Matt Johnston <matt@ucc.asn.au> parents: 321 diff changeset	135 static void
322 840f51824254 untested, add comms timeout code Matt Johnston <matt@ucc.asn.au> parents: 321 diff changeset	136 setup_chip()
324 e3664732f11f Add INT0 button Matt Johnston <matt@ucc.asn.au> parents: 321 diff changeset	137 {
360 5d86f1182f62 add "awake" and "reset" functions Matt Johnston <matt@ucc.asn.au> parents: 358 diff changeset	138 cli();
5d86f1182f62 add "awake" and "reset" functions Matt Johnston <matt@ucc.asn.au> parents: 358 diff changeset	139
5d86f1182f62 add "awake" and "reset" functions Matt Johnston <matt@ucc.asn.au> parents: 358 diff changeset	140 // 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	141 wdt_reset();
5d86f1182f62 add "awake" and "reset" functions Matt Johnston <matt@ucc.asn.au> parents: 358 diff changeset	142 MCUSR &= ~_BV(WDRF);
5d86f1182f62 add "awake" and "reset" functions Matt Johnston <matt@ucc.asn.au> parents: 358 diff changeset	143 WDTCSR \|= _BV(WDCE) \| _BV(WDE);
5d86f1182f62 add "awake" and "reset" functions Matt Johnston <matt@ucc.asn.au> parents: 358 diff changeset	144 WDTCSR = 0;
5d86f1182f62 add "awake" and "reset" functions Matt Johnston <matt@ucc.asn.au> parents: 358 diff changeset	145
322 840f51824254 untested, add comms timeout code Matt Johnston <matt@ucc.asn.au> parents: 321 diff changeset	146 // Set clock to 2mhz
840f51824254 untested, add comms timeout code Matt Johnston <matt@ucc.asn.au> parents: 321 diff changeset	147 CLKPR = _BV(CLKPCE);
840f51824254 untested, add comms timeout code Matt Johnston <matt@ucc.asn.au> parents: 321 diff changeset	148 // divide by 4
840f51824254 untested, add comms timeout code Matt Johnston <matt@ucc.asn.au> parents: 321 diff changeset	149 CLKPR = _BV(CLKPS1);
358 71d2cc90354a try a few more power saving measures, untested Matt Johnston <matt@ucc.asn.au> parents: 352 diff changeset	150
71d2cc90354a try a few more power saving measures, untested Matt Johnston <matt@ucc.asn.au> parents: 352 diff changeset	151 // enable pullups
71d2cc90354a try a few more power saving measures, untested Matt Johnston <matt@ucc.asn.au> parents: 352 diff changeset	152 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	153 PORTD = 0xff;
71d2cc90354a try a few more power saving measures, untested Matt Johnston <matt@ucc.asn.au> parents: 352 diff changeset	154 PORTC = 0xff;
322 840f51824254 untested, add comms timeout code Matt Johnston <matt@ucc.asn.au> parents: 321 diff changeset	155
325 b05c9fd7c098 Merge Matt Johnston <matt@ucc.asn.au> parents: 323 324 diff changeset	156 // 3.3v power for bluetooth and SD
322 840f51824254 untested, add comms timeout code Matt Johnston <matt@ucc.asn.au> parents: 321 diff changeset	157 DDR_LED \|= _BV(PIN_LED);
840f51824254 untested, add comms timeout code Matt Johnston <matt@ucc.asn.au> parents: 321 diff changeset	158 DDR_SHDN \|= _BV(PIN_SHDN);
325 b05c9fd7c098 Merge Matt Johnston <matt@ucc.asn.au> parents: 323 324 diff changeset	159
352 99f8b97a9449 Use the PRR etc, set value to proper ones Matt Johnston <matt@ucc.asn.au> parents: 349 diff changeset	160 // set pullup
99f8b97a9449 Use the PRR etc, set value to proper ones Matt Johnston <matt@ucc.asn.au> parents: 349 diff changeset	161 PORTD \|= _BV(PD2);
347 56f22e29582a fix tabbing Matt Johnston <matt@ucc.asn.au> parents: 346 diff changeset	162 // INT0 setup
358 71d2cc90354a try a few more power saving measures, untested Matt Johnston <matt@ucc.asn.au> parents: 352 diff changeset	163 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	164 EIMSK = _BV(INT0);
358 71d2cc90354a try a few more power saving measures, untested Matt Johnston <matt@ucc.asn.au> parents: 352 diff changeset	165
71d2cc90354a try a few more power saving measures, untested Matt Johnston <matt@ucc.asn.au> parents: 352 diff changeset	166 // comparator disable
71d2cc90354a try a few more power saving measures, untested Matt Johnston <matt@ucc.asn.au> parents: 352 diff changeset	167 ACSR = _BV(ACD);
71d2cc90354a try a few more power saving measures, untested Matt Johnston <matt@ucc.asn.au> parents: 352 diff changeset	168
71d2cc90354a try a few more power saving measures, untested Matt Johnston <matt@ucc.asn.au> parents: 352 diff changeset	169 // disable adc pin input buffers
71d2cc90354a try a few more power saving measures, untested Matt Johnston <matt@ucc.asn.au> parents: 352 diff changeset	170 DIDR0 = 0x3F; // acd0-adc5
71d2cc90354a try a few more power saving measures, untested Matt Johnston <matt@ucc.asn.au> parents: 352 diff changeset	171 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	172
71d2cc90354a try a few more power saving measures, untested Matt Johnston <matt@ucc.asn.au> parents: 352 diff changeset	173 sei();
324 e3664732f11f Add INT0 button Matt Johnston <matt@ucc.asn.au> parents: 321 diff changeset	174 }
e3664732f11f Add INT0 button Matt Johnston <matt@ucc.asn.au> parents: 321 diff changeset	175
322 840f51824254 untested, add comms timeout code Matt Johnston <matt@ucc.asn.au> parents: 321 diff changeset	176 static void
840f51824254 untested, add comms timeout code Matt Johnston <matt@ucc.asn.au> parents: 321 diff changeset	177 set_aux_power(uint8_t on)
840f51824254 untested, add comms timeout code Matt Johnston <matt@ucc.asn.au> parents: 321 diff changeset	178 {
840f51824254 untested, add comms timeout code Matt Johnston <matt@ucc.asn.au> parents: 321 diff changeset	179 if (on)
840f51824254 untested, add comms timeout code Matt Johnston <matt@ucc.asn.au> parents: 321 diff changeset	180 {
840f51824254 untested, add comms timeout code Matt Johnston <matt@ucc.asn.au> parents: 321 diff changeset	181 PORT_SHDN &= ~_BV(PIN_SHDN);
840f51824254 untested, add comms timeout code Matt Johnston <matt@ucc.asn.au> parents: 321 diff changeset	182 }
840f51824254 untested, add comms timeout code Matt Johnston <matt@ucc.asn.au> parents: 321 diff changeset	183 else
840f51824254 untested, add comms timeout code Matt Johnston <matt@ucc.asn.au> parents: 321 diff changeset	184 {
349 e7f070855a22 mostly works for testing Matt Johnston <matt@ucc.asn.au> parents: 347 diff changeset	185 PORT_SHDN \|= _BV(PIN_SHDN);
322 840f51824254 untested, add comms timeout code Matt Johnston <matt@ucc.asn.au> parents: 321 diff changeset	186 }
840f51824254 untested, add comms timeout code Matt Johnston <matt@ucc.asn.au> parents: 321 diff changeset	187 }
840f51824254 untested, add comms timeout code Matt Johnston <matt@ucc.asn.au> parents: 321 diff changeset	188
386 f4f0780708d1 - store settings in eeprom Matt Johnston <matt@ucc.asn.au> parents: 385 diff changeset	189 static void
f4f0780708d1 - store settings in eeprom Matt Johnston <matt@ucc.asn.au> parents: 385 diff changeset	190 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	191 {
f4f0780708d1 - store settings in eeprom Matt Johnston <matt@ucc.asn.au> parents: 385 diff changeset	192 measurements[sensor*max_measurements + measurement] = reading;
f4f0780708d1 - store settings in eeprom Matt Johnston <matt@ucc.asn.au> parents: 385 diff changeset	193 }
f4f0780708d1 - store settings in eeprom Matt Johnston <matt@ucc.asn.au> parents: 385 diff changeset	194
f4f0780708d1 - store settings in eeprom Matt Johnston <matt@ucc.asn.au> parents: 385 diff changeset	195 static uint16_t
f4f0780708d1 - store settings in eeprom Matt Johnston <matt@ucc.asn.au> parents: 385 diff changeset	196 get_measurement(uint8_t sensor, uint16_t measurement)
f4f0780708d1 - store settings in eeprom Matt Johnston <matt@ucc.asn.au> parents: 385 diff changeset	197 {
f4f0780708d1 - store settings in eeprom Matt Johnston <matt@ucc.asn.au> parents: 385 diff changeset	198 return measurements[sensor*max_measurements + measurement];
f4f0780708d1 - store settings in eeprom Matt Johnston <matt@ucc.asn.au> parents: 385 diff changeset	199 }
f4f0780708d1 - store settings in eeprom Matt Johnston <matt@ucc.asn.au> parents: 385 diff changeset	200
322 840f51824254 untested, add comms timeout code Matt Johnston <matt@ucc.asn.au> parents: 321 diff changeset	201 static void
840f51824254 untested, add comms timeout code Matt Johnston <matt@ucc.asn.au> parents: 321 diff changeset	202 setup_tick_counter()
840f51824254 untested, add comms timeout code Matt Johnston <matt@ucc.asn.au> parents: 321 diff changeset	203 {
840f51824254 untested, add comms timeout code Matt Johnston <matt@ucc.asn.au> parents: 321 diff changeset	204 // set up counter2.
840f51824254 untested, add comms timeout code Matt Johnston <matt@ucc.asn.au> parents: 321 diff changeset	205 // COM21 COM20 Set OC2 on Compare Match (p116)
840f51824254 untested, add comms timeout code Matt Johnston <matt@ucc.asn.au> parents: 321 diff changeset	206 // WGM21 Clear counter on compare
840f51824254 untested, add comms timeout code Matt Johnston <matt@ucc.asn.au> parents: 321 diff changeset	207 //TCCR2A = _BV(COM2A1) \| _BV(COM2A0) \| _BV(WGM21);
840f51824254 untested, add comms timeout code Matt Johnston <matt@ucc.asn.au> parents: 321 diff changeset	208 // toggle on match
840f51824254 untested, add comms timeout code Matt Johnston <matt@ucc.asn.au> parents: 321 diff changeset	209 TCCR2A = _BV(COM2A0);
840f51824254 untested, add comms timeout code Matt Johnston <matt@ucc.asn.au> parents: 321 diff changeset	210 // CS22 CS21 CS20 clk/1024
840f51824254 untested, add comms timeout code Matt Johnston <matt@ucc.asn.au> parents: 321 diff changeset	211 TCCR2B = _BV(CS22) \| _BV(CS21) \| _BV(CS20);
840f51824254 untested, add comms timeout code Matt Johnston <matt@ucc.asn.au> parents: 321 diff changeset	212 // set async mode
840f51824254 untested, add comms timeout code Matt Johnston <matt@ucc.asn.au> parents: 321 diff changeset	213 ASSR \|= _BV(AS2);
840f51824254 untested, add comms timeout code Matt Johnston <matt@ucc.asn.au> parents: 321 diff changeset	214 TCNT2 = 0;
840f51824254 untested, add comms timeout code Matt Johnston <matt@ucc.asn.au> parents: 321 diff changeset	215 OCR2A = SLEEP_COMPARE;
840f51824254 untested, add comms timeout code Matt Johnston <matt@ucc.asn.au> parents: 321 diff changeset	216 // interrupt
840f51824254 untested, add comms timeout code Matt Johnston <matt@ucc.asn.au> parents: 321 diff changeset	217 TIMSK2 = _BV(OCIE2A);
840f51824254 untested, add comms timeout code Matt Johnston <matt@ucc.asn.au> parents: 321 diff changeset	218 }
324 e3664732f11f Add INT0 button Matt Johnston <matt@ucc.asn.au> parents: 321 diff changeset	219
306 848b0fe159d2 Some basic bits Matt Johnston <matt@ucc.asn.au> parents: diff changeset	220 static void
313 139ecb1840fd serial prints something Matt Johnston <matt@ucc.asn.au> parents: 312 diff changeset	221 uart_on()
306 848b0fe159d2 Some basic bits Matt Johnston <matt@ucc.asn.au> parents: diff changeset	222 {
314 7aebb1452422 deep sleep works Matt Johnston <matt@ucc.asn.au> parents: 313 diff changeset	223 // Power reduction register
352 99f8b97a9449 Use the PRR etc, set value to proper ones Matt Johnston <matt@ucc.asn.au> parents: 349 diff changeset	224 PRR &= ~_BV(PRUSART0);
314 7aebb1452422 deep sleep works Matt Johnston <matt@ucc.asn.au> parents: 313 diff changeset	225
322 840f51824254 untested, add comms timeout code Matt Johnston <matt@ucc.asn.au> parents: 321 diff changeset	226 // 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	227 // baud rate
313 139ecb1840fd serial prints something Matt Johnston <matt@ucc.asn.au> parents: 312 diff changeset	228 UBRR0H = (unsigned char)(UBRR >> 8);
139ecb1840fd serial prints something Matt Johnston <matt@ucc.asn.au> parents: 312 diff changeset	229 UBRR0L = (unsigned char)UBRR;
139ecb1840fd serial prints something Matt Johnston <matt@ucc.asn.au> parents: 312 diff changeset	230 // set 2x clock, improves accuracy of UBRR
139ecb1840fd serial prints something Matt Johnston <matt@ucc.asn.au> parents: 312 diff changeset	231 UCSR0A \|= _BV(U2X0);
312 ef64a178092f - Some basic ADC code Matt Johnston <matt@ucc.asn.au> parents: 311 diff changeset	232 UCSR0B = _BV(RXCIE0) \| _BV(RXEN0) \| _BV(TXEN0);
306 848b0fe159d2 Some basic bits Matt Johnston <matt@ucc.asn.au> parents: diff changeset	233 //8N1
313 139ecb1840fd serial prints something Matt Johnston <matt@ucc.asn.au> parents: 312 diff changeset	234 UCSR0C = _BV(UCSZ01) \| _BV(UCSZ00);
347 56f22e29582a fix tabbing Matt Johnston <matt@ucc.asn.au> parents: 346 diff changeset	235 uart_enabled = 1;
312 ef64a178092f - Some basic ADC code Matt Johnston <matt@ucc.asn.au> parents: 311 diff changeset	236 }
ef64a178092f - Some basic ADC code Matt Johnston <matt@ucc.asn.au> parents: 311 diff changeset	237
ef64a178092f - Some basic ADC code Matt Johnston <matt@ucc.asn.au> parents: 311 diff changeset	238 static void
ef64a178092f - Some basic ADC code Matt Johnston <matt@ucc.asn.au> parents: 311 diff changeset	239 uart_off()
ef64a178092f - Some basic ADC code Matt Johnston <matt@ucc.asn.au> parents: 311 diff changeset	240 {
ef64a178092f - Some basic ADC code Matt Johnston <matt@ucc.asn.au> parents: 311 diff changeset	241 // Turn of interrupts and disable tx/rx
ef64a178092f - Some basic ADC code Matt Johnston <matt@ucc.asn.au> parents: 311 diff changeset	242 UCSR0B = 0;
347 56f22e29582a fix tabbing Matt Johnston <matt@ucc.asn.au> parents: 346 diff changeset	243 uart_enabled = 0;
312 ef64a178092f - Some basic ADC code Matt Johnston <matt@ucc.asn.au> parents: 311 diff changeset	244
ef64a178092f - Some basic ADC code Matt Johnston <matt@ucc.asn.au> parents: 311 diff changeset	245 // Power reduction register
352 99f8b97a9449 Use the PRR etc, set value to proper ones Matt Johnston <matt@ucc.asn.au> parents: 349 diff changeset	246 PRR \|= _BV(PRUSART0);
306 848b0fe159d2 Some basic bits Matt Johnston <matt@ucc.asn.au> parents: diff changeset	247 }
848b0fe159d2 Some basic bits Matt Johnston <matt@ucc.asn.au> parents: diff changeset	248
316 8f32eb67a279 reading DS18B20 works Matt Johnston <matt@ucc.asn.au> parents: 315 diff changeset	249 int
306 848b0fe159d2 Some basic bits Matt Johnston <matt@ucc.asn.au> parents: diff changeset	250 uart_putchar(char c, FILE *stream)
848b0fe159d2 Some basic bits Matt Johnston <matt@ucc.asn.au> parents: diff changeset	251 {
347 56f22e29582a fix tabbing Matt Johnston <matt@ucc.asn.au> parents: 346 diff changeset	252 if (!uart_enabled)
56f22e29582a fix tabbing Matt Johnston <matt@ucc.asn.au> parents: 346 diff changeset	253 {
56f22e29582a fix tabbing Matt Johnston <matt@ucc.asn.au> parents: 346 diff changeset	254 return EOF;
56f22e29582a fix tabbing Matt Johnston <matt@ucc.asn.au> parents: 346 diff changeset	255 }
326 f6b5941b4c34 Untested - calculate crc in uart_putchar Matt Johnston <matt@ucc.asn.au> parents: 325 diff changeset	256 // XXX could perhaps sleep in the loop for power.
314 7aebb1452422 deep sleep works Matt Johnston <matt@ucc.asn.au> parents: 313 diff changeset	257 if (c == '\n')
7aebb1452422 deep sleep works Matt Johnston <matt@ucc.asn.au> parents: 313 diff changeset	258 {
316 8f32eb67a279 reading DS18B20 works Matt Johnston <matt@ucc.asn.au> parents: 315 diff changeset	259 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	260 UDR0 = '\r';
314 7aebb1452422 deep sleep works Matt Johnston <matt@ucc.asn.au> parents: 313 diff changeset	261 }
308 e36ee3e156c1 switch to atmega328 Matt Johnston <matt@ucc.asn.au> parents: 307 diff changeset	262 loop_until_bit_is_set(UCSR0A, UDRE0);
e36ee3e156c1 switch to atmega328 Matt Johnston <matt@ucc.asn.au> parents: 307 diff changeset	263 UDR0 = c;
326 f6b5941b4c34 Untested - calculate crc in uart_putchar Matt Johnston <matt@ucc.asn.au> parents: 325 diff changeset	264 if (stream == crc_stdout)
f6b5941b4c34 Untested - calculate crc in uart_putchar Matt Johnston <matt@ucc.asn.au> parents: 325 diff changeset	265 {
332 05c1249da994 - Move crc16 to utils and fix it Matt Johnston <matt@ucc.asn.au> parents: 331 diff changeset	266 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	267 }
316 8f32eb67a279 reading DS18B20 works Matt Johnston <matt@ucc.asn.au> parents: 315 diff changeset	268 if (c == '\r')
8f32eb67a279 reading DS18B20 works Matt Johnston <matt@ucc.asn.au> parents: 315 diff changeset	269 {
8f32eb67a279 reading DS18B20 works Matt Johnston <matt@ucc.asn.au> parents: 315 diff changeset	270 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	271 UDR0 = '\n';
f6b5941b4c34 Untested - calculate crc in uart_putchar Matt Johnston <matt@ucc.asn.au> parents: 325 diff changeset	272 if (stream == crc_stdout)
f6b5941b4c34 Untested - calculate crc in uart_putchar Matt Johnston <matt@ucc.asn.au> parents: 325 diff changeset	273 {
f6b5941b4c34 Untested - calculate crc in uart_putchar Matt Johnston <matt@ucc.asn.au> parents: 325 diff changeset	274 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	275 }
316 8f32eb67a279 reading DS18B20 works Matt Johnston <matt@ucc.asn.au> parents: 315 diff changeset	276 }
346 d6219df77c41 main.c: Matt Johnston <matt@ucc.asn.au> parents: 341 diff changeset	277 return (unsigned char)c;
306 848b0fe159d2 Some basic bits Matt Johnston <matt@ucc.asn.au> parents: diff changeset	278 }
848b0fe159d2 Some basic bits Matt Johnston <matt@ucc.asn.au> parents: diff changeset	279
848b0fe159d2 Some basic bits Matt Johnston <matt@ucc.asn.au> parents: diff changeset	280 static void
848b0fe159d2 Some basic bits Matt Johnston <matt@ucc.asn.au> parents: diff changeset	281 cmd_fetch()
848b0fe159d2 Some basic bits Matt Johnston <matt@ucc.asn.au> parents: diff changeset	282 {
326 f6b5941b4c34 Untested - calculate crc in uart_putchar Matt Johnston <matt@ucc.asn.au> parents: 325 diff changeset	283 crc_out = 0;
361 cfcd200c69da untested code to log voltage and internal temperature Matt Johnston <matt@ucc.asn.au> parents: 360 diff changeset	284
387 1ee4485b59a2 try and be a bit more frugal with stack Matt Johnston <matt@ucc.asn.au> parents: 386 diff changeset	285 fprintf_P(crc_stdout, PSTR("START\n"));
365 d31a6550d264 - add some atomic guards Matt Johnston <matt@ucc.asn.au> parents: 364 diff changeset	286 {
387 1ee4485b59a2 try and be a bit more frugal with stack Matt Johnston <matt@ucc.asn.au> parents: 386 diff changeset	287 uint32_t epoch_copy;
1ee4485b59a2 try and be a bit more frugal with stack Matt Johnston <matt@ucc.asn.au> parents: 386 diff changeset	288 ATOMIC_BLOCK(ATOMIC_RESTORESTATE)
1ee4485b59a2 try and be a bit more frugal with stack Matt Johnston <matt@ucc.asn.au> parents: 386 diff changeset	289 {
1ee4485b59a2 try and be a bit more frugal with stack Matt Johnston <matt@ucc.asn.au> parents: 386 diff changeset	290 epoch_copy = clock_epoch;
1ee4485b59a2 try and be a bit more frugal with stack Matt Johnston <matt@ucc.asn.au> parents: 386 diff changeset	291 }
1ee4485b59a2 try and be a bit more frugal with stack Matt Johnston <matt@ucc.asn.au> parents: 386 diff changeset	292 fprintf_P(crc_stdout, PSTR("now=%lu\n"), epoch_copy);
365 d31a6550d264 - add some atomic guards Matt Johnston <matt@ucc.asn.au> parents: 364 diff changeset	293 }
387 1ee4485b59a2 try and be a bit more frugal with stack Matt Johnston <matt@ucc.asn.au> parents: 386 diff changeset	294 fprintf_P(crc_stdout, PSTR("time_step=%hu\n"), measure_wake);
1ee4485b59a2 try and be a bit more frugal with stack Matt Johnston <matt@ucc.asn.au> parents: 386 diff changeset	295 fprintf_P(crc_stdout, PSTR("first_time=%lu\n"), first_measurement_clock);
1ee4485b59a2 try and be a bit more frugal with stack Matt Johnston <matt@ucc.asn.au> parents: 386 diff changeset	296 fprintf_P(crc_stdout, PSTR("last_time=%lu\n"), last_measurement_clock);
1ee4485b59a2 try and be a bit more frugal with stack Matt Johnston <matt@ucc.asn.au> parents: 386 diff changeset	297 fprintf_P(crc_stdout, PSTR("comms_time=%lu\n"), last_comms_clock);
1ee4485b59a2 try and be a bit more frugal with stack Matt Johnston <matt@ucc.asn.au> parents: 386 diff changeset	298 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	299 fprintf_P(crc_stdout, PSTR("measure=%hu\n"), measure_wake);
afce71f829d6 - log more details Matt Johnston <matt@ucc.asn.au> parents: 389 diff changeset	300 fprintf_P(crc_stdout, PSTR("comms=%hu\n"), comms_wake);
afce71f829d6 - log more details Matt Johnston <matt@ucc.asn.au> parents: 389 diff changeset	301 fprintf_P(crc_stdout, PSTR("wake=%hhu\n"), wake_secs);
afce71f829d6 - log more details Matt Johnston <matt@ucc.asn.au> parents: 389 diff changeset	302 fprintf_P(crc_stdout, PSTR("tick=%d\n"), TICK);
afce71f829d6 - log more details Matt Johnston <matt@ucc.asn.au> parents: 389 diff changeset	303 fprintf_P(crc_stdout, PSTR("maxsens=%hhu\n"), MAX_SENSORS);
afce71f829d6 - log more details Matt Johnston <matt@ucc.asn.au> parents: 389 diff changeset	304 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	305 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	306 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	307 {
387 1ee4485b59a2 try and be a bit more frugal with stack Matt Johnston <matt@ucc.asn.au> parents: 386 diff changeset	308 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	309 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	310 fputc('\n', crc_stdout);
321 df7384336798 Add shutdown handling, print sensors in "fetch" output Matt Johnston <matt@ucc.asn.au> parents: 320 diff changeset	311 }
341 ccab04e2f601 - decrease measurement interval, measure at start Matt Johnston <matt@ucc.asn.au> parents: 339 diff changeset	312 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	313 for (uint16_t n = 0; n < n_measurements; n++)
306 848b0fe159d2 Some basic bits Matt Johnston <matt@ucc.asn.au> parents: diff changeset	314 {
352 99f8b97a9449 Use the PRR etc, set value to proper ones Matt Johnston <matt@ucc.asn.au> parents: 349 diff changeset	315 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	316 for (uint8_t s = 0; s < n_sensors; s++)
319 9621436cfa07 Add eeprom stuff Matt Johnston <matt@ucc.asn.au> parents: 318 diff changeset	317 {
386 f4f0780708d1 - store settings in eeprom Matt Johnston <matt@ucc.asn.au> parents: 385 diff changeset	318 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	319 }
326 f6b5941b4c34 Untested - calculate crc in uart_putchar Matt Johnston <matt@ucc.asn.au> parents: 325 diff changeset	320 fputc('\n', crc_stdout);
306 848b0fe159d2 Some basic bits Matt Johnston <matt@ucc.asn.au> parents: diff changeset	321 }
326 f6b5941b4c34 Untested - calculate crc in uart_putchar Matt Johnston <matt@ucc.asn.au> parents: 325 diff changeset	322 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	323 fprintf_P(stdout, PSTR("CRC=%hu\n"), crc_out);
306 848b0fe159d2 Some basic bits Matt Johnston <matt@ucc.asn.au> parents: diff changeset	324 }
848b0fe159d2 Some basic bits Matt Johnston <matt@ucc.asn.au> parents: diff changeset	325
848b0fe159d2 Some basic bits Matt Johnston <matt@ucc.asn.au> parents: diff changeset	326 static void
848b0fe159d2 Some basic bits Matt Johnston <matt@ucc.asn.au> parents: diff changeset	327 cmd_clear()
848b0fe159d2 Some basic bits Matt Johnston <matt@ucc.asn.au> parents: diff changeset	328 {
313 139ecb1840fd serial prints something Matt Johnston <matt@ucc.asn.au> parents: 312 diff changeset	329 n_measurements = 0;
338 12123e390169 More minor work Matt Johnston <matt@ucc.asn.au> parents: 333 diff changeset	330 printf_P(PSTR("cleared\n"));
306 848b0fe159d2 Some basic bits Matt Johnston <matt@ucc.asn.au> parents: diff changeset	331 }
848b0fe159d2 Some basic bits Matt Johnston <matt@ucc.asn.au> parents: diff changeset	332
848b0fe159d2 Some basic bits Matt Johnston <matt@ucc.asn.au> parents: diff changeset	333 static void
848b0fe159d2 Some basic bits Matt Johnston <matt@ucc.asn.au> parents: diff changeset	334 cmd_btoff()
848b0fe159d2 Some basic bits Matt Johnston <matt@ucc.asn.au> parents: diff changeset	335 {
365 d31a6550d264 - add some atomic guards Matt Johnston <matt@ucc.asn.au> parents: 364 diff changeset	336 ATOMIC_BLOCK(ATOMIC_RESTORESTATE)
d31a6550d264 - add some atomic guards Matt Johnston <matt@ucc.asn.au> parents: 364 diff changeset	337 {
d31a6550d264 - add some atomic guards Matt Johnston <matt@ucc.asn.au> parents: 364 diff changeset	338 comms_count = 0;
d31a6550d264 - add some atomic guards Matt Johnston <matt@ucc.asn.au> parents: 364 diff changeset	339 }
386 f4f0780708d1 - store settings in eeprom Matt Johnston <matt@ucc.asn.au> parents: 385 diff changeset	340 printf_P(PSTR("off:%hu\n"), comms_wake);
352 99f8b97a9449 Use the PRR etc, set value to proper ones Matt Johnston <matt@ucc.asn.au> parents: 349 diff changeset	341 _delay_ms(100);
322 840f51824254 untested, add comms timeout code Matt Johnston <matt@ucc.asn.au> parents: 321 diff changeset	342 comms_timeout = 0;
306 848b0fe159d2 Some basic bits Matt Johnston <matt@ucc.asn.au> parents: diff changeset	343 }
848b0fe159d2 Some basic bits Matt Johnston <matt@ucc.asn.au> parents: diff changeset	344
848b0fe159d2 Some basic bits Matt Johnston <matt@ucc.asn.au> parents: diff changeset	345 static void
360 5d86f1182f62 add "awake" and "reset" functions Matt Johnston <matt@ucc.asn.au> parents: 358 diff changeset	346 cmd_reset()
5d86f1182f62 add "awake" and "reset" functions Matt Johnston <matt@ucc.asn.au> parents: 358 diff changeset	347 {
5d86f1182f62 add "awake" and "reset" functions Matt Johnston <matt@ucc.asn.au> parents: 358 diff changeset	348 printf_P(PSTR("reset\n"));
5d86f1182f62 add "awake" and "reset" functions Matt Johnston <matt@ucc.asn.au> parents: 358 diff changeset	349 _delay_ms(100);
5d86f1182f62 add "awake" and "reset" functions Matt Johnston <matt@ucc.asn.au> parents: 358 diff changeset	350 cli(); // disable interrupts
5d86f1182f62 add "awake" and "reset" functions Matt Johnston <matt@ucc.asn.au> parents: 358 diff changeset	351 wdt_enable(WDTO_15MS); // enable watchdog
5d86f1182f62 add "awake" and "reset" functions Matt Johnston <matt@ucc.asn.au> parents: 358 diff changeset	352 while(1); // wait for watchdog to reset processor
5d86f1182f62 add "awake" and "reset" functions Matt Johnston <matt@ucc.asn.au> parents: 358 diff changeset	353 }
5d86f1182f62 add "awake" and "reset" functions Matt Johnston <matt@ucc.asn.au> parents: 358 diff changeset	354
5d86f1182f62 add "awake" and "reset" functions Matt Johnston <matt@ucc.asn.au> parents: 358 diff changeset	355 static void
318 31199b2941f6 Add simple_ds18b20.c etc Matt Johnston <matt@ucc.asn.au> parents: 316 diff changeset	356 cmd_measure()
31199b2941f6 Add simple_ds18b20.c etc Matt Johnston <matt@ucc.asn.au> parents: 316 diff changeset	357 {
339 449272fc63a3 - Debug log file for server Matt Johnston <matt@ucc.asn.au> parents: 338 diff changeset	358 printf_P(PSTR("measuring\n"));
318 31199b2941f6 Add simple_ds18b20.c etc Matt Johnston <matt@ucc.asn.au> parents: 316 diff changeset	359 need_measurement = 1;
31199b2941f6 Add simple_ds18b20.c etc Matt Johnston <matt@ucc.asn.au> parents: 316 diff changeset	360 }
31199b2941f6 Add simple_ds18b20.c etc Matt Johnston <matt@ucc.asn.au> parents: 316 diff changeset	361
31199b2941f6 Add simple_ds18b20.c etc Matt Johnston <matt@ucc.asn.au> parents: 316 diff changeset	362 static void
31199b2941f6 Add simple_ds18b20.c etc Matt Johnston <matt@ucc.asn.au> parents: 316 diff changeset	363 cmd_sensors()
31199b2941f6 Add simple_ds18b20.c etc Matt Johnston <matt@ucc.asn.au> parents: 316 diff changeset	364 {
31199b2941f6 Add simple_ds18b20.c etc Matt Johnston <matt@ucc.asn.au> parents: 316 diff changeset	365 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	366 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	367 long_delay(DS18B20_TCONV_12BIT);
318 31199b2941f6 Add simple_ds18b20.c etc Matt Johnston <matt@ucc.asn.au> parents: 316 diff changeset	368 simple_ds18b20_read_all();
31199b2941f6 Add simple_ds18b20.c etc Matt Johnston <matt@ucc.asn.au> parents: 316 diff changeset	369 }
31199b2941f6 Add simple_ds18b20.c etc Matt Johnston <matt@ucc.asn.au> parents: 316 diff changeset	370
319 9621436cfa07 Add eeprom stuff Matt Johnston <matt@ucc.asn.au> parents: 318 diff changeset	371 static void
382 f429169aa3cd don't store sensors in eeprom, scan at startup instead Matt Johnston <matt@ucc.asn.au> parents: 381 diff changeset	372 init_sensors()
319 9621436cfa07 Add eeprom stuff Matt Johnston <matt@ucc.asn.au> parents: 318 diff changeset	373 {
347 56f22e29582a fix tabbing Matt Johnston <matt@ucc.asn.au> parents: 346 diff changeset	374 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	375 printf_P(PSTR("init sensors\n"));
319 9621436cfa07 Add eeprom stuff Matt Johnston <matt@ucc.asn.au> parents: 318 diff changeset	376 ow_reset();
347 56f22e29582a fix tabbing Matt Johnston <matt@ucc.asn.au> parents: 346 diff changeset	377 for( uint8_t diff = OW_SEARCH_FIRST; diff != OW_LAST_DEVICE; )
56f22e29582a fix tabbing Matt Johnston <matt@ucc.asn.au> parents: 346 diff changeset	378 {
56f22e29582a fix tabbing Matt Johnston <matt@ucc.asn.au> parents: 346 diff changeset	379 diff = ow_rom_search( diff, &id[0] );
56f22e29582a fix tabbing Matt Johnston <matt@ucc.asn.au> parents: 346 diff changeset	380 if( diff == OW_PRESENCE_ERR ) {
56f22e29582a fix tabbing Matt Johnston <matt@ucc.asn.au> parents: 346 diff changeset	381 printf_P( PSTR("No Sensor found\r") );
56f22e29582a fix tabbing Matt Johnston <matt@ucc.asn.au> parents: 346 diff changeset	382 return;
56f22e29582a fix tabbing Matt Johnston <matt@ucc.asn.au> parents: 346 diff changeset	383 }
56f22e29582a fix tabbing Matt Johnston <matt@ucc.asn.au> parents: 346 diff changeset	384
56f22e29582a fix tabbing Matt Johnston <matt@ucc.asn.au> parents: 346 diff changeset	385 if( diff == OW_DATA_ERR ) {
56f22e29582a fix tabbing Matt Johnston <matt@ucc.asn.au> parents: 346 diff changeset	386 printf_P( PSTR("Bus Error\r") );
56f22e29582a fix tabbing Matt Johnston <matt@ucc.asn.au> parents: 346 diff changeset	387 return;
56f22e29582a fix tabbing Matt Johnston <matt@ucc.asn.au> parents: 346 diff changeset	388 }
382 f429169aa3cd don't store sensors in eeprom, scan at startup instead Matt Johnston <matt@ucc.asn.au> parents: 381 diff changeset	389
f429169aa3cd don't store sensors in eeprom, scan at startup instead Matt Johnston <matt@ucc.asn.au> parents: 381 diff changeset	390 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	391 {
f429169aa3cd don't store sensors in eeprom, scan at startup instead Matt Johnston <matt@ucc.asn.au> parents: 381 diff changeset	392 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	393 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	394 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	395 putchar('\n');
f429169aa3cd don't store sensors in eeprom, scan at startup instead Matt Johnston <matt@ucc.asn.au> parents: 381 diff changeset	396 n_sensors++;
f429169aa3cd don't store sensors in eeprom, scan at startup instead Matt Johnston <matt@ucc.asn.au> parents: 381 diff changeset	397 }
f429169aa3cd don't store sensors in eeprom, scan at startup instead Matt Johnston <matt@ucc.asn.au> parents: 381 diff changeset	398 else
f429169aa3cd don't store sensors in eeprom, scan at startup instead Matt Johnston <matt@ucc.asn.au> parents: 381 diff changeset	399 {
f429169aa3cd don't store sensors in eeprom, scan at startup instead Matt Johnston <matt@ucc.asn.au> parents: 381 diff changeset	400 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	401 }
319 9621436cfa07 Add eeprom stuff Matt Johnston <matt@ucc.asn.au> parents: 318 diff changeset	402 }
386 f4f0780708d1 - store settings in eeprom Matt Johnston <matt@ucc.asn.au> parents: 385 diff changeset	403
f4f0780708d1 - store settings in eeprom Matt Johnston <matt@ucc.asn.au> parents: 385 diff changeset	404 max_measurements = TOTAL_MEASUREMENTS / n_sensors;
f4f0780708d1 - store settings in eeprom Matt Johnston <matt@ucc.asn.au> parents: 385 diff changeset	405 }
f4f0780708d1 - store settings in eeprom Matt Johnston <matt@ucc.asn.au> parents: 385 diff changeset	406
f4f0780708d1 - store settings in eeprom Matt Johnston <matt@ucc.asn.au> parents: 385 diff changeset	407 static void
f4f0780708d1 - store settings in eeprom Matt Johnston <matt@ucc.asn.au> parents: 385 diff changeset	408 load_params()
f4f0780708d1 - store settings in eeprom Matt Johnston <matt@ucc.asn.au> parents: 385 diff changeset	409 {
f4f0780708d1 - store settings in eeprom Matt Johnston <matt@ucc.asn.au> parents: 385 diff changeset	410 uint16_t magic;
f4f0780708d1 - store settings in eeprom Matt Johnston <matt@ucc.asn.au> parents: 385 diff changeset	411 eeprom_read(magic, magic);
f4f0780708d1 - store settings in eeprom Matt Johnston <matt@ucc.asn.au> parents: 385 diff changeset	412 if (magic == EXPECT_MAGIC)
f4f0780708d1 - store settings in eeprom Matt Johnston <matt@ucc.asn.au> parents: 385 diff changeset	413 {
f4f0780708d1 - store settings in eeprom Matt Johnston <matt@ucc.asn.au> parents: 385 diff changeset	414 eeprom_read(measure_wake, measure_wake);
f4f0780708d1 - store settings in eeprom Matt Johnston <matt@ucc.asn.au> parents: 385 diff changeset	415 eeprom_read(comms_wake, comms_wake);
f4f0780708d1 - store settings in eeprom Matt Johnston <matt@ucc.asn.au> parents: 385 diff changeset	416 eeprom_read(wake_secs, wake_secs);
f4f0780708d1 - store settings in eeprom Matt Johnston <matt@ucc.asn.au> parents: 385 diff changeset	417 }
f4f0780708d1 - store settings in eeprom Matt Johnston <matt@ucc.asn.au> parents: 385 diff changeset	418 }
f4f0780708d1 - store settings in eeprom Matt Johnston <matt@ucc.asn.au> parents: 385 diff changeset	419
f4f0780708d1 - store settings in eeprom Matt Johnston <matt@ucc.asn.au> parents: 385 diff changeset	420 static void
f4f0780708d1 - store settings in eeprom Matt Johnston <matt@ucc.asn.au> parents: 385 diff changeset	421 cmd_get_params()
f4f0780708d1 - store settings in eeprom Matt Johnston <matt@ucc.asn.au> parents: 385 diff changeset	422 {
387 1ee4485b59a2 try and be a bit more frugal with stack Matt Johnston <matt@ucc.asn.au> parents: 386 diff changeset	423 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	424 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	425 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	426 printf_P(PSTR("tick %d\n"), TICK);
1ee4485b59a2 try and be a bit more frugal with stack Matt Johnston <matt@ucc.asn.au> parents: 386 diff changeset	427 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	428 n_sensors, MAX_SENSORS);
1ee4485b59a2 try and be a bit more frugal with stack Matt Johnston <matt@ucc.asn.au> parents: 386 diff changeset	429 printf_P(PSTR("meas %hu (%hu)\n"),
386 f4f0780708d1 - store settings in eeprom Matt Johnston <matt@ucc.asn.au> parents: 385 diff changeset	430 max_measurements, TOTAL_MEASUREMENTS);
319 9621436cfa07 Add eeprom stuff Matt Johnston <matt@ucc.asn.au> parents: 318 diff changeset	431 }
9621436cfa07 Add eeprom stuff Matt Johnston <matt@ucc.asn.au> parents: 318 diff changeset	432
9621436cfa07 Add eeprom stuff Matt Johnston <matt@ucc.asn.au> parents: 318 diff changeset	433 static void
386 f4f0780708d1 - store settings in eeprom Matt Johnston <matt@ucc.asn.au> parents: 385 diff changeset	434 cmd_set_params(const char *params)
319 9621436cfa07 Add eeprom stuff Matt Johnston <matt@ucc.asn.au> parents: 318 diff changeset	435 {
386 f4f0780708d1 - store settings in eeprom Matt Johnston <matt@ucc.asn.au> parents: 385 diff changeset	436 uint16_t new_measure_wake;
f4f0780708d1 - store settings in eeprom Matt Johnston <matt@ucc.asn.au> parents: 385 diff changeset	437 uint16_t new_comms_wake;
f4f0780708d1 - store settings in eeprom Matt Johnston <matt@ucc.asn.au> parents: 385 diff changeset	438 uint8_t new_wake_secs;
387 1ee4485b59a2 try and be a bit more frugal with stack Matt Johnston <matt@ucc.asn.au> parents: 386 diff changeset	439 int ret = sscanf_P(params, PSTR("%hu %hu %hhu"),
386 f4f0780708d1 - store settings in eeprom Matt Johnston <matt@ucc.asn.au> parents: 385 diff changeset	440 &new_measure_wake, &new_comms_wake, &new_wake_secs);
f4f0780708d1 - store settings in eeprom Matt Johnston <matt@ucc.asn.au> parents: 385 diff changeset	441
f4f0780708d1 - store settings in eeprom Matt Johnston <matt@ucc.asn.au> parents: 385 diff changeset	442 if (ret != 3)
319 9621436cfa07 Add eeprom stuff Matt Johnston <matt@ucc.asn.au> parents: 318 diff changeset	443 {
386 f4f0780708d1 - store settings in eeprom Matt Johnston <matt@ucc.asn.au> parents: 385 diff changeset	444 printf_P(PSTR("Bad values\n"));
f4f0780708d1 - store settings in eeprom Matt Johnston <matt@ucc.asn.au> parents: 385 diff changeset	445 }
f4f0780708d1 - store settings in eeprom Matt Johnston <matt@ucc.asn.au> parents: 385 diff changeset	446 else
f4f0780708d1 - store settings in eeprom Matt Johnston <matt@ucc.asn.au> parents: 385 diff changeset	447 {
320 cff7a4459dc9 Lots of it works now. Matt Johnston <matt@ucc.asn.au> parents: 319 diff changeset	448 cli();
386 f4f0780708d1 - store settings in eeprom Matt Johnston <matt@ucc.asn.au> parents: 385 diff changeset	449 eeprom_write(new_measure_wake, measure_wake);
f4f0780708d1 - store settings in eeprom Matt Johnston <matt@ucc.asn.au> parents: 385 diff changeset	450 eeprom_write(new_comms_wake, comms_wake);
f4f0780708d1 - store settings in eeprom Matt Johnston <matt@ucc.asn.au> parents: 385 diff changeset	451 eeprom_write(new_wake_secs, wake_secs);
f4f0780708d1 - store settings in eeprom Matt Johnston <matt@ucc.asn.au> parents: 385 diff changeset	452 uint16_t magic = EXPECT_MAGIC;
320 cff7a4459dc9 Lots of it works now. Matt Johnston <matt@ucc.asn.au> parents: 319 diff changeset	453 eeprom_write(magic, magic);
cff7a4459dc9 Lots of it works now. Matt Johnston <matt@ucc.asn.au> parents: 319 diff changeset	454 sei();
386 f4f0780708d1 - store settings in eeprom Matt Johnston <matt@ucc.asn.au> parents: 385 diff changeset	455 printf_P(PSTR("set_params for next boot\n"));
387 1ee4485b59a2 try and be a bit more frugal with stack Matt Johnston <matt@ucc.asn.au> parents: 386 diff changeset	456 printf_P(PSTR("measure %hu comms %hu wake %hhu\n"),
386 f4f0780708d1 - store settings in eeprom Matt Johnston <matt@ucc.asn.au> parents: 385 diff changeset	457 new_measure_wake, new_comms_wake, new_wake_secs);
319 9621436cfa07 Add eeprom stuff Matt Johnston <matt@ucc.asn.au> parents: 318 diff changeset	458 }
386 f4f0780708d1 - store settings in eeprom Matt Johnston <matt@ucc.asn.au> parents: 385 diff changeset	459 }
f4f0780708d1 - store settings in eeprom Matt Johnston <matt@ucc.asn.au> parents: 385 diff changeset	460
f4f0780708d1 - store settings in eeprom Matt Johnston <matt@ucc.asn.au> parents: 385 diff changeset	461 static void
f4f0780708d1 - store settings in eeprom Matt Johnston <matt@ucc.asn.au> parents: 385 diff changeset	462 cmd_awake()
f4f0780708d1 - store settings in eeprom Matt Johnston <matt@ucc.asn.au> parents: 385 diff changeset	463 {
f4f0780708d1 - store settings in eeprom Matt Johnston <matt@ucc.asn.au> parents: 385 diff changeset	464 stay_awake = 1;
f4f0780708d1 - store settings in eeprom Matt Johnston <matt@ucc.asn.au> parents: 385 diff changeset	465 printf_P(PSTR("awake\n"));
319 9621436cfa07 Add eeprom stuff Matt Johnston <matt@ucc.asn.au> parents: 318 diff changeset	466 }
9621436cfa07 Add eeprom stuff Matt Johnston <matt@ucc.asn.au> parents: 318 diff changeset	467
318 31199b2941f6 Add simple_ds18b20.c etc Matt Johnston <matt@ucc.asn.au> parents: 316 diff changeset	468 static void
306 848b0fe159d2 Some basic bits Matt Johnston <matt@ucc.asn.au> parents: diff changeset	469 read_handler()
848b0fe159d2 Some basic bits Matt Johnston <matt@ucc.asn.au> parents: diff changeset	470 {
312 ef64a178092f - Some basic ADC code Matt Johnston <matt@ucc.asn.au> parents: 311 diff changeset	471 if (strcmp_P(readbuf, PSTR("fetch")) == 0)
306 848b0fe159d2 Some basic bits Matt Johnston <matt@ucc.asn.au> parents: diff changeset	472 {
848b0fe159d2 Some basic bits Matt Johnston <matt@ucc.asn.au> parents: diff changeset	473 cmd_fetch();
848b0fe159d2 Some basic bits Matt Johnston <matt@ucc.asn.au> parents: diff changeset	474 }
312 ef64a178092f - Some basic ADC code Matt Johnston <matt@ucc.asn.au> parents: 311 diff changeset	475 else if (strcmp_P(readbuf, PSTR("clear")) == 0)
306 848b0fe159d2 Some basic bits Matt Johnston <matt@ucc.asn.au> parents: diff changeset	476 {
848b0fe159d2 Some basic bits Matt Johnston <matt@ucc.asn.au> parents: diff changeset	477 cmd_clear();
848b0fe159d2 Some basic bits Matt Johnston <matt@ucc.asn.au> parents: diff changeset	478 }
312 ef64a178092f - Some basic ADC code Matt Johnston <matt@ucc.asn.au> parents: 311 diff changeset	479 else if (strcmp_P(readbuf, PSTR("btoff")) == 0)
306 848b0fe159d2 Some basic bits Matt Johnston <matt@ucc.asn.au> parents: diff changeset	480 {
848b0fe159d2 Some basic bits Matt Johnston <matt@ucc.asn.au> parents: diff changeset	481 cmd_btoff();
848b0fe159d2 Some basic bits Matt Johnston <matt@ucc.asn.au> parents: diff changeset	482 }
318 31199b2941f6 Add simple_ds18b20.c etc Matt Johnston <matt@ucc.asn.au> parents: 316 diff changeset	483 else if (strcmp_P(readbuf, PSTR("measure")) == 0)
31199b2941f6 Add simple_ds18b20.c etc Matt Johnston <matt@ucc.asn.au> parents: 316 diff changeset	484 {
31199b2941f6 Add simple_ds18b20.c etc Matt Johnston <matt@ucc.asn.au> parents: 316 diff changeset	485 cmd_measure();
31199b2941f6 Add simple_ds18b20.c etc Matt Johnston <matt@ucc.asn.au> parents: 316 diff changeset	486 }
31199b2941f6 Add simple_ds18b20.c etc Matt Johnston <matt@ucc.asn.au> parents: 316 diff changeset	487 else if (strcmp_P(readbuf, PSTR("sensors")) == 0)
31199b2941f6 Add simple_ds18b20.c etc Matt Johnston <matt@ucc.asn.au> parents: 316 diff changeset	488 {
31199b2941f6 Add simple_ds18b20.c etc Matt Johnston <matt@ucc.asn.au> parents: 316 diff changeset	489 cmd_sensors();
31199b2941f6 Add simple_ds18b20.c etc Matt Johnston <matt@ucc.asn.au> parents: 316 diff changeset	490 }
386 f4f0780708d1 - store settings in eeprom Matt Johnston <matt@ucc.asn.au> parents: 385 diff changeset	491 else if (strcmp_P(readbuf, PSTR("get_params")) == 0)
f4f0780708d1 - store settings in eeprom Matt Johnston <matt@ucc.asn.au> parents: 385 diff changeset	492 {
f4f0780708d1 - store settings in eeprom Matt Johnston <matt@ucc.asn.au> parents: 385 diff changeset	493 cmd_get_params();
f4f0780708d1 - store settings in eeprom Matt Johnston <matt@ucc.asn.au> parents: 385 diff changeset	494 }
389 5e3880342390 - fix set_params (strange) Matt Johnston <matt@ucc.asn.au> parents: 387 diff changeset	495 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	496 {
389 5e3880342390 - fix set_params (strange) Matt Johnston <matt@ucc.asn.au> parents: 387 diff changeset	497 cmd_set_params(&readbuf[11]);
386 f4f0780708d1 - store settings in eeprom Matt Johnston <matt@ucc.asn.au> parents: 385 diff changeset	498 }
f4f0780708d1 - store settings in eeprom Matt Johnston <matt@ucc.asn.au> parents: 385 diff changeset	499 else if (strcmp_P(readbuf, PSTR("awake")) == 0)
f4f0780708d1 - store settings in eeprom Matt Johnston <matt@ucc.asn.au> parents: 385 diff changeset	500 {
f4f0780708d1 - store settings in eeprom Matt Johnston <matt@ucc.asn.au> parents: 385 diff changeset	501 cmd_awake();
f4f0780708d1 - store settings in eeprom Matt Johnston <matt@ucc.asn.au> parents: 385 diff changeset	502 }
360 5d86f1182f62 add "awake" and "reset" functions Matt Johnston <matt@ucc.asn.au> parents: 358 diff changeset	503 else if (strcmp_P(readbuf, PSTR("reset")) == 0)
5d86f1182f62 add "awake" and "reset" functions Matt Johnston <matt@ucc.asn.au> parents: 358 diff changeset	504 {
5d86f1182f62 add "awake" and "reset" functions Matt Johnston <matt@ucc.asn.au> parents: 358 diff changeset	505 cmd_reset();
5d86f1182f62 add "awake" and "reset" functions Matt Johnston <matt@ucc.asn.au> parents: 358 diff changeset	506 }
306 848b0fe159d2 Some basic bits Matt Johnston <matt@ucc.asn.au> parents: diff changeset	507 else
848b0fe159d2 Some basic bits Matt Johnston <matt@ucc.asn.au> parents: diff changeset	508 {
389 5e3880342390 - fix set_params (strange) Matt Johnston <matt@ucc.asn.au> parents: 387 diff changeset	509 printf_P(PSTR("Bad command '%s'\n"), readbuf);
306 848b0fe159d2 Some basic bits Matt Johnston <matt@ucc.asn.au> parents: diff changeset	510 }
848b0fe159d2 Some basic bits Matt Johnston <matt@ucc.asn.au> parents: diff changeset	511 }
848b0fe159d2 Some basic bits Matt Johnston <matt@ucc.asn.au> parents: diff changeset	512
326 f6b5941b4c34 Untested - calculate crc in uart_putchar Matt Johnston <matt@ucc.asn.au> parents: 325 diff changeset	513 ISR(INT0_vect)
324 e3664732f11f Add INT0 button Matt Johnston <matt@ucc.asn.au> parents: 321 diff changeset	514 {
347 56f22e29582a fix tabbing Matt Johnston <matt@ucc.asn.au> parents: 346 diff changeset	515 need_comms = 1;
386 f4f0780708d1 - store settings in eeprom Matt Johnston <matt@ucc.asn.au> parents: 385 diff changeset	516 comms_timeout = wake_secs;
330 7ac6b8846eea - some fixes for server code Matt Johnston <matt@ucc.asn.au> parents: 328 diff changeset	517 blink();
7ac6b8846eea - some fixes for server code Matt Johnston <matt@ucc.asn.au> parents: 328 diff changeset	518 _delay_ms(100);
7ac6b8846eea - some fixes for server code Matt Johnston <matt@ucc.asn.au> parents: 328 diff changeset	519 blink();
324 e3664732f11f Add INT0 button Matt Johnston <matt@ucc.asn.au> parents: 321 diff changeset	520 }
e3664732f11f Add INT0 button Matt Johnston <matt@ucc.asn.au> parents: 321 diff changeset	521
e3664732f11f Add INT0 button Matt Johnston <matt@ucc.asn.au> parents: 321 diff changeset	522
308 e36ee3e156c1 switch to atmega328 Matt Johnston <matt@ucc.asn.au> parents: 307 diff changeset	523 ISR(USART_RX_vect)
306 848b0fe159d2 Some basic bits Matt Johnston <matt@ucc.asn.au> parents: diff changeset	524 {
308 e36ee3e156c1 switch to atmega328 Matt Johnston <matt@ucc.asn.au> parents: 307 diff changeset	525 char c = UDR0;
339 449272fc63a3 - Debug log file for server Matt Johnston <matt@ucc.asn.au> parents: 338 diff changeset	526 #ifdef HAVE_UART_ECHO
318 31199b2941f6 Add simple_ds18b20.c etc Matt Johnston <matt@ucc.asn.au> parents: 316 diff changeset	527 uart_putchar(c, NULL);
339 449272fc63a3 - Debug log file for server Matt Johnston <matt@ucc.asn.au> parents: 338 diff changeset	528 #endif
328 46070aaf29ea A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 326 diff changeset	529 if (c == '\r' \|\| c == '\n')
306 848b0fe159d2 Some basic bits Matt Johnston <matt@ucc.asn.au> parents: diff changeset	530 {
328 46070aaf29ea A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 326 diff changeset	531 if (readpos > 0)
46070aaf29ea A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 326 diff changeset	532 {
46070aaf29ea A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 326 diff changeset	533 readbuf[readpos] = '\0';
333 298e502fdcd4 Add some web server handling Matt Johnston <matt@ucc.asn.au> parents: 332 diff changeset	534 have_cmd = 1;
328 46070aaf29ea A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 326 diff changeset	535 readpos = 0;
46070aaf29ea A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 326 diff changeset	536 }
306 848b0fe159d2 Some basic bits Matt Johnston <matt@ucc.asn.au> parents: diff changeset	537 }
848b0fe159d2 Some basic bits Matt Johnston <matt@ucc.asn.au> parents: diff changeset	538 else
848b0fe159d2 Some basic bits Matt Johnston <matt@ucc.asn.au> parents: diff changeset	539 {
848b0fe159d2 Some basic bits Matt Johnston <matt@ucc.asn.au> parents: diff changeset	540 readbuf[readpos] = c;
848b0fe159d2 Some basic bits Matt Johnston <matt@ucc.asn.au> parents: diff changeset	541 readpos++;
848b0fe159d2 Some basic bits Matt Johnston <matt@ucc.asn.au> parents: diff changeset	542 if (readpos >= sizeof(readbuf))
848b0fe159d2 Some basic bits Matt Johnston <matt@ucc.asn.au> parents: diff changeset	543 {
848b0fe159d2 Some basic bits Matt Johnston <matt@ucc.asn.au> parents: diff changeset	544 readpos = 0;
848b0fe159d2 Some basic bits Matt Johnston <matt@ucc.asn.au> parents: diff changeset	545 }
848b0fe159d2 Some basic bits Matt Johnston <matt@ucc.asn.au> parents: diff changeset	546 }
848b0fe159d2 Some basic bits Matt Johnston <matt@ucc.asn.au> parents: diff changeset	547 }
848b0fe159d2 Some basic bits Matt Johnston <matt@ucc.asn.au> parents: diff changeset	548
308 e36ee3e156c1 switch to atmega328 Matt Johnston <matt@ucc.asn.au> parents: 307 diff changeset	549 ISR(TIMER2_COMPA_vect)
307 e50091063890 Some counter2 bits Matt Johnston <matt@ucc.asn.au> parents: 306 diff changeset	550 {
320 cff7a4459dc9 Lots of it works now. Matt Johnston <matt@ucc.asn.au> parents: 319 diff changeset	551 TCNT2 = 0;
386 f4f0780708d1 - store settings in eeprom Matt Johnston <matt@ucc.asn.au> parents: 385 diff changeset	552 measure_count += TICK;
f4f0780708d1 - store settings in eeprom Matt Johnston <matt@ucc.asn.au> parents: 385 diff changeset	553 comms_count += TICK;
322 840f51824254 untested, add comms timeout code Matt Johnston <matt@ucc.asn.au> parents: 321 diff changeset	554
386 f4f0780708d1 - store settings in eeprom Matt Johnston <matt@ucc.asn.au> parents: 385 diff changeset	555 clock_epoch += TICK;
323 5181ea55ea77 Add clock_epoch Matt Johnston <matt@ucc.asn.au> parents: 322 diff changeset	556
322 840f51824254 untested, add comms timeout code Matt Johnston <matt@ucc.asn.au> parents: 321 diff changeset	557 if (comms_timeout != 0)
840f51824254 untested, add comms timeout code Matt Johnston <matt@ucc.asn.au> parents: 321 diff changeset	558 {
386 f4f0780708d1 - store settings in eeprom Matt Johnston <matt@ucc.asn.au> parents: 385 diff changeset	559 comms_timeout -= TICK;
322 840f51824254 untested, add comms timeout code Matt Johnston <matt@ucc.asn.au> parents: 321 diff changeset	560 }
840f51824254 untested, add comms timeout code Matt Johnston <matt@ucc.asn.au> parents: 321 diff changeset	561
386 f4f0780708d1 - store settings in eeprom Matt Johnston <matt@ucc.asn.au> parents: 385 diff changeset	562 if (measure_count >= measure_wake)
307 e50091063890 Some counter2 bits Matt Johnston <matt@ucc.asn.au> parents: 306 diff changeset	563 {
310 0a64532c1de1 Fill out more main.c structure Matt Johnston <matt@ucc.asn.au> parents: 309 diff changeset	564 measure_count = 0;
307 e50091063890 Some counter2 bits Matt Johnston <matt@ucc.asn.au> parents: 306 diff changeset	565 need_measurement = 1;
e50091063890 Some counter2 bits Matt Johnston <matt@ucc.asn.au> parents: 306 diff changeset	566 }
310 0a64532c1de1 Fill out more main.c structure Matt Johnston <matt@ucc.asn.au> parents: 309 diff changeset	567
386 f4f0780708d1 - store settings in eeprom Matt Johnston <matt@ucc.asn.au> parents: 385 diff changeset	568 if (comms_count >= comms_wake)
347 56f22e29582a fix tabbing Matt Johnston <matt@ucc.asn.au> parents: 346 diff changeset	569 {
56f22e29582a fix tabbing Matt Johnston <matt@ucc.asn.au> parents: 346 diff changeset	570 comms_count = 0;
56f22e29582a fix tabbing Matt Johnston <matt@ucc.asn.au> parents: 346 diff changeset	571 need_comms = 1;
56f22e29582a fix tabbing Matt Johnston <matt@ucc.asn.au> parents: 346 diff changeset	572 }
307 e50091063890 Some counter2 bits Matt Johnston <matt@ucc.asn.au> parents: 306 diff changeset	573 }
e50091063890 Some counter2 bits Matt Johnston <matt@ucc.asn.au> parents: 306 diff changeset	574
309 49e83333e546 Add FatFS Matt Johnston <matt@ucc.asn.au> parents: 308 diff changeset	575 DWORD get_fattime (void)
49e83333e546 Add FatFS Matt Johnston <matt@ucc.asn.au> parents: 308 diff changeset	576 {
49e83333e546 Add FatFS Matt Johnston <matt@ucc.asn.au> parents: 308 diff changeset	577 return 0;
49e83333e546 Add FatFS Matt Johnston <matt@ucc.asn.au> parents: 308 diff changeset	578 }
49e83333e546 Add FatFS Matt Johnston <matt@ucc.asn.au> parents: 308 diff changeset	579
307 e50091063890 Some counter2 bits Matt Johnston <matt@ucc.asn.au> parents: 306 diff changeset	580 static void
e50091063890 Some counter2 bits Matt Johnston <matt@ucc.asn.au> parents: 306 diff changeset	581 deep_sleep()
e50091063890 Some counter2 bits Matt Johnston <matt@ucc.asn.au> parents: 306 diff changeset	582 {
e50091063890 Some counter2 bits Matt Johnston <matt@ucc.asn.au> parents: 306 diff changeset	583 // p119 of manual
308 e36ee3e156c1 switch to atmega328 Matt Johnston <matt@ucc.asn.au> parents: 307 diff changeset	584 OCR2A = SLEEP_COMPARE;
e36ee3e156c1 switch to atmega328 Matt Johnston <matt@ucc.asn.au> parents: 307 diff changeset	585 loop_until_bit_is_clear(ASSR, OCR2AUB);
307 e50091063890 Some counter2 bits Matt Johnston <matt@ucc.asn.au> parents: 306 diff changeset	586
e50091063890 Some counter2 bits Matt Johnston <matt@ucc.asn.au> parents: 306 diff changeset	587 set_sleep_mode(SLEEP_MODE_PWR_SAVE);
e50091063890 Some counter2 bits Matt Johnston <matt@ucc.asn.au> parents: 306 diff changeset	588 sleep_mode();
e50091063890 Some counter2 bits Matt Johnston <matt@ucc.asn.au> parents: 306 diff changeset	589 }
e50091063890 Some counter2 bits Matt Johnston <matt@ucc.asn.au> parents: 306 diff changeset	590
e50091063890 Some counter2 bits Matt Johnston <matt@ucc.asn.au> parents: 306 diff changeset	591 static void
310 0a64532c1de1 Fill out more main.c structure Matt Johnston <matt@ucc.asn.au> parents: 309 diff changeset	592 idle_sleep()
0a64532c1de1 Fill out more main.c structure Matt Johnston <matt@ucc.asn.au> parents: 309 diff changeset	593 {
0a64532c1de1 Fill out more main.c structure Matt Johnston <matt@ucc.asn.au> parents: 309 diff changeset	594 set_sleep_mode(SLEEP_MODE_IDLE);
0a64532c1de1 Fill out more main.c structure Matt Johnston <matt@ucc.asn.au> parents: 309 diff changeset	595 sleep_mode();
0a64532c1de1 Fill out more main.c structure Matt Johnston <matt@ucc.asn.au> parents: 309 diff changeset	596 }
0a64532c1de1 Fill out more main.c structure Matt Johnston <matt@ucc.asn.au> parents: 309 diff changeset	597
365 d31a6550d264 - add some atomic guards Matt Johnston <matt@ucc.asn.au> parents: 364 diff changeset	598 static uint16_t
d31a6550d264 - add some atomic guards Matt Johnston <matt@ucc.asn.au> parents: 364 diff changeset	599 adc_vcc()
361 cfcd200c69da untested code to log voltage and internal temperature Matt Johnston <matt@ucc.asn.au> parents: 360 diff changeset	600 {
cfcd200c69da untested code to log voltage and internal temperature Matt Johnston <matt@ucc.asn.au> parents: 360 diff changeset	601 PRR &= ~_BV(PRADC);
cfcd200c69da untested code to log voltage and internal temperature Matt Johnston <matt@ucc.asn.au> parents: 360 diff changeset	602
368 d4c9c360448f merge Matt Johnston <matt@ucc.asn.au> parents: 366 367 diff changeset	603 // /16 prescaler
361 cfcd200c69da untested code to log voltage and internal temperature Matt Johnston <matt@ucc.asn.au> parents: 360 diff changeset	604 ADCSRA = _BV(ADEN) \| _BV(ADPS2);
cfcd200c69da untested code to log voltage and internal temperature Matt Johnston <matt@ucc.asn.au> parents: 360 diff changeset	605
cfcd200c69da untested code to log voltage and internal temperature Matt Johnston <matt@ucc.asn.au> parents: 360 diff changeset	606 // set to measure 1.1 reference
364 8645fdcacad1 fix voltage Matt Johnston <matt@ucc.asn.au> parents: 361 diff changeset	607 ADMUX = _BV(REFS0) \| _BV(MUX3) \| _BV(MUX2) \| _BV(MUX1);
366 daad73f65c0f average voltages Matt Johnston <matt@ucc.asn.au> parents: 365 diff changeset	608 // average a number of samples
daad73f65c0f average voltages Matt Johnston <matt@ucc.asn.au> parents: 365 diff changeset	609 uint16_t sum = 0;
daad73f65c0f average voltages Matt Johnston <matt@ucc.asn.au> parents: 365 diff changeset	610 uint8_t num = 0;
daad73f65c0f average voltages Matt Johnston <matt@ucc.asn.au> parents: 365 diff changeset	611 for (uint8_t n = 0; n < 20; n++)
365 d31a6550d264 - add some atomic guards Matt Johnston <matt@ucc.asn.au> parents: 364 diff changeset	612 {
d31a6550d264 - add some atomic guards Matt Johnston <matt@ucc.asn.au> parents: 364 diff changeset	613 ADCSRA \|= _BV(ADSC);
d31a6550d264 - add some atomic guards Matt Johnston <matt@ucc.asn.au> parents: 364 diff changeset	614 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	615
366 daad73f65c0f average voltages Matt Johnston <matt@ucc.asn.au> parents: 365 diff changeset	616 uint8_t low_11 = ADCL;
daad73f65c0f average voltages Matt Johnston <matt@ucc.asn.au> parents: 365 diff changeset	617 uint8_t high_11 = ADCH;
daad73f65c0f average voltages Matt Johnston <matt@ucc.asn.au> parents: 365 diff changeset	618 uint16_t val = low_11 + (high_11 << 8);
312 ef64a178092f - Some basic ADC code Matt Johnston <matt@ucc.asn.au> parents: 311 diff changeset	619
366 daad73f65c0f average voltages Matt Johnston <matt@ucc.asn.au> parents: 365 diff changeset	620 if (n >= 4)
daad73f65c0f average voltages Matt Johnston <matt@ucc.asn.au> parents: 365 diff changeset	621 {
daad73f65c0f average voltages Matt Johnston <matt@ucc.asn.au> parents: 365 diff changeset	622 sum += val;
daad73f65c0f average voltages Matt Johnston <matt@ucc.asn.au> parents: 365 diff changeset	623 num++;
daad73f65c0f average voltages Matt Johnston <matt@ucc.asn.au> parents: 365 diff changeset	624 }
daad73f65c0f average voltages Matt Johnston <matt@ucc.asn.au> parents: 365 diff changeset	625 }
daad73f65c0f average voltages Matt Johnston <matt@ucc.asn.au> parents: 365 diff changeset	626 ADCSRA = 0;
daad73f65c0f average voltages Matt Johnston <matt@ucc.asn.au> parents: 365 diff changeset	627 PRR \|= _BV(PRADC);
312 ef64a178092f - Some basic ADC code Matt Johnston <matt@ucc.asn.au> parents: 311 diff changeset	628
386 f4f0780708d1 - store settings in eeprom Matt Johnston <matt@ucc.asn.au> parents: 385 diff changeset	629 //float res_volts = 1.1 * 1024 * num / sum;
f4f0780708d1 - store settings in eeprom Matt Johnston <matt@ucc.asn.au> parents: 385 diff changeset	630 //return 1000 * res_volts;
f4f0780708d1 - store settings in eeprom Matt Johnston <matt@ucc.asn.au> parents: 385 diff changeset	631 return ((uint32_t)11001024num) / sum;
312 ef64a178092f - Some basic ADC code Matt Johnston <matt@ucc.asn.au> parents: 311 diff changeset	632 }
ef64a178092f - Some basic ADC code Matt Johnston <matt@ucc.asn.au> parents: 311 diff changeset	633
310 0a64532c1de1 Fill out more main.c structure Matt Johnston <matt@ucc.asn.au> parents: 309 diff changeset	634 static void
307 e50091063890 Some counter2 bits Matt Johnston <matt@ucc.asn.au> parents: 306 diff changeset	635 do_measurement()
e50091063890 Some counter2 bits Matt Johnston <matt@ucc.asn.au> parents: 306 diff changeset	636 {
381 83c83014e5e3 report raw ds18b20 values instead Matt Johnston <matt@ucc.asn.au> parents: 368 diff changeset	637 blink();
83c83014e5e3 report raw ds18b20 values instead Matt Johnston <matt@ucc.asn.au> parents: 368 diff changeset	638
361 cfcd200c69da untested code to log voltage and internal temperature Matt Johnston <matt@ucc.asn.au> parents: 360 diff changeset	639 simple_ds18b20_start_meas(NULL);
365 d31a6550d264 - add some atomic guards Matt Johnston <matt@ucc.asn.au> parents: 364 diff changeset	640 // sleep rather than using a long delay
d31a6550d264 - add some atomic guards Matt Johnston <matt@ucc.asn.au> parents: 364 diff changeset	641 deep_sleep();
d31a6550d264 - add some atomic guards Matt Johnston <matt@ucc.asn.au> parents: 364 diff changeset	642 //_delay_ms(DS18B20_TCONV_12BIT);
319 9621436cfa07 Add eeprom stuff Matt Johnston <matt@ucc.asn.au> parents: 318 diff changeset	643
386 f4f0780708d1 - store settings in eeprom Matt Johnston <matt@ucc.asn.au> parents: 385 diff changeset	644 if (n_measurements == max_measurements)
319 9621436cfa07 Add eeprom stuff Matt Johnston <matt@ucc.asn.au> parents: 318 diff changeset	645 {
9621436cfa07 Add eeprom stuff Matt Johnston <matt@ucc.asn.au> parents: 318 diff changeset	646 n_measurements = 0;
9621436cfa07 Add eeprom stuff Matt Johnston <matt@ucc.asn.au> parents: 318 diff changeset	647 }
312 ef64a178092f - Some basic ADC code Matt Johnston <matt@ucc.asn.au> parents: 311 diff changeset	648
386 f4f0780708d1 - store settings in eeprom Matt Johnston <matt@ucc.asn.au> parents: 385 diff changeset	649 for (uint8_t s = 0; s < n_sensors; s++)
319 9621436cfa07 Add eeprom stuff Matt Johnston <matt@ucc.asn.au> parents: 318 diff changeset	650 {
381 83c83014e5e3 report raw ds18b20 values instead Matt Johnston <matt@ucc.asn.au> parents: 368 diff changeset	651 uint16_t reading;
386 f4f0780708d1 - store settings in eeprom Matt Johnston <matt@ucc.asn.au> parents: 385 diff changeset	652 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	653 if (ret != DS18X20_OK)
319 9621436cfa07 Add eeprom stuff Matt Johnston <matt@ucc.asn.au> parents: 318 diff changeset	654 {
386 f4f0780708d1 - store settings in eeprom Matt Johnston <matt@ucc.asn.au> parents: 385 diff changeset	655 reading = VALUE_BROKEN;
319 9621436cfa07 Add eeprom stuff Matt Johnston <matt@ucc.asn.au> parents: 318 diff changeset	656 }
386 f4f0780708d1 - store settings in eeprom Matt Johnston <matt@ucc.asn.au> parents: 385 diff changeset	657 set_measurement(s, n_measurements, reading);
319 9621436cfa07 Add eeprom stuff Matt Johnston <matt@ucc.asn.au> parents: 318 diff changeset	658 }
328 46070aaf29ea A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 326 diff changeset	659
365 d31a6550d264 - add some atomic guards Matt Johnston <matt@ucc.asn.au> parents: 364 diff changeset	660 ATOMIC_BLOCK(ATOMIC_RESTORESTATE)
328 46070aaf29ea A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 326 diff changeset	661 {
365 d31a6550d264 - add some atomic guards Matt Johnston <matt@ucc.asn.au> parents: 364 diff changeset	662 if (n_measurements == 0)
d31a6550d264 - add some atomic guards Matt Johnston <matt@ucc.asn.au> parents: 364 diff changeset	663 {
d31a6550d264 - add some atomic guards Matt Johnston <matt@ucc.asn.au> parents: 364 diff changeset	664 first_measurement_clock = clock_epoch;
d31a6550d264 - add some atomic guards Matt Johnston <matt@ucc.asn.au> parents: 364 diff changeset	665 }
d31a6550d264 - add some atomic guards Matt Johnston <matt@ucc.asn.au> parents: 364 diff changeset	666 last_measurement_clock = clock_epoch;
328 46070aaf29ea A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 326 diff changeset	667 }
46070aaf29ea A bit of work on the server python Matt Johnston <matt@ucc.asn.au> parents: 326 diff changeset	668
320 cff7a4459dc9 Lots of it works now. Matt Johnston <matt@ucc.asn.au> parents: 319 diff changeset	669 n_measurements++;
318 31199b2941f6 Add simple_ds18b20.c etc Matt Johnston <matt@ucc.asn.au> parents: 316 diff changeset	670 //do_adc_335();
307 e50091063890 Some counter2 bits Matt Johnston <matt@ucc.asn.au> parents: 306 diff changeset	671 }
e50091063890 Some counter2 bits Matt Johnston <matt@ucc.asn.au> parents: 306 diff changeset	672
310 0a64532c1de1 Fill out more main.c structure Matt Johnston <matt@ucc.asn.au> parents: 309 diff changeset	673 static void
0a64532c1de1 Fill out more main.c structure Matt Johnston <matt@ucc.asn.au> parents: 309 diff changeset	674 do_comms()
0a64532c1de1 Fill out more main.c structure Matt Johnston <matt@ucc.asn.au> parents: 309 diff changeset	675 {
347 56f22e29582a fix tabbing Matt Johnston <matt@ucc.asn.au> parents: 346 diff changeset	676 // turn on bluetooth
365 d31a6550d264 - add some atomic guards Matt Johnston <matt@ucc.asn.au> parents: 364 diff changeset	677 ATOMIC_BLOCK(ATOMIC_RESTORESTATE)
d31a6550d264 - add some atomic guards Matt Johnston <matt@ucc.asn.au> parents: 364 diff changeset	678 {
d31a6550d264 - add some atomic guards Matt Johnston <matt@ucc.asn.au> parents: 364 diff changeset	679 last_comms_clock = clock_epoch;
d31a6550d264 - add some atomic guards Matt Johnston <matt@ucc.asn.au> parents: 364 diff changeset	680 }
330 7ac6b8846eea - some fixes for server code Matt Johnston <matt@ucc.asn.au> parents: 328 diff changeset	681 set_aux_power(1);
313 139ecb1840fd serial prints something Matt Johnston <matt@ucc.asn.au> parents: 312 diff changeset	682 uart_on();
347 56f22e29582a fix tabbing Matt Johnston <matt@ucc.asn.au> parents: 346 diff changeset	683
56f22e29582a fix tabbing Matt Johnston <matt@ucc.asn.au> parents: 346 diff changeset	684 // write sd card here? same 3.3v regulator...
56f22e29582a fix tabbing Matt Johnston <matt@ucc.asn.au> parents: 346 diff changeset	685
386 f4f0780708d1 - store settings in eeprom Matt Johnston <matt@ucc.asn.au> parents: 385 diff changeset	686 for (comms_timeout = wake_secs;
f4f0780708d1 - store settings in eeprom Matt Johnston <matt@ucc.asn.au> parents: 385 diff changeset	687 comms_timeout > 0 \|\| stay_awake;
f4f0780708d1 - store settings in eeprom Matt Johnston <matt@ucc.asn.au> parents: 385 diff changeset	688 )
347 56f22e29582a fix tabbing Matt Johnston <matt@ucc.asn.au> parents: 346 diff changeset	689 {
312 ef64a178092f - Some basic ADC code Matt Johnston <matt@ucc.asn.au> parents: 311 diff changeset	690 if (need_measurement)
ef64a178092f - Some basic ADC code Matt Johnston <matt@ucc.asn.au> parents: 311 diff changeset	691 {
320 cff7a4459dc9 Lots of it works now. Matt Johnston <matt@ucc.asn.au> parents: 319 diff changeset	692 need_measurement = 0;
312 ef64a178092f - Some basic ADC code Matt Johnston <matt@ucc.asn.au> parents: 311 diff changeset	693 do_measurement();
349 e7f070855a22 mostly works for testing Matt Johnston <matt@ucc.asn.au> parents: 347 diff changeset	694 continue;
312 ef64a178092f - Some basic ADC code Matt Johnston <matt@ucc.asn.au> parents: 311 diff changeset	695 }
ef64a178092f - Some basic ADC code Matt Johnston <matt@ucc.asn.au> parents: 311 diff changeset	696
333 298e502fdcd4 Add some web server handling Matt Johnston <matt@ucc.asn.au> parents: 332 diff changeset	697 if (have_cmd)
298e502fdcd4 Add some web server handling Matt Johnston <matt@ucc.asn.au> parents: 332 diff changeset	698 {
298e502fdcd4 Add some web server handling Matt Johnston <matt@ucc.asn.au> parents: 332 diff changeset	699 have_cmd = 0;
298e502fdcd4 Add some web server handling Matt Johnston <matt@ucc.asn.au> parents: 332 diff changeset	700 read_handler();
349 e7f070855a22 mostly works for testing Matt Johnston <matt@ucc.asn.au> parents: 347 diff changeset	701 continue;
333 298e502fdcd4 Add some web server handling Matt Johnston <matt@ucc.asn.au> parents: 332 diff changeset	702 }
298e502fdcd4 Add some web server handling Matt Johnston <matt@ucc.asn.au> parents: 332 diff changeset	703
322 840f51824254 untested, add comms timeout code Matt Johnston <matt@ucc.asn.au> parents: 321 diff changeset	704 // wait for commands from the master
347 56f22e29582a fix tabbing Matt Johnston <matt@ucc.asn.au> parents: 346 diff changeset	705 idle_sleep();
56f22e29582a fix tabbing Matt Johnston <matt@ucc.asn.au> parents: 346 diff changeset	706 }
310 0a64532c1de1 Fill out more main.c structure Matt Johnston <matt@ucc.asn.au> parents: 309 diff changeset	707
312 ef64a178092f - Some basic ADC code Matt Johnston <matt@ucc.asn.au> parents: 311 diff changeset	708 uart_off();
352 99f8b97a9449 Use the PRR etc, set value to proper ones Matt Johnston <matt@ucc.asn.au> parents: 349 diff changeset	709 // 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	710 _delay_ms(100);
322 840f51824254 untested, add comms timeout code Matt Johnston <matt@ucc.asn.au> parents: 321 diff changeset	711 set_aux_power(0);
310 0a64532c1de1 Fill out more main.c structure Matt Johnston <matt@ucc.asn.au> parents: 309 diff changeset	712 }
0a64532c1de1 Fill out more main.c structure Matt Johnston <matt@ucc.asn.au> parents: 309 diff changeset	713
313 139ecb1840fd serial prints something Matt Johnston <matt@ucc.asn.au> parents: 312 diff changeset	714 static void
139ecb1840fd serial prints something Matt Johnston <matt@ucc.asn.au> parents: 312 diff changeset	715 blink()
139ecb1840fd serial prints something Matt Johnston <matt@ucc.asn.au> parents: 312 diff changeset	716 {
139ecb1840fd serial prints something Matt Johnston <matt@ucc.asn.au> parents: 312 diff changeset	717 PORT_LED &= ~_BV(PIN_LED);
315 7d409dded901 Import ds18x20 code Matt Johnston <matt@ucc.asn.au> parents: 314 diff changeset	718 _delay_ms(1);
313 139ecb1840fd serial prints something Matt Johnston <matt@ucc.asn.au> parents: 312 diff changeset	719 PORT_LED \|= _BV(PIN_LED);
139ecb1840fd serial prints something Matt Johnston <matt@ucc.asn.au> parents: 312 diff changeset	720 }
139ecb1840fd serial prints something Matt Johnston <matt@ucc.asn.au> parents: 312 diff changeset	721
139ecb1840fd serial prints something Matt Johnston <matt@ucc.asn.au> parents: 312 diff changeset	722 static void
139ecb1840fd serial prints something Matt Johnston <matt@ucc.asn.au> parents: 312 diff changeset	723 long_delay(int ms)
139ecb1840fd serial prints something Matt Johnston <matt@ucc.asn.au> parents: 312 diff changeset	724 {
139ecb1840fd serial prints something Matt Johnston <matt@ucc.asn.au> parents: 312 diff changeset	725 int iter = ms / 100;
139ecb1840fd serial prints something Matt Johnston <matt@ucc.asn.au> parents: 312 diff changeset	726
139ecb1840fd serial prints something Matt Johnston <matt@ucc.asn.au> parents: 312 diff changeset	727 for (int i = 0; i < iter; i++)
139ecb1840fd serial prints something Matt Johnston <matt@ucc.asn.au> parents: 312 diff changeset	728 {
139ecb1840fd serial prints something Matt Johnston <matt@ucc.asn.au> parents: 312 diff changeset	729 _delay_ms(100);
139ecb1840fd serial prints something Matt Johnston <matt@ucc.asn.au> parents: 312 diff changeset	730 }
139ecb1840fd serial prints something Matt Johnston <matt@ucc.asn.au> parents: 312 diff changeset	731 }
139ecb1840fd serial prints something Matt Johnston <matt@ucc.asn.au> parents: 312 diff changeset	732
314 7aebb1452422 deep sleep works Matt Johnston <matt@ucc.asn.au> parents: 313 diff changeset	733 ISR(BADISR_vect)
7aebb1452422 deep sleep works Matt Johnston <matt@ucc.asn.au> parents: 313 diff changeset	734 {
320 cff7a4459dc9 Lots of it works now. Matt Johnston <matt@ucc.asn.au> parents: 319 diff changeset	735 //uart_on();
314 7aebb1452422 deep sleep works Matt Johnston <matt@ucc.asn.au> parents: 313 diff changeset	736 printf_P(PSTR("Bad interrupt\n"));
7aebb1452422 deep sleep works Matt Johnston <matt@ucc.asn.au> parents: 313 diff changeset	737 }
7aebb1452422 deep sleep works Matt Johnston <matt@ucc.asn.au> parents: 313 diff changeset	738
306 848b0fe159d2 Some basic bits Matt Johnston <matt@ucc.asn.au> parents: diff changeset	739 int main(void)
848b0fe159d2 Some basic bits Matt Johnston <matt@ucc.asn.au> parents: diff changeset	740 {
322 840f51824254 untested, add comms timeout code Matt Johnston <matt@ucc.asn.au> parents: 321 diff changeset	741 setup_chip();
840f51824254 untested, add comms timeout code Matt Johnston <matt@ucc.asn.au> parents: 321 diff changeset	742 blink();
315 7d409dded901 Import ds18x20 code Matt Johnston <matt@ucc.asn.au> parents: 314 diff changeset	743
322 840f51824254 untested, add comms timeout code Matt Johnston <matt@ucc.asn.au> parents: 321 diff changeset	744 set_aux_power(0);
313 139ecb1840fd serial prints something Matt Johnston <matt@ucc.asn.au> parents: 312 diff changeset	745
312 ef64a178092f - Some basic ADC code Matt Johnston <matt@ucc.asn.au> parents: 311 diff changeset	746 stdout = &mystdout;
313 139ecb1840fd serial prints something Matt Johnston <matt@ucc.asn.au> parents: 312 diff changeset	747 uart_on();
139ecb1840fd serial prints something Matt Johnston <matt@ucc.asn.au> parents: 312 diff changeset	748
322 840f51824254 untested, add comms timeout code Matt Johnston <matt@ucc.asn.au> parents: 321 diff changeset	749 printf(PSTR("Started.\n"));
319 9621436cfa07 Add eeprom stuff Matt Johnston <matt@ucc.asn.au> parents: 318 diff changeset	750
386 f4f0780708d1 - store settings in eeprom Matt Johnston <matt@ucc.asn.au> parents: 385 diff changeset	751 load_params();
319 9621436cfa07 Add eeprom stuff Matt Johnston <matt@ucc.asn.au> parents: 318 diff changeset	752
382 f429169aa3cd don't store sensors in eeprom, scan at startup instead Matt Johnston <matt@ucc.asn.au> parents: 381 diff changeset	753 init_sensors();
f429169aa3cd don't store sensors in eeprom, scan at startup instead Matt Johnston <matt@ucc.asn.au> parents: 381 diff changeset	754
314 7aebb1452422 deep sleep works Matt Johnston <matt@ucc.asn.au> parents: 313 diff changeset	755 uart_off();
306 848b0fe159d2 Some basic bits Matt Johnston <matt@ucc.asn.au> parents: diff changeset	756
312 ef64a178092f - Some basic ADC code Matt Johnston <matt@ucc.asn.au> parents: 311 diff changeset	757 // 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	758 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	759
7aebb1452422 deep sleep works Matt Johnston <matt@ucc.asn.au> parents: 313 diff changeset	760 // for testing
7aebb1452422 deep sleep works Matt Johnston <matt@ucc.asn.au> parents: 313 diff changeset	761 uart_on();
7aebb1452422 deep sleep works Matt Johnston <matt@ucc.asn.au> parents: 313 diff changeset	762
322 840f51824254 untested, add comms timeout code Matt Johnston <matt@ucc.asn.au> parents: 321 diff changeset	763 setup_tick_counter();
840f51824254 untested, add comms timeout code Matt Johnston <matt@ucc.asn.au> parents: 321 diff changeset	764
318 31199b2941f6 Add simple_ds18b20.c etc Matt Johnston <matt@ucc.asn.au> parents: 316 diff changeset	765 sei();
314 7aebb1452422 deep sleep works Matt Johnston <matt@ucc.asn.au> parents: 313 diff changeset	766
331 5de3fc71ce48 - Make the python work on openwrt Matt Johnston <matt@ucc.asn.au> parents: 330 diff changeset	767 need_comms = 1;
341 ccab04e2f601 - decrease measurement interval, measure at start Matt Johnston <matt@ucc.asn.au> parents: 339 diff changeset	768 need_measurement = 1;
331 5de3fc71ce48 - Make the python work on openwrt Matt Johnston <matt@ucc.asn.au> parents: 330 diff changeset	769
322 840f51824254 untested, add comms timeout code Matt Johnston <matt@ucc.asn.au> parents: 321 diff changeset	770 for(;;)
840f51824254 untested, add comms timeout code Matt Johnston <matt@ucc.asn.au> parents: 321 diff changeset	771 {
307 e50091063890 Some counter2 bits Matt Johnston <matt@ucc.asn.au> parents: 306 diff changeset	772 if (need_measurement)
e50091063890 Some counter2 bits Matt Johnston <matt@ucc.asn.au> parents: 306 diff changeset	773 {
320 cff7a4459dc9 Lots of it works now. Matt Johnston <matt@ucc.asn.au> parents: 319 diff changeset	774 need_measurement = 0;
307 e50091063890 Some counter2 bits Matt Johnston <matt@ucc.asn.au> parents: 306 diff changeset	775 do_measurement();
347 56f22e29582a fix tabbing Matt Johnston <matt@ucc.asn.au> parents: 346 diff changeset	776 continue;
307 e50091063890 Some counter2 bits Matt Johnston <matt@ucc.asn.au> parents: 306 diff changeset	777 }
310 0a64532c1de1 Fill out more main.c structure Matt Johnston <matt@ucc.asn.au> parents: 309 diff changeset	778
0a64532c1de1 Fill out more main.c structure Matt Johnston <matt@ucc.asn.au> parents: 309 diff changeset	779 if (need_comms)
0a64532c1de1 Fill out more main.c structure Matt Johnston <matt@ucc.asn.au> parents: 309 diff changeset	780 {
322 840f51824254 untested, add comms timeout code Matt Johnston <matt@ucc.asn.au> parents: 321 diff changeset	781 need_comms = 0;
310 0a64532c1de1 Fill out more main.c structure Matt Johnston <matt@ucc.asn.au> parents: 309 diff changeset	782 do_comms();
347 56f22e29582a fix tabbing Matt Johnston <matt@ucc.asn.au> parents: 346 diff changeset	783 continue;
310 0a64532c1de1 Fill out more main.c structure Matt Johnston <matt@ucc.asn.au> parents: 309 diff changeset	784 }
0a64532c1de1 Fill out more main.c structure Matt Johnston <matt@ucc.asn.au> parents: 309 diff changeset	785
347 56f22e29582a fix tabbing Matt Johnston <matt@ucc.asn.au> parents: 346 diff changeset	786 deep_sleep();
306 848b0fe159d2 Some basic bits Matt Johnston <matt@ucc.asn.au> parents: diff changeset	787 }
318 31199b2941f6 Add simple_ds18b20.c etc Matt Johnston <matt@ucc.asn.au> parents: 316 diff changeset	788
306 848b0fe159d2 Some basic bits Matt Johnston <matt@ucc.asn.au> parents: diff changeset	789 return 0; /* never reached */
848b0fe159d2 Some basic bits Matt Johnston <matt@ucc.asn.au> parents: diff changeset	790 }

Mercurial > templog

annotate main.c @ 393:afce71f829d6