Merge branch 'master' of github.com:jackhumbert/qmk_firmware

# Conflicts:
#	keyboard/ergodox_ez/keymaps/zweihander-osx/keymap.c
#	keyboard/ergodox_ez/keymaps/zweihander-osx/zweihander-osx.hex

1 files changed, 34 insertions, 0 deletions

diff --git a/keyboards/alps64/led.c b/keyboards/alps64/led.c
new file mode 100644
index 000000000..d20c51aab
--- /dev/null
+++ b/keyboards/alps64/led.c
@@ -0,0 +1,34 @@
+/*
+Copyright 2012 Jun Wako <wakojun@gmail.com>
+
+This program 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 2 of the License, or
+(at your option) any later version.
+
+This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include <avr/io.h>
+#include "stdint.h"
+#include "led.h"
+
+
+void led_set(uint8_t usb_led)
+{
+    if (usb_led & (1<<USB_LED_CAPS_LOCK)) {
+        // output high
+        DDRC |= (1<<5);
+        PORTC |= (1<<5);
+    } else {
+        // Hi-Z
+        DDRC &= ~(1<<5);
+        PORTC &= ~(1<<5);
+    }
+}