diff options
| author | Christian Pointner <equinox@mur.at> | 2012-05-31 01:36:26 +0000 |
|---|---|---|
| committer | Christian Pointner <equinox@mur.at> | 2012-05-31 01:36:26 +0000 |
| commit | 75f983994c5d3f028f8751db646c10a97a8afdfe (patch) | |
| tree | 92236ea334408be8dc5d4e3fe5ef3cf0f20df2fa /software | |
| parent | fixed interrupt for MSSP1? (diff) | |
cleanup
git-svn-id: https://svn.spreadspace.org/mur.sat@497 7de4ea59-55d0-425e-a1af-a3118ea81d4c
Diffstat (limited to 'software')
| -rw-r--r-- | software/idm-test/idm-test.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/software/idm-test/idm-test.c b/software/idm-test/idm-test.c index 8913c37..0de977f 100644 --- a/software/idm-test/idm-test.c +++ b/software/idm-test/idm-test.c @@ -26,7 +26,6 @@ #include <avr/interrupt.h>
#include <avr/power.h>
-#include "lufa-descriptor-usbserial.h"
#include "util.h"
#include "led.h"
@@ -40,19 +39,7 @@ #include <LUFA/Drivers/Peripheral/SPI.h>
#include <LUFA/Drivers/Misc/RingBuffer.h>
#include <LUFA/Drivers/USB/USB.h>
-
- /* Hardware Defines: */
-#define SPI_CS_DDR DDRB
-#define SPI_CS_PORT PORTB
-#define CS 0
-#define PWRDWN_DDR DDRB
-#define PWRDWN_PORT PORTB
-#define PWRDWN 7
-#define INT_DDR DDRD
-#define INT_PORT PORTD
-#define INT_PIN PIND
-#define INT 0
-// Powerdown is at LED Pin
+#include "lufa-descriptor-usbserial.h"
/* Global I/O Buffers: */
static RingBuffer_t SPItoUSB_Buffer;
@@ -91,7 +78,20 @@ void EVENT_USB_Device_ControlRequest(void) {
CDC_Device_ProcessControlRequest(&VirtualSerial_CDC_Interface);
}
+/* end LUFA CDC-ACM specific definitions*/
+
+ /* Hardware Defines: */
+#define SPI_CS_DDR DDRB
+#define SPI_CS_PORT PORTB
+#define CS 0
+#define PWRDWN_DDR DDRB
+#define PWRDWN_PORT PORTB
+#define PWRDWN 7
+#define INT_DDR DDRD
+#define INT_PORT PORTD
+#define INT_PIN PIND
+#define INT 0
void SetupHardware(void)
{
|