localhots
/
qmk_firmware
1
0
Fork 0
Code Releases Activity

usb_usb: Update for new core layout

This commit is contained in:
Jun Wako 2014-12-05 09:59:08 +09:00
parent 4192bce16b
commit f6f698dda0
3 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
common/print.h
View File

@ -38,12 +38,7 @@
#if defined(__AVR__) #if defined(__AVR__)
#include "avr/xprintf.h" #include "avr/xprintf.h"
// TODO: avoid collision with arduino/Print.h
#ifndef __cplusplus
#define print(s) xputs(PSTR(s)) #define print(s) xputs(PSTR(s))
#endif
#define println(s) xputs(PSTR(s "\r\n")) #define println(s) xputs(PSTR(s "\r\n"))
#ifdef __cplusplus #ifdef __cplusplus

6
converter/usb_usb/matrix.c
View File

@ -81,7 +81,7 @@ bool matrix_is_on(uint8_t row, uint8_t col) {
return true; return true;
} }
} }
for (uint8_t i = 0; i < REPORT_KEYS; i++) { for (uint8_t i = 0; i < KEYBOARD_REPORT_KEYS; i++) {
if (usb_hid_keyboard_report.keys[i] == code) { if (usb_hid_keyboard_report.keys[i] == code) {
return true; return true;
} }
@ -96,7 +96,7 @@ uint8_t matrix_get_row(uint8_t row) {
row_bits |= usb_hid_keyboard_report.mods; row_bits |= usb_hid_keyboard_report.mods;
} }
for (uint8_t i = 0; i < REPORT_KEYS; i++) { for (uint8_t i = 0; i < KEYBOARD_REPORT_KEYS; i++) {
if (IS_ANY(usb_hid_keyboard_report.keys[i])) { if (IS_ANY(usb_hid_keyboard_report.keys[i])) {
if (row == ROW(usb_hid_keyboard_report.keys[i])) { if (row == ROW(usb_hid_keyboard_report.keys[i])) {
row_bits |= ROW_BITS(usb_hid_keyboard_report.keys[i]); row_bits |= ROW_BITS(usb_hid_keyboard_report.keys[i]);
@ -110,7 +110,7 @@ uint8_t matrix_key_count(void) {
uint8_t count = 0; uint8_t count = 0;
count += bitpop(usb_hid_keyboard_report.mods); count += bitpop(usb_hid_keyboard_report.mods);
for (uint8_t i = 0; i < REPORT_KEYS; i++) { for (uint8_t i = 0; i < KEYBOARD_REPORT_KEYS; i++) {
if (IS_ANY(usb_hid_keyboard_report.keys[i])) { if (IS_ANY(usb_hid_keyboard_report.keys[i])) {
count++; count++;
} }

2
protocol/usb_hid.mk
View File

@ -42,7 +42,7 @@ SRC += $(USB_HID_DIR)/override_Serial.cpp
# replace arduino/wiring.c # replace arduino/wiring.c
SRC += $(USB_HID_DIR)/override_wiring.c SRC += $(USB_HID_DIR)/override_wiring.c
SRC += common/timer.c SRC += common/avr/timer.c
SRC += $(USB_HOST_SHIELD_SRC) SRC += $(USB_HOST_SHIELD_SRC)
SRC += $(ARDUINO_CORES_SRC) SRC += $(ARDUINO_CORES_SRC)