From ea0709a58521c4cb5471668afd7745a4fca5eb63 Mon Sep 17 00:00:00 2001 From: Bernhard Tittelbach Date: Wed, 9 Oct 2013 21:11:34 +0000 Subject: 1wire port git-svn-id: https://svn.spreadspace.org/avr/trunk@236 aa12f405-d877-488e-9caf-2d797e2a1cc7 --- usb-ajar/usb-ajar.c | 324 ++++++++++++++++++++++++++-------------------------- 1 file changed, 162 insertions(+), 162 deletions(-) (limited to 'usb-ajar') diff --git a/usb-ajar/usb-ajar.c b/usb-ajar/usb-ajar.c index 2c978e1..c6ccee5 100644 --- a/usb-ajar/usb-ajar.c +++ b/usb-ajar/usb-ajar.c @@ -1,162 +1,162 @@ -/* - * spreadspace avr utils - * - * - * Copyright (C) 2013 Christian Pointner - * - * This file is part of spreadspace avr utils. - * - * spreadspace avr utils is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * any later version. - * - * spreadspace avr utils is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with spreadspace avr utils. If not, see . - */ - - -#include -#include -#include -#include -#include -#include - -#include "util.h" -#include "led.h" -#include "anyio.h" - -#include "onewire.h" -#include "ds1820.h" - -#define PIN_HIGH(PORT, PIN) PORT |= (1 << PIN) -#define PIN_LOW(PORT, PIN) PORT &= ~(1 << PIN) -#define PINMODE_OUTPUT PIN_HIGH //just use DDR instead of PORT -#define PINMODE_INPUT PIN_LOW //just use DDR instead of PORT - -#define OP_SETBIT |= -#define OP_CLEARBIT &= ~ -#define OP_CHECK & -#define PIN_SW(PORTDDRREG, PIN, OP) PORTDDRREG OP (1 << PIN) - -#define HIGHv OP_SETBIT -#define LOWv OP_CLEARBIT - -uint8_t num_temp_sensors_ = 0; - -void tempToUSB(uint8_t bit_resolution) -{ - uint8_t sensor_index = 0; - uint16_t raw_temp = 0; - double temp=0.0; - - if (num_temp_sensors_ == 0) - { - printf("No DS1820 sensors ?? running bus discovery... \r\n"); - num_temp_sensors_ = ds1820_discover(); - } - - for (sensor_index=0; sensor_index < num_temp_sensors_; sensor_index++) - { - ds1820_set_resolution(sensor_index, bit_resolution); - ds1820_start_measuring(sensor_index); - } - - ds1820_wait_conversion_time(bit_resolution); - - for (sensor_index=0; sensor_index < num_temp_sensors_; sensor_index++) - { - raw_temp = ds1820_read_temperature(sensor_index); - if (raw_temp == DS1820_ERROR) - { - printf("CRC comm error\r\n"); - } else { - temp = ds1820_raw_temp_to_celsius( raw_temp ); - printf("temp%d: %d.%d", sensor_index +1, raw_temp / 16, 10 * (raw_temp % 16) / 16); - } - } -} - -void handle_cmd(uint8_t cmd) -{ - switch(cmd) { - case 'r': reset2bootloader(); break; - case '1': num_temp_sensors_ = ds1820_discover(); break; - default: printf("error\r\n"); return; - } - printf("ok\r\n"); -} - -int main(void) -{ - /* Disable watchdog if enabled by bootloader/fuses */ - MCUSR &= ~(1 << WDRF); - wdt_disable(); - - cpu_init(); - led_init(); - anyio_init(115200, 0); - sei(); - owi_init(PINC4, &PINC); - - PIN_HIGH(PORTB, PINB1); - PINMODE_INPUT(DDRB, PINB1); - char door_ajar = 0; - char last_door_ajar = 0; - - num_temp_sensors_ = ds1820_discover(); - uint16_t ms_elapsed = 0; - - led_off(); - led2_on(); - - for(;;) { - int16_t BytesReceived = anyio_bytes_received(); - while(BytesReceived > 0) { - int ReceivedByte = fgetc(stdin); - if(ReceivedByte != EOF) { - handle_cmd(ReceivedByte); - } - BytesReceived--; - } - - door_ajar = PINB & _BV(PINB1); - if (door_ajar != last_door_ajar) { - last_door_ajar = door_ajar; - if (door_ajar) { - printf("BackdoorInfo(ajar): ajar\r\n"); - led_off(); - led2_on(); - } else { - printf("BackdoorInfo(ajar): shut\r\n"); - led_off(); - led2_off(); - } - } - - anyio_task(); - if (door_ajar) { - _delay_ms(100); - ms_elapsed += 100; - led_toggle(); - led2_toggle(); - } else - { - _delay_ms(1200); - ms_elapsed += 1200; - led2_toggle(); - } - - if (ms_elapsed & (1<<14)) - { - ms_elapsed = 0; - tempToUSB(12); - } - } -} +/* + * spreadspace avr utils + * + * + * Copyright (C) 2013 Christian Pointner + * + * This file is part of spreadspace avr utils. + * + * spreadspace avr utils is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * any later version. + * + * spreadspace avr utils is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with spreadspace avr utils. If not, see . + */ + + +#include +#include +#include +#include +#include +#include + +#include "util.h" +#include "led.h" +#include "anyio.h" + +#include "onewire.h" +#include "ds1820.h" + +#define PIN_HIGH(PORT, PIN) PORT |= (1 << PIN) +#define PIN_LOW(PORT, PIN) PORT &= ~(1 << PIN) +#define PINMODE_OUTPUT PIN_HIGH //just use DDR instead of PORT +#define PINMODE_INPUT PIN_LOW //just use DDR instead of PORT + +#define OP_SETBIT |= +#define OP_CLEARBIT &= ~ +#define OP_CHECK & +#define PIN_SW(PORTDDRREG, PIN, OP) PORTDDRREG OP (1 << PIN) + +#define HIGHv OP_SETBIT +#define LOWv OP_CLEARBIT + +uint8_t num_temp_sensors_ = 0; + +void tempToUSB(uint8_t bit_resolution) +{ + uint8_t sensor_index = 0; + uint16_t raw_temp = 0; + + if (num_temp_sensors_ == 0) + { + printf("No DS1820 sensors ?? running bus discovery... \r\n"); + num_temp_sensors_ = ds1820_discover(); + } + + for (sensor_index=0; sensor_index < num_temp_sensors_; sensor_index++) + { + ds1820_set_resolution(sensor_index, bit_resolution); + ds1820_start_measuring(sensor_index); + } + + ds1820_wait_conversion_time(bit_resolution); + + for (sensor_index=0; sensor_index < num_temp_sensors_; sensor_index++) + { + raw_temp = ds1820_read_temperature(sensor_index); + if (raw_temp == DS1820_ERROR) + { + printf("CRC comm error\r\n"); + } else { + printf("temp%d: %d.%d\r\n", sensor_index +1, raw_temp / 16, 10 * (raw_temp % 16) / 16); + } + } +} + +void handle_cmd(uint8_t cmd) +{ + switch(cmd) { + case 'r': reset2bootloader(); break; + case '1': num_temp_sensors_ = ds1820_discover(); break; + default: printf("error\r\n"); return; + } + printf("ok\r\n"); +} + +int main(void) +{ + /* Disable watchdog if enabled by bootloader/fuses */ + MCUSR &= ~(1 << WDRF); + wdt_disable(); + + cpu_init(); + led_init(); + anyio_init(115200, 0); + sei(); + + PIN_HIGH(PORTB, PINB1); + PINMODE_INPUT(DDRB, PINB1); + + owi_init(PINC4, &PINC); + + char door_ajar = 0; + char last_door_ajar = 0; + + num_temp_sensors_ = ds1820_discover(); + uint16_t ms_elapsed = 0; + + led_off(); + led2_on(); + + for(;;) { + int16_t BytesReceived = anyio_bytes_received(); + while(BytesReceived > 0) { + int ReceivedByte = fgetc(stdin); + if(ReceivedByte != EOF) { + handle_cmd(ReceivedByte); + } + BytesReceived--; + } + + door_ajar = PINB & _BV(PINB1); + if (door_ajar != last_door_ajar) { + last_door_ajar = door_ajar; + if (door_ajar) { + printf("BackdoorInfo(ajar): ajar\r\n"); + led_off(); + led2_on(); + } else { + printf("BackdoorInfo(ajar): shut\r\n"); + led_off(); + led2_off(); + } + } + + anyio_task(); + if (door_ajar) { + _delay_ms(100); + ms_elapsed += 100; + led_toggle(); + led2_toggle(); + } else + { + _delay_ms(1200); + ms_elapsed += 1200; + led2_toggle(); + } + + if (ms_elapsed & (1<<14)) + { + ms_elapsed = 0; + tempToUSB(12); + } + } +} -- cgit v1.2.3