aboutsummaryrefslogtreecommitdiff
path: root/keyboard.c
diff options
context:
space:
mode:
authortmk <nobody@nowhere>2011-09-17 22:39:50 +0900
committertmk <nobody@nowhere>2011-09-17 23:53:18 +0900
commite67c988824f5ec0c965beb412f8ee5953dfd3c8c (patch)
tree190543f5bddfd31a326234aad91a0a995e55863a /keyboard.c
parentb703de7b298f8463bf4654fa3730ba1958a7fa9e (diff)
downloadqmk_firmware-e67c988824f5ec0c965beb412f8ee5953dfd3c8c.tar.gz
qmk_firmware-e67c988824f5ec0c965beb412f8ee5953dfd3c8c.zip
Added Bulegiga iWRAP support into HHKB.(Bluetooth)
Diffstat (limited to 'keyboard.c')
-rw-r--r--keyboard.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/keyboard.c b/keyboard.c
index 9bba409f1..5c2643c95 100644
--- a/keyboard.c
+++ b/keyboard.c
@@ -27,7 +27,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
27#ifdef MOUSEKEY_ENABLE 27#ifdef MOUSEKEY_ENABLE
28#include "mousekey.h" 28#include "mousekey.h"
29#endif 29#endif
30#ifdef USB_EXTRA_ENABLE 30#ifdef EXTRAKEY_ENABLE
31#include <util/delay.h> 31#include <util/delay.h>
32#endif 32#endif
33 33
@@ -47,7 +47,7 @@ void keyboard_init(void)
47void keyboard_proc(void) 47void keyboard_proc(void)
48{ 48{
49 uint8_t fn_bits = 0; 49 uint8_t fn_bits = 0;
50#ifdef USB_EXTRA_ENABLE 50#ifdef EXTRAKEY_ENABLE
51 uint16_t consumer_code = 0; 51 uint16_t consumer_code = 0;
52#endif 52#endif
53 53
@@ -82,7 +82,8 @@ void keyboard_proc(void)
82 } else if (IS_FN(code)) { 82 } else if (IS_FN(code)) {
83 fn_bits |= FN_BIT(code); 83 fn_bits |= FN_BIT(code);
84 } 84 }
85#ifdef USB_EXTRA_ENABLE 85// TODO: use table or something
86#ifdef EXTRAKEY_ENABLE
86 // System Control 87 // System Control
87 else if (code == KB_SYSTEM_POWER) { 88 else if (code == KB_SYSTEM_POWER) {
88#ifdef HOST_PJRC 89#ifdef HOST_PJRC
@@ -170,7 +171,7 @@ void keyboard_proc(void)
170 // TODO: should send only when changed from last report 171 // TODO: should send only when changed from last report
171 if (matrix_is_modified()) { 172 if (matrix_is_modified()) {
172 host_send_keyboard_report(); 173 host_send_keyboard_report();
173#ifdef USB_EXTRA_ENABLE 174#ifdef EXTRAKEY_ENABLE
174 host_consumer_send(consumer_code); 175 host_consumer_send(consumer_code);
175#endif 176#endif
176#ifdef DEBUG_LED 177#ifdef DEBUG_LED