From 8cba9d9165c6645a94c8ea97bd15f43674984997 Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Mon, 2 Jun 2014 15:06:47 +0000 Subject: added initial analog support diff --git a/software/rhmixxx/Makefile b/software/rhmixxx/Makefile index 7b31d1f..60531a5 100644 --- a/software/rhmixxx/Makefile +++ b/software/rhmixxx/Makefile @@ -21,7 +21,7 @@ NAME := rhmixxx BOARD_TYPE := rhmixxx -OBJ := $(NAME).o keypad.o eventqueue.o gpio.o +OBJ := $(NAME).o keypad.o eventqueue.o gpio.o analog.o LIBS := util led lufa-descriptor-midi EXTERNAL_LIBS := lufa diff --git a/software/rhmixxx/analog.c b/software/rhmixxx/analog.c new file mode 100644 index 0000000..45c89b0 --- /dev/null +++ b/software/rhmixxx/analog.c @@ -0,0 +1,36 @@ +/* + * rhmidi + * + * Copyright (C) 2014 Christian Pointner + * + * This file is part of rhmidi. + * + * rhmidi 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. + * + * rhmidi 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 rhmidi. If not, see . + */ + +#include +#include "analog.h" +#include "eventqueue.h" + +#define ANALOG_PIN PINF +#define ANALOG_PORT PORTF +#define ANALOG_DDR DDRF + +void analog_init(void) +{ +} + +void analog_task(void) +{ +} diff --git a/software/rhmixxx/analog.h b/software/rhmixxx/analog.h new file mode 100644 index 0000000..925f5a6 --- /dev/null +++ b/software/rhmixxx/analog.h @@ -0,0 +1,31 @@ +/* + * rhmidi + * + * Copyright (C) 2014 Christian Pointner + * + * This file is part of rhmidi. + * + * rhmidi 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. + * + * rhmidi 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 rhmidi. If not, see . + */ + +#ifndef RHMIXXX_analog_h_INCLUDED +#define RHMIXXX_analog_h_INCLUDED + +#define ANALOG_NUM_INPUTS 8 +#define ANALOG_MIDI_NOTE_OFFSET 64 + +void analog_init(void); +void analog_task(void); + +#endif diff --git a/software/rhmixxx/rhmixxx.c b/software/rhmixxx/rhmixxx.c index f94b67b..3e3d66f 100644 --- a/software/rhmixxx/rhmixxx.c +++ b/software/rhmixxx/rhmixxx.c @@ -75,6 +75,7 @@ void EVENT_USB_Device_ControlRequest(void) #include "keypad.h" #include "eventqueue.h" #include "gpio.h" +#include "analog.h" static void process_incoming_midi(void) { @@ -146,6 +147,7 @@ int main(void) eventqueue_init(); keypad_init(); gpio_init(); + analog_init(); USB_Init(); sei(); -- cgit v0.10.2