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

bluefruit, pjrc: Update protocols for new API

tags/v1.9
tmk 9 years ago
parent
22d99f26af
commit
06527bde4f
6 changed files with 7 additions and 35 deletions
Unified View Show Diff Stats
  1. 1
    15
      converter/terminal_bluefruit/Makefile
  2. 0
    15
      converter/terminal_usb/Makefile
  3. 2
    2
      protocol/bluefruit/bluefruit.c
  4. 1
    1
      protocol/bluefruit/main.c
  5. 2
    1
      protocol/pjrc/main.c
  6. 1
    1
      protocol/pjrc/usb_keyboard.c

+ 1
- 15
converter/terminal_bluefruit/Makefile View File

PS2_USE_INT = yes # uses external interrupt for falling edge of PS/2 clock pin PS2_USE_INT = yes # uses external interrupt for falling edge of PS/2 clock pin
#PS2_USE_BUSYWAIT = yes # uses primitive reference code #PS2_USE_BUSYWAIT = yes # uses primitive reference code


ifdef PS2_USE_USART
SRC += protocol/ps2_usart.c
OPT_DEFS += -DPS2_USE_USART
endif

ifdef PS2_USE_INT
SRC += protocol/ps2.c
OPT_DEFS += -DPS2_USE_INT
endif

ifdef PS2_USE_BUSYWAIT
SRC += protocol/ps2.c
OPT_DEFS += -DPS2_USE_BUSYWAIT
endif

#---------------- Programming Options -------------------------- #---------------- Programming Options --------------------------
PROGRAM_CMD = teensy_loader_cli -mmcu=$(MCU) -w -v $(TARGET).hex PROGRAM_CMD = teensy_loader_cli -mmcu=$(MCU) -w -v $(TARGET).hex


VPATH += $(TOP_DIR) VPATH += $(TOP_DIR)




include $(TOP_DIR)/protocol.mk
include $(TOP_DIR)/protocol/bluefruit.mk include $(TOP_DIR)/protocol/bluefruit.mk
include $(TOP_DIR)/protocol.mk include $(TOP_DIR)/protocol.mk
include $(TOP_DIR)/common.mk include $(TOP_DIR)/common.mk

+ 0
- 15
converter/terminal_usb/Makefile View File

#PS2_USE_INT = yes # uses external interrupt for falling edge of PS/2 clock pin #PS2_USE_INT = yes # uses external interrupt for falling edge of PS/2 clock pin
#PS2_USE_BUSYWAIT = yes # uses primitive reference code #PS2_USE_BUSYWAIT = yes # uses primitive reference code


ifdef PS2_USE_USART
SRC += protocol/ps2_usart.c
OPT_DEFS += -DPS2_USE_USART
endif

ifdef PS2_USE_INT
SRC += protocol/ps2.c
OPT_DEFS += -DPS2_USE_INT
endif

ifdef PS2_USE_BUSYWAIT
SRC += protocol/ps2.c
OPT_DEFS += -DPS2_USE_BUSYWAIT
endif



#---------------- Programming Options -------------------------- #---------------- Programming Options --------------------------
PROGRAM_CMD = teensy_loader_cli -mmcu=$(MCU) -w -v $(TARGET).hex PROGRAM_CMD = teensy_loader_cli -mmcu=$(MCU) -w -v $(TARGET).hex

+ 2
- 2
protocol/bluefruit/bluefruit.c View File

void bluefruit_keyboard_print_report(report_keyboard_t *report) void bluefruit_keyboard_print_report(report_keyboard_t *report)
{ {
if (!debug_keyboard) return; if (!debug_keyboard) return;
dprintf("keys: "); for (int i = 0; i < REPORT_KEYS; i++) { debug_hex8(report->keys[i]); dprintf(" "); }
dprintf("keys: "); for (int i = 0; i < KEYBOARD_REPORT_KEYS; i++) { debug_hex8(report->keys[i]); dprintf(" "); }
dprintf(" mods: "); debug_hex8(report->mods); dprintf(" mods: "); debug_hex8(report->mods);
dprintf(" reserved: "); debug_hex8(report->reserved); dprintf(" reserved: "); debug_hex8(report->reserved);
dprintf("\n"); dprintf("\n");
bluefruit_trace_header(); bluefruit_trace_header();
#endif #endif
bluefruit_serial_send(0xFD); bluefruit_serial_send(0xFD);
for (uint8_t i = 0; i < REPORT_SIZE; i++) {
for (uint8_t i = 0; i < KEYBOARD_REPORT_SIZE; i++) {
bluefruit_serial_send(report->raw[i]); bluefruit_serial_send(report->raw[i]);
} }
#ifdef BLUEFRUIT_TRACE_SERIAL #ifdef BLUEFRUIT_TRACE_SERIAL

+ 1
- 1
protocol/bluefruit/main.c View File

dprintf("Starting main loop"); dprintf("Starting main loop");
while (1) { while (1) {
while (suspend) { while (suspend) {
suspend_power_down();
suspend_power_down(WDTO_120MS);
if (remote_wakeup && suspend_wakeup_condition()) { if (remote_wakeup && suspend_wakeup_condition()) {
usb_remote_wakeup(); usb_remote_wakeup();
} }

+ 2
- 1
protocol/pjrc/main.c View File

#include <stdbool.h> #include <stdbool.h>
#include <avr/io.h> #include <avr/io.h>
#include <avr/interrupt.h> #include <avr/interrupt.h>
#include <avr/wdt.h>
#include <util/delay.h> #include <util/delay.h>
#include "keyboard.h" #include "keyboard.h"
#include "usb.h" #include "usb.h"
#endif #endif
while (1) { while (1) {
while (suspend) { while (suspend) {
suspend_power_down();
suspend_power_down(WDTO_120MS);
if (remote_wakeup && suspend_wakeup_condition()) { if (remote_wakeup && suspend_wakeup_condition()) {
usb_remote_wakeup(); usb_remote_wakeup();
} }

+ 1
- 1
protocol/pjrc/usb_keyboard.c View File

{ {
if (!debug_keyboard) return; if (!debug_keyboard) return;
print("keys: "); print("keys: ");
for (int i = 0; i < REPORT_KEYS; i++) { phex(report->keys[i]); print(" "); }
for (int i = 0; i < KEYBOARD_REPORT_KEYS; i++) { phex(report->keys[i]); print(" "); }
print(" mods: "); phex(report->mods); print("\n"); print(" mods: "); phex(report->mods); print("\n");
} }



Write Preview
Loading…
Cancel
Save