di0ib
/
tmk_keyboard
Watch 1
Star 0
Fork 0
Code Releases 4 Activity
Browse Source

usb_usb: Update for new core layout

tags/v1.9
Jun Wako 9 years ago
parent
4192bce16b
commit
f6f698dda0
3 changed files with 4 additions and 9 deletions
Unified View Show Diff Stats
  1. 0
    5
      common/print.h
  2. 3
    3
      converter/usb_usb/matrix.c
  3. 1
    1
      protocol/usb_hid.mk

+ 0
- 5
common/print.h View File

#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

+ 3
- 3
converter/usb_usb/matrix.c View File

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;
} }
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]);
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++;
} }

+ 1
- 1
protocol/usb_hid.mk View File



# 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)

Write Preview
Loading…
Cancel
Save