summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Pointner <equinox@spreadspace.org>2015-02-24 23:23:50 +0100
committerChristian Pointner <equinox@spreadspace.org>2015-02-24 23:23:50 +0100
commitb934205bece0b9e4c8b5010a542f107122c98730 (patch)
treef59878211ffb6c70a779577dae9d3c7da34b4725
parentmoved tuer-rfid to realraum github repo (diff)
moved usb-ajar to realraum github repo
-rw-r--r--usb-ajar/Makefile47
-rw-r--r--usb-ajar/usb-ajar.c177
2 files changed, 0 insertions, 224 deletions
diff --git a/usb-ajar/Makefile b/usb-ajar/Makefile
deleted file mode 100644
index 003e25c..0000000
--- a/usb-ajar/Makefile
+++ /dev/null
@@ -1,47 +0,0 @@
-##
-## spreadspace avr utils
-##
-##
-## Copyright (C) 2013-2014 Christian Pointner <equinox@spreadspace.org>
-##
-## 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 <http://www.gnu.org/licenses/>.
-##
-
-NAME := usb-ajar
-BOARD_TYPE := minimus32
-OBJ := $(NAME).o
-LIBS := util led lufa-descriptor-usbserial anyio onewire ds1820
-EXTERNAL_LIBS := lufa
-SPREADAVR_PATH := ..
-RESET_FUNC := $(SPREADAVR_PATH)/tools/reset_lufa_cdc
-RESET_PARAM := 'r'
-
-LUFA_PATH := $(SPREADAVR_PATH)/contrib/LUFA-120219
-LUFA_OPTS = -D USB_DEVICE_ONLY
-LUFA_OPTS += -D DEVICE_STATE_AS_GPIOR=0
-LUFA_OPTS += -D ORDERED_EP_CONFIG
-LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8
-LUFA_OPTS += -D FIXED_NUM_CONFIGURATIONS=1
-LUFA_OPTS += -D USE_FLASH_DESCRIPTORS
-LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"
-LUFA_OPTS += -D INTERRUPT_CONTROL_ENDPOINT
-
-LUFA_OPTS += -D USB_MANUFACTURER="L\"xro\"" -D USB_MANUFACTURER_LEN=3
-LUFA_OPTS += -D USB_PRODUCT="L\"spreadspace usb-ajar example\"" -D USB_PRODUCT_LEN=28
-
-LUFA_COMPONENTS := USB USBCLASS SERIAL
-
-include $(SPREADAVR_PATH)/include.mk
diff --git a/usb-ajar/usb-ajar.c b/usb-ajar/usb-ajar.c
deleted file mode 100644
index 1db377e..0000000
--- a/usb-ajar/usb-ajar.c
+++ /dev/null
@@ -1,177 +0,0 @@
-/*
- * spreadspace avr utils
- *
- *
- * Copyright (C) 2013-2014 Christian Pointner <equinox@spreadspace.org>
- *
- * 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 <http://www.gnu.org/licenses/>.
- */
-
-
-#include <avr/io.h>
-#include <avr/wdt.h>
-#include <util/delay.h>
-#include <avr/interrupt.h>
-#include <avr/power.h>
-#include <stdio.h>
-
-#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);
- PIN_HIGH(PORTB, PINB0);
- PINMODE_INPUT(DDRB, PINB0);
- PIN_LOW(PORTD, PIND7);
- PINMODE_OUTPUT(DDRD, PIND7);
-
- owi_init(PINC4, &PINC);
-
- char door_ajar = 0;
- char last_door_ajar = 0;
- char gas_leak = 0;
- char last_gas_leak = 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();
- }
- }
- gas_leak = ! (PINB & _BV(PINB0));
- if (gas_leak != last_gas_leak)
- {
- if (gas_leak)
- printf("GasLeakAlert\r\n");
- last_gas_leak = gas_leak;
- }
-
- 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))
- {
- if (gas_leak)
- printf("GasLeakAlert\r\n");
- ms_elapsed = 0;
- tempToUSB(12);
- }
- }
-}