From 9ea1ffa5e7b7c98532c217cb4595a301fd65f718 Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@helsinki.at>
Date: Sat, 3 May 2014 14:15:03 +0000
Subject: upgraded avr utils


diff --git a/software/defines.mk b/software/defines.mk
index e0f264c..cf3a8d2 100644
--- a/software/defines.mk
+++ b/software/defines.mk
@@ -121,7 +121,7 @@ ifeq ($(BOARD_TYPE),teenstep)
   LUFA_BOARD = NONE
 endif
 ifeq ($(BOARD_TYPE),rhmixxx)
-  MCU := at90usb647
+  MCU := at90usb1286
   ARCH = AVR8
   F_CPU := 16000000
   F_USB = $(F_CPU)
diff --git a/software/lib/led.c b/software/lib/led.c
index 593d97b..fd2754e 100644
--- a/software/lib/led.c
+++ b/software/lib/led.c
@@ -29,13 +29,15 @@
 #elif defined(__BOARD_teensy1__) || defined(__BOARD_teensy1pp__) || defined(__BOARD_teensy2__) || defined(__BOARD_teensy2pp__) || \
       defined(__BOARD_arduinoNG__) ||  defined(__BOARD_arduino2009v2__) || defined(__BOARD_arduino2009__) || defined(__BOARD_arduino10000__) || \
       defined(__BOARD_hhd70dongle__) || defined(__BOARD_rda1846dongle__) || defined(__BOARD_culV3__) || \
-      defined(__BOARD_slowpandongle1__) || defined(__BOARD_slowpandongle2__) || defined(__BOARD_teenstep__)
+      defined(__BOARD_slowpandongle1__) || defined(__BOARD_slowpandongle2__) || defined(__BOARD_teenstep__) || \
+      defined(__BOARD_rhmixxx__)
 #define NUM_LEDS 1
 #else
 #define NUM_LEDS 0
 #endif
 
-#if defined(__BOARD_teensy1__) || defined(__BOARD_teensy1pp__) || defined(__BOARD_minimus__) || defined(__BOARD_minimus32__)
+#if defined(__BOARD_teensy1__) || defined(__BOARD_teensy1pp__) || defined(__BOARD_minimus__) || defined(__BOARD_minimus32__) || \
+    defined(__BOARD_rhmixxx__)
 #define LED_DIR 0
 #else
 #define LED_DIR 1
@@ -76,6 +78,12 @@
 #define LED_PINNUM 5
 #endif
 
+#if defined(__BOARD_rhmixxx__)
+#define LED_PORT PORTE
+#define LED_DDR DDRE
+#define LED_PINNUM 0
+#endif
+
 void led_init(void)
 {
 #if NUM_LEDS >= 1
diff --git a/software/lib/util.c b/software/lib/util.c
index c99c0f7..7442b2c 100644
--- a/software/lib/util.c
+++ b/software/lib/util.c
@@ -67,7 +67,7 @@ void jtag_disable(void)
 #elif defined(__BOARD_slowpandongle1__) || defined(__BOARD_slowpandongle2__) || defined(__BOARD_teenstep__)
   #define BOOTLOADER_VEC 0x3800
 #elif defined(__BOARD_rhmixxx__)
-  #define BOOTLOADER_VEC 0x7800
+  #define BOOTLOADER_VEC 0xF000
 #else
   #define BOOTLOADER_VEC 0x0000
 #endif
diff --git a/software/rhmixxx/rhmixxx.c b/software/rhmixxx/rhmixxx.c
index c305462..6b22d21 100644
--- a/software/rhmixxx/rhmixxx.c
+++ b/software/rhmixxx/rhmixxx.c
@@ -80,17 +80,17 @@ void EVENT_USB_Device_ControlRequest(void)
 
 static FILE serial_stream;
 
-#define KEY_PIN PINF
-#define KEY_PORT PORTF
-#define KEY_DDR DDRF
+#define KEY_PIN PINA
+#define KEY_PORT PORTA
+#define KEY_DDR DDRA
 #define KEY_BIT 0
 
 #define KEY_LP_MAX 255
 
 void key_init(void)
 {
-  KEY_DDR = KEY_DDR & ~(1<<KEY_BIT);
-  KEY_PORT |= (1<<KEY_BIT);
+  KEY_DDR = 0xF0;
+  KEY_PORT = 0xEF;
 }
 
 int main(void)
-- 
cgit v0.10.2