diff options
Diffstat (limited to 'usb-adc-dustsensor')
-rw-r--r-- | usb-adc-dustsensor/Makefile | 94 | ||||
-rw-r--r-- | usb-adc-dustsensor/usb-adc-dustsensor.c | 232 |
2 files changed, 163 insertions, 163 deletions
diff --git a/usb-adc-dustsensor/Makefile b/usb-adc-dustsensor/Makefile index 64b48b2..8881db2 100644 --- a/usb-adc-dustsensor/Makefile +++ b/usb-adc-dustsensor/Makefile @@ -1,47 +1,47 @@ -##
-## 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-adc-dustsensor
-BOARD_TYPE := teensy2
-OBJ := $(NAME).o
-LIBS := util led lufa-descriptor-usbserial usbio
-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-adc-dustsensor example\"" -D USB_PRODUCT_LEN=38
-
-LUFA_COMPONENTS := USB USBCLASS
-
-include $(SPREADAVR_PATH)/include.mk
+## +## 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-adc-dustsensor +BOARD_TYPE := teensy2 +OBJ := $(NAME).o +LIBS := util led lufa-descriptor-usbserial usbio +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-adc-dustsensor example\"" -D USB_PRODUCT_LEN=38 + +LUFA_COMPONENTS := USB USBCLASS + +include $(SPREADAVR_PATH)/include.mk diff --git a/usb-adc-dustsensor/usb-adc-dustsensor.c b/usb-adc-dustsensor/usb-adc-dustsensor.c index a0b9057..480596e 100644 --- a/usb-adc-dustsensor/usb-adc-dustsensor.c +++ b/usb-adc-dustsensor/usb-adc-dustsensor.c @@ -1,116 +1,116 @@ -/*
- * 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 <avr/interrupt.h>
-#include <avr/power.h>
-#include <util/delay.h>
-
-#include "util.h"
-#include "led.h"
-
-#include "usbio.h"
-#include <stdio.h>
-
-
-// Dustsensor defines:
-#include <LUFA/Drivers/Peripheral/ADC.h>
-
-#define PIN_HIGH(PORT, PIN) PORT |= (1 << PIN)
-#define PIN_LOW(PORT, PIN) PORT &= ~(1 << PIN)
-
-#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
-#define DUSTS_LED(OP) PIN_SW(PORTF, PF0, OP)
-
-#define DUSTS_ADC_NUM 1
-#define DUSTS_ADC_MUX_MASK ADC_CHANNEL1
-
-
-void dusts_init(void)
-{
- DDRF = (1 << PF0);
- DUSTS_LED(HIGHv);
- //ADC_Init(ADC_SINGLE_CONVERSION);
- ADC_Init(ADC_FREE_RUNNING);
- ADC_SetupChannel (DUSTS_ADC_NUM);
-}
-
-int16_t dusts_measure(void) {
- DUSTS_LED(LOWv);
- _delay_us(280);
-
- //measure ADC
- int16_t m = ADC_GetChannelReading(ADC_REFERENCE_AVCC | DUSTS_ADC_MUX_MASK);
-
- _delay_us(40);
- DUSTS_LED(HIGHv);
- return m;
-}
-
-
-
-
-
-void handle_cmd(uint8_t cmd)
-{
- int16_t mv=0;
- switch(cmd) {
- case 'm': mv = dusts_measure(); printf("Dust Value: %d\r\n", mv); break;
- case 'r': reset2bootloader(); break;
- default: printf("error\r\n"); return;
- }
-}
-
-int main(void)
-{
- MCUSR &= ~(1 << WDRF);
- wdt_disable();
- led_init();
- led_on();
- cpu_init();
- usbio_init();
- dusts_init();
- sei();
-
- for(;;) {
- led_off();
- int16_t BytesReceived = usbio_bytes_received();
- while(BytesReceived > 0) {
- int ReceivedByte = fgetc(stdin);
- if(ReceivedByte != EOF) {
- handle_cmd(ReceivedByte);
- }
- BytesReceived--;
- }
- usbio_task();
- led_on();
- _delay_ms(100);
- }
-}
+/* + * 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 <avr/interrupt.h> +#include <avr/power.h> +#include <util/delay.h> + +#include "util.h" +#include "led.h" + +#include "usbio.h" +#include <stdio.h> + + +// Dustsensor defines: +#include <LUFA/Drivers/Peripheral/ADC.h> + +#define PIN_HIGH(PORT, PIN) PORT |= (1 << PIN) +#define PIN_LOW(PORT, PIN) PORT &= ~(1 << PIN) + +#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 +#define DUSTS_LED(OP) PIN_SW(PORTF, PF0, OP) + +#define DUSTS_ADC_NUM 1 +#define DUSTS_ADC_MUX_MASK ADC_CHANNEL1 + + +void dusts_init(void) +{ + DDRF = (1 << PF0); + DUSTS_LED(HIGHv); + //ADC_Init(ADC_SINGLE_CONVERSION); + ADC_Init(ADC_FREE_RUNNING); + ADC_SetupChannel (DUSTS_ADC_NUM); +} + +int16_t dusts_measure(void) { + DUSTS_LED(LOWv); + _delay_us(280); + + //measure ADC + int16_t m = ADC_GetChannelReading(ADC_REFERENCE_AVCC | DUSTS_ADC_MUX_MASK); + + _delay_us(40); + DUSTS_LED(HIGHv); + return m; +} + + + + + +void handle_cmd(uint8_t cmd) +{ + int16_t mv=0; + switch(cmd) { + case 'm': mv = dusts_measure(); printf("Dust Value: %d\r\n", mv); break; + case 'r': reset2bootloader(); break; + default: printf("error\r\n"); return; + } +} + +int main(void) +{ + MCUSR &= ~(1 << WDRF); + wdt_disable(); + led_init(); + led_on(); + cpu_init(); + usbio_init(); + dusts_init(); + sei(); + + for(;;) { + led_off(); + int16_t BytesReceived = usbio_bytes_received(); + while(BytesReceived > 0) { + int ReceivedByte = fgetc(stdin); + if(ReceivedByte != EOF) { + handle_cmd(ReceivedByte); + } + BytesReceived--; + } + usbio_task(); + led_on(); + _delay_ms(100); + } +} |