From f15b2691c92e1d9b3c0e59363c803ec540303f37 Mon Sep 17 00:00:00 2001
From: tmk <nobody@nowhere>
Date: Sun, 15 Jun 2014 13:56:17 +0900
Subject: [PATCH 01/50] Add keyboard/mbed_onekey
---
common/debug.h | 2 +-
common/print.c | 22 ---
common/print.h | 143 +++++++--------
keyboard/mbed_onekey/HIDKeyboard.cpp | 256 +++++++++++++++++++++++++++
keyboard/mbed_onekey/HIDKeyboard.h | 36 ++++
keyboard/mbed_onekey/Makefile | 29 +++
keyboard/mbed_onekey/common.mk | 19 ++
keyboard/mbed_onekey/gcc.mk | 79 +++++++++
keyboard/mbed_onekey/main.cpp | 55 ++++++
keyboard/mbed_onekey/mbed.mk | 92 ++++++++++
10 files changed, 640 insertions(+), 93 deletions(-)
create mode 100644 keyboard/mbed_onekey/HIDKeyboard.cpp
create mode 100644 keyboard/mbed_onekey/HIDKeyboard.h
create mode 100644 keyboard/mbed_onekey/Makefile
create mode 100644 keyboard/mbed_onekey/common.mk
create mode 100644 keyboard/mbed_onekey/gcc.mk
create mode 100644 keyboard/mbed_onekey/main.cpp
create mode 100644 keyboard/mbed_onekey/mbed.mk
diff --git a/common/debug.h b/common/debug.h
index 8aaa5ed915..399b2d0a7c 100644
--- a/common/debug.h
+++ b/common/debug.h
@@ -26,7 +26,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define dprint(s) do { if (debug_enable) print(s); } while (0)
#define dprintln() do { if (debug_enable) print_crlf(); } while (0)
-#define dprintf(fmt, ...) do { if (debug_enable) __xprintf(PSTR(fmt), ##__VA_ARGS__); } while (0)
+#define dprintf(fmt, ...) do { if (debug_enable) xprintf(fmt, ##__VA_ARGS__); } while (0)
#define dmsg(s) dprintf("%s at %s: %S\n", __FILE__, __LINE__, PSTR(s))
/* DO NOT USE these anymore */
diff --git a/common/print.c b/common/print.c
index 783bb4e9bb..c13a29f317 100644
--- a/common/print.c
+++ b/common/print.c
@@ -37,26 +37,4 @@ void print_set_sendchar(int8_t (*sendchar_func)(uint8_t))
xdev_out(sendchar_func);
}
-void print_S(const char *s)
-{
- uint8_t c;
- while (1) {
- c = *s++;
- if (!c) break;
- if (c == '\n') sendchar('\r');
- sendchar(c);
- }
-}
-
-void print_lf(void)
-{
- sendchar('\n');
-}
-
-void print_crlf(void)
-{
- sendchar('\r');
- sendchar('\n');
-}
-
#endif
diff --git a/common/print.h b/common/print.h
index 930e84be99..6a6771f710 100644
--- a/common/print.h
+++ b/common/print.h
@@ -27,98 +27,79 @@
#include <stdint.h>
#include <stdbool.h>
-#include <avr/pgmspace.h>
-#include "xprintf.h"
#include "util.h"
-// this macro allows you to write print("some text") and
-// the string is automatically placed into flash memory :)
-// TODO: avoid collision with arduino/Print.h
-#ifndef __cplusplus
-#define print(s) print_P(PSTR(s))
-#endif
-#define println(s) print_P(PSTR(s "\n"))
-
-/* for old name */
-#define pdec(data) print_dec(data)
-#define pdec16(data) print_dec(data)
-#define phex(data) print_hex8(data)
-#define phex16(data) print_hex16(data)
-#define pbin(data) print_bin8(data)
-#define pbin16(data) print_bin16(data)
-#define pbin_reverse(data) print_bin_reverse8(data)
-#define pbin_reverse16(data) print_bin_reverse16(data)
-
-/* print value utility */
-#define print_val_dec(v) xprintf(#v ": %u\n", v)
-#define print_val_decs(v) xprintf(#v ": %d\n", v)
-#define print_val_hex8(v) xprintf(#v ": %X\n", v)
-#define print_val_hex16(v) xprintf(#v ": %02X\n", v)
-#define print_val_hex32(v) xprintf(#v ": %04lX\n", v)
-#define print_val_bin8(v) xprintf(#v ": %08b\n", v)
-#define print_val_bin16(v) xprintf(#v ": %016b\n", v)
-#define print_val_bin32(v) xprintf(#v ": %032lb\n", v)
-#define print_val_bin_reverse8(v) xprintf(#v ": %08b\n", bitrev(v))
-#define print_val_bin_reverse16(v) xprintf(#v ": %016b\n", bitrev16(v))
-#define print_val_bin_reverse32(v) xprintf(#v ": %032lb\n", bitrev32(v))
-
#ifndef NO_PRINT
+
+#ifdef __AVR__
+
+#include "xprintf.h"
+
+
+// TODO: avoid collision with arduino/Print.h
+#ifndef __cplusplus
+#define print(s) xputs(PSTR(s))
+#endif
+#define println(s) xputs(PSTR(s "\n"))
+
#ifdef __cplusplus
extern "C" {
#endif
-
/* function pointer of sendchar to be used by print utility */
void print_set_sendchar(int8_t (*print_sendchar_func)(uint8_t));
-/* print string stored in data memory(SRAM)
- * print_S("hello world");
- * This consumes precious SRAM memory space for string.
- */
-void print_S(const char *s);
+#elif __arm__
-void print_lf(void);
-void print_crlf(void);
+#include "mbed.h"
+Serial ser(UART_TX, UART_RX);
+#define xprintf ser.printf
+#define print(s) xprintf(s)
+#define println(s) xprintf(s "\n")
+/* TODO: to select output destinations: UART/USBSerial */
+#define print_set_sendchar(func)
+#endif /* __AVR__ */
-/* print string stored in program memory(FLASH)
- * print_P(PSTR("hello world");
- * This consumes relatively abundant FLASH memory area not SRAM.
- */
-#define print_P(s) xputs(s)
/* decimal */
-#define print_dec(i) xprintf("%u", i)
-#define print_decs(i) xprintf("%d", i)
-
+#define print_dec(i) xprintf("%u", i)
+#define print_decs(i) xprintf("%d", i)
/* hex */
-#define print_hex4(i) xprintf("%X", i)
-#define print_hex8(i) xprintf("%02X", i)
-#define print_hex16(i) xprintf("%04X", i)
-#define print_hex32(i) xprintf("%08lX", i)
-
+#define print_hex4(i) xprintf("%X", i)
+#define print_hex8(i) xprintf("%02X", i)
+#define print_hex16(i) xprintf("%04X", i)
+#define print_hex32(i) xprintf("%08lX", i)
/* binary */
-#define print_bin4(i) xprintf("%04b", i)
-#define print_bin8(i) xprintf("%08b", i)
-#define print_bin16(i) xprintf("%016b", i)
-#define print_bin32(i) xprintf("%032lb", i)
+#define print_bin4(i) xprintf("%04b", i)
+#define print_bin8(i) xprintf("%08b", i)
+#define print_bin16(i) xprintf("%016b", i)
+#define print_bin32(i) xprintf("%032lb", i)
+#define print_bin_reverse8(i) xprintf("%08b", bitrev(i))
+#define print_bin_reverse16(i) xprintf("%016b", bitrev16(i))
+#define print_bin_reverse32(i) xprintf("%032lb", bitrev32(i))
+/* print value utility */
+#define print_val_dec(v) xprintf(#v ": %u\n", v)
+#define print_val_decs(v) xprintf(#v ": %d\n", v)
+#define print_val_hex8(v) xprintf(#v ": %X\n", v)
+#define print_val_hex16(v) xprintf(#v ": %02X\n", v)
+#define print_val_hex32(v) xprintf(#v ": %04lX\n", v)
+#define print_val_bin8(v) xprintf(#v ": %08b\n", v)
+#define print_val_bin16(v) xprintf(#v ": %016b\n", v)
+#define print_val_bin32(v) xprintf(#v ": %032lb\n", v)
+#define print_val_bin_reverse8(v) xprintf(#v ": %08b\n", bitrev(v))
+#define print_val_bin_reverse16(v) xprintf(#v ": %016b\n", bitrev16(v))
+#define print_val_bin_reverse32(v) xprintf(#v ": %032lb\n", bitrev32(v))
-#define print_bin_reverse8(i) xprintf("%08b", bitrev(i))
-#define print_bin_reverse16(i) xprintf("%016b", bitrev16(i))
-#define print_bin_reverse32(i) xprintf("%032lb", bitrev32(i))
-
-#ifdef __cplusplus
-}
-#endif
-
-#else
+#else /* NO_PRINT */
+#define xprintf
+#define print
+#define println
#define print_set_sendchar(func)
-#define print_S(s)
-#define print_P(s)
#define print_dec(data)
#define print_decs(data)
#define print_hex4(data)
@@ -132,8 +113,30 @@ void print_crlf(void);
#define print_bin_reverse8(data)
#define print_bin_reverse16(data)
#define print_bin_reverse32(data)
+#define print_val_dec(v)
+#define print_val_decs(v)
+#define print_val_hex8(v)
+#define print_val_hex16(v)
+#define print_val_hex32(v)
+#define print_val_bin8(v)
+#define print_val_bin16(v)
+#define print_val_bin32(v)
+#define print_val_bin_reverse8(v)
+#define print_val_bin_reverse16(v)
+#define print_val_bin_reverse32(v)
-#endif
+#endif /* NO_PRINT */
+
+
+/* Backward compatiblitly for old name */
+#define pdec(data) print_dec(data)
+#define pdec16(data) print_dec(data)
+#define phex(data) print_hex8(data)
+#define phex16(data) print_hex16(data)
+#define pbin(data) print_bin8(data)
+#define pbin16(data) print_bin16(data)
+#define pbin_reverse(data) print_bin_reverse8(data)
+#define pbin_reverse16(data) print_bin_reverse16(data)
#endif
diff --git a/keyboard/mbed_onekey/HIDKeyboard.cpp b/keyboard/mbed_onekey/HIDKeyboard.cpp
new file mode 100644
index 0000000000..f40c2d2f2a
--- /dev/null
+++ b/keyboard/mbed_onekey/HIDKeyboard.cpp
@@ -0,0 +1,256 @@
+#include <stdint.h>
+#include "USBHID.h"
+#include "USBHID_Types.h"
+#include "USBDescriptor.h"
+#include "HIDKeyboard.h"
+
+#define DEFAULT_CONFIGURATION (1)
+
+
+HIDKeyboard::HIDKeyboard(uint16_t vendor_id, uint16_t product_id, uint16_t product_release): USBDevice(vendor_id, product_id, product_release)
+{
+ USBDevice::connect();
+}
+
+bool HIDKeyboard::sendReport(report_keyboard_t report) {
+ USBDevice::write(EP1IN, report.raw, sizeof(report), MAX_PACKET_SIZE_EP1);
+ return true;
+}
+
+bool HIDKeyboard::USBCallback_setConfiguration(uint8_t configuration) {
+ if (configuration != DEFAULT_CONFIGURATION) {
+ return false;
+ }
+
+ // Configure endpoints > 0
+ addEndpoint(EPINT_IN, MAX_PACKET_SIZE_EPINT);
+ //addEndpoint(EPINT_OUT, MAX_PACKET_SIZE_EPINT);
+
+ // We activate the endpoint to be able to recceive data
+ //readStart(EPINT_OUT, MAX_PACKET_SIZE_EPINT);
+ return true;
+}
+
+
+uint8_t * HIDKeyboard::stringImanufacturerDesc() {
+ static uint8_t stringImanufacturerDescriptor[] = {
+ 0x18, /*bLength*/
+ STRING_DESCRIPTOR, /*bDescriptorType 0x03*/
+ 't',0,'m',0,'k',0,'-',0,'k',0,'b',0,'d',0,'.',0,'c',0,'o',0,'m',0 /*bString iManufacturer*/
+ };
+ return stringImanufacturerDescriptor;
+}
+
+uint8_t * HIDKeyboard::stringIproductDesc() {
+ static uint8_t stringIproductDescriptor[] = {
+ 0x0a, /*bLength*/
+ STRING_DESCRIPTOR, /*bDescriptorType 0x03*/
+ 'm',0,'b',0,'e',0,'d',0 /*bString iProduct*/
+ };
+ return stringIproductDescriptor;
+}
+
+uint8_t * HIDKeyboard::stringIserialDesc() {
+ static uint8_t stringIserialDescriptor[] = {
+ 0x04, /*bLength*/
+ STRING_DESCRIPTOR, /*bDescriptorType 0x03*/
+ '0',0 /*bString iSerial*/
+ };
+ return stringIserialDescriptor;
+}
+
+uint8_t * HIDKeyboard::reportDesc() {
+ static uint8_t reportDescriptor[] = {
+ USAGE_PAGE(1), 0x01, // Generic Desktop
+ USAGE(1), 0x06, // Keyboard
+ COLLECTION(1), 0x01, // Application
+
+ USAGE_PAGE(1), 0x07, // Key Codes
+ USAGE_MINIMUM(1), 0xE0,
+ USAGE_MAXIMUM(1), 0xE7,
+ LOGICAL_MINIMUM(1), 0x00,
+ LOGICAL_MAXIMUM(1), 0x01,
+ REPORT_SIZE(1), 0x01,
+ REPORT_COUNT(1), 0x08,
+ INPUT(1), 0x02, // Data, Variable, Absolute
+
+ REPORT_COUNT(1), 0x01,
+ REPORT_SIZE(1), 0x08,
+ INPUT(1), 0x01, // Constant
+
+ REPORT_COUNT(1), 0x05,
+ REPORT_SIZE(1), 0x01,
+ USAGE_PAGE(1), 0x08, // LEDs
+ USAGE_MINIMUM(1), 0x01,
+ USAGE_MAXIMUM(1), 0x05,
+ OUTPUT(1), 0x02, // Data, Variable, Absolute
+
+ REPORT_COUNT(1), 0x01,
+ REPORT_SIZE(1), 0x03,
+ OUTPUT(1), 0x01, // Constant
+
+
+ REPORT_COUNT(1), 0x06,
+ REPORT_SIZE(1), 0x08,
+ LOGICAL_MINIMUM(1), 0x00,
+ LOGICAL_MAXIMUM(1), 0xFF,
+ USAGE_PAGE(1), 0x07, // Key Codes
+ USAGE_MINIMUM(1), 0x00,
+ USAGE_MAXIMUM(1), 0xFF,
+ INPUT(1), 0x00, // Data, Array
+ END_COLLECTION(0),
+ };
+ reportLength = sizeof(reportDescriptor);
+ return reportDescriptor;
+}
+
+uint16_t HIDKeyboard::reportDescLength() {
+ reportDesc();
+ return reportLength;
+}
+
+#define TOTAL_DESCRIPTOR_LENGTH ((1 * CONFIGURATION_DESCRIPTOR_LENGTH) \
+ + (1 * INTERFACE_DESCRIPTOR_LENGTH) \
+ + (1 * HID_DESCRIPTOR_LENGTH) \
+ + (1 * ENDPOINT_DESCRIPTOR_LENGTH))
+uint8_t * HIDKeyboard::configurationDesc() {
+ static uint8_t configurationDescriptor[] = {
+ CONFIGURATION_DESCRIPTOR_LENGTH,// bLength
+ CONFIGURATION_DESCRIPTOR, // bDescriptorType
+ LSB(TOTAL_DESCRIPTOR_LENGTH), // wTotalLength (LSB)
+ MSB(TOTAL_DESCRIPTOR_LENGTH), // wTotalLength (MSB)
+ 0x01, // bNumInterfaces
+ DEFAULT_CONFIGURATION, // bConfigurationValue
+ 0x00, // iConfiguration
+ C_RESERVED | C_REMOTE_WAKEUP, // bmAttributes
+ C_POWER(100), // bMaxPowerHello World from Mbed
+
+ INTERFACE_DESCRIPTOR_LENGTH, // bLength
+ INTERFACE_DESCRIPTOR, // bDescriptorType
+ 0x00, // bInterfaceNumber
+ 0x00, // bAlternateSetting
+ 0x01, // bNumEndpoints
+ HID_CLASS, // bInterfaceClass
+ 1, // bInterfaceSubClass (boot)
+ 1, // bInterfaceProtocol (keyboard)
+ 0x00, // iInterface
+
+ HID_DESCRIPTOR_LENGTH, // bLength
+ HID_DESCRIPTOR, // bDescriptorType
+ LSB(HID_VERSION_1_11), // bcdHID (LSB)
+ MSB(HID_VERSION_1_11), // bcdHID (MSB)
+ 0x00, // bCountryCode
+ 0x01, // bNumDescriptors
+ REPORT_DESCRIPTOR, // bDescriptorType
+ (uint8_t)(LSB(reportDescLength())), // wDescriptorLength (LSB)
+ (uint8_t)(MSB(reportDescLength())), // wDescriptorLength (MSB)
+
+ ENDPOINT_DESCRIPTOR_LENGTH, // bLength
+ ENDPOINT_DESCRIPTOR, // bDescriptorType
+ PHY_TO_DESC(EP1IN), // bEndpointAddress
+ E_INTERRUPT, // bmAttributes
+ LSB(MAX_PACKET_SIZE_EPINT), // wMaxPacketSize (LSB)
+ MSB(MAX_PACKET_SIZE_EPINT), // wMaxPacketSize (MSB)
+ 1, // bInterval (milliseconds)
+ };
+ return configurationDescriptor;
+}
+
+#if 0
+uint8_t * HIDKeyboard::deviceDesc() {
+ static uint8_t deviceDescriptor[] = {
+ DEVICE_DESCRIPTOR_LENGTH, /* bLength */
+ DEVICE_DESCRIPTOR, /* bDescriptorType */
+ LSB(USB_VERSION_2_0), /* bcdUSB (LSB) */
+ MSB(USB_VERSION_2_0), /* bcdUSB (MSB) */
+ 0x00, /* bDeviceClass */
+ 0x00, /* bDeviceSubClass */
+ 0x00, /* bDeviceprotocol */
+ MAX_PACKET_SIZE_EP0, /* bMaxPacketSize0 */
+ (uint8_t)(LSB(0xfeed)), /* idVendor (LSB) */
+ (uint8_t)(MSB(0xfeed)), /* idVendor (MSB) */
+ (uint8_t)(LSB(0x1bed)), /* idProduct (LSB) */
+ (uint8_t)(MSB(0x1bed)), /* idProduct (MSB) */
+ (uint8_t)(LSB(0x0002)), /* bcdDevice (LSB) */
+ (uint8_t)(MSB(0x0002)), /* bcdDevice (MSB) */
+ 0, /* iManufacturer */
+ 0, /* iProduct */
+ 0, /* iSerialNumber */
+ 0x01 /* bNumConfigurations */
+ };
+ return deviceDescriptor;
+}
+#endif
+
+bool HIDKeyboard::USBCallback_request() {
+ bool success = false;
+ CONTROL_TRANSFER * transfer = getTransferPtr();
+ uint8_t *hidDescriptor;
+
+ // Process additional standard requests
+
+ if ((transfer->setup.bmRequestType.Type == STANDARD_TYPE))
+ {
+ switch (transfer->setup.bRequest)
+ {
+ case GET_DESCRIPTOR:
+ switch (DESCRIPTOR_TYPE(transfer->setup.wValue))
+ {
+ case REPORT_DESCRIPTOR:
+ if ((reportDesc() != NULL) \
+ && (reportDescLength() != 0))
+ {
+ transfer->remaining = reportDescLength();
+ transfer->ptr = reportDesc();
+ transfer->direction = DEVICE_TO_HOST;
+ success = true;
+ }
+ break;
+ case HID_DESCRIPTOR:
+ // Find the HID descriptor, after the configuration descriptor
+ hidDescriptor = findDescriptor(HID_DESCRIPTOR);
+ if (hidDescriptor != NULL)
+ {
+ transfer->remaining = HID_DESCRIPTOR_LENGTH;
+ transfer->ptr = hidDescriptor;
+ transfer->direction = DEVICE_TO_HOST;
+ success = true;
+ }
+ break;
+
+ default:
+ break;
+ }
+ break;
+ default:
+ break;
+ }
+ }
+
+ // Process class-specific requests
+/*
+ if (transfer->setup.bmRequestType.Type == CLASS_TYPE)
+ {
+ switch (transfer->setup.bRequest)
+ {
+ case SET_REPORT:
+ // First byte will be used for report ID
+ //outputReport.data[0] = transfer->setup.wValue & 0xff;
+ //outputReport.length = transfer->setup.wLength + 1;
+ outputReport.length = transfer->setup.wLength;
+
+ //transfer->remaining = sizeof(outputReport.data) - 1;
+ //transfer->ptr = &outputReport.data[1];
+ transfer->remaining = sizeof(outputReport.data);
+ transfer->ptr = &outputReport.data[0];
+ transfer->direction = HOST_TO_DEVICE;
+ transfer->notify = true;
+ success = true;
+ default:
+ break;
+ }
+ }
+*/
+
+ return success;
+}
diff --git a/keyboard/mbed_onekey/HIDKeyboard.h b/keyboard/mbed_onekey/HIDKeyboard.h
new file mode 100644
index 0000000000..b00c97b9b0
--- /dev/null
+++ b/keyboard/mbed_onekey/HIDKeyboard.h
@@ -0,0 +1,36 @@
+#ifndef HIDKEYBOARD_H
+
+#include "stdint.h"
+#include "stdbool.h"
+#include "USBHID.h"
+
+
+typedef union {
+ uint8_t raw[8];
+ struct {
+ uint8_t mods;
+ uint8_t reserved;
+ uint8_t keys[6];
+ };
+} __attribute__ ((packed)) report_keyboard_t;
+
+
+class HIDKeyboard : public USBDevice {
+public:
+ HIDKeyboard(uint16_t vendor_id = 0xFEED, uint16_t product_id = 0xabed, uint16_t product_release = 0x0001);
+
+ bool sendReport(report_keyboard_t report);
+protected:
+ uint16_t reportLength;
+ virtual bool USBCallback_setConfiguration(uint8_t configuration);
+ virtual uint8_t * stringImanufacturerDesc();
+ virtual uint8_t * stringIproductDesc();
+ virtual uint8_t * stringIserialDesc();
+ virtual uint16_t reportDescLength();
+ virtual uint8_t * reportDesc();
+ virtual uint8_t * configurationDesc();
+ //virtual uint8_t * deviceDesc();
+ virtual bool USBCallback_request();
+};
+
+#endif
diff --git a/keyboard/mbed_onekey/Makefile b/keyboard/mbed_onekey/Makefile
new file mode 100644
index 0000000000..e194052c10
--- /dev/null
+++ b/keyboard/mbed_onekey/Makefile
@@ -0,0 +1,29 @@
+# This file was automagically generated by mbed.org. For more information,
+# see http://mbed.org/handbook/Exporting-to-GCC-ARM-Embedded
+
+PROJECT = USBKeyboard_HelloWorld
+
+TMK_DIR = ../..
+MBED_DIR = ./mbed-sdk
+
+#VPATH += $(MBED_DIR):$(TMK_DIR)
+vpath %.s .:$(MBED_DIR):$(TMK_DIR)
+vpath %.c .:$(MBED_DIR):$(TMK_DIR)
+vpath %.cpp .:$(MBED_DIR):$(TMK_DIR)
+
+OBJDIR = ./build
+
+OBJECTS = \
+ $(OBJDIR)/./HIDKeyboard.o \
+ $(OBJDIR)/./main.o
+
+SYS_OBJECTS =
+
+INCLUDE_PATHS = -I.
+
+LIBRARY_PATHS =
+LIBRARIES =
+
+include mbed.mk
+include common.mk
+include gcc.mk
diff --git a/keyboard/mbed_onekey/common.mk b/keyboard/mbed_onekey/common.mk
new file mode 100644
index 0000000000..f21fce8864
--- /dev/null
+++ b/keyboard/mbed_onekey/common.mk
@@ -0,0 +1,19 @@
+COMMON_DIR = common
+OBJECTS += \
+# $(COMMON_DIR)/host.o \
+# $(COMMON_DIR)/keyboard.o \
+# $(COMMON_DIR)/action.o \
+# $(COMMON_DIR)/action_tapping.o \
+# $(COMMON_DIR)/action_macro.o \
+# $(COMMON_DIR)/action_layer.o \
+# $(COMMON_DIR)/action_util.o \
+# $(COMMON_DIR)/keymap.o \
+# $(COMMON_DIR)/timer.o \
+ $(COMMON_DIR)/print.o \
+# $(COMMON_DIR)/bootloader.o \
+# $(COMMON_DIR)/suspend.o \
+ $(COMMON_DIR)/xprintf.o \
+ $(COMMON_DIR)/util.o
+
+INCLUDE_PATHS += \
+ -I$(TMK_DIR)/$(COMMON_DIR)
diff --git a/keyboard/mbed_onekey/gcc.mk b/keyboard/mbed_onekey/gcc.mk
new file mode 100644
index 0000000000..e31527bbc1
--- /dev/null
+++ b/keyboard/mbed_onekey/gcc.mk
@@ -0,0 +1,79 @@
+###############################################################################
+GCC_BIN =
+AS = $(GCC_BIN)arm-none-eabi-as
+CC = $(GCC_BIN)arm-none-eabi-gcc
+CPP = $(GCC_BIN)arm-none-eabi-g++
+LD = $(GCC_BIN)arm-none-eabi-gcc
+OBJCOPY = $(GCC_BIN)arm-none-eabi-objcopy
+OBJDUMP = $(GCC_BIN)arm-none-eabi-objdump
+SIZE = $(GCC_BIN)arm-none-eabi-size
+CHKSUM = ~/Dropbox/MBED/tool/lpc-vector-checksum
+
+CPU = -mcpu=cortex-m0 -mthumb
+CC_FLAGS = $(CPU) -c -g -fno-common -fmessage-length=0 -Wall -fno-exceptions -ffunction-sections -fdata-sections
+CC_FLAGS += -MMD -MP
+CC_SYMBOLS = -DTARGET_LPC11U35_401 -DTARGET_M0 -DTARGET_NXP -DTARGET_LPC11UXX -DTOOLCHAIN_GCC_ARM -DTOOLCHAIN_GCC -D__CORTEX_M0 -DARM_MATH_CM0 -DMBED_BUILD_TIMESTAMP=1399108688.49 -D__MBED__=1
+
+LD_FLAGS = -mcpu=cortex-m0 -mthumb -Wl,--gc-sections --specs=nano.specs
+LD_FLAGS += -Wl,-Map=$(OBJDIR)/$(PROJECT).map,--cref
+LD_SYS_LIBS = -lstdc++ -lsupc++ -lm -lc -lgcc -lnosys
+
+ifeq ($(DEBUG), 1)
+ CC_FLAGS += -DDEBUG -O0
+else
+ CC_FLAGS += -DNDEBUG -Os
+endif
+
+all: $(OBJDIR)/$(PROJECT).bin $(OBJDIR)/$(PROJECT).hex size
+
+clean:
+ rm -f $(OBJDIR)/$(PROJECT).bin $(OBJDIR)/$(PROJECT).elf $(OBJDIR)/$(PROJECT).hex $(OBJDIR)/$(PROJECT).map $(OBJDIR)/$(PROJECT).lst $(OBJECTS) $(DEPS)
+ rm -fr $(OBJDIR)
+
+$(OBJDIR)/%.o: %.s
+ mkdir -p $(@D)
+ $(AS) $(CPU) -o $@ $<
+
+$(OBJDIR)/%.o: %.c
+ mkdir -p $(@D)
+ $(CC) $(CC_FLAGS) $(CC_SYMBOLS) -std=gnu99 $(INCLUDE_PATHS) -o $@ $<
+
+$(OBJDIR)/%.o: %.cpp
+ mkdir -p $(@D)
+ $(CPP) $(CC_FLAGS) $(CC_SYMBOLS) -std=gnu++98 $(INCLUDE_PATHS) -o $@ $<
+
+
+$(OBJDIR)/$(PROJECT).elf: $(OBJECTS) $(SYS_OBJECTS)
+ $(LD) $(LD_FLAGS) -T$(LINKER_SCRIPT) $(LIBRARY_PATHS) -o $@ $^ $(LIBRARIES) $(LD_SYS_LIBS) $(LIBRARIES) $(LD_SYS_LIBS)
+ @echo ""
+ @echo "*****"
+ @echo "***** You must modify vector checksum value in *.bin and *.hex files."
+ @echo "*****"
+ @echo ""
+
+$(OBJDIR)/$(PROJECT).bin: $(OBJDIR)/$(PROJECT).elf
+ @$(OBJCOPY) -O binary $< $@
+ @echo "Writing vector checksum value into $@ ..."
+ @$(CHKSUM) $@
+ @echo
+
+$(OBJDIR)/$(PROJECT).hex: $(OBJDIR)/$(PROJECT).elf
+ @$(OBJCOPY) -O ihex $< $@
+
+$(OBJDIR)/$(PROJECT).lst: $(OBJDIR)/$(PROJECT).elf
+ @$(OBJDUMP) -Sdh $< > $@
+
+lst: $(OBJDIR)/$(PROJECT).lst
+
+size:
+ $(SIZE) $(OBJDIR)/$(PROJECT).elf
+
+prog: $(OBJDIR)/$(PROJECT).bin
+ @echo "Program..."
+ifneq ($(shell mount | grep 'CRP DISABLD'),)
+ umount /dev/nxpisp >/dev/null 2>&1
+endif
+ dd if=$< of=/dev/nxpisp seek=4
+
+DEPS = $(OBJECTS:.o=.d) $(SYS_OBJECTS:.o=.d)
+-include $(DEPS)
diff --git a/keyboard/mbed_onekey/main.cpp b/keyboard/mbed_onekey/main.cpp
new file mode 100644
index 0000000000..581534e025
--- /dev/null
+++ b/keyboard/mbed_onekey/main.cpp
@@ -0,0 +1,55 @@
+#include "mbed.h"
+#include "HIDKeyboard.h"
+#include "debug.h"
+
+/*
+//#define DEBUG
+#ifdef DEBUG
+Serial ser(UART_TX, UART_RX);
+#define dprintf(fmt, ...) ser.printf(fmt, ## __VA_ARGS__)
+#else
+#define dprintf(fmt, ...)
+#endif
+*/
+
+
+// button and LEDs
+DigitalIn isp(P0_1);
+DigitalOut led_red(P0_20);
+DigitalOut led_green(P0_21);
+
+//USBKeyboard
+HIDKeyboard keyboard;
+
+
+int main(void) {
+ //isp.mode(PullUp);
+ //led_red = 0;
+ //led_green = 0;
+ debug_enable = true;
+ dprintf("HIDKeyboard:\n");
+ print("aaa");
+
+ report_keyboard_t report = { 2, 0, 4, }; //a
+ report_keyboard_t report_off = { 0 };
+ while (1) {
+ //keyboard.mediaControl(KEY_VOLUME_DOWN);
+ //keyboard.printf("Hello World from Mbed\r\n");
+ //keyboard.keyCode('s', KEY_CTRL);
+ //keyboard.keyCode(KEY_CAPS_LOCK);
+
+ //led_green = !led_green;
+ //leds = keyboard.lockStatus();
+ //ser.putc(ser.getc());
+
+ if (isp == 0) {
+ led_red = 0; // on
+ keyboard.sendReport(report);
+ } else {
+ led_red = 1; // off
+ keyboard.sendReport(report_off);
+ }
+ led_green = !led_green;
+ //wait(0.5);
+ }
+}
diff --git a/keyboard/mbed_onekey/mbed.mk b/keyboard/mbed_onekey/mbed.mk
new file mode 100644
index 0000000000..962a05e6e5
--- /dev/null
+++ b/keyboard/mbed_onekey/mbed.mk
@@ -0,0 +1,92 @@
+OBJECTS += \
+ $(OBJDIR)/libraries/mbed/targets/cmsis/TARGET_NXP/TARGET_LPC11UXX/TOOLCHAIN_GCC_ARM/startup_LPC11xx.o \
+ $(OBJDIR)/libraries/mbed/targets/cmsis/TARGET_NXP/TARGET_LPC11UXX/cmsis_nvic.o \
+ $(OBJDIR)/libraries/mbed/targets/cmsis/TARGET_NXP/TARGET_LPC11UXX/system_LPC11Uxx.o \
+ $(OBJDIR)/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/port_api.o \
+ $(OBJDIR)/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/spi_api.o \
+ $(OBJDIR)/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/analogin_api.o \
+ $(OBJDIR)/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/gpio_api.o \
+ $(OBJDIR)/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/gpio_irq_api.o \
+ $(OBJDIR)/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/serial_api.o \
+ $(OBJDIR)/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/i2c_api.o \
+ $(OBJDIR)/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/pwmout_api.o \
+ $(OBJDIR)/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/sleep.o \
+ $(OBJDIR)/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/pinmap.o \
+ $(OBJDIR)/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/us_ticker.o \
+ $(OBJDIR)/libraries/mbed/common/board.o \
+ $(OBJDIR)/libraries/mbed/common/mbed_interface.o \
+ $(OBJDIR)/libraries/mbed/common/exit.o \
+ $(OBJDIR)/libraries/mbed/common/rtc_time.o \
+ $(OBJDIR)/libraries/mbed/common/us_ticker_api.o \
+ $(OBJDIR)/libraries/mbed/common/pinmap_common.o \
+ $(OBJDIR)/libraries/mbed/common/error.o \
+ $(OBJDIR)/libraries/mbed/common/gpio.o \
+ $(OBJDIR)/libraries/mbed/common/semihost_api.o \
+ $(OBJDIR)/libraries/mbed/common/wait_api.o \
+ $(OBJDIR)/libraries/mbed/common/RawSerial.o \
+ $(OBJDIR)/libraries/mbed/common/Ticker.o \
+ $(OBJDIR)/libraries/mbed/common/FilePath.o \
+ $(OBJDIR)/libraries/mbed/common/I2C.o \
+ $(OBJDIR)/libraries/mbed/common/FileBase.o \
+ $(OBJDIR)/libraries/mbed/common/retarget.o \
+ $(OBJDIR)/libraries/mbed/common/Serial.o \
+ $(OBJDIR)/libraries/mbed/common/Stream.o \
+ $(OBJDIR)/libraries/mbed/common/FileSystemLike.o \
+ $(OBJDIR)/libraries/mbed/common/CallChain.o \
+ $(OBJDIR)/libraries/mbed/common/InterruptManager.o \
+ $(OBJDIR)/libraries/mbed/common/SerialBase.o \
+ $(OBJDIR)/libraries/mbed/common/BusInOut.o \
+ $(OBJDIR)/libraries/mbed/common/SPISlave.o \
+ $(OBJDIR)/libraries/mbed/common/I2CSlave.o \
+ $(OBJDIR)/libraries/mbed/common/FunctionPointer.o \
+ $(OBJDIR)/libraries/mbed/common/Timer.o \
+ $(OBJDIR)/libraries/mbed/common/SPI.o \
+ $(OBJDIR)/libraries/mbed/common/Timeout.o \
+ $(OBJDIR)/libraries/mbed/common/Ethernet.o \
+ $(OBJDIR)/libraries/mbed/common/TimerEvent.o \
+ $(OBJDIR)/libraries/mbed/common/CAN.o \
+ $(OBJDIR)/libraries/mbed/common/BusOut.o \
+ $(OBJDIR)/libraries/mbed/common/FileLike.o \
+ $(OBJDIR)/libraries/mbed/common/BusIn.o \
+ $(OBJDIR)/libraries/mbed/common/InterruptIn.o \
+ $(OBJDIR)/libraries/mbed/common/LocalFileSystem.o \
+ $(OBJDIR)/libraries/USBDevice/USBHID/USBMouse.o \
+ $(OBJDIR)/libraries/USBDevice/USBHID/USBHID.o \
+ $(OBJDIR)/libraries/USBDevice/USBHID/USBMouseKeyboard.o \
+ $(OBJDIR)/libraries/USBDevice/USBHID/USBKeyboard.o \
+ $(OBJDIR)/libraries/USBDevice/USBDevice/USBHAL_KL25Z.o \
+ $(OBJDIR)/libraries/USBDevice/USBDevice/USBDevice.o \
+ $(OBJDIR)/libraries/USBDevice/USBDevice/USBHAL_LPC17.o \
+ $(OBJDIR)/libraries/USBDevice/USBDevice/USBHAL_LPC40.o \
+ $(OBJDIR)/libraries/USBDevice/USBDevice/USBHAL_LPC11U.o \
+ $(OBJDIR)/libraries/USBDevice/USBDevice/USBHAL_STM32F4.o \
+ $(OBJDIR)/libraries/USBDevice/USBAudio/USBAudio.o \
+ $(OBJDIR)/libraries/USBDevice/USBSerial/USBSerial.o \
+ $(OBJDIR)/libraries/USBDevice/USBSerial/USBCDC.o \
+ $(OBJDIR)/libraries/USBDevice/USBMSD/USBMSD.o \
+ $(OBJDIR)/libraries/USBDevice/USBMIDI/USBMIDI.o
+
+INCLUDE_PATHS += \
+ -I$(MBED_DIR)/libraries/mbed/targets \
+ -I$(MBED_DIR)/libraries/mbed/targets/hal \
+ -I$(MBED_DIR)/libraries/mbed/targets/hal/TARGET_NXP \
+ -I$(MBED_DIR)/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX \
+ -I$(MBED_DIR)/libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11UXX/TARGET_LPC11U35_401 \
+ -I$(MBED_DIR)/libraries/mbed/targets/cmsis \
+ -I$(MBED_DIR)/libraries/mbed/targets/cmsis/TARGET_NXP \
+ -I$(MBED_DIR)/libraries/mbed/targets/cmsis/TARGET_NXP/TARGET_LPC11UXX \
+ -I$(MBED_DIR)/libraries/mbed/targets/cmsis/TARGET_NXP/TARGET_LPC11UXX/TOOLCHAIN_GCC_ARM \
+ -I$(MBED_DIR)/libraries/mbed/targets/cmsis/TARGET_NXP/TARGET_LPC11UXX/TOOLCHAIN_GCC_ARM/TARGET_LPC11U35_401 \
+ -I$(MBED_DIR)/libraries/mbed \
+ -I$(MBED_DIR)/libraries/mbed/hal \
+ -I$(MBED_DIR)/libraries/mbed/api \
+ -I$(MBED_DIR)/libraries/mbed/common \
+ -I$(MBED_DIR)/libraries/USBDevice \
+ -I$(MBED_DIR)/libraries/USBDevice/USBHID \
+ -I$(MBED_DIR)/libraries/USBDevice/USBDevice \
+ -I$(MBED_DIR)/libraries/USBDevice/USBAudio \
+ -I$(MBED_DIR)/libraries/USBDevice/USBSerial \
+ -I$(MBED_DIR)/libraries/USBDevice/USBMSD \
+ -I$(MBED_DIR)/libraries/USBDevice/USBMIDI
+
+LINKER_SCRIPT = $(MBED_DIR)/libraries/mbed/targets/cmsis/TARGET_NXP/TARGET_LPC11UXX/TOOLCHAIN_GCC_ARM/TARGET_LPC11U35_401/LPC11U35.ld
From 867f115bee190515aa195dc3e58f1c381ea9695b Mon Sep 17 00:00:00 2001
From: tmk <nobody@nowhere>
Date: Mon, 16 Jun 2014 11:12:45 +0900
Subject: [PATCH 02/50] Port timer to mbed
---
common.mk | 2 +-
common/{ => avr}/timer.c | 1 +
common/mbed/timer.c | 40 ++++++++++++++++++++++++++++++++++
common/timer.h | 19 ----------------
keyboard/mbed_onekey/common.mk | 29 ++++++++++++------------
keyboard/mbed_onekey/main.cpp | 21 +++++++++++++-----
6 files changed, 73 insertions(+), 39 deletions(-)
rename common/{ => avr}/timer.c (98%)
create mode 100644 common/mbed/timer.c
diff --git a/common.mk b/common.mk
index 62ac0ff787..9d58fa2145 100644
--- a/common.mk
+++ b/common.mk
@@ -7,7 +7,7 @@ SRC += $(COMMON_DIR)/host.c \
$(COMMON_DIR)/action_layer.c \
$(COMMON_DIR)/action_util.c \
$(COMMON_DIR)/keymap.c \
- $(COMMON_DIR)/timer.c \
+ $(COMMON_DIR)/avr/timer.c \
$(COMMON_DIR)/print.c \
$(COMMON_DIR)/bootloader.c \
$(COMMON_DIR)/suspend.c \
diff --git a/common/timer.c b/common/avr/timer.c
similarity index 98%
rename from common/timer.c
rename to common/avr/timer.c
index e0dec6cefc..292b41c3a6 100644
--- a/common/timer.c
+++ b/common/avr/timer.c
@@ -18,6 +18,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <avr/io.h>
#include <avr/interrupt.h>
#include <stdint.h>
+#include "timer_avr.h"
#include "timer.h"
diff --git a/common/mbed/timer.c b/common/mbed/timer.c
new file mode 100644
index 0000000000..a64a77239c
--- /dev/null
+++ b/common/mbed/timer.c
@@ -0,0 +1,40 @@
+#include "cmsis.h"
+#include "timer.h"
+
+/* Mill second tick count */
+volatile uint32_t timer_count = 0;
+
+/* Timer interrupt handler */
+void SysTick_Handler(void) {
+ timer_count++;
+}
+
+void timer_init(void)
+{
+ SysTick_Config(SystemCoreClock / 1000); /* 1ms tick */
+}
+
+void timer_clear(void)
+{
+ timer_count = 0;
+}
+
+uint16_t timer_read(void)
+{
+ return (uint16_t)(timer_count & 0xFFFF);
+}
+
+uint32_t timer_read32(void)
+{
+ return timer_count;
+}
+
+uint16_t timer_elapsed(uint16_t last)
+{
+ return TIMER_DIFF_16(timer_read(), last);
+}
+
+uint32_t timer_elapsed32(uint32_t last)
+{
+ return TIMER_DIFF_32(timer_read32(), last);
+}
diff --git a/common/timer.h b/common/timer.h
index 6437473ff7..f0c5ffc98a 100644
--- a/common/timer.h
+++ b/common/timer.h
@@ -20,25 +20,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <stdint.h>
-#ifndef TIMER_PRESCALER
-# if F_CPU > 16000000
-# define TIMER_PRESCALER 256
-# elif F_CPU > 2000000
-# define TIMER_PRESCALER 64
-# elif F_CPU > 250000
-# define TIMER_PRESCALER 8
-# else
-# define TIMER_PRESCALER 1
-# endif
-#endif
-#define TIMER_RAW_FREQ (F_CPU/TIMER_PRESCALER)
-#define TIMER_RAW TCNT0
-#define TIMER_RAW_TOP (TIMER_RAW_FREQ/1000)
-
-#if (TIMER_RAW_TOP > 255)
-# error "Timer0 can't count 1ms at this clock freq. Use larger prescaler."
-#endif
-
#define TIMER_DIFF(a, b, max) ((a) >= (b) ? (a) - (b) : (max) - (b) + (a))
#define TIMER_DIFF_8(a, b) TIMER_DIFF(a, b, UINT8_MAX)
#define TIMER_DIFF_16(a, b) TIMER_DIFF(a, b, UINT16_MAX)
diff --git a/keyboard/mbed_onekey/common.mk b/keyboard/mbed_onekey/common.mk
index f21fce8864..975ae9d0da 100644
--- a/keyboard/mbed_onekey/common.mk
+++ b/keyboard/mbed_onekey/common.mk
@@ -1,19 +1,20 @@
COMMON_DIR = common
OBJECTS += \
-# $(COMMON_DIR)/host.o \
-# $(COMMON_DIR)/keyboard.o \
-# $(COMMON_DIR)/action.o \
-# $(COMMON_DIR)/action_tapping.o \
-# $(COMMON_DIR)/action_macro.o \
-# $(COMMON_DIR)/action_layer.o \
-# $(COMMON_DIR)/action_util.o \
-# $(COMMON_DIR)/keymap.o \
-# $(COMMON_DIR)/timer.o \
- $(COMMON_DIR)/print.o \
-# $(COMMON_DIR)/bootloader.o \
-# $(COMMON_DIR)/suspend.o \
- $(COMMON_DIR)/xprintf.o \
- $(COMMON_DIR)/util.o
+ $(OBJDIR)/$(COMMON_DIR)/mbed/timer.o \
INCLUDE_PATHS += \
-I$(TMK_DIR)/$(COMMON_DIR)
+
+
+
+
+# $(OBJDIR)/$(COMMON_DIR)/host.o \
+# $(OBJDIR)/$(COMMON_DIR)/keyboard.o \
+# $(OBJDIR)/$(COMMON_DIR)/action.o \
+# $(OBJDIR)/$(COMMON_DIR)/action_tapping.o \
+# $(OBJDIR)/$(COMMON_DIR)/action_macro.o \
+# $(OBJDIR)/$(COMMON_DIR)/action_layer.o \
+# $(OBJDIR)/$(COMMON_DIR)/action_util.o \
+# $(OBJDIR)/$(COMMON_DIR)/keymap.o \
+# $(OBJDIR)/$(COMMON_DIR)/bootloader.o \
+# $(OBJDIR)/$(COMMON_DIR)/suspend.o \
diff --git a/keyboard/mbed_onekey/main.cpp b/keyboard/mbed_onekey/main.cpp
index 581534e025..1df940aa97 100644
--- a/keyboard/mbed_onekey/main.cpp
+++ b/keyboard/mbed_onekey/main.cpp
@@ -1,6 +1,7 @@
#include "mbed.h"
#include "HIDKeyboard.h"
#include "debug.h"
+#include "timer.h"
/*
//#define DEBUG
@@ -27,11 +28,16 @@ int main(void) {
//led_red = 0;
//led_green = 0;
debug_enable = true;
- dprintf("HIDKeyboard:\n");
- print("aaa");
+ dprintf("HIDKeyboard:\r\n");
+
+ timer_init();
+ xprintf("timer: %i\r\n", timer_read());
report_keyboard_t report = { 2, 0, 4, }; //a
report_keyboard_t report_off = { 0 };
+
+ bool last_isp = isp;
+ uint32_t last_timer;
while (1) {
//keyboard.mediaControl(KEY_VOLUME_DOWN);
//keyboard.printf("Hello World from Mbed\r\n");
@@ -42,14 +48,19 @@ int main(void) {
//leds = keyboard.lockStatus();
//ser.putc(ser.getc());
+ if (last_isp == isp) continue;
if (isp == 0) {
led_red = 0; // on
- keyboard.sendReport(report);
+ xprintf("timer: %i\r\n", timer_read32());
+ xprintf("diff: %i\r\n", timer_elapsed32(last_timer));
+ //keyboard.sendReport(report);
} else {
led_red = 1; // off
- keyboard.sendReport(report_off);
+ //keyboard.sendReport(report_off);
}
- led_green = !led_green;
+ last_isp = isp;
+ last_timer = timer_read();
+ //led_green = !led_green;
//wait(0.5);
}
}
From 04fe78ee0a7fe9baed39f021799a3dbb24ebeb36 Mon Sep 17 00:00:00 2001
From: tmk <nobody@nowhere>
Date: Mon, 16 Jun 2014 15:38:39 +0900
Subject: [PATCH 03/50] Fix print and timer
---
common/avr/timer_avr.h | 42 ++++++++++++++++++++++++++++++++++
common/{ => avr}/xprintf.S | 0
common/{ => avr}/xprintf.h | 0
common/debug.h | 4 ++--
common/debug_config.h | 9 ++++----
common/mbed/timer.c | 1 +
common/nodebug.h | 2 --
common/print.h | 16 ++++++-------
keyboard/mbed_onekey/common.mk | 3 ++-
9 files changed, 60 insertions(+), 17 deletions(-)
create mode 100644 common/avr/timer_avr.h
rename common/{ => avr}/xprintf.S (100%)
rename common/{ => avr}/xprintf.h (100%)
diff --git a/common/avr/timer_avr.h b/common/avr/timer_avr.h
new file mode 100644
index 0000000000..0e85eb1017
--- /dev/null
+++ b/common/avr/timer_avr.h
@@ -0,0 +1,42 @@
+/*
+Copyright 2011 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/>.
+*/
+
+#ifndef TIMER_AVR_H
+#define TIMER_AVR_H 1
+
+#include <stdint.h>
+
+#ifndef TIMER_PRESCALER
+# if F_CPU > 16000000
+# define TIMER_PRESCALER 256
+# elif F_CPU > 2000000
+# define TIMER_PRESCALER 64
+# elif F_CPU > 250000
+# define TIMER_PRESCALER 8
+# else
+# define TIMER_PRESCALER 1
+# endif
+#endif
+#define TIMER_RAW_FREQ (F_CPU/TIMER_PRESCALER)
+#define TIMER_RAW TCNT0
+#define TIMER_RAW_TOP (TIMER_RAW_FREQ/1000)
+
+#if (TIMER_RAW_TOP > 255)
+# error "Timer0 can't count 1ms at this clock freq. Use larger prescaler."
+#endif
+
+#endif
diff --git a/common/xprintf.S b/common/avr/xprintf.S
similarity index 100%
rename from common/xprintf.S
rename to common/avr/xprintf.S
diff --git a/common/xprintf.h b/common/avr/xprintf.h
similarity index 100%
rename from common/xprintf.h
rename to common/avr/xprintf.h
diff --git a/common/debug.h b/common/debug.h
index 399b2d0a7c..8ca2569a49 100644
--- a/common/debug.h
+++ b/common/debug.h
@@ -25,13 +25,13 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#ifndef NO_DEBUG
#define dprint(s) do { if (debug_enable) print(s); } while (0)
-#define dprintln() do { if (debug_enable) print_crlf(); } while (0)
+#define dprintln(s) do { if (debug_enable) println(s); } while (0)
#define dprintf(fmt, ...) do { if (debug_enable) xprintf(fmt, ##__VA_ARGS__); } while (0)
#define dmsg(s) dprintf("%s at %s: %S\n", __FILE__, __LINE__, PSTR(s))
/* DO NOT USE these anymore */
#define debug(s) do { if (debug_enable) print(s); } while (0)
-#define debugln(s) do { if (debug_enable) print_crlf(); } while (0)
+#define debugln(s) do { if (debug_enable) println(s); } while (0)
#define debug_S(s) do { if (debug_enable) print_S(s); } while (0)
#define debug_P(s) do { if (debug_enable) print_P(s); } while (0)
#define debug_msg(s) do { \
diff --git a/common/debug_config.h b/common/debug_config.h
index e00fd10336..0e67ee49f4 100644
--- a/common/debug_config.h
+++ b/common/debug_config.h
@@ -38,14 +38,15 @@ typedef union {
} debug_config_t;
debug_config_t debug_config;
+#ifdef __cplusplus
+}
+#endif
+
+
/* for backward compatibility */
#define debug_enable (debug_config.enable)
#define debug_matrix (debug_config.matrix)
#define debug_keyboard (debug_config.keyboard)
#define debug_mouse (debug_config.mouse)
-#ifdef __cplusplus
-}
-#endif
-
#endif
diff --git a/common/mbed/timer.c b/common/mbed/timer.c
index a64a77239c..c357ceb786 100644
--- a/common/mbed/timer.c
+++ b/common/mbed/timer.c
@@ -11,6 +11,7 @@ void SysTick_Handler(void) {
void timer_init(void)
{
+ timer_count = 0;
SysTick_Config(SystemCoreClock / 1000); /* 1ms tick */
}
diff --git a/common/nodebug.h b/common/nodebug.h
index aec790bbc1..8ef123f9fd 100644
--- a/common/nodebug.h
+++ b/common/nodebug.h
@@ -18,8 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#ifndef NODEBUG_H
#define NODEBUG_H 1
-#include "debug_config.h"
-
#define dprint(s)
#define dprintln(s)
#define dprintf(fmt, ...)
diff --git a/common/print.h b/common/print.h
index 6a6771f710..4001bcf1b5 100644
--- a/common/print.h
+++ b/common/print.h
@@ -35,7 +35,7 @@
#ifndef NO_PRINT
-#ifdef __AVR__
+#if defined(__AVR__)
#include "xprintf.h"
@@ -44,21 +44,21 @@
#ifndef __cplusplus
#define print(s) xputs(PSTR(s))
#endif
-#define println(s) xputs(PSTR(s "\n"))
+#define println(s) xputs(PSTR(s "\r\n"))
#ifdef __cplusplus
-extern "C" {
+extern "C"
#endif
/* function pointer of sendchar to be used by print utility */
void print_set_sendchar(int8_t (*print_sendchar_func)(uint8_t));
-#elif __arm__
+#elif defined(__arm__)
+
+#include "mbed/xprintf.h"
-#include "mbed.h"
-Serial ser(UART_TX, UART_RX);
-#define xprintf ser.printf
#define print(s) xprintf(s)
-#define println(s) xprintf(s "\n")
+#define println(s) xprintf(s "\r\n")
+
/* TODO: to select output destinations: UART/USBSerial */
#define print_set_sendchar(func)
diff --git a/keyboard/mbed_onekey/common.mk b/keyboard/mbed_onekey/common.mk
index 975ae9d0da..101a822052 100644
--- a/keyboard/mbed_onekey/common.mk
+++ b/keyboard/mbed_onekey/common.mk
@@ -1,16 +1,17 @@
COMMON_DIR = common
OBJECTS += \
$(OBJDIR)/$(COMMON_DIR)/mbed/timer.o \
+ $(OBJDIR)/$(COMMON_DIR)/mbed/xprintf.o \
INCLUDE_PATHS += \
-I$(TMK_DIR)/$(COMMON_DIR)
+# $(OBJDIR)/$(COMMON_DIR)/action.o \
# $(OBJDIR)/$(COMMON_DIR)/host.o \
# $(OBJDIR)/$(COMMON_DIR)/keyboard.o \
-# $(OBJDIR)/$(COMMON_DIR)/action.o \
# $(OBJDIR)/$(COMMON_DIR)/action_tapping.o \
# $(OBJDIR)/$(COMMON_DIR)/action_macro.o \
# $(OBJDIR)/$(COMMON_DIR)/action_layer.o \
From c67ae2a6b546c822759352586c14cd9dccbbe0ff Mon Sep 17 00:00:00 2001
From: tmk <nobody@nowhere>
Date: Tue, 17 Jun 2014 00:57:59 +0900
Subject: [PATCH 04/50] Port action_* to mbed
---
common.mk | 2 +-
common/action.c | 2 +-
common/action.h | 13 ++++++++++---
common/action_layer.c | 2 +-
common/action_layer.h | 2 +-
common/action_macro.c | 8 ++++----
common/action_macro.h | 8 ++++----
common/action_util.c | 20 ++++++++++----------
common/action_util.h | 9 +++++++++
common/bootmagic.c | 2 +-
common/host.c | 4 ++--
common/keyboard.c | 2 +-
common/keyboard.h | 8 ++++----
common/keymap.c | 4 ++--
common/keymap.h | 2 +-
common/print.h | 2 +-
common/report.h | 22 +++++++++++-----------
common/wait.h | 20 ++++++++++++++++++++
keyboard/mbed_onekey/HIDKeyboard.h | 11 +----------
keyboard/mbed_onekey/Makefile | 1 +
keyboard/mbed_onekey/common.mk | 12 ++++++------
21 files changed, 92 insertions(+), 64 deletions(-)
create mode 100644 common/wait.h
diff --git a/common.mk b/common.mk
index 9d58fa2145..9b5ef0ea88 100644
--- a/common.mk
+++ b/common.mk
@@ -11,7 +11,7 @@ SRC += $(COMMON_DIR)/host.c \
$(COMMON_DIR)/print.c \
$(COMMON_DIR)/bootloader.c \
$(COMMON_DIR)/suspend.c \
- $(COMMON_DIR)/xprintf.S \
+ $(COMMON_DIR)/avr/xprintf.S \
$(COMMON_DIR)/util.c
diff --git a/common/action.c b/common/action.c
index fddb97c508..94498fe6cb 100644
--- a/common/action.c
+++ b/common/action.c
@@ -499,7 +499,7 @@ void clear_keyboard_but_mods(void)
#endif
}
-bool is_tap_key(key_t key)
+bool is_tap_key(keypos_t key)
{
action_t action = layer_switch_get_action(key);
diff --git a/common/action.h b/common/action.h
index 077711c231..8a4736d7bc 100644
--- a/common/action.h
+++ b/common/action.h
@@ -25,6 +25,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "action_macro.h"
+#ifdef __cplusplus
+extern "C" {
+#endif
+
/* tapping count and state */
typedef struct {
bool interrupted :1;
@@ -42,12 +46,11 @@ typedef struct {
#endif
} keyrecord_t;
-
/* Execute action per keyevent */
void action_exec(keyevent_t event);
/* action for key */
-action_t action_for_key(uint8_t layer, key_t key);
+action_t action_for_key(uint8_t layer, keypos_t key);
/* macro */
const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt);
@@ -65,11 +68,15 @@ void unregister_mods(uint8_t mods);
void clear_keyboard(void);
void clear_keyboard_but_mods(void);
void layer_switch(uint8_t new_layer);
-bool is_tap_key(key_t key);
+bool is_tap_key(keypos_t key);
/* debug */
void debug_event(keyevent_t event);
void debug_record(keyrecord_t record);
void debug_action(action_t action);
+#ifdef __cplusplus
+}
+#endif
+
#endif /* ACTION_H */
diff --git a/common/action_layer.c b/common/action_layer.c
index 526e24d539..c535615f44 100644
--- a/common/action_layer.c
+++ b/common/action_layer.c
@@ -112,7 +112,7 @@ void layer_debug(void)
-action_t layer_switch_get_action(key_t key)
+action_t layer_switch_get_action(keypos_t key)
{
action_t action;
action.code = ACTION_TRANSPARENT;
diff --git a/common/action_layer.h b/common/action_layer.h
index 034e00027b..b6da353cfd 100644
--- a/common/action_layer.h
+++ b/common/action_layer.h
@@ -72,6 +72,6 @@ void layer_xor(uint32_t state);
/* return action depending on current layer status */
-action_t layer_switch_get_action(key_t key);
+action_t layer_switch_get_action(keypos_t key);
#endif
diff --git a/common/action_macro.c b/common/action_macro.c
index d85aee3796..ba93fc8b23 100644
--- a/common/action_macro.c
+++ b/common/action_macro.c
@@ -14,10 +14,10 @@ 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 <util/delay.h>
#include "action.h"
#include "action_util.h"
#include "action_macro.h"
+#include "wait.h"
#ifdef DEBUG_ACTION
#include "debug.h"
@@ -28,7 +28,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#ifndef NO_ACTION_MACRO
-#define MACRO_READ() (macro = pgm_read_byte(macro_p++))
+#define MACRO_READ() (macro = MACRO_GET(macro_p++))
void action_macro_play(const macro_t *macro_p)
{
macro_t macro = END;
@@ -58,7 +58,7 @@ void action_macro_play(const macro_t *macro_p)
case WAIT:
MACRO_READ();
dprintf("WAIT(%u)\n", macro);
- { uint8_t ms = macro; while (ms--) _delay_ms(1); }
+ { uint8_t ms = macro; while (ms--) wait_ms(1); }
break;
case INTERVAL:
interval = MACRO_READ();
@@ -77,7 +77,7 @@ void action_macro_play(const macro_t *macro_p)
return;
}
// interval
- { uint8_t ms = interval; while (ms--) _delay_ms(1); }
+ { uint8_t ms = interval; while (ms--) wait_ms(1); }
}
}
#endif
diff --git a/common/action_macro.h b/common/action_macro.h
index 6218263088..aedc32ec6b 100644
--- a/common/action_macro.h
+++ b/common/action_macro.h
@@ -17,12 +17,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#ifndef ACTION_MACRO_H
#define ACTION_MACRO_H
#include <stdint.h>
-#include <avr/pgmspace.h>
+#include "progmem.h"
-#define MACRO_NONE 0
-#define MACRO(...) ({ static const macro_t __m[] PROGMEM = { __VA_ARGS__ }; &__m[0]; })
-
+#define MACRO_NONE 0
+#define MACRO(...) ({ static const macro_t __m[] PROGMEM = { __VA_ARGS__ }; &__m[0]; })
+#define MACRO_GET(p) pgm_read_byte(p)
typedef uint8_t macro_t;
diff --git a/common/action_util.c b/common/action_util.c
index 5f44b3812c..dbee630d18 100644
--- a/common/action_util.c
+++ b/common/action_util.c
@@ -31,8 +31,8 @@ static uint8_t real_mods = 0;
static uint8_t weak_mods = 0;
#ifdef USB_6KRO_ENABLE
-#define RO_ADD(a, b) ((a + b) % REPORT_KEYS)
-#define RO_SUB(a, b) ((a - b + REPORT_KEYS) % REPORT_KEYS)
+#define RO_ADD(a, b) ((a + b) % KEYBOARD_REPORT_KEYS)
+#define RO_SUB(a, b) ((a - b + KEYBOARD_REPORT_KEYS) % KEYBOARD_REPORT_KEYS)
#define RO_INC(a) RO_ADD(a, 1)
#define RO_DEC(a) RO_SUB(a, 1)
static int8_t cb_head = 0;
@@ -98,7 +98,7 @@ void del_key(uint8_t key)
void clear_keys(void)
{
// not clear mods
- for (int8_t i = 1; i < REPORT_SIZE; i++) {
+ for (int8_t i = 1; i < KEYBOARD_REPORT_SIZE; i++) {
keyboard_report->raw[i] = 0;
}
}
@@ -145,7 +145,7 @@ void clear_oneshot_mods(void)
uint8_t has_anykey(void)
{
uint8_t cnt = 0;
- for (uint8_t i = 1; i < REPORT_SIZE; i++) {
+ for (uint8_t i = 1; i < KEYBOARD_REPORT_SIZE; i++) {
if (keyboard_report->raw[i])
cnt++;
}
@@ -162,7 +162,7 @@ uint8_t get_first_key(void)
#ifdef NKRO_ENABLE
if (keyboard_nkro) {
uint8_t i = 0;
- for (; i < REPORT_BITS && !keyboard_report->nkro.bits[i]; i++)
+ for (; i < KEYBOARD_REPORT_BITS && !keyboard_report->nkro.bits[i]; i++)
;
return i<<3 | biton(keyboard_report->nkro.bits[i]);
}
@@ -234,7 +234,7 @@ static inline void add_key_byte(uint8_t code)
#else
int8_t i = 0;
int8_t empty = -1;
- for (; i < REPORT_KEYS; i++) {
+ for (; i < KEYBOARD_REPORT_KEYS; i++) {
if (keyboard_report->keys[i] == code) {
break;
}
@@ -242,7 +242,7 @@ static inline void add_key_byte(uint8_t code)
empty = i;
}
}
- if (i == REPORT_KEYS) {
+ if (i == KEYBOARD_REPORT_KEYS) {
if (empty != -1) {
keyboard_report->keys[empty] = code;
}
@@ -278,7 +278,7 @@ static inline void del_key_byte(uint8_t code)
} while (i != cb_tail);
}
#else
- for (uint8_t i = 0; i < REPORT_KEYS; i++) {
+ for (uint8_t i = 0; i < KEYBOARD_REPORT_KEYS; i++) {
if (keyboard_report->keys[i] == code) {
keyboard_report->keys[i] = 0;
}
@@ -289,7 +289,7 @@ static inline void del_key_byte(uint8_t code)
#ifdef NKRO_ENABLE
static inline void add_key_bit(uint8_t code)
{
- if ((code>>3) < REPORT_BITS) {
+ if ((code>>3) < KEYBOARD_REPORT_BITS) {
keyboard_report->nkro.bits[code>>3] |= 1<<(code&7);
} else {
dprintf("add_key_bit: can't add: %02X\n", code);
@@ -298,7 +298,7 @@ static inline void add_key_bit(uint8_t code)
static inline void del_key_bit(uint8_t code)
{
- if ((code>>3) < REPORT_BITS) {
+ if ((code>>3) < KEYBOARD_REPORT_BITS) {
keyboard_report->nkro.bits[code>>3] &= ~(1<<(code&7));
} else {
dprintf("del_key_bit: can't del: %02X\n", code);
diff --git a/common/action_util.h b/common/action_util.h
index f9d3161a80..a955638b46 100644
--- a/common/action_util.h
+++ b/common/action_util.h
@@ -20,6 +20,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <stdint.h>
#include "report.h"
+#ifdef __cplusplus
+extern "C" {
+#endif
+
extern report_keyboard_t *keyboard_report;
void send_keyboard_report(void);
@@ -54,4 +58,9 @@ void oneshot_disable(void);
uint8_t has_anykey(void);
uint8_t has_anymod(void);
uint8_t get_first_key(void);
+
+#ifdef __cplusplus
+}
+#endif
+
#endif
diff --git a/common/bootmagic.c b/common/bootmagic.c
index 642d5face4..b002a58562 100644
--- a/common/bootmagic.c
+++ b/common/bootmagic.c
@@ -111,7 +111,7 @@ static bool scan_keycode(uint8_t keycode)
matrix_row_t matrix_row = matrix_get_row(r);
for (uint8_t c = 0; c < MATRIX_COLS; c++) {
if (matrix_row & ((matrix_row_t)1<<c)) {
- if (keycode == keymap_key_to_keycode(0, (key_t){ .row = r, .col = c })) {
+ if (keycode == keymap_key_to_keycode(0, (keypos_t){ .row = r, .col = c })) {
return true;
}
}
diff --git a/common/host.c b/common/host.c
index 2e56971bdd..e9b7916706 100644
--- a/common/host.c
+++ b/common/host.c
@@ -16,7 +16,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <stdint.h>
-#include <avr/interrupt.h>
+//#include <avr/interrupt.h>
#include "keycode.h"
#include "host.h"
#include "util.h"
@@ -55,7 +55,7 @@ void host_keyboard_send(report_keyboard_t *report)
if (debug_keyboard) {
dprint("keyboard_report: ");
- for (uint8_t i = 0; i < REPORT_SIZE; i++) {
+ for (uint8_t i = 0; i < KEYBOARD_REPORT_SIZE; i++) {
dprintf("%02X ", report->raw[i]);
}
dprint("\n");
diff --git a/common/keyboard.c b/common/keyboard.c
index 2b66f20a01..b71d5bf13c 100644
--- a/common/keyboard.c
+++ b/common/keyboard.c
@@ -100,7 +100,7 @@ void keyboard_task(void)
for (uint8_t c = 0; c < MATRIX_COLS; c++) {
if (matrix_change & ((matrix_row_t)1<<c)) {
action_exec((keyevent_t){
- .key = (key_t){ .row = r, .col = c },
+ .key = (keypos_t){ .row = r, .col = c },
.pressed = (matrix_row & ((matrix_row_t)1<<c)),
.time = (timer_read() | 1) /* time should not be 0 */
});
diff --git a/common/keyboard.h b/common/keyboard.h
index d1a922420b..60f8a89d1d 100644
--- a/common/keyboard.h
+++ b/common/keyboard.h
@@ -30,16 +30,16 @@ extern "C" {
typedef struct {
uint8_t col;
uint8_t row;
-} key_t;
+} keypos_t;
/* key event */
typedef struct {
- key_t key;
+ keypos_t key;
bool pressed;
uint16_t time;
} keyevent_t;
-/* equivalent test of key_t */
+/* equivalent test of keypos_t */
#define KEYEQ(keya, keyb) ((keya).row == (keyb).row && (keya).col == (keyb).col)
/* Rules for No Event:
@@ -52,7 +52,7 @@ static inline bool IS_RELEASED(keyevent_t event) { return (!IS_NOEVENT(event) &&
/* Tick event */
#define TICK (keyevent_t){ \
- .key = (key_t){ .row = 255, .col = 255 }, \
+ .key = (keypos_t){ .row = 255, .col = 255 }, \
.pressed = false, \
.time = (timer_read() | 1) \
}
diff --git a/common/keymap.c b/common/keymap.c
index bfb8ffac1a..0df2e2edff 100644
--- a/common/keymap.c
+++ b/common/keymap.c
@@ -28,7 +28,7 @@ static action_t keycode_to_action(uint8_t keycode);
/* converts key to action */
-action_t action_for_key(uint8_t layer, key_t key)
+action_t action_for_key(uint8_t layer, keypos_t key)
{
uint8_t keycode = keymap_key_to_keycode(layer, key);
switch (keycode) {
@@ -156,7 +156,7 @@ static action_t keycode_to_action(uint8_t keycode)
* Consider using new keymap API instead.
*/
__attribute__ ((weak))
-uint8_t keymap_key_to_keycode(uint8_t layer, key_t key)
+uint8_t keymap_key_to_keycode(uint8_t layer, keypos_t key)
{
return keymap_get_keycode(layer, key.row, key.col);
}
diff --git a/common/keymap.h b/common/keymap.h
index 4c3019a364..e1a6f992e6 100644
--- a/common/keymap.h
+++ b/common/keymap.h
@@ -43,7 +43,7 @@ keymap_config_t keymap_config;
/* translates key to keycode */
-uint8_t keymap_key_to_keycode(uint8_t layer, key_t key);
+uint8_t keymap_key_to_keycode(uint8_t layer, keypos_t key);
/* translates Fn keycode to action */
action_t keymap_fn_to_action(uint8_t keycode);
diff --git a/common/print.h b/common/print.h
index 4001bcf1b5..a8dbbc020a 100644
--- a/common/print.h
+++ b/common/print.h
@@ -37,7 +37,7 @@
#if defined(__AVR__)
-#include "xprintf.h"
+#include "avr/xprintf.h"
// TODO: avoid collision with arduino/Print.h
diff --git a/common/report.h b/common/report.h
index 71543cc23f..62190469a4 100644
--- a/common/report.h
+++ b/common/report.h
@@ -74,19 +74,19 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* key report size(NKRO or boot mode) */
#if defined(PROTOCOL_PJRC) && defined(NKRO_ENABLE)
# include "usb.h"
-# define REPORT_SIZE KBD2_SIZE
-# define REPORT_KEYS (KBD2_SIZE - 2)
-# define REPORT_BITS (KBD2_SIZE - 1)
+# define KEYBOARD_REPORT_SIZE KBD2_SIZE
+# define KEYBOARD_REPORT_KEYS (KBD2_SIZE - 2)
+# define KEYBOARD_REPORT_BITS (KBD2_SIZE - 1)
#elif defined(PROTOCOL_LUFA) && defined(NKRO_ENABLE)
# include "protocol/lufa/descriptor.h"
-# define REPORT_SIZE NKRO_EPSIZE
-# define REPORT_KEYS (NKRO_EPSIZE - 2)
-# define REPORT_BITS (NKRO_EPSIZE - 1)
+# define KEYBOARD_REPORT_SIZE NKRO_EPSIZE
+# define KEYBOARD_REPORT_KEYS (NKRO_EPSIZE - 2)
+# define KEYBOARD_REPORT_BITS (NKRO_EPSIZE - 1)
#else
-# define REPORT_SIZE 8
-# define REPORT_KEYS 6
+# define KEYBOARD_REPORT_SIZE 8
+# define KEYBOARD_REPORT_KEYS 6
#endif
@@ -115,16 +115,16 @@ extern "C" {
*
*/
typedef union {
- uint8_t raw[REPORT_SIZE];
+ uint8_t raw[KEYBOARD_REPORT_SIZE];
struct {
uint8_t mods;
uint8_t reserved;
- uint8_t keys[REPORT_KEYS];
+ uint8_t keys[KEYBOARD_REPORT_KEYS];
};
#ifdef NKRO_ENABLE
struct {
uint8_t mods;
- uint8_t bits[REPORT_BITS];
+ uint8_t bits[KEYBOARD_REPORT_BITS];
} nkro;
#endif
} __attribute__ ((packed)) report_keyboard_t;
diff --git a/common/wait.h b/common/wait.h
new file mode 100644
index 0000000000..40d00b0c75
--- /dev/null
+++ b/common/wait.h
@@ -0,0 +1,20 @@
+#ifndef WAIT_H
+#define WAIT_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#if defined(__AVR__)
+# include <util/delay.h>
+# define wait_ms(ms) _delay_ms(ms)
+# define wait_us(us) _delay_us(us)
+#elif defined(__arm__)
+# include "wait_api.h"
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/keyboard/mbed_onekey/HIDKeyboard.h b/keyboard/mbed_onekey/HIDKeyboard.h
index b00c97b9b0..4ebe610a63 100644
--- a/keyboard/mbed_onekey/HIDKeyboard.h
+++ b/keyboard/mbed_onekey/HIDKeyboard.h
@@ -3,16 +3,7 @@
#include "stdint.h"
#include "stdbool.h"
#include "USBHID.h"
-
-
-typedef union {
- uint8_t raw[8];
- struct {
- uint8_t mods;
- uint8_t reserved;
- uint8_t keys[6];
- };
-} __attribute__ ((packed)) report_keyboard_t;
+#include "report.h"
class HIDKeyboard : public USBDevice {
diff --git a/keyboard/mbed_onekey/Makefile b/keyboard/mbed_onekey/Makefile
index e194052c10..1bc91bc7e7 100644
--- a/keyboard/mbed_onekey/Makefile
+++ b/keyboard/mbed_onekey/Makefile
@@ -15,6 +15,7 @@ OBJDIR = ./build
OBJECTS = \
$(OBJDIR)/./HIDKeyboard.o \
+ $(OBJDIR)/./mbed_driver.o \
$(OBJDIR)/./main.o
SYS_OBJECTS =
diff --git a/keyboard/mbed_onekey/common.mk b/keyboard/mbed_onekey/common.mk
index 101a822052..6eb7f76995 100644
--- a/keyboard/mbed_onekey/common.mk
+++ b/keyboard/mbed_onekey/common.mk
@@ -2,20 +2,20 @@ COMMON_DIR = common
OBJECTS += \
$(OBJDIR)/$(COMMON_DIR)/mbed/timer.o \
$(OBJDIR)/$(COMMON_DIR)/mbed/xprintf.o \
+ $(OBJDIR)/$(COMMON_DIR)/action.o \
+ $(OBJDIR)/$(COMMON_DIR)/action_tapping.o \
+ $(OBJDIR)/$(COMMON_DIR)/action_macro.o \
+ $(OBJDIR)/$(COMMON_DIR)/action_layer.o \
+ $(OBJDIR)/$(COMMON_DIR)/action_util.o \
+ $(OBJDIR)/$(COMMON_DIR)/host.o \
INCLUDE_PATHS += \
-I$(TMK_DIR)/$(COMMON_DIR)
-# $(OBJDIR)/$(COMMON_DIR)/action.o \
-# $(OBJDIR)/$(COMMON_DIR)/host.o \
# $(OBJDIR)/$(COMMON_DIR)/keyboard.o \
-# $(OBJDIR)/$(COMMON_DIR)/action_tapping.o \
-# $(OBJDIR)/$(COMMON_DIR)/action_macro.o \
-# $(OBJDIR)/$(COMMON_DIR)/action_layer.o \
-# $(OBJDIR)/$(COMMON_DIR)/action_util.o \
# $(OBJDIR)/$(COMMON_DIR)/keymap.o \
# $(OBJDIR)/$(COMMON_DIR)/bootloader.o \
# $(OBJDIR)/$(COMMON_DIR)/suspend.o \
From ee70fe59ee8ebc6dcbf55171b1a2dd72e1744ae6 Mon Sep 17 00:00:00 2001
From: tmk <nobody@nowhere>
Date: Tue, 17 Jun 2014 14:03:13 +0900
Subject: [PATCH 05/50] Fix debug.h and remove debug_config.h
---
common/debug.h | 110 +++++++++++++++++++++++++++++++-----------
common/debug_config.h | 52 --------------------
common/nodebug.h | 28 ++---------
3 files changed, 86 insertions(+), 104 deletions(-)
delete mode 100644 common/debug_config.h
diff --git a/common/debug.h b/common/debug.h
index 8ca2569a49..26472c8fa3 100644
--- a/common/debug.h
+++ b/common/debug.h
@@ -19,44 +19,100 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define DEBUG_H 1
#include "print.h"
-#include "debug_config.h"
+/*
+ * Debug output control
+ */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef union {
+ uint8_t raw;
+ struct {
+ bool enable:1;
+ bool matrix:1;
+ bool keyboard:1;
+ bool mouse:1;
+ uint8_t reserved:4;
+ };
+} debug_config_t;
+
+extern debug_config_t debug_config;
+debug_config_t debug_config __attribute__ ((weak)) = {};
+
+#ifdef __cplusplus
+}
+#endif
+
+#define debug_enable (debug_config.enable)
+#define debug_matrix (debug_config.matrix)
+#define debug_keyboard (debug_config.keyboard)
+#define debug_mouse (debug_config.mouse)
+
+
+
+/*
+ * Debug print utils
+ */
#ifndef NO_DEBUG
-#define dprint(s) do { if (debug_enable) print(s); } while (0)
-#define dprintln(s) do { if (debug_enable) println(s); } while (0)
-#define dprintf(fmt, ...) do { if (debug_enable) xprintf(fmt, ##__VA_ARGS__); } while (0)
-#define dmsg(s) dprintf("%s at %s: %S\n", __FILE__, __LINE__, PSTR(s))
+#define dprint(s) do { if (debug_enable) print(s); } while (0)
+#define dprintln(s) do { if (debug_enable) println(s); } while (0)
+#define dprintf(fmt, ...) do { if (debug_enable) xprintf(fmt, ##__VA_ARGS__); } while (0)
+#define dmsg(s) dprintf("%s at %s: %S\n", __FILE__, __LINE__, PSTR(s))
-/* DO NOT USE these anymore */
-#define debug(s) do { if (debug_enable) print(s); } while (0)
-#define debugln(s) do { if (debug_enable) println(s); } while (0)
-#define debug_S(s) do { if (debug_enable) print_S(s); } while (0)
-#define debug_P(s) do { if (debug_enable) print_P(s); } while (0)
-#define debug_msg(s) do { \
+/* Deprecated. DO NOT USE these anymore, use dprintf instead. */
+#define debug(s) do { if (debug_enable) print(s); } while (0)
+#define debugln(s) do { if (debug_enable) println(s); } while (0)
+#define debug_msg(s) do { \
if (debug_enable) { \
print(__FILE__); print(" at "); print_dec(__LINE__); print(" in "); print(": "); print(s); \
} \
} while (0)
-#define debug_dec(data) do { if (debug_enable) print_dec(data); } while (0)
-#define debug_decs(data) do { if (debug_enable) print_decs(data); } while (0)
-#define debug_hex4(data) do { if (debug_enable) print_hex4(data); } while (0)
-#define debug_hex8(data) do { if (debug_enable) print_hex8(data); } while (0)
-#define debug_hex16(data) do { if (debug_enable) print_hex16(data); } while (0)
-#define debug_hex32(data) do { if (debug_enable) print_hex32(data); } while (0)
-#define debug_bin8(data) do { if (debug_enable) print_bin8(data); } while (0)
-#define debug_bin16(data) do { if (debug_enable) print_bin16(data); } while (0)
-#define debug_bin32(data) do { if (debug_enable) print_bin32(data); } while (0)
-#define debug_bin_reverse8(data) do { if (debug_enable) print_bin_reverse8(data); } while (0)
-#define debug_bin_reverse16(data) do { if (debug_enable) print_bin_reverse16(data); } while (0)
-#define debug_bin_reverse32(data) do { if (debug_enable) print_bin_reverse32(data); } while (0)
-#define debug_hex(data) debug_hex8(data)
-#define debug_bin(data) debug_bin8(data)
-#define debug_bin_reverse(data) debug_bin8(data)
+#define debug_dec(data) do { if (debug_enable) print_dec(data); } while (0)
+#define debug_decs(data) do { if (debug_enable) print_decs(data); } while (0)
+#define debug_hex4(data) do { if (debug_enable) print_hex4(data); } while (0)
+#define debug_hex8(data) do { if (debug_enable) print_hex8(data); } while (0)
+#define debug_hex16(data) do { if (debug_enable) print_hex16(data); } while (0)
+#define debug_hex32(data) do { if (debug_enable) print_hex32(data); } while (0)
+#define debug_bin8(data) do { if (debug_enable) print_bin8(data); } while (0)
+#define debug_bin16(data) do { if (debug_enable) print_bin16(data); } while (0)
+#define debug_bin32(data) do { if (debug_enable) print_bin32(data); } while (0)
+#define debug_bin_reverse8(data) do { if (debug_enable) print_bin_reverse8(data); } while (0)
+#define debug_bin_reverse16(data) do { if (debug_enable) print_bin_reverse16(data); } while (0)
+#define debug_bin_reverse32(data) do { if (debug_enable) print_bin_reverse32(data); } while (0)
+#define debug_hex(data) debug_hex8(data)
+#define debug_bin(data) debug_bin8(data)
+#define debug_bin_reverse(data) debug_bin8(data)
#else
-#include "nodebug.h"
+
+/* NO_DEBUG */
+#define dprint(s)
+#define dprintln(s)
+#define dprintf(fmt, ...)
+#define dmsg(s)
+#define debug(s)
+#define debugln(s)
+#define debug_msg(s)
+#define debug_dec(data)
+#define debug_decs(data)
+#define debug_hex4(data)
+#define debug_hex8(data)
+#define debug_hex16(data)
+#define debug_hex32(data)
+#define debug_bin8(data)
+#define debug_bin16(data)
+#define debug_bin32(data)
+#define debug_bin_reverse8(data)
+#define debug_bin_reverse16(data)
+#define debug_bin_reverse32(data)
+#define debug_hex(data)
+#define debug_bin(data)
+#define debug_bin_reverse(data)
+
#endif
#endif
diff --git a/common/debug_config.h b/common/debug_config.h
deleted file mode 100644
index 0e67ee49f4..0000000000
--- a/common/debug_config.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
-Copyright 2013 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/>.
-*/
-
-#ifndef DEBUG_CONFIG_H
-#define DEBUG_CONFIG_H 1
-
-#include <stdbool.h>
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* NOTE: Not portable. Bit field order depends on implementation */
-typedef union {
- uint8_t raw;
- struct {
- bool enable:1;
- bool matrix:1;
- bool keyboard:1;
- bool mouse:1;
- uint8_t reserved:4;
- };
-} debug_config_t;
-debug_config_t debug_config;
-
-#ifdef __cplusplus
-}
-#endif
-
-
-/* for backward compatibility */
-#define debug_enable (debug_config.enable)
-#define debug_matrix (debug_config.matrix)
-#define debug_keyboard (debug_config.keyboard)
-#define debug_mouse (debug_config.mouse)
-
-#endif
diff --git a/common/nodebug.h b/common/nodebug.h
index 8ef123f9fd..93309ada47 100644
--- a/common/nodebug.h
+++ b/common/nodebug.h
@@ -18,30 +18,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#ifndef NODEBUG_H
#define NODEBUG_H 1
-#define dprint(s)
-#define dprintln(s)
-#define dprintf(fmt, ...)
-#define dmsg(s)
-
-#define debug(s)
-#define debugln(s)
-#define debug_S(s)
-#define debug_P(s)
-#define debug_msg(s)
-#define debug_dec(data)
-#define debug_decs(data)
-#define debug_hex4(data)
-#define debug_hex8(data)
-#define debug_hex16(data)
-#define debug_hex32(data)
-#define debug_bin8(data)
-#define debug_bin16(data)
-#define debug_bin32(data)
-#define debug_bin_reverse8(data)
-#define debug_bin_reverse16(data)
-#define debug_bin_reverse32(data)
-#define debug_hex(data)
-#define debug_bin(data)
-#define debug_bin_reverse(data)
+#define NO_DEBUG
+#include "debug.h"
+#undef NO_DEBUG
#endif
From e81c70149ecf73256f8bb7d77cefc07f2b91d2be Mon Sep 17 00:00:00 2001
From: tmk <nobody@nowhere>
Date: Tue, 17 Jun 2014 22:41:14 +0900
Subject: [PATCH 06/50] Fix common files for mbed
---
common.mk | 10 +--
common/{ => avr}/bootloader.c | 0
common/{ => avr}/eeconfig.c | 0
common/{ => avr}/suspend.c | 24 +++++-
common/avr/suspend_avr.h | 27 +++++++
common/host.h | 4 +-
common/keyboard.c | 1 -
common/keymap.c | 1 -
common/mbed/bootloader.c | 4 +
common/mbed/suspend.c | 6 ++
common/mbed/xprintf.cpp | 46 +++++++++++
common/mbed/xprintf.h | 17 +++++
common/mousekey.c | 1 -
common/mousekey.h | 20 +++--
common/progmem.h | 11 +++
common/suspend.h | 20 -----
keyboard/mbed_onekey/Makefile | 8 ++
keyboard/mbed_onekey/common.mk | 70 +++++++++++++++--
keyboard/mbed_onekey/config.h | 7 ++
keyboard/mbed_onekey/gcc.mk | 3 +-
keyboard/mbed_onekey/main.cpp | 109 +++++++++++----------------
keyboard/mbed_onekey/mbed_driver.cpp | 41 ++++++++++
keyboard/mbed_onekey/mbed_driver.h | 3 +
23 files changed, 323 insertions(+), 110 deletions(-)
rename common/{ => avr}/bootloader.c (100%)
rename common/{ => avr}/eeconfig.c (100%)
rename common/{ => avr}/suspend.c (71%)
create mode 100644 common/avr/suspend_avr.h
create mode 100644 common/mbed/bootloader.c
create mode 100644 common/mbed/suspend.c
create mode 100644 common/mbed/xprintf.cpp
create mode 100644 common/mbed/xprintf.h
create mode 100644 common/progmem.h
create mode 100644 keyboard/mbed_onekey/config.h
create mode 100644 keyboard/mbed_onekey/mbed_driver.cpp
create mode 100644 keyboard/mbed_onekey/mbed_driver.h
diff --git a/common.mk b/common.mk
index 9b5ef0ea88..04f0364771 100644
--- a/common.mk
+++ b/common.mk
@@ -7,18 +7,18 @@ SRC += $(COMMON_DIR)/host.c \
$(COMMON_DIR)/action_layer.c \
$(COMMON_DIR)/action_util.c \
$(COMMON_DIR)/keymap.c \
- $(COMMON_DIR)/avr/timer.c \
$(COMMON_DIR)/print.c \
- $(COMMON_DIR)/bootloader.c \
- $(COMMON_DIR)/suspend.c \
+ $(COMMON_DIR)/util.c \
+ $(COMMON_DIR)/avr/suspend.c \
$(COMMON_DIR)/avr/xprintf.S \
- $(COMMON_DIR)/util.c
+ $(COMMON_DIR)/avr/timer.c \
+ $(COMMON_DIR)/avr/bootloader.c
# Option modules
ifdef BOOTMAGIC_ENABLE
SRC += $(COMMON_DIR)/bootmagic.c
- SRC += $(COMMON_DIR)/eeconfig.c
+ SRC += $(COMMON_DIR)/avr/eeconfig.c
OPT_DEFS += -DBOOTMAGIC_ENABLE
endif
diff --git a/common/bootloader.c b/common/avr/bootloader.c
similarity index 100%
rename from common/bootloader.c
rename to common/avr/bootloader.c
diff --git a/common/eeconfig.c b/common/avr/eeconfig.c
similarity index 100%
rename from common/eeconfig.c
rename to common/avr/eeconfig.c
diff --git a/common/suspend.c b/common/avr/suspend.c
similarity index 71%
rename from common/suspend.c
rename to common/avr/suspend.c
index 5b378892f3..f44a036beb 100644
--- a/common/suspend.c
+++ b/common/avr/suspend.c
@@ -1,7 +1,29 @@
-#include "suspend.h"
+#include <stdbool.h>
+#include <avr/sleep.h>
+#include <avr/wdt.h>
+#include <avr/interrupt.h>
#include "matrix.h"
#include "action.h"
#include "backlight.h"
+#include "suspend_avr.h"
+#include "suspend.h"
+
+
+#define wdt_intr_enable(value) \
+__asm__ __volatile__ ( \
+ "in __tmp_reg__,__SREG__" "\n\t" \
+ "cli" "\n\t" \
+ "wdr" "\n\t" \
+ "sts %0,%1" "\n\t" \
+ "out __SREG__,__tmp_reg__" "\n\t" \
+ "sts %0,%2" "\n\t" \
+ : /* no outputs */ \
+ : "M" (_SFR_MEM_ADDR(_WD_CONTROL_REG)), \
+ "r" (_BV(_WD_CHANGE_BIT) | _BV(WDE)), \
+ "r" ((uint8_t) ((value & 0x08 ? _WD_PS3_MASK : 0x00) | \
+ _BV(WDIE) | (value & 0x07)) ) \
+ : "r0" \
+)
void suspend_power_down(void)
diff --git a/common/avr/suspend_avr.h b/common/avr/suspend_avr.h
new file mode 100644
index 0000000000..357102da44
--- /dev/null
+++ b/common/avr/suspend_avr.h
@@ -0,0 +1,27 @@
+#ifndef SUSPEND_AVR_H
+#define SUSPEND_AVR_H
+
+#include <stdint.h>
+#include <stdbool.h>
+#include <avr/sleep.h>
+#include <avr/wdt.h>
+#include <avr/interrupt.h>
+
+
+#define wdt_intr_enable(value) \
+__asm__ __volatile__ ( \
+ "in __tmp_reg__,__SREG__" "\n\t" \
+ "cli" "\n\t" \
+ "wdr" "\n\t" \
+ "sts %0,%1" "\n\t" \
+ "out __SREG__,__tmp_reg__" "\n\t" \
+ "sts %0,%2" "\n\t" \
+ : /* no outputs */ \
+ : "M" (_SFR_MEM_ADDR(_WD_CONTROL_REG)), \
+ "r" (_BV(_WD_CHANGE_BIT) | _BV(WDE)), \
+ "r" ((uint8_t) ((value & 0x08 ? _WD_PS3_MASK : 0x00) | \
+ _BV(WDIE) | (value & 0x07)) ) \
+ : "r0" \
+)
+
+#endif
diff --git a/common/host.h b/common/host.h
index a56e6c3b04..918af69e8f 100644
--- a/common/host.h
+++ b/common/host.h
@@ -32,8 +32,8 @@ extern "C" {
extern bool keyboard_nkro;
#endif
-uint8_t keyboard_idle;
-uint8_t keyboard_protocol;
+extern uint8_t keyboard_idle;
+extern uint8_t keyboard_protocol;
/* host driver */
diff --git a/common/keyboard.c b/common/keyboard.c
index b71d5bf13c..9a809ff4a1 100644
--- a/common/keyboard.c
+++ b/common/keyboard.c
@@ -15,7 +15,6 @@ 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 <stdint.h>
-#include <util/delay.h>
#include "keyboard.h"
#include "matrix.h"
#include "keymap.h"
diff --git a/common/keymap.c b/common/keymap.c
index 0df2e2edff..4c0b61b8c1 100644
--- a/common/keymap.c
+++ b/common/keymap.c
@@ -14,7 +14,6 @@ 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/pgmspace.h>
#include "keymap.h"
#include "report.h"
#include "keycode.h"
diff --git a/common/mbed/bootloader.c b/common/mbed/bootloader.c
new file mode 100644
index 0000000000..b51e83943a
--- /dev/null
+++ b/common/mbed/bootloader.c
@@ -0,0 +1,4 @@
+#include "bootloader.h"
+
+
+void bootloader_jump(void) {}
diff --git a/common/mbed/suspend.c b/common/mbed/suspend.c
new file mode 100644
index 0000000000..32651574f8
--- /dev/null
+++ b/common/mbed/suspend.c
@@ -0,0 +1,6 @@
+#include <stdbool.h>
+
+
+void suspend_power_down(void) {}
+bool suspend_wakeup_condition(void) { return true; }
+void suspend_wakeup_init(void) {}
diff --git a/common/mbed/xprintf.cpp b/common/mbed/xprintf.cpp
new file mode 100644
index 0000000000..4342b79f80
--- /dev/null
+++ b/common/mbed/xprintf.cpp
@@ -0,0 +1,46 @@
+#include <cstdarg>
+//#include <stdarg.h>
+#include "mbed.h"
+#include "mbed/xprintf.h"
+
+
+#define STRING_STACK_LIMIT 120
+
+/* mbed Serial */
+Serial ser(UART_TX, UART_RX);
+
+/* TODO: Need small implementation for embedded */
+int xprintf(const char* format, ...)
+{
+ /* copy from mbed/common/RawSerial.cpp */
+ std::va_list arg;
+ va_start(arg, format);
+ int len = vsnprintf(NULL, 0, format, arg);
+ if (len < STRING_STACK_LIMIT) {
+ char temp[STRING_STACK_LIMIT];
+ vsprintf(temp, format, arg);
+ ser.puts(temp);
+ } else {
+ char *temp = new char[len + 1];
+ vsprintf(temp, format, arg);
+ ser.puts(temp);
+ delete[] temp;
+ }
+ va_end(arg);
+ return len;
+
+/* Fail: __builtin_va_arg_pack?
+ * https://gcc.gnu.org/onlinedocs/gcc-4.3.5/gcc/Constructing-Calls.html#Constructing-Calls
+ void *arg = __builtin_apply_args();
+ void *ret = __builtin_apply((void*)(&(ser.printf)), arg, 100);
+ __builtin_return(ret)
+*/
+/* Fail: varargs can not be passed to printf
+ //int r = ser.printf("test %i\r\n", 123);
+ va_list arg;
+ va_start(arg, format);
+ int r = ser.printf(format, arg);
+ va_end(arg);
+ return r;
+*/
+}
diff --git a/common/mbed/xprintf.h b/common/mbed/xprintf.h
new file mode 100644
index 0000000000..26bc529e5b
--- /dev/null
+++ b/common/mbed/xprintf.h
@@ -0,0 +1,17 @@
+#ifndef XPRINTF_H
+#define XPRINTF_H
+
+//#define xprintf(format, ...) __xprintf(format, ##__VA_ARGS__)
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+int xprintf(const char *format, ...);
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif
diff --git a/common/mousekey.c b/common/mousekey.c
index 017be94116..23469476e2 100644
--- a/common/mousekey.c
+++ b/common/mousekey.c
@@ -16,7 +16,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <stdint.h>
-#include <util/delay.h>
#include "keycode.h"
#include "host.h"
#include "timer.h"
diff --git a/common/mousekey.h b/common/mousekey.h
index d8d7beaaa3..6eede06b44 100644
--- a/common/mousekey.h
+++ b/common/mousekey.h
@@ -52,12 +52,16 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#endif
-uint8_t mk_delay;
-uint8_t mk_interval;
-uint8_t mk_max_speed;
-uint8_t mk_time_to_max;
-uint8_t mk_wheel_max_speed;
-uint8_t mk_wheel_time_to_max;
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern uint8_t mk_delay;
+extern uint8_t mk_interval;
+extern uint8_t mk_max_speed;
+extern uint8_t mk_time_to_max;
+extern uint8_t mk_wheel_max_speed;
+extern uint8_t mk_wheel_time_to_max;
void mousekey_task(void);
@@ -66,4 +70,8 @@ void mousekey_off(uint8_t code);
void mousekey_clear(void);
void mousekey_send(void);
+#ifdef __cplusplus
+}
+#endif
+
#endif
diff --git a/common/progmem.h b/common/progmem.h
new file mode 100644
index 0000000000..09aeb8b7c4
--- /dev/null
+++ b/common/progmem.h
@@ -0,0 +1,11 @@
+#ifndef PROGMEM_H
+#define PROGMEM_H 1
+
+#if defined(__AVR__)
+# include <avr/pgmspace.h>
+#elif defined(__arm__)
+# define PROGMEM
+# define pgm_read_byte(p) *(p)
+#endif
+
+#endif
diff --git a/common/suspend.h b/common/suspend.h
index 1c1e41ac3e..9b76f280d1 100644
--- a/common/suspend.h
+++ b/common/suspend.h
@@ -3,26 +3,6 @@
#include <stdint.h>
#include <stdbool.h>
-#include <avr/sleep.h>
-#include <avr/wdt.h>
-#include <avr/interrupt.h>
-
-
-#define wdt_intr_enable(value) \
-__asm__ __volatile__ ( \
- "in __tmp_reg__,__SREG__" "\n\t" \
- "cli" "\n\t" \
- "wdr" "\n\t" \
- "sts %0,%1" "\n\t" \
- "out __SREG__,__tmp_reg__" "\n\t" \
- "sts %0,%2" "\n\t" \
- : /* no outputs */ \
- : "M" (_SFR_MEM_ADDR(_WD_CONTROL_REG)), \
- "r" (_BV(_WD_CHANGE_BIT) | _BV(WDE)), \
- "r" ((uint8_t) ((value & 0x08 ? _WD_PS3_MASK : 0x00) | \
- _BV(WDIE) | (value & 0x07)) ) \
- : "r0" \
-)
void suspend_power_down(void);
diff --git a/keyboard/mbed_onekey/Makefile b/keyboard/mbed_onekey/Makefile
index 1bc91bc7e7..e686f424e6 100644
--- a/keyboard/mbed_onekey/Makefile
+++ b/keyboard/mbed_onekey/Makefile
@@ -18,6 +18,8 @@ OBJECTS = \
$(OBJDIR)/./mbed_driver.o \
$(OBJDIR)/./main.o
+CONFIG_H = config.h
+
SYS_OBJECTS =
INCLUDE_PATHS = -I.
@@ -25,6 +27,12 @@ INCLUDE_PATHS = -I.
LIBRARY_PATHS =
LIBRARIES =
+# Build Options
+# Comment out to disable
+#BOOTMAGIC_ENABLE = yes
+MOUSEKEY_ENABLE = yes
+
+
include mbed.mk
include common.mk
include gcc.mk
diff --git a/keyboard/mbed_onekey/common.mk b/keyboard/mbed_onekey/common.mk
index 6eb7f76995..1bd7d6edbe 100644
--- a/keyboard/mbed_onekey/common.mk
+++ b/keyboard/mbed_onekey/common.mk
@@ -1,21 +1,79 @@
COMMON_DIR = common
OBJECTS += \
- $(OBJDIR)/$(COMMON_DIR)/mbed/timer.o \
- $(OBJDIR)/$(COMMON_DIR)/mbed/xprintf.o \
$(OBJDIR)/$(COMMON_DIR)/action.o \
$(OBJDIR)/$(COMMON_DIR)/action_tapping.o \
$(OBJDIR)/$(COMMON_DIR)/action_macro.o \
$(OBJDIR)/$(COMMON_DIR)/action_layer.o \
$(OBJDIR)/$(COMMON_DIR)/action_util.o \
$(OBJDIR)/$(COMMON_DIR)/host.o \
+ $(OBJDIR)/$(COMMON_DIR)/keymap.o \
+ $(OBJDIR)/$(COMMON_DIR)/keyboard.o \
+ $(OBJDIR)/$(COMMON_DIR)/util.o \
+ $(OBJDIR)/$(COMMON_DIR)/mbed/suspend.o \
+ $(OBJDIR)/$(COMMON_DIR)/mbed/timer.o \
+ $(OBJDIR)/$(COMMON_DIR)/mbed/xprintf.o \
+ $(OBJDIR)/$(COMMON_DIR)/mbed/bootloader.o \
INCLUDE_PATHS += \
-I$(TMK_DIR)/$(COMMON_DIR)
+CC_FLAGS += -include $(CONFIG_H)
-# $(OBJDIR)/$(COMMON_DIR)/keyboard.o \
-# $(OBJDIR)/$(COMMON_DIR)/keymap.o \
-# $(OBJDIR)/$(COMMON_DIR)/bootloader.o \
-# $(OBJDIR)/$(COMMON_DIR)/suspend.o \
+# Option modules
+ifdef BOOTMAGIC_ENABLE
+ $(error Not Supported)
+ OBJECTS += $(OBJDIR)/$(COMMON_DIR)/bootmagic.o
+ OBJECTS += $(OBJDIR)/$(COMMON_DIR)/mbed/eeprom.o
+ OPT_DEFS += -DBOOTMAGIC_ENABLE
+endif
+
+ifdef MOUSEKEY_ENABLE
+ OBJECTS += $(OBJDIR)/$(COMMON_DIR)/mousekey.o
+ OPT_DEFS += -DMOUSEKEY_ENABLE
+ OPT_DEFS += -DMOUSE_ENABLE
+endif
+
+ifdef EXTRAKEY_ENABLE
+ $(error Not Supported)
+ OPT_DEFS += -DEXTRAKEY_ENABLE
+endif
+
+ifdef CONSOLE_ENABLE
+ $(error Not Supported)
+ OPT_DEFS += -DCONSOLE_ENABLE
+else
+ OPT_DEFS += -DNO_PRINT
+ OPT_DEFS += -DNO_DEBUG
+endif
+
+ifdef COMMAND_ENABLE
+ $(error Not Supported)
+ SRC += $(COMMON_DIR)/command.c
+ OPT_DEFS += -DCOMMAND_ENABLE
+endif
+
+ifdef NKRO_ENABLE
+ $(error Not Supported)
+ OPT_DEFS += -DNKRO_ENABLE
+endif
+
+ifdef SLEEP_LED_ENABLE
+ $(error Not Supported)
+ SRC += $(COMMON_DIR)/sleep_led.c
+ OPT_DEFS += -DSLEEP_LED_ENABLE
+ OPT_DEFS += -DNO_SUSPEND_POWER_DOWN
+endif
+
+ifdef BACKLIGHT_ENABLE
+ $(error Not Supported)
+ SRC += $(COMMON_DIR)/backlight.c
+ OPT_DEFS += -DBACKLIGHT_ENABLE
+endif
+
+ifdef KEYMAP_SECTION_ENABLE
+ $(error Not Supported)
+ OPT_DEFS += -DKEYMAP_SECTION_ENABLE
+ EXTRALDFLAGS = -Wl,-L$(TOP_DIR),-Tldscript_keymap_avr5.x
+endif
diff --git a/keyboard/mbed_onekey/config.h b/keyboard/mbed_onekey/config.h
new file mode 100644
index 0000000000..a3aadd0389
--- /dev/null
+++ b/keyboard/mbed_onekey/config.h
@@ -0,0 +1,7 @@
+#ifndef CONFIG_H
+#define CONFIG_H
+
+#define MATRIX_ROWS 1
+#define MATRIX_COLS 1
+
+#endif
diff --git a/keyboard/mbed_onekey/gcc.mk b/keyboard/mbed_onekey/gcc.mk
index e31527bbc1..0fc41fe275 100644
--- a/keyboard/mbed_onekey/gcc.mk
+++ b/keyboard/mbed_onekey/gcc.mk
@@ -10,7 +10,8 @@ SIZE = $(GCC_BIN)arm-none-eabi-size
CHKSUM = ~/Dropbox/MBED/tool/lpc-vector-checksum
CPU = -mcpu=cortex-m0 -mthumb
-CC_FLAGS = $(CPU) -c -g -fno-common -fmessage-length=0 -Wall -fno-exceptions -ffunction-sections -fdata-sections
+
+CC_FLAGS += $(CPU) -c -g -fno-common -fmessage-length=0 -Wall -fno-exceptions -ffunction-sections -fdata-sections
CC_FLAGS += -MMD -MP
CC_SYMBOLS = -DTARGET_LPC11U35_401 -DTARGET_M0 -DTARGET_NXP -DTARGET_LPC11UXX -DTOOLCHAIN_GCC_ARM -DTOOLCHAIN_GCC -D__CORTEX_M0 -DARM_MATH_CM0 -DMBED_BUILD_TIMESTAMP=1399108688.49 -D__MBED__=1
diff --git a/keyboard/mbed_onekey/main.cpp b/keyboard/mbed_onekey/main.cpp
index 1df940aa97..b2f7243c85 100644
--- a/keyboard/mbed_onekey/main.cpp
+++ b/keyboard/mbed_onekey/main.cpp
@@ -1,66 +1,43 @@
-#include "mbed.h"
-#include "HIDKeyboard.h"
-#include "debug.h"
-#include "timer.h"
-
-/*
-//#define DEBUG
-#ifdef DEBUG
-Serial ser(UART_TX, UART_RX);
-#define dprintf(fmt, ...) ser.printf(fmt, ## __VA_ARGS__)
-#else
-#define dprintf(fmt, ...)
-#endif
-*/
-
-
-// button and LEDs
-DigitalIn isp(P0_1);
-DigitalOut led_red(P0_20);
-DigitalOut led_green(P0_21);
-
-//USBKeyboard
-HIDKeyboard keyboard;
-
-
-int main(void) {
- //isp.mode(PullUp);
- //led_red = 0;
- //led_green = 0;
- debug_enable = true;
- dprintf("HIDKeyboard:\r\n");
-
- timer_init();
- xprintf("timer: %i\r\n", timer_read());
-
- report_keyboard_t report = { 2, 0, 4, }; //a
- report_keyboard_t report_off = { 0 };
-
- bool last_isp = isp;
- uint32_t last_timer;
- while (1) {
- //keyboard.mediaControl(KEY_VOLUME_DOWN);
- //keyboard.printf("Hello World from Mbed\r\n");
- //keyboard.keyCode('s', KEY_CTRL);
- //keyboard.keyCode(KEY_CAPS_LOCK);
-
- //led_green = !led_green;
- //leds = keyboard.lockStatus();
- //ser.putc(ser.getc());
-
- if (last_isp == isp) continue;
- if (isp == 0) {
- led_red = 0; // on
- xprintf("timer: %i\r\n", timer_read32());
- xprintf("diff: %i\r\n", timer_elapsed32(last_timer));
- //keyboard.sendReport(report);
- } else {
- led_red = 1; // off
- //keyboard.sendReport(report_off);
- }
- last_isp = isp;
- last_timer = timer_read();
- //led_green = !led_green;
- //wait(0.5);
- }
-}
+#include "mbed.h"
+#include "debug.h"
+#include "timer.h"
+#include "action.h"
+#include "keycode.h"
+#include "host.h"
+#include "host_driver.h"
+#include "mbed_driver.h"
+
+
+// Button and LEDs of LPC11U35 board
+DigitalIn isp(P0_1); // ISP button
+DigitalOut led_red(P0_20);
+DigitalOut led_green(P0_21);
+
+
+int main(void) {
+ isp.mode(PullUp);
+ led_red = 1;
+ led_green = 0;
+
+ timer_init();
+ host_set_driver(&mbed_driver);
+
+ //debug_enable = true;
+ xprintf("mbed_onekey ver.eee:\r\n");
+
+
+ bool last_isp = isp;
+ while (1) {
+ //led_green = !led_green;
+ if (last_isp == isp) continue;
+ last_isp = isp;
+ if (last_isp == 0) {
+ led_red = 0; // on
+ dprintf("timer: %i\r\n", timer_read());
+ register_code(KC_A);
+ } else {
+ led_red = 1; // off
+ unregister_code(KC_A);
+ }
+ }
+}
diff --git a/keyboard/mbed_onekey/mbed_driver.cpp b/keyboard/mbed_onekey/mbed_driver.cpp
new file mode 100644
index 0000000000..333f8e3782
--- /dev/null
+++ b/keyboard/mbed_onekey/mbed_driver.cpp
@@ -0,0 +1,41 @@
+#include "HIDKeyboard.h"
+#include "host.h"
+#include "host_driver.h"
+#include "mbed_driver.h"
+
+HIDKeyboard keyboard;
+
+
+/* Host driver */
+static uint8_t keyboard_leds(void);
+static void send_keyboard(report_keyboard_t *report);
+static void send_mouse(report_mouse_t *report);
+static void send_system(uint16_t data);
+static void send_consumer(uint16_t data);
+
+host_driver_t mbed_driver = {
+ keyboard_leds,
+ send_keyboard,
+ send_mouse,
+ send_system,
+ send_consumer
+};
+
+
+static uint8_t keyboard_leds(void)
+{
+ return 0;
+}
+static void send_keyboard(report_keyboard_t *report)
+{
+ keyboard.sendReport(*report);
+}
+static void send_mouse(report_mouse_t *report)
+{
+}
+static void send_system(uint16_t data)
+{
+}
+static void send_consumer(uint16_t data)
+{
+}
diff --git a/keyboard/mbed_onekey/mbed_driver.h b/keyboard/mbed_onekey/mbed_driver.h
new file mode 100644
index 0000000000..dd1153b43a
--- /dev/null
+++ b/keyboard/mbed_onekey/mbed_driver.h
@@ -0,0 +1,3 @@
+#include "host_driver.h"
+
+extern host_driver_t mbed_driver;
From 80c3ff5fa03429f1e4ea15032f665ceb88c9b8c3 Mon Sep 17 00:00:00 2001
From: tmk <nobody@nowhere>
Date: Wed, 18 Jun 2014 02:22:59 +0900
Subject: [PATCH 07/50] Fix build files for mbed
---
.gitignore | 2 ++
keyboard/mbed_onekey/Makefile | 13 ++++---------
.../mbed_onekey => protocol/mbed}/HIDKeyboard.cpp | 0
.../mbed_onekey => protocol/mbed}/HIDKeyboard.h | 0
.../mbed_onekey => protocol/mbed}/mbed_driver.cpp | 0
.../mbed_onekey => protocol/mbed}/mbed_driver.h | 0
{keyboard/mbed_onekey => tool/mbed}/common.mk | 0
{keyboard/mbed_onekey => tool/mbed}/gcc.mk | 0
{keyboard/mbed_onekey => tool/mbed}/mbed.mk | 7 +++++++
9 files changed, 13 insertions(+), 9 deletions(-)
rename {keyboard/mbed_onekey => protocol/mbed}/HIDKeyboard.cpp (100%)
rename {keyboard/mbed_onekey => protocol/mbed}/HIDKeyboard.h (100%)
rename {keyboard/mbed_onekey => protocol/mbed}/mbed_driver.cpp (100%)
rename {keyboard/mbed_onekey => protocol/mbed}/mbed_driver.h (100%)
rename {keyboard/mbed_onekey => tool/mbed}/common.mk (100%)
rename {keyboard/mbed_onekey => tool/mbed}/gcc.mk (100%)
rename {keyboard/mbed_onekey => tool/mbed}/mbed.mk (97%)
diff --git a/.gitignore b/.gitignore
index c25d41d238..b79d72b7c7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,5 @@
*.map
*.sym
tags
+build/
+*.bak
diff --git a/keyboard/mbed_onekey/Makefile b/keyboard/mbed_onekey/Makefile
index e686f424e6..d0d1148ce2 100644
--- a/keyboard/mbed_onekey/Makefile
+++ b/keyboard/mbed_onekey/Makefile
@@ -1,7 +1,4 @@
-# This file was automagically generated by mbed.org. For more information,
-# see http://mbed.org/handbook/Exporting-to-GCC-ARM-Embedded
-
-PROJECT = USBKeyboard_HelloWorld
+PROJECT = mbed_onekey
TMK_DIR = ../..
MBED_DIR = ./mbed-sdk
@@ -14,8 +11,6 @@ vpath %.cpp .:$(MBED_DIR):$(TMK_DIR)
OBJDIR = ./build
OBJECTS = \
- $(OBJDIR)/./HIDKeyboard.o \
- $(OBJDIR)/./mbed_driver.o \
$(OBJDIR)/./main.o
CONFIG_H = config.h
@@ -33,6 +28,6 @@ LIBRARIES =
MOUSEKEY_ENABLE = yes
-include mbed.mk
-include common.mk
-include gcc.mk
+include $(TMK_DIR)/tool/mbed/mbed.mk
+include $(TMK_DIR)/tool/mbed/common.mk
+include $(TMK_DIR)/tool/mbed/gcc.mk
diff --git a/keyboard/mbed_onekey/HIDKeyboard.cpp b/protocol/mbed/HIDKeyboard.cpp
similarity index 100%
rename from keyboard/mbed_onekey/HIDKeyboard.cpp
rename to protocol/mbed/HIDKeyboard.cpp
diff --git a/keyboard/mbed_onekey/HIDKeyboard.h b/protocol/mbed/HIDKeyboard.h
similarity index 100%
rename from keyboard/mbed_onekey/HIDKeyboard.h
rename to protocol/mbed/HIDKeyboard.h
diff --git a/keyboard/mbed_onekey/mbed_driver.cpp b/protocol/mbed/mbed_driver.cpp
similarity index 100%
rename from keyboard/mbed_onekey/mbed_driver.cpp
rename to protocol/mbed/mbed_driver.cpp
diff --git a/keyboard/mbed_onekey/mbed_driver.h b/protocol/mbed/mbed_driver.h
similarity index 100%
rename from keyboard/mbed_onekey/mbed_driver.h
rename to protocol/mbed/mbed_driver.h
diff --git a/keyboard/mbed_onekey/common.mk b/tool/mbed/common.mk
similarity index 100%
rename from keyboard/mbed_onekey/common.mk
rename to tool/mbed/common.mk
diff --git a/keyboard/mbed_onekey/gcc.mk b/tool/mbed/gcc.mk
similarity index 100%
rename from keyboard/mbed_onekey/gcc.mk
rename to tool/mbed/gcc.mk
diff --git a/keyboard/mbed_onekey/mbed.mk b/tool/mbed/mbed.mk
similarity index 97%
rename from keyboard/mbed_onekey/mbed.mk
rename to tool/mbed/mbed.mk
index 962a05e6e5..0f12ee2af3 100644
--- a/keyboard/mbed_onekey/mbed.mk
+++ b/tool/mbed/mbed.mk
@@ -89,4 +89,11 @@ INCLUDE_PATHS += \
-I$(MBED_DIR)/libraries/USBDevice/USBMSD \
-I$(MBED_DIR)/libraries/USBDevice/USBMIDI
+OBJECTS += \
+ $(OBJDIR)/protocol/mbed/mbed_driver.o \
+ $(OBJDIR)/protocol/mbed/HIDKeyboard.o \
+
+INCLUDE_PATHS += \
+ -I$(TMK_DIR)/protocol/mbed
+
LINKER_SCRIPT = $(MBED_DIR)/libraries/mbed/targets/cmsis/TARGET_NXP/TARGET_LPC11UXX/TOOLCHAIN_GCC_ARM/TARGET_LPC11U35_401/LPC11U35.ld
From 4c8e0fd0bd1712421f957ec5e0ca16fc6bbb3856 Mon Sep 17 00:00:00 2001
From: tmk <nobody@nowhere>
Date: Thu, 19 Jun 2014 16:13:35 +0900
Subject: [PATCH 08/50] Port ps2_usb to mbed
---
common/progmem.h | 1 +
converter/ps2_usb/Makefile.mbed | 44 ++++++++++++++++++
converter/ps2_usb/config_mbed.h | 60 +++++++++++++++++++++++++
converter/ps2_usb/keymap_common.c | 3 +-
converter/ps2_usb/keymap_common.h | 1 -
converter/ps2_usb/main.cpp | 46 +++++++++++++++++++
converter/ps2_usb/matrix.c | 3 +-
keyboard/mbed_onekey/Makefile | 2 +-
protocol.mk | 1 +
protocol/ps2.h | 65 +++------------------------
protocol/ps2_busywait.c | 16 ++++---
protocol/ps2_io.h | 15 +++++++
protocol/ps2_io_avr.c | 74 +++++++++++++++++++++++++++++++
protocol/ps2_io_mbed.c | 60 +++++++++++++++++++++++++
tool/mbed/common.mk | 42 +++++++++---------
15 files changed, 343 insertions(+), 90 deletions(-)
create mode 100644 converter/ps2_usb/Makefile.mbed
create mode 100644 converter/ps2_usb/config_mbed.h
create mode 100644 converter/ps2_usb/main.cpp
create mode 100644 protocol/ps2_io.h
create mode 100644 protocol/ps2_io_avr.c
create mode 100644 protocol/ps2_io_mbed.c
diff --git a/common/progmem.h b/common/progmem.h
index 09aeb8b7c4..199b1bedfe 100644
--- a/common/progmem.h
+++ b/common/progmem.h
@@ -6,6 +6,7 @@
#elif defined(__arm__)
# define PROGMEM
# define pgm_read_byte(p) *(p)
+# define pgm_read_word(p) *(p)
#endif
#endif
diff --git a/converter/ps2_usb/Makefile.mbed b/converter/ps2_usb/Makefile.mbed
new file mode 100644
index 0000000000..631f270f75
--- /dev/null
+++ b/converter/ps2_usb/Makefile.mbed
@@ -0,0 +1,44 @@
+PROJECT = ps2_usb
+
+TMK_DIR = ../..
+MBED_DIR = $(TMK_DIR)/mbed-sdk
+
+#VPATH += $(MBED_DIR):$(TMK_DIR)
+vpath %.s .:$(MBED_DIR):$(TMK_DIR)
+vpath %.c .:$(MBED_DIR):$(TMK_DIR)
+vpath %.cpp .:$(MBED_DIR):$(TMK_DIR)
+
+OBJDIR = ./build
+
+OBJECTS = \
+ $(OBJDIR)/protocol/ps2_busywait.o \
+ $(OBJDIR)/protocol/ps2_io_mbed.o \
+ $(OBJDIR)/./keymap_common.o \
+ $(OBJDIR)/./matrix.o \
+ $(OBJDIR)/./led.o \
+ $(OBJDIR)/./main.o
+
+ifdef KEYMAP
+ OBJECTS := $(OBJDIR)/keymap_$(KEYMAP).o $(OBJECTS)
+else
+ OBJECTS := $(OBJDIR)/keymap_plain.o $(OBJECTS)
+endif
+
+CONFIG_H = config_mbed.h
+
+SYS_OBJECTS =
+
+INCLUDE_PATHS = -I.
+
+LIBRARY_PATHS =
+LIBRARIES =
+
+# Build Options
+# Comment out to disable
+#BOOTMAGIC_ENABLE = yes
+MOUSEKEY_ENABLE = yes
+
+
+include $(TMK_DIR)/tool/mbed/mbed.mk
+include $(TMK_DIR)/tool/mbed/common.mk
+include $(TMK_DIR)/tool/mbed/gcc.mk
diff --git a/converter/ps2_usb/config_mbed.h b/converter/ps2_usb/config_mbed.h
new file mode 100644
index 0000000000..5819763e65
--- /dev/null
+++ b/converter/ps2_usb/config_mbed.h
@@ -0,0 +1,60 @@
+/*
+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/>.
+*/
+
+#ifndef CONFIG_MBED_H
+#define CONFIG_MBED_H
+
+
+#if 0
+// duplicated name against mbed USBDeivce
+#define VENDOR_ID 0xFEED
+#define PRODUCT_ID 0x6512
+#endif
+#define DEVICE_VER 0x0001
+#define MANUFACTURER t.m.k.
+#define PRODUCT PS/2 keyboard converter
+#define DESCRIPTION convert PS/2 keyboard to USB
+
+
+/* matrix size */
+#define MATRIX_ROWS 32 // keycode bit: 3-0
+#define MATRIX_COLS 8 // keycode bit: 6-4
+
+
+/* key combination for command */
+#define IS_COMMAND() ( \
+ keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) || \
+ keyboard_report->mods == (MOD_BIT(KC_LCTRL) | MOD_BIT(KC_RSHIFT)) \
+)
+
+
+/*
+ * PS/2 Busywait
+ */
+#ifdef PS2_USE_BUSYWAIT
+# define PS2_CLOCK_PORT PORTD
+# define PS2_CLOCK_PIN PIND
+# define PS2_CLOCK_DDR DDRD
+# define PS2_CLOCK_BIT 5
+# define PS2_DATA_PORT PORTD
+# define PS2_DATA_PIN PIND
+# define PS2_DATA_DDR DDRD
+# define PS2_DATA_BIT 2
+#endif
+
+
+#endif
diff --git a/converter/ps2_usb/keymap_common.c b/converter/ps2_usb/keymap_common.c
index 241d2e33b1..e344fb4167 100644
--- a/converter/ps2_usb/keymap_common.c
+++ b/converter/ps2_usb/keymap_common.c
@@ -15,10 +15,11 @@ 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 "keymap_common.h"
+#include "progmem.h"
/* translates key to keycode */
-uint8_t keymap_key_to_keycode(uint8_t layer, key_t key)
+uint8_t keymap_key_to_keycode(uint8_t layer, keypos_t key)
{
return pgm_read_byte(&keymaps[(layer)][(key.row)][(key.col)]);
}
diff --git a/converter/ps2_usb/keymap_common.h b/converter/ps2_usb/keymap_common.h
index 216a8dc020..d783e01ded 100644
--- a/converter/ps2_usb/keymap_common.h
+++ b/converter/ps2_usb/keymap_common.h
@@ -19,7 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <stdint.h>
#include <stdbool.h>
-#include <avr/pgmspace.h>
#include "keycode.h"
#include "action.h"
#include "action_macro.h"
diff --git a/converter/ps2_usb/main.cpp b/converter/ps2_usb/main.cpp
new file mode 100644
index 0000000000..860af149a0
--- /dev/null
+++ b/converter/ps2_usb/main.cpp
@@ -0,0 +1,46 @@
+#include "mbed.h"
+#include "debug.h"
+#include "timer.h"
+#include "action.h"
+#include "keycode.h"
+#include "host.h"
+#include "host_driver.h"
+#include "mbed_driver.h"
+
+
+// Button and LEDs of LPC11U35 board
+DigitalIn isp(P0_1); // ISP button
+DigitalOut led_red(P0_20);
+DigitalOut led_green(P0_21);
+
+
+int main(void) {
+ isp.mode(PullUp);
+ led_red = 1;
+ led_green = 0;
+
+ timer_init();
+ host_set_driver(&mbed_driver);
+ keyboard_init();
+
+ //debug_enable = true;
+ xprintf("mbed_onekey ver.eee:\r\n");
+
+
+ bool last_isp = isp;
+ while (1) {
+ keyboard_task();
+
+ //led_green = !led_green;
+ if (last_isp == isp) continue;
+ last_isp = isp;
+ if (last_isp == 0) {
+ led_red = 0; // on
+ dprintf("timer: %i\r\n", timer_read());
+ //register_code(KC_A);
+ } else {
+ led_red = 1; // off
+ //unregister_code(KC_A);
+ }
+ }
+}
diff --git a/converter/ps2_usb/matrix.c b/converter/ps2_usb/matrix.c
index 45344c0f75..45cf2a4a90 100644
--- a/converter/ps2_usb/matrix.c
+++ b/converter/ps2_usb/matrix.c
@@ -17,8 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <stdint.h>
#include <stdbool.h>
-#include <avr/io.h>
-#include <util/delay.h>
#include "action.h"
#include "print.h"
#include "util.h"
@@ -189,6 +187,7 @@ uint8_t matrix_scan(void)
}
uint8_t code = ps2_host_recv();
+ if (code) xprintf("%i\r\n", code);
if (!ps2_error) {
switch (state) {
case INIT:
diff --git a/keyboard/mbed_onekey/Makefile b/keyboard/mbed_onekey/Makefile
index d0d1148ce2..2f7399ba02 100644
--- a/keyboard/mbed_onekey/Makefile
+++ b/keyboard/mbed_onekey/Makefile
@@ -1,7 +1,7 @@
PROJECT = mbed_onekey
TMK_DIR = ../..
-MBED_DIR = ./mbed-sdk
+MBED_DIR = $(TMK_DIR)/mbed-sdk
#VPATH += $(MBED_DIR):$(TMK_DIR)
vpath %.s .:$(MBED_DIR):$(TMK_DIR)
diff --git a/protocol.mk b/protocol.mk
index 7f561e62d6..ca435ba43c 100644
--- a/protocol.mk
+++ b/protocol.mk
@@ -9,6 +9,7 @@ endif
ifdef PS2_USE_BUSYWAIT
SRC += protocol/ps2_busywait.c
+ SRC += protocol/ps2_io_avr.c
OPT_DEFS += -DPS2_USE_BUSYWAIT
endif
diff --git a/protocol/ps2.h b/protocol/ps2.h
index 483eea7209..acde679cf4 100644
--- a/protocol/ps2.h
+++ b/protocol/ps2.h
@@ -39,8 +39,9 @@ POSSIBILITY OF SUCH DAMAGE.
#define PS2_H
#include <stdbool.h>
-#include <util/delay.h>
-#include <avr/io.h>
+#include "wait.h"
+#include "ps2_io.h"
+#include "print.h"
/*
* Primitive PS/2 Library for AVR
@@ -92,79 +93,27 @@ uint8_t ps2_host_recv(void);
void ps2_host_set_led(uint8_t usb_led);
-/* Check port settings for clock and data line */
-#if !(defined(PS2_CLOCK_PORT) && \
- defined(PS2_CLOCK_PIN) && \
- defined(PS2_CLOCK_DDR) && \
- defined(PS2_CLOCK_BIT))
-# error "PS/2 clock port setting is required in config.h"
-#endif
-
-#if !(defined(PS2_DATA_PORT) && \
- defined(PS2_DATA_PIN) && \
- defined(PS2_DATA_DDR) && \
- defined(PS2_DATA_BIT))
-# error "PS/2 data port setting is required in config.h"
-#endif
-
/*--------------------------------------------------------------------
* static functions
*------------------------------------------------------------------*/
-static inline void clock_lo(void)
-{
- PS2_CLOCK_PORT &= ~(1<<PS2_CLOCK_BIT);
- PS2_CLOCK_DDR |= (1<<PS2_CLOCK_BIT);
-}
-static inline void clock_hi(void)
-{
- /* input with pull up */
- PS2_CLOCK_DDR &= ~(1<<PS2_CLOCK_BIT);
- PS2_CLOCK_PORT |= (1<<PS2_CLOCK_BIT);
-}
-static inline bool clock_in(void)
-{
- PS2_CLOCK_DDR &= ~(1<<PS2_CLOCK_BIT);
- PS2_CLOCK_PORT |= (1<<PS2_CLOCK_BIT);
- _delay_us(1);
- return PS2_CLOCK_PIN&(1<<PS2_CLOCK_BIT);
-}
-static inline void data_lo(void)
-{
- PS2_DATA_PORT &= ~(1<<PS2_DATA_BIT);
- PS2_DATA_DDR |= (1<<PS2_DATA_BIT);
-}
-static inline void data_hi(void)
-{
- /* input with pull up */
- PS2_DATA_DDR &= ~(1<<PS2_DATA_BIT);
- PS2_DATA_PORT |= (1<<PS2_DATA_BIT);
-}
-static inline bool data_in(void)
-{
- PS2_DATA_DDR &= ~(1<<PS2_DATA_BIT);
- PS2_DATA_PORT |= (1<<PS2_DATA_BIT);
- _delay_us(1);
- return PS2_DATA_PIN&(1<<PS2_DATA_BIT);
-}
-
static inline uint16_t wait_clock_lo(uint16_t us)
{
- while (clock_in() && us) { asm(""); _delay_us(1); us--; }
+ while (clock_in() && us) { asm(""); wait_us(1); us--; }
return us;
}
static inline uint16_t wait_clock_hi(uint16_t us)
{
- while (!clock_in() && us) { asm(""); _delay_us(1); us--; }
+ while (!clock_in() && us) { asm(""); wait_us(1); us--; }
return us;
}
static inline uint16_t wait_data_lo(uint16_t us)
{
- while (data_in() && us) { asm(""); _delay_us(1); us--; }
+ while (data_in() && us) { asm(""); wait_us(1); us--; }
return us;
}
static inline uint16_t wait_data_hi(uint16_t us)
{
- while (!data_in() && us) { asm(""); _delay_us(1); us--; }
+ while (!data_in() && us) { asm(""); wait_us(1); us--; }
return us;
}
diff --git a/protocol/ps2_busywait.c b/protocol/ps2_busywait.c
index 05dd7b27e6..a64933219e 100644
--- a/protocol/ps2_busywait.c
+++ b/protocol/ps2_busywait.c
@@ -40,8 +40,9 @@ POSSIBILITY OF SUCH DAMAGE.
*/
#include <stdbool.h>
-#include <util/delay.h>
+#include "wait.h"
#include "ps2.h"
+#include "ps2_io.h"
#include "debug.h"
@@ -58,8 +59,11 @@ uint8_t ps2_error = PS2_ERR_NONE;
void ps2_host_init(void)
{
+ clock_init();
+ data_init();
+
// POR(150-2000ms) plus BAT(300-500ms) may take 2.5sec([3]p.20)
- _delay_ms(2500);
+ wait_ms(2500);
inhibit();
}
@@ -71,7 +75,7 @@ uint8_t ps2_host_send(uint8_t data)
/* terminate a transmission if we have */
inhibit();
- _delay_us(100); // 100us [4]p.13, [5]p.50
+ wait_us(100); // 100us [4]p.13, [5]p.50
/* 'Request to Send' and Start bit */
data_lo();
@@ -80,7 +84,7 @@ uint8_t ps2_host_send(uint8_t data)
/* Data bit */
for (uint8_t i = 0; i < 8; i++) {
- _delay_us(15);
+ wait_us(15);
if (data&(1<<i)) {
parity = !parity;
data_hi();
@@ -92,13 +96,13 @@ uint8_t ps2_host_send(uint8_t data)
}
/* Parity bit */
- _delay_us(15);
+ wait_us(15);
if (parity) { data_hi(); } else { data_lo(); }
WAIT(clock_hi, 50, 4);
WAIT(clock_lo, 50, 5);
/* Stop bit */
- _delay_us(15);
+ wait_us(15);
data_hi();
/* Ack */
diff --git a/protocol/ps2_io.h b/protocol/ps2_io.h
new file mode 100644
index 0000000000..a46a358e7c
--- /dev/null
+++ b/protocol/ps2_io.h
@@ -0,0 +1,15 @@
+#ifndef PS2_IO_H
+#define PS2_IO_H
+
+
+void clock_init(void);
+void clock_lo(void);
+void clock_hi(void);
+bool clock_in(void);
+
+void data_init(void);
+void data_lo(void);
+void data_hi(void);
+bool data_in(void);
+
+#endif
diff --git a/protocol/ps2_io_avr.c b/protocol/ps2_io_avr.c
new file mode 100644
index 0000000000..be13d6696a
--- /dev/null
+++ b/protocol/ps2_io_avr.c
@@ -0,0 +1,74 @@
+#include <stdbool.h>
+#include <util/delay.h>
+
+/* Check port settings for clock and data line */
+#if !(defined(PS2_CLOCK_PORT) && \
+ defined(PS2_CLOCK_PIN) && \
+ defined(PS2_CLOCK_DDR) && \
+ defined(PS2_CLOCK_BIT))
+# error "PS/2 clock port setting is required in config.h"
+#endif
+
+#if !(defined(PS2_DATA_PORT) && \
+ defined(PS2_DATA_PIN) && \
+ defined(PS2_DATA_DDR) && \
+ defined(PS2_DATA_BIT))
+# error "PS/2 data port setting is required in config.h"
+#endif
+
+
+/*
+ * Clock
+ */
+void clock_init(void)
+{
+}
+
+void clock_lo(void)
+{
+ PS2_CLOCK_PORT &= ~(1<<PS2_CLOCK_BIT);
+ PS2_CLOCK_DDR |= (1<<PS2_CLOCK_BIT);
+}
+
+void clock_hi(void)
+{
+ /* input with pull up */
+ PS2_CLOCK_DDR &= ~(1<<PS2_CLOCK_BIT);
+ PS2_CLOCK_PORT |= (1<<PS2_CLOCK_BIT);
+}
+
+bool clock_in(void)
+{
+ PS2_CLOCK_DDR &= ~(1<<PS2_CLOCK_BIT);
+ PS2_CLOCK_PORT |= (1<<PS2_CLOCK_BIT);
+ _delay_us(1);
+ return PS2_CLOCK_PIN&(1<<PS2_CLOCK_BIT);
+}
+
+/*
+ * Data
+ */
+void data_init(void)
+{
+}
+
+void data_lo(void)
+{
+ PS2_DATA_PORT &= ~(1<<PS2_DATA_BIT);
+ PS2_DATA_DDR |= (1<<PS2_DATA_BIT);
+}
+
+void data_hi(void)
+{
+ /* input with pull up */
+ PS2_DATA_DDR &= ~(1<<PS2_DATA_BIT);
+ PS2_DATA_PORT |= (1<<PS2_DATA_BIT);
+}
+
+bool data_in(void)
+{
+ PS2_DATA_DDR &= ~(1<<PS2_DATA_BIT);
+ PS2_DATA_PORT |= (1<<PS2_DATA_BIT);
+ _delay_us(1);
+ return PS2_DATA_PIN&(1<<PS2_DATA_BIT);
+}
diff --git a/protocol/ps2_io_mbed.c b/protocol/ps2_io_mbed.c
new file mode 100644
index 0000000000..83bdcef7f5
--- /dev/null
+++ b/protocol/ps2_io_mbed.c
@@ -0,0 +1,60 @@
+#include <stdbool.h>
+#include "ps2_io.h"
+#include "gpio_api.h"
+
+
+static gpio_t clock;
+static gpio_t data;
+
+/*
+ * Clock
+ */
+void clock_init(void)
+{
+ gpio_init(&clock, P0_9);
+ gpio_mode(&clock, OpenDrain|PullNone);
+}
+
+void clock_lo(void)
+{
+ gpio_dir(&clock, PIN_OUTPUT);
+ gpio_write(&clock, 0);
+}
+void clock_hi(void)
+{
+ gpio_dir(&clock, PIN_OUTPUT);
+ gpio_write(&clock, 1);
+}
+
+bool clock_in(void)
+{
+ gpio_dir(&clock, PIN_INPUT);
+ return gpio_read(&clock);
+}
+
+/*
+ * Data
+ */
+void data_init(void)
+{
+ gpio_init(&data, P0_8);
+ gpio_mode(&data, OpenDrain|PullNone);
+}
+
+void data_lo(void)
+{
+ gpio_dir(&data, PIN_OUTPUT);
+ gpio_write(&data, 0);
+}
+
+void data_hi(void)
+{
+ gpio_dir(&data, PIN_OUTPUT);
+ gpio_write(&data, 1);
+}
+
+bool data_in(void)
+{
+ gpio_dir(&data, PIN_INPUT);
+ return gpio_read(&data);
+}
diff --git a/tool/mbed/common.mk b/tool/mbed/common.mk
index 1bd7d6edbe..93a927a3e8 100644
--- a/tool/mbed/common.mk
+++ b/tool/mbed/common.mk
@@ -1,21 +1,21 @@
-COMMON_DIR = common
OBJECTS += \
- $(OBJDIR)/$(COMMON_DIR)/action.o \
- $(OBJDIR)/$(COMMON_DIR)/action_tapping.o \
- $(OBJDIR)/$(COMMON_DIR)/action_macro.o \
- $(OBJDIR)/$(COMMON_DIR)/action_layer.o \
- $(OBJDIR)/$(COMMON_DIR)/action_util.o \
- $(OBJDIR)/$(COMMON_DIR)/host.o \
- $(OBJDIR)/$(COMMON_DIR)/keymap.o \
- $(OBJDIR)/$(COMMON_DIR)/keyboard.o \
- $(OBJDIR)/$(COMMON_DIR)/util.o \
- $(OBJDIR)/$(COMMON_DIR)/mbed/suspend.o \
- $(OBJDIR)/$(COMMON_DIR)/mbed/timer.o \
- $(OBJDIR)/$(COMMON_DIR)/mbed/xprintf.o \
- $(OBJDIR)/$(COMMON_DIR)/mbed/bootloader.o \
+ $(OBJDIR)/common/action.o \
+ $(OBJDIR)/common/action_tapping.o \
+ $(OBJDIR)/common/action_macro.o \
+ $(OBJDIR)/common/action_layer.o \
+ $(OBJDIR)/common/action_util.o \
+ $(OBJDIR)/common/host.o \
+ $(OBJDIR)/common/keymap.o \
+ $(OBJDIR)/common/keyboard.o \
+ $(OBJDIR)/common/util.o \
+ $(OBJDIR)/common/mbed/suspend.o \
+ $(OBJDIR)/common/mbed/timer.o \
+ $(OBJDIR)/common/mbed/xprintf.o \
+ $(OBJDIR)/common/mbed/bootloader.o \
INCLUDE_PATHS += \
- -I$(TMK_DIR)/$(COMMON_DIR)
+ -I$(TMK_DIR)/common \
+ -I$(TMK_DIR)/protocol
CC_FLAGS += -include $(CONFIG_H)
@@ -24,13 +24,13 @@ CC_FLAGS += -include $(CONFIG_H)
# Option modules
ifdef BOOTMAGIC_ENABLE
$(error Not Supported)
- OBJECTS += $(OBJDIR)/$(COMMON_DIR)/bootmagic.o
- OBJECTS += $(OBJDIR)/$(COMMON_DIR)/mbed/eeprom.o
+ OBJECTS += $(OBJDIR)/common/bootmagic.o
+ OBJECTS += $(OBJDIR)/common/mbed/eeprom.o
OPT_DEFS += -DBOOTMAGIC_ENABLE
endif
ifdef MOUSEKEY_ENABLE
- OBJECTS += $(OBJDIR)/$(COMMON_DIR)/mousekey.o
+ OBJECTS += $(OBJDIR)/common/mousekey.o
OPT_DEFS += -DMOUSEKEY_ENABLE
OPT_DEFS += -DMOUSE_ENABLE
endif
@@ -50,7 +50,7 @@ endif
ifdef COMMAND_ENABLE
$(error Not Supported)
- SRC += $(COMMON_DIR)/command.c
+ SRC += common/command.c
OPT_DEFS += -DCOMMAND_ENABLE
endif
@@ -61,14 +61,14 @@ endif
ifdef SLEEP_LED_ENABLE
$(error Not Supported)
- SRC += $(COMMON_DIR)/sleep_led.c
+ SRC += common/sleep_led.c
OPT_DEFS += -DSLEEP_LED_ENABLE
OPT_DEFS += -DNO_SUSPEND_POWER_DOWN
endif
ifdef BACKLIGHT_ENABLE
$(error Not Supported)
- SRC += $(COMMON_DIR)/backlight.c
+ SRC += common/backlight.c
OPT_DEFS += -DBACKLIGHT_ENABLE
endif
From b4a91ecf4e46ee533563fd759e26dd249bf6b4de Mon Sep 17 00:00:00 2001
From: tmk <nobody@nowhere>
Date: Fri, 20 Jun 2014 14:39:49 +0900
Subject: [PATCH 09/50] Add LED indicator support in mbed
---
protocol/mbed/HIDKeyboard.cpp | 43 +++++++++++++++++++++++------------
protocol/mbed/HIDKeyboard.h | 4 ++++
protocol/mbed/mbed_driver.cpp | 2 +-
3 files changed, 34 insertions(+), 15 deletions(-)
diff --git a/protocol/mbed/HIDKeyboard.cpp b/protocol/mbed/HIDKeyboard.cpp
index f40c2d2f2a..947077cd24 100644
--- a/protocol/mbed/HIDKeyboard.cpp
+++ b/protocol/mbed/HIDKeyboard.cpp
@@ -17,6 +17,10 @@ bool HIDKeyboard::sendReport(report_keyboard_t report) {
return true;
}
+uint8_t HIDKeyboard::leds() {
+ return led_state;
+}
+
bool HIDKeyboard::USBCallback_setConfiguration(uint8_t configuration) {
if (configuration != DEFAULT_CONFIGURATION) {
return false;
@@ -228,29 +232,40 @@ bool HIDKeyboard::USBCallback_request() {
}
// Process class-specific requests
-/*
if (transfer->setup.bmRequestType.Type == CLASS_TYPE)
{
- switch (transfer->setup.bRequest)
- {
- case SET_REPORT:
- // First byte will be used for report ID
- //outputReport.data[0] = transfer->setup.wValue & 0xff;
- //outputReport.length = transfer->setup.wLength + 1;
- outputReport.length = transfer->setup.wLength;
+ switch (transfer->setup.bRequest) {
+ case SET_REPORT:
+ // LED indicator
+ // TODO: check Interface and Report length?
+ // if (transfer->setup.wIndex == INTERFACE_KEYBOAD) { }
+ // if (transfer->setup.wLength == 1)
- //transfer->remaining = sizeof(outputReport.data) - 1;
- //transfer->ptr = &outputReport.data[1];
- transfer->remaining = sizeof(outputReport.data);
- transfer->ptr = &outputReport.data[0];
+ transfer->remaining = 1;
+ //transfer->ptr = ?? what ptr should be set when OUT(not used?)
transfer->direction = HOST_TO_DEVICE;
- transfer->notify = true;
+ transfer->notify = true; /* notify with USBCallback_requestCompleted */
success = true;
default:
break;
}
}
-*/
return success;
}
+
+void HIDKeyboard::USBCallback_requestCompleted(uint8_t * buf, uint32_t length)
+{
+ if (length > 0) {
+ CONTROL_TRANSFER *transfer = getTransferPtr();
+ if (transfer->setup.bmRequestType.Type == CLASS_TYPE) {
+ switch (transfer->setup.bRequest) {
+ case SET_REPORT:
+ led_state = buf[0];
+ break;
+ default:
+ break;
+ }
+ }
+ }
+}
diff --git a/protocol/mbed/HIDKeyboard.h b/protocol/mbed/HIDKeyboard.h
index 4ebe610a63..c537e5ecee 100644
--- a/protocol/mbed/HIDKeyboard.h
+++ b/protocol/mbed/HIDKeyboard.h
@@ -11,6 +11,7 @@ public:
HIDKeyboard(uint16_t vendor_id = 0xFEED, uint16_t product_id = 0xabed, uint16_t product_release = 0x0001);
bool sendReport(report_keyboard_t report);
+ uint8_t leds(void);
protected:
uint16_t reportLength;
virtual bool USBCallback_setConfiguration(uint8_t configuration);
@@ -22,6 +23,9 @@ protected:
virtual uint8_t * configurationDesc();
//virtual uint8_t * deviceDesc();
virtual bool USBCallback_request();
+ virtual void USBCallback_requestCompleted(uint8_t * buf, uint32_t length);
+private:
+ uint8_t led_state;
};
#endif
diff --git a/protocol/mbed/mbed_driver.cpp b/protocol/mbed/mbed_driver.cpp
index 333f8e3782..6c7b16e23d 100644
--- a/protocol/mbed/mbed_driver.cpp
+++ b/protocol/mbed/mbed_driver.cpp
@@ -24,7 +24,7 @@ host_driver_t mbed_driver = {
static uint8_t keyboard_leds(void)
{
- return 0;
+ return keyboard.leds();
}
static void send_keyboard(report_keyboard_t *report)
{
From a9f5f201ad6b009675fdf16c4447033cc2ac0995 Mon Sep 17 00:00:00 2001
From: tmk <nobody@nowhere>
Date: Fri, 20 Jun 2014 15:30:10 +0900
Subject: [PATCH 10/50] Add checksum tool for NXP LPC
---
tool/mbed/gcc.mk | 2 +-
tool/mbed/lpc-vector-checksum.c | 99 +++++++++++++++++++++++++++++++++
2 files changed, 100 insertions(+), 1 deletion(-)
create mode 100644 tool/mbed/lpc-vector-checksum.c
diff --git a/tool/mbed/gcc.mk b/tool/mbed/gcc.mk
index 0fc41fe275..032f7c6cae 100644
--- a/tool/mbed/gcc.mk
+++ b/tool/mbed/gcc.mk
@@ -7,7 +7,7 @@ LD = $(GCC_BIN)arm-none-eabi-gcc
OBJCOPY = $(GCC_BIN)arm-none-eabi-objcopy
OBJDUMP = $(GCC_BIN)arm-none-eabi-objdump
SIZE = $(GCC_BIN)arm-none-eabi-size
-CHKSUM = ~/Dropbox/MBED/tool/lpc-vector-checksum
+CHKSUM = $(TMK_DIR)/tool/mbed/lpc-vector-checksum
CPU = -mcpu=cortex-m0 -mthumb
diff --git a/tool/mbed/lpc-vector-checksum.c b/tool/mbed/lpc-vector-checksum.c
new file mode 100644
index 0000000000..316a1253a0
--- /dev/null
+++ b/tool/mbed/lpc-vector-checksum.c
@@ -0,0 +1,99 @@
+/***************************************************************************
+* https://github.com/dhylands/projects/blob/master/lpc/lpc-vector-checksum/lpc-vector-checksum.c
+*
+* Copyright (c) 2012 by Dave Hylands
+* All Rights Reserved
+*
+* Permission is granted to any individual or institution to use, copy,
+* modify, or redistribute this file so long as it is not sold for profit,
+* and that this copyright notice is retained.
+*
+***************************************************************************
+*
+* This program calculates the vector checksum used in LPC17xx binary
+* images.
+*
+* Usage: lpc-vector-checksum file
+*
+***************************************************************************/
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <errno.h>
+#include <string.h>
+
+/***************************************************************************/
+/**
+* update_vector_checksum
+*
+* The algorithim is to write the checksum such that the checksum of the
+* first 8 words is equal to zero.
+*
+* The LPC1768 uses little-endian, and this particular routine assumes
+* that it's running on a little-endian architecture.
+*/
+static int update_vector_checksum( const char *filename )
+{
+ uint32_t sum;
+ uint32_t header[8];
+ FILE *fs;
+ int i;
+
+ if (( fs = fopen( filename, "r+b" )) == NULL )
+ {
+ fprintf( stderr, "Unable to open '%s' for reading/writing (%d): %s\n",
+ filename, errno, strerror( errno ));
+ return 0;
+ }
+
+ if ( fread( header, sizeof( header ), 1, fs ) != 1 )
+ {
+ fprintf( stderr, "Failed to read header from '%s' (perhaps the file is too small?)",
+ filename );
+ fclose( fs );
+ return 0;
+ }
+
+ sum = 0;
+ for ( i = 0; i < 7; i++ )
+ {
+ sum += header[i];
+ }
+ printf( "sum = 0x%08x, value to write = 0x%08x\n", sum, -sum );
+
+ /* write back the checksum to location 7
+ * http://sigalrm.blogspot.jp/2011/10/cortex-m3-exception-vector-checksum.html
+ */
+ fseek(fs, 0x1c, SEEK_SET);
+ sum = -sum;
+ fwrite(&sum, 4, 1, fs);
+
+ fclose( fs );
+
+ return 1;
+}
+
+/***************************************************************************/
+/**
+* main
+*/
+int main( int argc, char **argv )
+{
+ int arg;
+
+ if ( argc < 2)
+ {
+ fprintf( stderr, "Usage: lpc-vector-checksum file ...\n" );
+ exit( 1 );
+ }
+
+ for ( arg = 1; arg < argc; arg++ )
+ {
+ update_vector_checksum( argv[ arg ]);
+ }
+
+ exit( 0 );
+ return 0;
+}
+
From 2e0e21d444cc279699881563cf02e7ef05725bae Mon Sep 17 00:00:00 2001
From: tmk <nobody@nowhere>
Date: Tue, 17 Jun 2014 00:57:59 +0900
Subject: [PATCH 11/50] Port action_* to mbed
---
keyboard/mbed_onekey/common.mk | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
create mode 100644 keyboard/mbed_onekey/common.mk
diff --git a/keyboard/mbed_onekey/common.mk b/keyboard/mbed_onekey/common.mk
new file mode 100644
index 0000000000..6eb7f76995
--- /dev/null
+++ b/keyboard/mbed_onekey/common.mk
@@ -0,0 +1,21 @@
+COMMON_DIR = common
+OBJECTS += \
+ $(OBJDIR)/$(COMMON_DIR)/mbed/timer.o \
+ $(OBJDIR)/$(COMMON_DIR)/mbed/xprintf.o \
+ $(OBJDIR)/$(COMMON_DIR)/action.o \
+ $(OBJDIR)/$(COMMON_DIR)/action_tapping.o \
+ $(OBJDIR)/$(COMMON_DIR)/action_macro.o \
+ $(OBJDIR)/$(COMMON_DIR)/action_layer.o \
+ $(OBJDIR)/$(COMMON_DIR)/action_util.o \
+ $(OBJDIR)/$(COMMON_DIR)/host.o \
+
+INCLUDE_PATHS += \
+ -I$(TMK_DIR)/$(COMMON_DIR)
+
+
+
+
+# $(OBJDIR)/$(COMMON_DIR)/keyboard.o \
+# $(OBJDIR)/$(COMMON_DIR)/keymap.o \
+# $(OBJDIR)/$(COMMON_DIR)/bootloader.o \
+# $(OBJDIR)/$(COMMON_DIR)/suspend.o \
From 54aee16a84eee27e816a89da5ca0dd3e9294cad9 Mon Sep 17 00:00:00 2001
From: tmk <nobody@nowhere>
Date: Wed, 25 Jun 2014 11:23:30 +0900
Subject: [PATCH 12/50] Fix timer.h to include AVR specific header
---
common/timer.h | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/common/timer.h b/common/timer.h
index f0c5ffc98a..fe23f87aec 100644
--- a/common/timer.h
+++ b/common/timer.h
@@ -20,6 +20,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <stdint.h>
+#if defined(__AVR__)
+#include "avr/timer_avr.h"
+#endif
+
+
#define TIMER_DIFF(a, b, max) ((a) >= (b) ? (a) - (b) : (max) - (b) + (a))
#define TIMER_DIFF_8(a, b) TIMER_DIFF(a, b, UINT8_MAX)
#define TIMER_DIFF_16(a, b) TIMER_DIFF(a, b, UINT16_MAX)
From ea60dae6e69bd3b120f2f702aeea691cb6d3d790 Mon Sep 17 00:00:00 2001
From: tmk <nobody@nowhere>
Date: Wed, 25 Jun 2014 13:50:51 +0900
Subject: [PATCH 13/50] Fix for new API(key_t to keypos_t)
---
keyboard/hhkb/keymap_common.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/keyboard/hhkb/keymap_common.c b/keyboard/hhkb/keymap_common.c
index 67b3db85d4..e938fb6270 100644
--- a/keyboard/hhkb/keymap_common.c
+++ b/keyboard/hhkb/keymap_common.c
@@ -21,7 +21,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* translates key to keycode */
-uint8_t keymap_key_to_keycode(uint8_t layer, key_t key)
+uint8_t keymap_key_to_keycode(uint8_t layer, keypos_t key)
{
return pgm_read_byte(&keymaps[(layer)][(key.row)][(key.col)]);
}
From 4069776c022502f117b83b66c5a71700135acfbc Mon Sep 17 00:00:00 2001
From: tmk <nobody@nowhere>
Date: Wed, 25 Jun 2014 13:57:36 +0900
Subject: [PATCH 14/50] Add initial files for RN-42
---
keyboard/hhkb_rn42/Makefile | 142 ++++++++++++++
keyboard/hhkb_rn42/config.h | 67 +++++++
keyboard/hhkb_rn42/keymap_common.c | 33 ++++
keyboard/hhkb_rn42/keymap_common.h | 57 ++++++
keyboard/hhkb_rn42/keymap_hasu.c | 280 ++++++++++++++++++++++++++++
keyboard/hhkb_rn42/led.c | 33 ++++
keyboard/hhkb_rn42/main.c | 67 +++++++
keyboard/hhkb_rn42/matrix.c | 288 +++++++++++++++++++++++++++++
keyboard/hhkb_rn42/rn42.c | 37 ++++
keyboard/hhkb_rn42/rn42.h | 6 +
10 files changed, 1010 insertions(+)
create mode 100644 keyboard/hhkb_rn42/Makefile
create mode 100644 keyboard/hhkb_rn42/config.h
create mode 100644 keyboard/hhkb_rn42/keymap_common.c
create mode 100644 keyboard/hhkb_rn42/keymap_common.h
create mode 100644 keyboard/hhkb_rn42/keymap_hasu.c
create mode 100644 keyboard/hhkb_rn42/led.c
create mode 100644 keyboard/hhkb_rn42/main.c
create mode 100644 keyboard/hhkb_rn42/matrix.c
create mode 100644 keyboard/hhkb_rn42/rn42.c
create mode 100644 keyboard/hhkb_rn42/rn42.h
diff --git a/keyboard/hhkb_rn42/Makefile b/keyboard/hhkb_rn42/Makefile
new file mode 100644
index 0000000000..7b3b993b70
--- /dev/null
+++ b/keyboard/hhkb_rn42/Makefile
@@ -0,0 +1,142 @@
+#----------------------------------------------------------------------------
+# On command line:
+#
+# make all = Make software.
+#
+# make clean = Clean out built project files.
+#
+# make coff = Convert ELF to AVR COFF.
+#
+# make extcoff = Convert ELF to AVR Extended COFF.
+#
+# make program = Download the hex file to the device.
+# Please customize your programmer settings(PROGRAM_CMD)
+#
+# make teensy = Download the hex file to the device, using teensy_loader_cli.
+# (must have teensy_loader_cli installed).
+#
+# make dfu = Download the hex file to the device, using dfu-programmer (must
+# have dfu-programmer installed).
+#
+# make flip = Download the hex file to the device, using Atmel FLIP (must
+# have Atmel FLIP installed).
+#
+# make dfu-ee = Download the eeprom file to the device, using dfu-programmer
+# (must have dfu-programmer installed).
+#
+# make flip-ee = Download the eeprom file to the device, using Atmel FLIP
+# (must have Atmel FLIP installed).
+#
+# make debug = Start either simulavr or avarice as specified for debugging,
+# with avr-gdb or avr-insight as the front end for debugging.
+#
+# make filename.s = Just compile filename.c into the assembler code only.
+#
+# make filename.i = Create a preprocessed source file for use in submitting
+# bug reports to the GCC project.
+#
+# To rebuild project do "make clean" then "make all".
+#----------------------------------------------------------------------------
+
+# Target file name (without extension).
+TARGET = hhkb_lufa
+
+# Directory common source filess exist
+TOP_DIR = ../..
+
+# Directory keyboard dependent files exist
+TARGET_DIR = .
+
+
+# List C source files here. (C dependencies are automatically generated.)
+SRC += keymap_common.c \
+ matrix.c \
+ led.c \
+ main.c
+
+ifdef KEYMAP
+ SRC := keymap_$(KEYMAP).c $(SRC)
+else
+ SRC := keymap_hhkb.c $(SRC)
+endif
+
+CONFIG_H = config.h
+
+
+# MCU name
+# PJRC Teensy++ 2.0
+#MCU = at90usb1286
+# TMK Alt Controller or PJRC Teensy 2.0
+MCU = atmega32u4
+
+# Processor frequency.
+# This will define a symbol, F_CPU, in all source code files equal to the
+# processor frequency in Hz. You can then use this symbol in your source code to
+# calculate timings. Do NOT tack on a 'UL' at the end, this will be done
+# automatically to create a 32-bit value in your source code.
+#
+# This will be an integer division of F_USB below, as it is sourced by
+# F_USB after it has run through any CPU prescalers. Note that this value
+# does not *change* the processor frequency - it should merely be updated to
+# reflect the processor speed set externally so that the code can use accurate
+# software delays.
+F_CPU = 16000000
+
+
+#
+# LUFA specific
+#
+# Target architecture (see library "Board Types" documentation).
+ARCH = AVR8
+
+# Input clock frequency.
+# This will define a symbol, F_USB, in all source code files equal to the
+# input clock frequency (before any prescaling is performed) in Hz. This value may
+# differ from F_CPU if prescaling is used on the latter, and is required as the
+# raw input clock is fed directly to the PLL sections of the AVR for high speed
+# clock generation for the USB and other AVR subsections. Do NOT tack on a 'UL'
+# at the end, this will be done automatically to create a 32-bit value in your
+# source code.
+#
+# If no clock division is performed on the input clock inside the AVR (via the
+# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU.
+F_USB = $(F_CPU)
+
+# Interrupt driven control endpoint task
+#OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
+
+
+# Boot Section Size in *bytes*
+# Teensy halfKay 512
+# Teensy++ halfKay 1024
+# Atmel DFU loader 4096 (TMK Alt Controller)
+# LUFA bootloader 4096
+# USBaspLoader 2048
+OPT_DEFS += -DBOOTLOADER_SIZE=4096
+
+
+# Build Options
+# comment out to disable the options.
+#
+BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration
+MOUSEKEY_ENABLE = yes # Mouse keys
+EXTRAKEY_ENABLE = yes # Audio control and System control
+CONSOLE_ENABLE = yes # Console for debug
+COMMAND_ENABLE = yes # Commands for debug and configuration
+NKRO_ENABLE = yes # USB Nkey Rollover
+KEYMAP_SECTION_ENABLE = yes # fixed address keymap for keymap editor
+
+
+# Search Path
+VPATH += $(TARGET_DIR)
+VPATH += $(TOP_DIR)
+
+include $(TOP_DIR)/protocol/lufa.mk
+include $(TOP_DIR)/common.mk
+include $(TOP_DIR)/rules.mk
+
+debug-on: EXTRAFLAGS += -DDEBUG -DDEBUG_ACTION
+debug-on: all
+
+debug-off: EXTRAFLAGS += -DNO_DEBUG -DNO_PRINT
+debug-off: all
diff --git a/keyboard/hhkb_rn42/config.h b/keyboard/hhkb_rn42/config.h
new file mode 100644
index 0000000000..a8f76ae6b0
--- /dev/null
+++ b/keyboard/hhkb_rn42/config.h
@@ -0,0 +1,67 @@
+/*
+Copyright 2011 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/>.
+*/
+
+#ifndef CONFIG_H
+#define CONFIG_H
+
+
+#define VENDOR_ID 0xFEED
+#define PRODUCT_ID 0xCAFE
+#define DEVICE_VER 0x0104
+#define MANUFACTURER t.m.k.
+#define PRODUCT HHKB mod
+#define DESCRIPTION t.m.k. keyboard firmware for HHKB mod
+
+
+/* matrix size */
+#define MATRIX_ROWS 8
+#define MATRIX_COLS 8
+
+
+/* key combination for command */
+#define IS_COMMAND() (keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)))
+
+
+/* period of tapping(ms) */
+#define TAPPING_TERM 300
+/* tap count needed for toggling a feature */
+#define TAPPING_TOGGLE 5
+/* Oneshot timeout(ms) */
+#define ONESHOT_TIMEOUT 300
+
+/* Boot Magic salt key: Space */
+#define BOOTMAGIC_KEY_SALT KC_FN6
+
+
+/*
+ * Feature disable options
+ * These options are also useful to firmware size reduction.
+ */
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+//#define NO_ACTION_MACRO
+//#define NO_ACTION_FUNCTION
+
+#endif
diff --git a/keyboard/hhkb_rn42/keymap_common.c b/keyboard/hhkb_rn42/keymap_common.c
new file mode 100644
index 0000000000..e938fb6270
--- /dev/null
+++ b/keyboard/hhkb_rn42/keymap_common.c
@@ -0,0 +1,33 @@
+/*
+Copyright 2012,2013 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 <stdint.h>
+#include "action.h"
+#include <avr/pgmspace.h>
+#include "keymap_common.h"
+
+
+/* translates key to keycode */
+uint8_t keymap_key_to_keycode(uint8_t layer, keypos_t key)
+{
+ return pgm_read_byte(&keymaps[(layer)][(key.row)][(key.col)]);
+}
+
+/* translates Fn keycode to action */
+action_t keymap_fn_to_action(uint8_t keycode)
+{
+ return (action_t){ .code = pgm_read_word(&fn_actions[FN_INDEX(keycode)]) };
+}
diff --git a/keyboard/hhkb_rn42/keymap_common.h b/keyboard/hhkb_rn42/keymap_common.h
new file mode 100644
index 0000000000..ec922a3225
--- /dev/null
+++ b/keyboard/hhkb_rn42/keymap_common.h
@@ -0,0 +1,57 @@
+/*
+Copyright 2012,2013 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/>.
+*/
+#ifndef KEYMAP_COMMON_H
+#define KEYMAP_COMMON_H
+
+#include <stdint.h>
+#include <stdbool.h>
+#include "keycode.h"
+#include "action.h"
+#include "action_code.h"
+#include "action_layer.h"
+#include "action_macro.h"
+#include "action_util.h"
+#include "report.h"
+#include "host.h"
+#include "print.h"
+#include "debug.h"
+#include "keymap.h"
+
+
+extern const uint8_t keymaps[][MATRIX_ROWS][MATRIX_COLS];
+extern const uint16_t fn_actions[];
+
+
+#define KEYMAP( \
+ K31, K30, K00, K10, K11, K20, K21, K40, K41, K60, K61, K70, K71, K50, K51, \
+ K32, K01, K02, K13, K12, K23, K22, K42, K43, K62, K63, K73, K72, K52, \
+ K33, K04, K03, K14, K15, K24, K25, K45, K44, K65, K64, K74, K53, \
+ K34, K05, K06, K07, K16, K17, K26, K46, K66, K76, K75, K55, K54, \
+ K35, K36, K37, K57, K56 \
+) \
+{ \
+ { KC_##K00, KC_##K01, KC_##K02, KC_##K03, KC_##K04, KC_##K05, KC_##K06, KC_##K07 }, \
+ { KC_##K10, KC_##K11, KC_##K12, KC_##K13, KC_##K14, KC_##K15, KC_##K16, KC_##K17 }, \
+ { KC_##K20, KC_##K21, KC_##K22, KC_##K23, KC_##K24, KC_##K25, KC_##K26, KC_NO }, \
+ { KC_##K30, KC_##K31, KC_##K32, KC_##K33, KC_##K34, KC_##K35, KC_##K36, KC_##K37 }, \
+ { KC_##K40, KC_##K41, KC_##K42, KC_##K43, KC_##K44, KC_##K45, KC_##K46, KC_NO }, \
+ { KC_##K50, KC_##K51, KC_##K52, KC_##K53, KC_##K54, KC_##K55, KC_##K56, KC_##K57 }, \
+ { KC_##K60, KC_##K61, KC_##K62, KC_##K63, KC_##K64, KC_##K65, KC_##K66, KC_NO }, \
+ { KC_##K70, KC_##K71, KC_##K72, KC_##K73, KC_##K74, KC_##K75, KC_##K76, KC_NO } \
+}
+
+#endif
diff --git a/keyboard/hhkb_rn42/keymap_hasu.c b/keyboard/hhkb_rn42/keymap_hasu.c
new file mode 100644
index 0000000000..e3d951bea7
--- /dev/null
+++ b/keyboard/hhkb_rn42/keymap_hasu.c
@@ -0,0 +1,280 @@
+/*
+ * Hasu: my personal keymap
+ */
+#include "keymap_common.h"
+
+
+#ifdef KEYMAP_SECTION_ENABLE
+const uint8_t keymaps[][MATRIX_ROWS][MATRIX_COLS] __attribute__ ((section (".keymap.keymaps"))) = {
+#else
+const uint8_t keymaps[][MATRIX_ROWS][MATRIX_COLS] PROGMEM = {
+#endif
+ /* Layer 0: Default Layer
+ * ,-----------------------------------------------------------.
+ * |Esc| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =| \| `|
+ * |-----------------------------------------------------------|
+ * |Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]|Backs|
+ * |-----------------------------------------------------------|
+ * |Contro| A| S| D| F| G| H| J| K| L|Fn3| '|Fn6 |
+ * |-----------------------------------------------------------|
+ * |Fn7 | Z| X| C| V| B| N| M| ,| .|Fn2|Shift |Fn1|
+ * `-----------------------------------------------------------'
+ * |Gui|Alt | Fn4 |Fn5 |Gui|
+ * `-------------------------------------------'
+ */
+ [0] = \
+ KEYMAP(ESC, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, MINS,EQL, BSLS,GRV, \
+ TAB, Q, W, E, R, T, Y, U, I, O, P, LBRC,RBRC,BSPC, \
+ LCTL,A, S, D, F, G, H, J, K, L, FN3, QUOT,FN6, \
+ FN7, Z, X, C, V, B, N, M, COMM,DOT, FN2, RSFT,FN1, \
+ LGUI,LALT, FN4, FN5, RGUI),
+
+ /* Layer 1: HHKB mode[HHKB Fn]
+ * ,-----------------------------------------------------------.
+ * |Esc| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|Ins|Del|
+ * |-----------------------------------------------------------|
+ * |Caps | | | | | | | |Psc|Slk|Pus|Up | |Backs|
+ * |-----------------------------------------------------------|
+ * |Contro|VoD|VoU|Mut| | | *| /|Hom|PgU|Lef|Rig|Enter |
+ * |-----------------------------------------------------------|
+ * |Shift | | | | | | +| -|End|PgD|Dow|Shift | |
+ * `-----------------------------------------------------------'
+ * |Gui|Alt | Space |Alt |Gui|
+ * `-------------------------------------------'
+ */
+ [1] = \
+ KEYMAP(GRV, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, INS, DEL, \
+ CAPS,NO, NO, NO, NO, NO, NO, NO, PSCR,SLCK,PAUS, UP, NO, BSPC, \
+ LCTL,VOLD,VOLU,MUTE,NO, NO, PAST,PSLS,HOME,PGUP,LEFT,RGHT,ENT, \
+ LSFT,NO, NO, NO, NO, NO, PPLS,PMNS,END, PGDN,DOWN,RSFT,TRNS, \
+ LGUI,LALT, SPC, RALT,RGUI),
+
+ /* Layer 2: Vi mode[Slash]
+ * ,-----------------------------------------------------------.
+ * |Esc| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|Ins|Del|
+ * |-----------------------------------------------------------|
+ * |Tab |Hom|PgD|Up |PgU|End|Hom|PgD|PgUlEnd| | | |Backs|
+ * |-----------------------------------------------------------|
+ * |Contro| |Lef|Dow|Rig| |Lef|Dow|Up |Rig| | |Return |
+ * |-----------------------------------------------------------|
+ * |Shift | | | | | |Hom|PgD|PgUlEnd|Fn0|Shift | |
+ * `-----------------------------------------------------------'
+ * |Gui|Alt | Space |Alt |Gui|
+ * `-------------------------------------------'
+ */
+ [2] = \
+ KEYMAP(GRV, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, INS, DEL, \
+ TAB, HOME,PGDN,UP, PGUP,END, HOME,PGDN,PGUP,END, NO, NO, NO, BSPC, \
+ LCTL,NO, LEFT,DOWN,RGHT,NO, LEFT,DOWN,UP, RGHT,NO, NO, ENT, \
+ LSFT,NO, NO, NO, NO, NO, HOME,PGDN,PGUP,END, TRNS,RSFT,NO, \
+ LGUI,LALT, SPC, RALT,RGUI),
+
+ /* Layer 3: Mouse mode(IJKL)[Semicolon]
+ * ,-----------------------------------------------------------.
+ * |Esc| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|Ins|Del|
+ * |-----------------------------------------------------------|
+ * |Tab | | | | | |MwL|MwD|McU|MwU|MwR|Wbk|Wfr|Alt-T|
+ * |-----------------------------------------------------------|
+ * |Contro| | | | | |Mb2|McL|McD|McR|Fn | |Return |
+ * |-----------------------------------------------------------|
+ * |Shift | | | | |Mb3|Mb2|Mb1|Mb4|Mb5| |Shift | |
+ * `-----------------------------------------------------------'
+ * |Gui |Alt | Mb1 |Fn |Fn |
+ * `--------------------------------------------'
+ * Mc: Mouse Cursor / Mb: Mouse Button / Mw: Mouse Wheel8
+ */
+ [3] = \
+ KEYMAP(GRV, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, INS, DEL, \
+ FN8, NO, NO, NO, NO, NO, WH_L,WH_D,MS_U,WH_U,WH_R,WBAK,WFWD,FN8, \
+ LCTL,ACL0,ACL1,ACL2,ACL2,NO, NO, MS_L,MS_D,MS_R,TRNS,NO, ENT, \
+ LSFT,NO, NO, NO, NO, BTN3,BTN2,BTN1,BTN4,BTN5,NO, RSFT,NO, \
+ LGUI,LALT, BTN1, TRNS,TRNS),
+
+ /* Layer 5: Mouse mode(IJKL)[Space]
+ * ,-----------------------------------------------------------.
+ * |Esc| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|Ins|Del|
+ * |-----------------------------------------------------------|
+ * |Tab | | | | | |MwL|MwD|McU|MwU|MwR|Wbk|Wfr|Alt-T|
+ * |-----------------------------------------------------------|
+ * |Contro| | | | | |Mb2|McL|McD|McR|Mb1| |Return |
+ * |-----------------------------------------------------------|
+ * |Shift | | | | |Mb3|Mb2|Mb1|Mb4|Mb5| |Shift | |
+ * `-----------------------------------------------------------'
+ * |Gui |Alt | Mb1 |Fn |Fn |
+ * `--------------------------------------------'
+ * Mc: Mouse Cursor / Mb: Mouse Button / Mw: Mouse Wheel8
+ */
+ [4] = \
+ KEYMAP(GRV, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, INS, DEL, \
+ FN8, NO, NO, NO, NO, NO, WH_L,WH_D,MS_U,WH_U,WH_R,WBAK,WFWD,FN8, \
+ LCTL,VOLD,VOLU,MUTE,NO, NO, NO, MS_L,MS_D,MS_R,BTN1,NO, ENT, \
+ LSFT,NO, NO, NO, NO, BTN3,BTN2,BTN1,BTN4,BTN5,NO, RSFT,NO, \
+ LGUI,LALT, TRNS, TRNS,TRNS),
+
+#if 0
+ /* Layer 3: Mouse mode(HJKL)[Semicolon]
+ * ,-----------------------------------------------------------.
+ * |Esc| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|Ins|Del|
+ * |-----------------------------------------------------------|
+ * |Tab | | | | | |MwL|MwD|MwU|MwR| | | |Backs|
+ * |-----------------------------------------------------------|
+ * |Contro| | | | | |McL|McD|McU|McR|Fn0| |Return |
+ * |-----------------------------------------------------------|
+ * |Shift | | | | |Mb3|Mb2|Mb1|Mb4|Mb5| |Shift | |
+ * `-----------------------------------------------------------'
+ * |Gui |Alt | Mb1 |Alt |Fn0|
+ * `--------------------------------------------'
+ * Mc: Mouse Cursor / Mb: Mouse Button / Mw: Mouse Wheel
+ */
+ KEYMAP(GRV, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, INS, DEL, \
+ TAB, NO, NO, NO, NO, NO, WH_L,WH_D,WH_U,WH_R,NO, NO, NO, BSPC, \
+ LCTL,NO, ACL0,ACL1,ACL2,NO, MS_L,MS_D,MS_U,MS_R,TRNS,QUOT,ENT, \
+ LSFT,NO, NO, NO, NO, BTN3,BTN2,BTN1,BTN4,BTN5,SLSH,RSFT,NO, \
+ LGUI,LALT, BTN1, RALT,TRNS),
+
+ /* Layer4: Mouse mode(HJKL)[Space]
+ * ,-----------------------------------------------------------.
+ * |Esc| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|Ins|Del|
+ * |-----------------------------------------------------------|
+ * |Tab | | | | | |MwL|MwD|MwU|MwR| |Wbk|Wfr|Alt-T|
+ * |-----------------------------------------------------------|
+ * |Contro| | | | | |McL|McD|McU|McR|Fn0| |Return |
+ * |-----------------------------------------------------------|
+ * |Shift | | | | |Mb3|Mb2|Mb1|Mb4|Mb5| |Shift | |
+ * `-----------------------------------------------------------'
+ * |Gui |Alt | Fn0 |Alt |Fn0|
+ * `--------------------------------------------'
+ * Mc: Mouse Cursor / Mb: Mouse Button / Mw: Mouse Wheel
+ */
+ KEYMAP(GRV, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, INS, DEL, \
+ FN8, NO, NO, NO, NO, NO, WH_L,WH_D,WH_U,WH_R,NO, WBAK,WFWD,FN8, \
+ LCTL,NO, ACL0,ACL1,ACL2,NO, MS_L,MS_D,MS_U,MS_R,BTN1,NO, ENT, \
+ LSFT,NO, NO, NO, NO, BTN3,BTN2,BTN1,BTN4,BTN5,NO, RSFT,NO, \
+ LGUI,LALT, TRNS, RALT,RGUI),
+#endif
+#if 0
+ /* Layer x: Matias half-qwerty keyboard style[Space]
+ * ,-----------------------------------------------------------.
+ * | -| 0| 9| 8| 7| 6| 5| 4| 3| 2| 1| | | |Esc|
+ * |-----------------------------------------------------------|
+ * |Backs| P| O| I| U| Y| T| R| E| W| Q| | |Tab |
+ * |-----------------------------------------------------------|
+ * |Contro| ;| L| K| J| H| G| F| D| S| A|Con|Control |
+ * |-----------------------------------------------------------|
+ * |Shift | /| .| ,| M| N| B| V| C| X| Z|Shift | |
+ * `-----------------------------------------------------------'
+ * |Gui |Alt | Fn0 |Alt |Gui|
+ * `--------------------------------------------'
+ */
+ KEYMAP(MINS,0, 9, 8, 7, 6, 5, 4, 3, 2, 1, NO, NO, NO, ESC, \
+ BSPC,P, O, I, U, Y, T, R, E, W, Q, NO, NO, TAB, \
+ LCTL,SCLN,L, K, J, H, G, F, D, S, A, RCTL,RCTL, \
+ LSFT,SLSH,DOT, COMM,M, N, B, V, C, X, Z, RSFT,NO, \
+ LGUI,LALT, TRNS, RALT,RGUI),
+#endif
+};
+
+
+
+/* id for user defined functions */
+enum function_id {
+ LSHIFT_LPAREN,
+};
+
+enum macro_id {
+ HELLO,
+ VOLUP,
+ ALT_TAB,
+};
+
+
+/*
+ * Fn action definition
+ */
+#ifdef KEYMAP_SECTION_ENABLE
+const uint16_t fn_actions[] __attribute__ ((section (".keymap.fn_actions"))) = {
+#else
+const uint16_t fn_actions[] PROGMEM = {
+#endif
+ [0] = ACTION_DEFAULT_LAYER_SET(0), // Default layer(not used)
+ [1] = ACTION_LAYER_TAP_TOGGLE(1), // HHKB layer(toggle with 5 taps)
+ [2] = ACTION_LAYER_TAP_KEY(2, KC_SLASH), // Cursor layer with Slash*
+ [3] = ACTION_LAYER_TAP_KEY(3, KC_SCLN), // Mousekey layer with Semicolon*
+ [4] = ACTION_LAYER_TAP_KEY(4, KC_SPC), // Mousekey layer with Space
+ [5] = ACTION_LAYER_MOMENTARY(4), // Mousekey layer(IJKL)
+ [6] = ACTION_MODS_TAP_KEY(MOD_RCTL, KC_ENT), // RControl with tap Enter
+ [7] = ACTION_MODS_ONESHOT(MOD_LSFT), // Oneshot Shift
+ [8] = ACTION_MACRO(ALT_TAB), // Application switching
+
+// [x] = ACTION_LMOD_TAP_KEY(KC_LCTL, KC_BSPC), // LControl with tap Backspace
+// [x] = ACTION_LMOD_TAP_KEY(KC_LCTL, KC_ESC), // LControl with tap Esc
+// [x] = ACTION_FUNCTION_TAP(LSHIFT_LPAREN), // Function: LShift with tap '('
+// [x] = ACTION_MACRO(HELLO), // Macro: say hello
+// [x] = ACTION_MACRO(VOLUP), // Macro: media key
+};
+
+
+/*
+ * Macro definition
+ */
+const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
+{
+ switch (id) {
+ case HELLO:
+ return (record->event.pressed ?
+ MACRO( I(0), T(H), T(E), T(L), T(L), W(255), T(O), END ) :
+ MACRO_NONE );
+ case VOLUP:
+ return (record->event.pressed ?
+ MACRO( D(VOLU), U(VOLU), END ) :
+ MACRO_NONE );
+ case ALT_TAB:
+ return (record->event.pressed ?
+ MACRO( D(LALT), D(TAB), END ) :
+ MACRO( U(TAB), END ));
+ }
+ return MACRO_NONE;
+}
+
+
+
+/*
+ * user defined action function
+ */
+void action_function(keyrecord_t *record, uint8_t id, uint8_t opt)
+{
+ if (record->event.pressed) dprint("P"); else dprint("R");
+ dprintf("%d", record->tap.count);
+ if (record->tap.interrupted) dprint("i");
+ dprint("\n");
+
+ switch (id) {
+ case LSHIFT_LPAREN:
+ // Shift parentheses example: LShft + tap '('
+ // http://stevelosh.com/blog/2012/10/a-modern-space-cadet/#shift-parentheses
+ // http://geekhack.org/index.php?topic=41989.msg1304899#msg1304899
+ if (record->event.pressed) {
+ if (record->tap.count > 0 && !record->tap.interrupted) {
+ if (record->tap.interrupted) {
+ dprint("tap interrupted\n");
+ register_mods(MOD_BIT(KC_LSHIFT));
+ }
+ } else {
+ register_mods(MOD_BIT(KC_LSHIFT));
+ }
+ } else {
+ if (record->tap.count > 0 && !(record->tap.interrupted)) {
+ add_weak_mods(MOD_BIT(KC_LSHIFT));
+ send_keyboard_report();
+ register_code(KC_9);
+ unregister_code(KC_9);
+ del_weak_mods(MOD_BIT(KC_LSHIFT));
+ send_keyboard_report();
+ record->tap.count = 0; // ad hoc: cancel tap
+ } else {
+ unregister_mods(MOD_BIT(KC_LSHIFT));
+ }
+ }
+ break;
+ }
+}
diff --git a/keyboard/hhkb_rn42/led.c b/keyboard/hhkb_rn42/led.c
new file mode 100644
index 0000000000..8a08fe27fc
--- /dev/null
+++ b/keyboard/hhkb_rn42/led.c
@@ -0,0 +1,33 @@
+/*
+Copyright 2011 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"
+
+
+/* HHKB has no LEDs */
+void led_set(uint8_t usb_led)
+{
+ if (usb_led & (1<<USB_LED_CAPS_LOCK)) {
+ DDRD |= (1<<6);
+ PORTD |= (1<<6);
+ } else {
+ DDRD |= (1<<6);
+ PORTD &= ~(1<<6);
+ }
+}
diff --git a/keyboard/hhkb_rn42/main.c b/keyboard/hhkb_rn42/main.c
new file mode 100644
index 0000000000..b6a8456f7f
--- /dev/null
+++ b/keyboard/hhkb_rn42/main.c
@@ -0,0 +1,67 @@
+#include <avr/io.h>
+#include <avr/power.h>
+#include <avr/wdt.h>
+#include "lufa.h"
+#include "print.h"
+#include "sendchar.h"
+
+
+static void SetupHardware(void)
+{
+ /* Disable watchdog if enabled by bootloader/fuses */
+ MCUSR &= ~(1 << WDRF);
+ wdt_disable();
+
+ /* Disable clock division */
+ clock_prescale_set(clock_div_1);
+
+ // Leonardo needs. Without this USB device is not recognized.
+ USB_Disable();
+
+ USB_Init();
+
+ // for Console_Task
+ USB_Device_EnableSOFEvents();
+ print_set_sendchar(sendchar);
+}
+
+int main(void) __attribute__ ((weak));
+int main(void)
+{
+ SetupHardware();
+ sei();
+
+ /* wait for USB startup & debug output */
+ while (USB_DeviceState != DEVICE_STATE_Configured) {
+#if defined(INTERRUPT_CONTROL_ENDPOINT)
+ ;
+#else
+ USB_USBTask();
+#endif
+ }
+ print("USB configured.\n");
+
+ /* init modules */
+ keyboard_init();
+ host_set_driver(&lufa_driver);
+#ifdef SLEEP_LED_ENABLE
+ sleep_led_init();
+#endif
+
+ print("Keyboard start.\n");
+ while (1) {
+ while (USB_DeviceState == DEVICE_STATE_Suspended) {
+ suspend_power_down();
+ if (USB_Device_RemoteWakeupEnabled && suspend_wakeup_condition()) {
+ USB_Device_SendRemoteWakeup();
+ }
+ }
+
+ keyboard_task();
+
+#if !defined(INTERRUPT_CONTROL_ENDPOINT)
+ USB_USBTask();
+#endif
+ }
+}
+
diff --git a/keyboard/hhkb_rn42/matrix.c b/keyboard/hhkb_rn42/matrix.c
new file mode 100644
index 0000000000..d0731ef1f8
--- /dev/null
+++ b/keyboard/hhkb_rn42/matrix.c
@@ -0,0 +1,288 @@
+/*
+Copyright 2011 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/>.
+*/
+
+/*
+ * scan matrix
+ */
+#include <stdint.h>
+#include <stdbool.h>
+#include <avr/io.h>
+#include <avr/interrupt.h>
+#include <util/delay.h>
+#include "print.h"
+#include "debug.h"
+#include "util.h"
+#include "timer.h"
+#include "matrix.h"
+
+
+// Timer resolution check
+#if (1000000/TIMER_RAW_FREQ > 20)
+# error "Timer resolution(>20us) is not enough for HHKB matrix scan tweak on V-USB."
+#endif
+
+
+// matrix state buffer(1:on, 0:off)
+static matrix_row_t *matrix;
+static matrix_row_t *matrix_prev;
+static matrix_row_t _matrix0[MATRIX_ROWS];
+static matrix_row_t _matrix1[MATRIX_ROWS];
+
+
+// Matrix I/O ports
+//
+// row: HC4051[A,B,C] selects scan row0-7
+// col: LS145[A,B,C,D] selects scan col0-7 and enable(D)
+// key: on: 0/off: 1
+// prev: unknown: output previous key state(negated)?
+
+#if defined(__AVR_AT90USB1286__)
+// Ports for Teensy++
+// row: PB0-2
+// col: PB3-5,6
+// key: PE6(pull-uped)
+// prev: PE7
+#define KEY_INIT() do { \
+ DDRB |= 0x7F; \
+ DDRE |= (1<<7); \
+ DDRE &= ~(1<<6); \
+ PORTE |= (1<<6); \
+} while (0)
+#define KEY_SELECT(ROW, COL) (PORTB = (PORTB & 0xC0) | \
+ (((COL) & 0x07)<<3) | \
+ ((ROW) & 0x07))
+#define KEY_ENABLE() (PORTB &= ~(1<<6))
+#define KEY_UNABLE() (PORTB |= (1<<6))
+#define KEY_STATE() (PINE & (1<<6))
+#define KEY_PREV_ON() (PORTE |= (1<<7))
+#define KEY_PREV_OFF() (PORTE &= ~(1<<7))
+#define KEY_POWER_ON()
+#define KEY_POWER_OFF()
+
+#elif defined(__AVR_ATmega32U4__)
+// Ports for my designed Alt Controller PCB
+// row: PB0-2
+// col: PB3-5,6
+// key: PD7(pull-uped)
+// prev: PB7
+// power: PD4(L:off/H:on)
+#define KEY_INIT() do { \
+ DDRB = 0xFF; \
+ PORTB = 0x00; \
+ DDRD &= ~0x80; \
+ PORTD |= 0x80; \
+ /* keyswitch board power on */ \
+ DDRD |= (1<<4); \
+ PORTD |= (1<<4); \
+ KEY_UNABLE(); \
+ KEY_PREV_OFF(); \
+} while (0)
+#define KEY_SELECT(ROW, COL) (PORTB = (PORTB & 0xC0) | \
+ (((COL) & 0x07)<<3) | \
+ ((ROW) & 0x07))
+#define KEY_ENABLE() (PORTB &= ~(1<<6))
+#define KEY_UNABLE() (PORTB |= (1<<6))
+#define KEY_STATE() (PIND & (1<<7))
+#define KEY_PREV_ON() (PORTB |= (1<<7))
+#define KEY_PREV_OFF() (PORTB &= ~(1<<7))
+#define KEY_POWER_ON()
+#define KEY_POWER_OFF()
+/*
+#define KEY_POWER_ON() do { \
+ KEY_INIT(); \
+ PORTD |= (1<<4); \
+ _delay_ms(1); \
+} while (0)
+#define KEY_POWER_OFF() do { \
+ PORTD &= ~(1<<4); \
+ DDRB &= ~0xFF; \
+ PORTB &= ~0xFF; \
+ DDRB &= ~0x80; \
+ PORTB &= ~0x80; \
+} while (0)
+*/
+
+
+#elif defined(__AVR_ATmega328P__)
+// Ports for V-USB
+// key: PB0(pull-uped)
+// prev: PB1
+// row: PB2-4
+// col: PC0-2,3
+// power: PB5(Low:on/Hi-z:off)
+#define KEY_INIT() do { \
+ DDRB |= 0x3E; \
+ DDRB &= ~(1<<0); \
+ PORTB |= 1<<0; \
+ DDRC |= 0x0F; \
+ KEY_UNABLE(); \
+ KEY_PREV_OFF(); \
+} while (0)
+#define KEY_SELECT(ROW, COL) do { \
+ PORTB = (PORTB & 0xE3) | ((ROW) & 0x07)<<2; \
+ PORTC = (PORTC & 0xF8) | ((COL) & 0x07); \
+} while (0)
+#define KEY_ENABLE() (PORTC &= ~(1<<3))
+#define KEY_UNABLE() (PORTC |= (1<<3))
+#define KEY_STATE() (PINB & (1<<0))
+#define KEY_PREV_ON() (PORTB |= (1<<1))
+#define KEY_PREV_OFF() (PORTB &= ~(1<<1))
+// Power supply switching
+#define KEY_POWER_ON() do { \
+ KEY_INIT(); \
+ PORTB &= ~(1<<5); \
+ _delay_ms(1); \
+} while (0)
+#define KEY_POWER_OFF() do { \
+ DDRB &= ~0x3F; \
+ PORTB &= ~0x3F; \
+ DDRC &= ~0x0F; \
+ PORTC &= ~0x0F; \
+} while (0)
+
+#else
+# error "define code for matrix scan"
+#endif
+
+
+inline
+uint8_t matrix_rows(void)
+{
+ return MATRIX_ROWS;
+}
+
+inline
+uint8_t matrix_cols(void)
+{
+ return MATRIX_COLS;
+}
+
+void matrix_init(void)
+{
+#ifdef DEBUG
+ debug_enable = true;
+ debug_keyboard = true;
+#endif
+
+ KEY_INIT();
+
+ // initialize matrix state: all keys off
+ for (uint8_t i=0; i < MATRIX_ROWS; i++) _matrix0[i] = 0x00;
+ for (uint8_t i=0; i < MATRIX_ROWS; i++) _matrix1[i] = 0x00;
+ matrix = _matrix0;
+ matrix_prev = _matrix1;
+}
+
+uint8_t matrix_scan(void)
+{
+ uint8_t *tmp;
+
+ tmp = matrix_prev;
+ matrix_prev = matrix;
+ matrix = tmp;
+
+ KEY_POWER_ON();
+ for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
+ for (uint8_t col = 0; col < MATRIX_COLS; col++) {
+ KEY_SELECT(row, col);
+ _delay_us(40);
+
+ // Not sure this is needed. This just emulates HHKB controller's behaviour.
+ if (matrix_prev[row] & (1<<col)) {
+ KEY_PREV_ON();
+ }
+ _delay_us(7);
+
+ // NOTE: KEY_STATE is valid only in 20us after KEY_ENABLE.
+ // If V-USB interrupts in this section we could lose 40us or so
+ // and would read invalid value from KEY_STATE.
+ uint8_t last = TIMER_RAW;
+
+ KEY_ENABLE();
+
+ // Wait for KEY_STATE outputs its value.
+ // 1us was ok on one HHKB, but not worked on another.
+ // no wait doesn't work on Teensy++ with pro(1us works)
+ // no wait does work on tmk PCB(8MHz) with pro2
+ // 1us wait does work on both of above
+ // 1us wait doesn't work on tmk(16MHz)
+ // 5us wait does work on tmk(16MHz)
+ // 5us wait does work on tmk(16MHz/2)
+ // 5us wait does work on tmk(8MHz)
+ // 10us wait does work on Teensy++ with pro
+ // 10us wait does work on 328p+iwrap with pro
+ // 10us wait doesn't work on tmk PCB(8MHz) with pro2(very lagged scan)
+ _delay_us(5);
+
+ if (KEY_STATE()) {
+ matrix[row] &= ~(1<<col);
+ } else {
+ matrix[row] |= (1<<col);
+ }
+
+ // Ignore if this code region execution time elapses more than 20us.
+ // MEMO: 20[us] * (TIMER_RAW_FREQ / 1000000)[count per us]
+ // MEMO: then change above using this rule: a/(b/c) = a*1/(b/c) = a*(c/b)
+ if (TIMER_DIFF_RAW(TIMER_RAW, last) > 20/(1000000/TIMER_RAW_FREQ)) {
+ matrix[row] = matrix_prev[row];
+ }
+
+ KEY_PREV_OFF();
+ KEY_UNABLE();
+ // NOTE: KEY_STATE keep its state in 20us after KEY_ENABLE.
+ // This takes 25us or more to make sure KEY_STATE returns to idle state.
+ _delay_us(150);
+ }
+ }
+ KEY_POWER_OFF();
+ return 1;
+}
+
+bool matrix_is_modified(void)
+{
+ for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
+ if (matrix[i] != matrix_prev[i])
+ return true;
+ }
+ return false;
+}
+
+inline
+bool matrix_has_ghost(void)
+{
+ return false;
+}
+
+inline
+bool matrix_is_on(uint8_t row, uint8_t col)
+{
+ return (matrix[row] & (1<<col));
+}
+
+inline
+matrix_row_t matrix_get_row(uint8_t row)
+{
+ return matrix[row];
+}
+
+void matrix_print(void)
+{
+ print("\nr/c 01234567\n");
+ for (uint8_t row = 0; row < matrix_rows(); row++) {
+ xprintf("%02X: %08b\n", row, bitrev(matrix_get_row(row)));
+ }
+}
diff --git a/keyboard/hhkb_rn42/rn42.c b/keyboard/hhkb_rn42/rn42.c
new file mode 100644
index 0000000000..bbf05a392a
--- /dev/null
+++ b/keyboard/hhkb_rn42/rn42.c
@@ -0,0 +1,37 @@
+#include "host.h"
+#include "host_driver.h"
+#include "rn42.h"
+
+
+/* Host driver */
+static uint8_t keyboard_leds(void);
+static void send_keyboard(report_keyboard_t *report);
+static void send_mouse(report_mouse_t *report);
+static void send_system(uint16_t data);
+static void send_consumer(uint16_t data);
+
+host_driver_t rn42_driver = {
+ keyboard_leds,
+ send_keyboard,
+ send_mouse,
+ send_system,
+ send_consumer
+};
+
+static uint8_t keyboard_leds(void) { return 0; }
+
+static void send_keyboard(report_keyboard_t *report)
+{
+}
+
+static void send_mouse(report_mouse_t *report)
+{
+}
+
+static void send_system(uint16_t data)
+{
+}
+
+static void send_consumer(uint16_t data)
+{
+}
diff --git a/keyboard/hhkb_rn42/rn42.h b/keyboard/hhkb_rn42/rn42.h
new file mode 100644
index 0000000000..57ae17ba17
--- /dev/null
+++ b/keyboard/hhkb_rn42/rn42.h
@@ -0,0 +1,6 @@
+#ifndef RN42_H
+#define RN42_H
+
+host_driver_t rn42_driver;
+
+#endif
From 47bc3016d36cbfd83904fff5947acb6436dd37c3 Mon Sep 17 00:00:00 2001
From: tmk <nobody@nowhere>
Date: Tue, 1 Jul 2014 04:02:10 +0900
Subject: [PATCH 15/50] Ad hoc fix of command API
---
common/command.c | 28 +++++++++++++++++++---------
common/command.h | 10 ++++++++--
2 files changed, 27 insertions(+), 11 deletions(-)
diff --git a/common/command.c b/common/command.c
index 2c65f0da78..971ef7f0af 100644
--- a/common/command.c
+++ b/common/command.c
@@ -63,19 +63,22 @@ static uint8_t numkey2num(uint8_t code);
static void switch_default_layer(uint8_t layer);
-typedef enum { ONESHOT, CONSOLE, MOUSEKEY } cmdstate_t;
-static cmdstate_t state = ONESHOT;
+command_state_t command_state = ONESHOT;
bool command_proc(uint8_t code)
{
- switch (state) {
+ switch (command_state) {
case ONESHOT:
if (!IS_COMMAND())
return false;
return (command_extra(code) || command_common(code));
+ break;
case CONSOLE:
- command_console(code);
+ if (IS_COMMAND())
+ return (command_extra(code) || command_common(code));
+ else
+ return (command_console_extra(code) || command_console(code));
break;
#ifdef MOUSEKEY_ENABLE
case MOUSEKEY:
@@ -83,12 +86,13 @@ bool command_proc(uint8_t code)
break;
#endif
default:
- state = ONESHOT;
+ command_state = ONESHOT;
return false;
}
return true;
}
+/* TODO: Refactoring is needed. */
/* This allows to define extra commands. return false when not processed. */
bool command_extra(uint8_t code) __attribute__ ((weak));
bool command_extra(uint8_t code)
@@ -96,6 +100,12 @@ bool command_extra(uint8_t code)
return false;
}
+bool command_console_extra(uint8_t code) __attribute__ ((weak));
+bool command_console_extra(uint8_t code)
+{
+ return false;
+}
+
/***********************************************************
* Command common
@@ -203,7 +213,7 @@ static bool command_common(uint8_t code)
command_console_help();
print("\nEnter Console Mode\n");
print("C> ");
- state = CONSOLE;
+ command_state = CONSOLE;
break;
case KC_PAUSE:
clear_keyboard();
@@ -388,14 +398,14 @@ static bool command_console(uint8_t code)
case KC_Q:
case KC_ESC:
print("\nQuit Console Mode\n");
- state = ONESHOT;
+ command_state = ONESHOT;
return false;
#ifdef MOUSEKEY_ENABLE
case KC_M:
mousekey_console_help();
print("\nEnter Mousekey Console\n");
print("M0>");
- state = MOUSEKEY;
+ command_state = MOUSEKEY;
return true;
#endif
default:
@@ -555,7 +565,7 @@ static bool mousekey_console(uint8_t code)
mousekey_param = 0;
print("\nQuit Mousekey Console\n");
print("C> ");
- state = CONSOLE;
+ command_state = CONSOLE;
return false;
case KC_P:
mousekey_param_print();
diff --git a/common/command.h b/common/command.h
index be739fafe8..b57a6c1ced 100644
--- a/common/command.h
+++ b/common/command.h
@@ -18,10 +18,16 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#ifndef COMMAND_H
#define COMMAND
+/* TODO: Refactoring */
+typedef enum { ONESHOT, CONSOLE, MOUSEKEY } command_state_t;
+extern command_state_t command_state;
+
+/* This allows to extend commands. Return false when command is not processed. */
+bool command_extra(uint8_t code);
+bool command_console_extra(uint8_t code);
+
#ifdef COMMAND_ENABLE
bool command_proc(uint8_t code);
-/* This allows to extend commands. Return 0 when command is not processed. */
-bool command_extra(uint8_t code);
#else
#define command_proc(code) false
#endif
From be19b2bf324cbbca53cbd4a7588311041a7353a6 Mon Sep 17 00:00:00 2001
From: tmk <nobody@nowhere>
Date: Tue, 1 Jul 2014 04:29:07 +0900
Subject: [PATCH 16/50] Change buffer size: 256 bytes
---
protocol/serial_uart.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/protocol/serial_uart.c b/protocol/serial_uart.c
index 6c0af88175..600340cd8e 100644
--- a/protocol/serial_uart.c
+++ b/protocol/serial_uart.c
@@ -47,7 +47,7 @@ void serial_init(void)
}
// RX ring buffer
-#define RBUF_SIZE 8
+#define RBUF_SIZE 256
static uint8_t rbuf[RBUF_SIZE];
static uint8_t rbuf_head = 0;
static uint8_t rbuf_tail = 0;
From 31a298f9d9bc78f504d662e1590ec333c1f37735 Mon Sep 17 00:00:00 2001
From: tmk <nobody@nowhere>
Date: Tue, 1 Jul 2014 04:29:45 +0900
Subject: [PATCH 17/50] Add RN-42 Bluetooth module support
---
keyboard/hhkb_rn42/MEMO.txt | 294 ++++++++++++++++++++++++++++++++++++
keyboard/hhkb_rn42/Makefile | 9 +-
keyboard/hhkb_rn42/config.h | 29 ++++
keyboard/hhkb_rn42/main.c | 232 +++++++++++++++++++++++++++-
keyboard/hhkb_rn42/rn42.c | 129 ++++++++++++++++
keyboard/hhkb_rn42/rn42.h | 9 ++
6 files changed, 696 insertions(+), 6 deletions(-)
create mode 100644 keyboard/hhkb_rn42/MEMO.txt
diff --git a/keyboard/hhkb_rn42/MEMO.txt b/keyboard/hhkb_rn42/MEMO.txt
new file mode 100644
index 0000000000..cc5683488a
--- /dev/null
+++ b/keyboard/hhkb_rn42/MEMO.txt
@@ -0,0 +1,294 @@
+Roving RN-42
+============
+
+
+TODO
+----
+- USB connection check
+- BT on/off check: whether RX line is pulled up?
+- CTS/RTS lines are needed? just connect in loop back if no flow control is needed.
+- CTS is needed for waking up from deep sleep?
+- USB/BT switching BT is on -> BT, BT is off -> USB
+
+- Low voltage lock out LVLO of DC converter for protection of Lipo
+- Lipo charger configuration: fast charge time
+- Low voltage alarm: LED indcates voltage of Lipo
+
+- Power saving: HHKB scan, BT radio control
+
+- Serial API callback when data are available/received(and when send buffer is available)
+- Serial API instance several serial ports can be used
+
+
+
+Configuration
+-------------
+Ver 6.15 04/26/2013
+(c) Roving Networks
+***Settings***
+BTA=0006664B3AE3
+BTName=tmkBT-3AE3
+Baudrt(SW4)=115K
+Mode =Pair
+Authen=2
+Bonded=1
+Rem=001BDC06415B
+***ADVANCED Settings***
+SrvName= keyboard/mouse
+SrvClass=0000
+DevClass=05C0
+InqWindw=0100
+PagWindw=0100
+CfgTimer=255
+StatuStr=NULL
+HidFlags=3f
+DTRtimer=8
+KeySwapr=0
+***OTHER Settings***
+Profile= HID
+CfgChar= $
+SniffEna=0
+LowPower=0
+TX Power=4
+IOPorts= 0
+IOValues=0
+Sleeptmr=0
+DebugMod=0
+RoleSwch=0
+
+Ver 6.15 04/26/2013
+(c) Roving Networks
+***Settings***
+BTA=0006664B3AE3
+BTName=tmkBT-3AE3
+Baudrt(SW4)=115K
+Mode =DTR
+Authen=2
+Bonded=0
+Rem=BCF5AC9BCB7E
+***ADVANCED Settings***
+SrvName= keyboard/mouse
+SrvClass=0000
+DevClass=0000
+InqWindw=0100
+PagWindw=0100
+CfgTimer=255
+StatuStr=NULL
+HidFlags=3f
+DTRtimer=8
+KeySwapr=0
+***OTHER Settings***
+Profile= HID
+CfgChar= $
+SniffEna=0
+LowPower=0
+TX Power=ffe8
+IOPorts= 0
+IOValues=0
+Sleeptmr=0
+DebugMod=0
+RoleSwch=0
+
+
+command mode
+------------
+To enter command mode disconnect the module from host and type '$$$'.(you will see 'CMD')
+To exit type '---'.(you will see 'END')
+
+Serial line: 115200bps, 8bit, 1-stopbit, non-parity, no flow control
+SSP: 115200bps, 8bit, 1-stopbit, non-parity, no flow control(via Bluetooth)
+
+
+S-,tmkBT // Device name
+SH,0038 // HID register
+SC,0000 // COD: 000005C0 (see HID spec/Bluegiga doc)
+SD,05C0 // bit 12-8 7 6 5-0
+ // 00101 1 1 0
+ // peripheral pointing keybaord joystick, gamepad, ...
+S~,6 // HID profile
+SS,keyboard/mouse // service name
+SM,6 // Pairing mode: auto connect
+SM,4 // Master mode: Connection can be controled with GPIO6
+
+SY,FEE8 // lower power -20dbM
+
+
+
+HID profile
+-----------
+S~,6 HID profile
+S~,0 SPP profile
+R,1 reboot
+
+
+Apple iOS
+---------
+Cannot supported without apple iAP authentication chip.
+
+
+HID flag register
+-----------------
+SH,0200
+GH
+
+10 0000 0000(0200) default
+00 0011 1000(0038) Combo
+|| | | |\_\____ number of paired devices to which the module can reconnect
+|| | | \_______ send out reports over UART (0xFF <len> <data>)
+|| \__\_________ descriptor type
+|\______________ toggle virtual keyboard on iOS when first connected
+\_______________ Force HID mode if GPIO11 is high on power-up
+
+ Descriptor type:
+ 0000: keybaord
+ 0001: Game Pad
+ 0010: Mouse
+ 0011: Combo
+ 0100: Joystick
+ 1xxx: reserved
+
+Out report - Indicator
+----------------------
+0xFE 0x02 0x01 <LED_state>
+
+
+LED Status
+----------
+Configuring 10 times per sec
+Startup/configuration timer 2 times per sec
+Discoverable/Inquiring/Idle once per sec
+Connected solid on
+
+
+Pairing
+-------
+First, host initiates pairing process and once it is done, auto connect will work thereafter.
+SM,3 Master mode
+SM,4 Auto Connect DTR Mode uses GPIO6 to make and break connection(Mode =DTR)
+ confirm: auto connect works and control connection with GPIO6
+SM,5 Auto Connect ANY Mode (Mode =ANY)
+ each time GPIO is set, make inquiry and connect to the first found device
+SM,6 automatically reconnect(Mode =Pair)
+ confirm: auto connect works well but difficult to enter command mode.
+
+
+Fast data mode
+--------------
+The module enters fast data mode after 'remote configuration timer' window is passed from power on.
+In this mode the module does not accept '$$$' to enter command mode.
+
+Power Management
+----------------
+Inquiry and Page window Idle or Active (3.1.1)
+ Downside: delay in discovery or connection time
+ SI, // set inquiry scan window(discovery) on/off duty?
+ SJ, // set page scan window(connection)
+ This reduces averaege power >20mA to 5mA(3mA in Sniff mode)
+
+Sniff mode Transmit
+ Sniff mode is disabled by default and radio is active continuously when connected.(25-30mA)
+ In Sniff mode the radio wakes up intermittently and sleeps in very low power mode.(2mA)
+ SW,<val> // set interval timer(*0.625ms) 0000-7FFF
+
+Deep sleep Idle (3.1.2)
+ In this mode the module shuts down completly and only draws about 300uA. To enable this set the most signifant bit(0x8000) of Sniff interaval timer.
+ SW,8320 // deep sleep enable(interval=0x320*0.625ms)
+ In normal sleep the firmware is still running in idle mode, and wakes up about 20 times per second to check ports, update LEDs, etc. During deep sleep, the firmware actually stops runnig some tasks and the LEDs only update about once per second.
+ To wake from deep sleep there are three ways: (in worst case wake up takes 5ms)
+ *send a charactor to the UART(first charactor will be lost)
+ *toggle CTS low to high and wait 5ms
+ *wake automatically every slot time(<val>*0.625ms)
+ Once the radio is awake it stay active for exactly 1 second of inactivity and then sleeps again.
+ Downside: latency and data loss
+
+Disable Output driver Idle or Active (3.1.3)
+ S%,1000 // set all GPIO pins(0-11) to inputs.
+
+Lower Transmit Power Idle or Active (3.1.4)
+ SY,<hex> // transmit power setting(takes effect after a power cycle and reboot)
+ Downside: reducing effective range
+
+
+Optimizig for Latency
+---------------------
+By default the firmware is optimized for throughput.
+SQ,16 // set latency bit
+SQ,0 // unset latency bit
+
+
+Configuration timer settings
+----------------------------
+Remote configuration is used for the module to be configured with various commands over Bluetooth(SPP profile only?).
+
+The module has remote configuration timer to allow remote configuration over Bluetooth after power up in Slave mode. In Master modes the remote configuration timer is set to 0(no remote configuration). (In Trigger Master mode the timer is used as an idle timer to break the connection after time expires with no charactors receive.)
+ ST,0 // no remote, no local when connected
+ ST,<1-252> // local and remote with timeout in seconds from power up
+ ST,253 // local only without timeout
+ ST,254 // remote only without timeout
+ ST,255 // local and remote without timeout
+
+
+Android
+-------
+3.7.1.5 Note: To connect with Android phone the modules must wake up 11ms every 2.5seconds.
+
+
+Commands
+--------
+SC,
+SM,<val>
+SD,
+SP,<string> Pin code(alpahnumeric)
+SQ,<mask> Special configuration(GPIO, discovery mode, low latency, reboot, UART)
+SR,<hex> Store remote address
+SR,Z Erase all address
+SS,<string> Set service name(1-20)**
+ST,<val> Remote configuration timer(Master:0, Slave:0-255, Triger:as idle timer)
+SU,<val> UART baud rate
+SW,<val> low-power sniff mode** deep sleep and wake up every 625us * <val>
+SX,<0|1> bonding enable only acceps device that matches the stored address
+SY,<hex> power setting**
+SZ,<val> non-standard raw baud rate <val>=baud*0.004096
+S~,<val> Profile 0:SPP, 5:APL, 6:HID
+S-,<string> Device name -15 alphanumeric charactors
+S?,<0|1> role switch enable
+S$,<char> command mode char
+$|,<hex> low-power connect mode deep sleep/active(discoverable and connectable) cycle
+D display basic setting
+E display extended setting
+GB display the device's Bluetooth address
+GF display Bluetooth address of connected device
+GK show connection status
+GR show remote address for reconnecting
+G& show GPIO pin
+G<char> show stored setting
++ toggle local echo on/off
+& show GPIO 3,4,6,7(DIP switch)
+C connect to stored remote address
+C,<address> connect last address
+CFI connect and go into fast data mode
+CFR connect and go into fast data mode
+CT,<address>,<val> connect to the address and disconnect after val?
+F,1 fast data mod:
+H display help
+I,<time>,<cod> inquiry scan with <cod>
+IN
+IQ scan
+IS inquiry scan with 001F00
+J hide pin code
+K, kill disconnects current connection
+L link quality
+M show modem signlal status
+O display other settings
+P,<car> pass through?
+Q quiet mode make the module not discoverable
+Q,0 discoverable and connectable
+Q,1 not discoverable and not connectable
+Q,2 not discoverable and connectable
+Q,? display current quiet mode
+R,1 reboot
+T,<0|1> pass received data while in command mode
+U,<baud>,<parity> change UART setting tentatively
+V display firmware version
+W wake from quiet mode enable discovery and connection
+Z deep sleep mode(<2mA)
diff --git a/keyboard/hhkb_rn42/Makefile b/keyboard/hhkb_rn42/Makefile
index 7b3b993b70..8cfe3f1184 100644
--- a/keyboard/hhkb_rn42/Makefile
+++ b/keyboard/hhkb_rn42/Makefile
@@ -52,12 +52,14 @@ TARGET_DIR = .
SRC += keymap_common.c \
matrix.c \
led.c \
+ serial_uart.c \
+ rn42.c \
main.c
ifdef KEYMAP
SRC := keymap_$(KEYMAP).c $(SRC)
else
- SRC := keymap_hhkb.c $(SRC)
+ SRC := keymap_hasu.c $(SRC)
endif
CONFIG_H = config.h
@@ -123,14 +125,15 @@ MOUSEKEY_ENABLE = yes # Mouse keys
EXTRAKEY_ENABLE = yes # Audio control and System control
CONSOLE_ENABLE = yes # Console for debug
COMMAND_ENABLE = yes # Commands for debug and configuration
-NKRO_ENABLE = yes # USB Nkey Rollover
-KEYMAP_SECTION_ENABLE = yes # fixed address keymap for keymap editor
+#NKRO_ENABLE = yes # USB Nkey Rollover
+#KEYMAP_SECTION_ENABLE = yes # fixed address keymap for keymap editor
# Search Path
VPATH += $(TARGET_DIR)
VPATH += $(TOP_DIR)
+include $(TOP_DIR)/protocol.mk
include $(TOP_DIR)/protocol/lufa.mk
include $(TOP_DIR)/common.mk
include $(TOP_DIR)/rules.mk
diff --git a/keyboard/hhkb_rn42/config.h b/keyboard/hhkb_rn42/config.h
index a8f76ae6b0..a0ab878eb8 100644
--- a/keyboard/hhkb_rn42/config.h
+++ b/keyboard/hhkb_rn42/config.h
@@ -47,6 +47,35 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define BOOTMAGIC_KEY_SALT KC_FN6
+/*
+ * Hardware Serial(UART)
+ * Baud rate are calculated with round off(+0.5).
+ */
+#ifdef __AVR_ATmega32U4__
+ /* iom32u4.h has no definition of UCSR1D. copy from iom32u2.h */
+ #define UCSR1D _SFR_MEM8(0xCB)
+ #define RTSEN 0
+ #define CTSEN 1
+
+ #define SERIAL_UART_BAUD 115200
+ #define SERIAL_UART_DATA UDR1
+ #define SERIAL_UART_UBRR ((F_CPU/(16.0*SERIAL_UART_BAUD)-1+0.5))
+ #define SERIAL_UART_RXD_VECT USART1_RX_vect
+ #define SERIAL_UART_TXD_READY (UCSR1A&(1<<UDRE1))
+ #define SERIAL_UART_INIT() do { \
+ UBRR1L = (uint8_t) SERIAL_UART_UBRR; /* baud rate */ \
+ UBRR1H = ((uint16_t)SERIAL_UART_UBRR>>8); /* baud rate */ \
+ UCSR1B |= (1<<RXCIE1) | (1<<RXEN1); /* RX interrupt, RX: enable */ \
+ UCSR1B |= (0<<TXCIE1) | (1<<TXEN1); /* TX interrupt, TX: enable */ \
+ UCSR1C |= (0<<UPM11) | (0<<UPM10); /* parity: none(00), even(01), odd(11) */ \
+ UCSR1D |= (0<<RTSEN) | (0<<CTSEN); /* RTS, CTS */ \
+ sei(); \
+ } while(0)
+#else
+ #error "USART configuration is needed."
+#endif
+
+
/*
* Feature disable options
* These options are also useful to firmware size reduction.
diff --git a/keyboard/hhkb_rn42/main.c b/keyboard/hhkb_rn42/main.c
index b6a8456f7f..b0097dfe0d 100644
--- a/keyboard/hhkb_rn42/main.c
+++ b/keyboard/hhkb_rn42/main.c
@@ -4,8 +4,18 @@
#include "lufa.h"
#include "print.h"
#include "sendchar.h"
+#include "rn42.h"
+#include "serial.h"
+#include "keyboard.h"
+#include "command.h"
+#include "keycode.h"
+#include "action.h"
+#include "action_util.h"
+#include "wait.h"
+bool config_mode = false;
+
static void SetupHardware(void)
{
/* Disable watchdog if enabled by bootloader/fuses */
@@ -25,14 +35,17 @@ static void SetupHardware(void)
print_set_sendchar(sendchar);
}
+static bool force_usb = false;
int main(void) __attribute__ ((weak));
int main(void)
{
SetupHardware();
sei();
- /* wait for USB startup & debug output */
- while (USB_DeviceState != DEVICE_STATE_Configured) {
+ /* wait for USB startup to get ready for debug output */
+ uint8_t timeout = 255; // timeout when USB is not available(Bluetooth)
+ while (timeout-- && USB_DeviceState != DEVICE_STATE_Configured) {
+ wait_ms(4);
#if defined(INTERRUPT_CONTROL_ENDPOINT)
;
#else
@@ -41,27 +54,240 @@ int main(void)
}
print("USB configured.\n");
+ rn42_init();
+ print("RN-42 init\n");
+
/* init modules */
keyboard_init();
- host_set_driver(&lufa_driver);
+
+ if (rn42_ready()) {
+ host_set_driver(&rn42_driver);
+ } else {
+ host_set_driver(&lufa_driver);
+ }
+
#ifdef SLEEP_LED_ENABLE
sleep_led_init();
#endif
print("Keyboard start.\n");
while (1) {
+/*
while (USB_DeviceState == DEVICE_STATE_Suspended) {
suspend_power_down();
if (USB_Device_RemoteWakeupEnabled && suspend_wakeup_condition()) {
USB_Device_SendRemoteWakeup();
}
}
+*/
keyboard_task();
#if !defined(INTERRUPT_CONTROL_ENDPOINT)
USB_USBTask();
#endif
+
+ int16_t c;
+ if (config_mode) {
+ while ((c = serial_recv2()) != -1) xprintf("%c", c);
+ } else {
+ while ((c = serial_recv2()) != -1) {
+ // LED Out report: 0xFE, 0x02, 0x01, <leds>
+ // To get the report over UART set bit3 with SH, command.
+ static enum {LED_INIT, LED_FE, LED_02, LED_01} state = LED_INIT;
+ xprintf("%X\n", c);
+ switch (state) {
+ case LED_INIT:
+ if (c == 0xFE) state = LED_FE;
+ else state = LED_INIT;
+ break;
+ case LED_FE:
+ if (c == 0x02) state = LED_02;
+ else state = LED_INIT;
+ break;
+ case LED_02:
+ if (c == 0x01) state = LED_01;
+ else state = LED_INIT;
+ break;
+ case LED_01:
+ // TODO: move to rn42.c and make accessible with keyboard_leds()
+ xprintf("LED status: %X\n", c);
+ state = LED_INIT;
+ break;
+ default:
+ state = LED_INIT;
+ }
+ }
+ }
+
+ /* Bluetooth mode when ready */
+ if (!force_usb) {
+ if (rn42_ready() && host_get_driver() != &rn42_driver) {
+ clear_keyboard();
+ host_set_driver(&rn42_driver);
+ } else if (!rn42_ready() && host_get_driver() != &lufa_driver) {
+ clear_keyboard();
+ host_set_driver(&lufa_driver);
+ }
+ }
}
}
+static bool local_echo = false;
+bool command_extra(uint8_t code)
+{
+ static host_driver_t *prev_driver = &rn42_driver;
+ switch (code) {
+ case KC_H:
+ case KC_SLASH: /* ? */
+ print("\n\n----- Bluetooth RN-42 Help -----\n");
+ print("w: toggle RN-42 config mode(enter/exit)\n");
+ print("l: toggle print module output(local echo)\n");
+ print("a: Bluetooth auto connect\n");
+ print("del: Bluetooth disconnect\n");
+ print("i: info\n");
+
+ if (config_mode) {
+ return true;
+ } else {
+ print("u: force USB mode\n");
+ return false; // to display default command help
+ }
+ case KC_W:
+ if (!config_mode) {
+ print("\nEnter RN-42 config mode\n");
+ print("type $$$ to enter RN-42 command mode\n");
+ print("type Delete to disconnect Bluetooth connection\n");
+ command_state = CONSOLE;
+ config_mode = true;
+ prev_driver = host_get_driver();
+ clear_keyboard();
+ host_set_driver(&rn42_config_driver);
+ } else {
+ print("\nExit RN-42 config mode\n");
+ command_state = ONESHOT;
+ config_mode = false;
+ clear_keyboard();
+ host_set_driver(prev_driver);
+ }
+ return true;
+ case KC_L:
+ if (local_echo) {
+ print("local echo off\n");
+ local_echo = false;
+ } else {
+ print("local echo on\n");
+ local_echo = true;
+ }
+ return true;
+ case KC_U:
+ if (config_mode) return false;
+ if (force_usb) {
+ print("Auto mode\n");
+ force_usb = false;
+ } else {
+ print("USB mode\n");
+ force_usb = true;
+ clear_keyboard();
+ host_set_driver(&lufa_driver);
+ }
+ return true;
+ case KC_A:
+ print("auto connect\n");
+ rn42_autoconnect();
+ return true;
+ case KC_DELETE:
+ print("disconnect\n");
+ rn42_disconnect();
+ //rn42_putc('\0'); // see 5.3.4.4 DISCONNECT KEY of User's Guide
+ return true;
+ case KC_I:
+ print("\nRN-42 info\n");
+ xprintf("protocol: %s\n", (host_get_driver() == &rn42_driver) ? "RN-42" : "LUFA");
+ xprintf("force_usb: %X\n", force_usb);
+ xprintf("rn42_ready(): %X\n", rn42_ready());
+ xprintf("config_mode: %X\n", config_mode);
+ return true;
+ default:
+ if (config_mode)
+ return true;
+ else
+ return false; // exec default command
+ }
+ return true;
+}
+
+static uint8_t code2asc(uint8_t code);
+bool command_console_extra(uint8_t code)
+{
+ switch (code) {
+ default:
+ rn42_putc(code2asc(code));
+ if (local_echo) xprintf("%c", code2asc(code));
+ return true;
+ }
+ return false;
+}
+
+// convert keycode into ascii charactor
+static uint8_t code2asc(uint8_t code)
+{
+ bool shifted = (get_mods() & (MOD_BIT(KC_LSHIFT)|MOD_BIT(KC_RSHIFT))) ? true : false;
+ switch (code) {
+ case KC_A: return (shifted ? 'A' : 'a');
+ case KC_B: return (shifted ? 'B' : 'b');
+ case KC_C: return (shifted ? 'C' : 'c');
+ case KC_D: return (shifted ? 'D' : 'd');
+ case KC_E: return (shifted ? 'E' : 'e');
+ case KC_F: return (shifted ? 'F' : 'f');
+ case KC_G: return (shifted ? 'G' : 'g');
+ case KC_H: return (shifted ? 'H' : 'h');
+ case KC_I: return (shifted ? 'I' : 'i');
+ case KC_J: return (shifted ? 'J' : 'j');
+ case KC_K: return (shifted ? 'K' : 'k');
+ case KC_L: return (shifted ? 'L' : 'l');
+ case KC_M: return (shifted ? 'M' : 'm');
+ case KC_N: return (shifted ? 'N' : 'n');
+ case KC_O: return (shifted ? 'O' : 'o');
+ case KC_P: return (shifted ? 'P' : 'p');
+ case KC_Q: return (shifted ? 'Q' : 'q');
+ case KC_R: return (shifted ? 'R' : 'r');
+ case KC_S: return (shifted ? 'S' : 's');
+ case KC_T: return (shifted ? 'T' : 't');
+ case KC_U: return (shifted ? 'U' : 'u');
+ case KC_V: return (shifted ? 'V' : 'v');
+ case KC_W: return (shifted ? 'W' : 'w');
+ case KC_X: return (shifted ? 'X' : 'x');
+ case KC_Y: return (shifted ? 'Y' : 'y');
+ case KC_Z: return (shifted ? 'Z' : 'z');
+ case KC_1: return (shifted ? '!' : '1');
+ case KC_2: return (shifted ? '@' : '2');
+ case KC_3: return (shifted ? '#' : '3');
+ case KC_4: return (shifted ? '$' : '4');
+ case KC_5: return (shifted ? '%' : '5');
+ case KC_6: return (shifted ? '^' : '6');
+ case KC_7: return (shifted ? '&' : '7');
+ case KC_8: return (shifted ? '*' : '8');
+ case KC_9: return (shifted ? '(' : '9');
+ case KC_0: return (shifted ? ')' : '0');
+ case KC_ENTER: return '\n';
+ case KC_ESCAPE: return 0x1B;
+ case KC_BSPACE: return '\b';
+ case KC_TAB: return '\t';
+ case KC_SPACE: return ' ';
+ case KC_MINUS: return (shifted ? '_' : '-');
+ case KC_EQUAL: return (shifted ? '+' : '=');
+ case KC_LBRACKET: return (shifted ? '{' : '[');
+ case KC_RBRACKET: return (shifted ? '}' : ']');
+ case KC_BSLASH: return (shifted ? '|' : '\\');
+ case KC_NONUS_HASH: return (shifted ? '|' : '\\');
+ case KC_SCOLON: return (shifted ? ':' : ';');
+ case KC_QUOTE: return (shifted ? '"' : '\'');
+ case KC_GRAVE: return (shifted ? '~' : '`');
+ case KC_COMMA: return (shifted ? '<' : ',');
+ case KC_DOT: return (shifted ? '>' : '.');
+ case KC_SLASH: return (shifted ? '?' : '/');
+ case KC_DELETE: return '\0'; // Delete to disconnect
+ default: return ' ';
+ }
+}
diff --git a/keyboard/hhkb_rn42/rn42.c b/keyboard/hhkb_rn42/rn42.c
index bbf05a392a..dceea72ca0 100644
--- a/keyboard/hhkb_rn42/rn42.c
+++ b/keyboard/hhkb_rn42/rn42.c
@@ -1,6 +1,9 @@
#include "host.h"
#include "host_driver.h"
+#include "serial.h"
#include "rn42.h"
+#include "print.h"
+#include "wait.h"
/* Host driver */
@@ -18,20 +21,146 @@ host_driver_t rn42_driver = {
send_consumer
};
+
+void rn42_init(void)
+{
+ // PF1: check RTS(active low)
+ DDRF &= ~(1<<1);
+ PORTF &= ~(1<<1);
+
+ // PF7: BT connection control(HiZ: connect, low: disconnect)
+ // JTAG disable for PORT F. write JTD bit twice within four cycles.
+ MCUCR |= (1<<JTD);
+ MCUCR |= (1<<JTD);
+ rn42_autoconnect();
+
+ // PD5: CTS (low: allow to send, high:not allowed)
+ DDRD |= (1<<5);
+ PORTD &= ~(1<<5);
+
+ serial_init();
+}
+
+void rn42_putc(uint8_t c)
+{
+ serial_send(c);
+}
+
+void rn42_autoconnect(void)
+{
+ DDRF &= ~(1<<7);
+ PORTF &= ~(1<<7);
+}
+
+void rn42_disconnect(void)
+{
+ DDRF |= (1<<7);
+ PORTF &= ~(1<<7);
+}
+
+bool rn42_ready(void)
+{
+ // RTS low
+ return PINF&(1<<1) ? false : true;
+}
+
+
static uint8_t keyboard_leds(void) { return 0; }
static void send_keyboard(report_keyboard_t *report)
{
+ // wake from deep sleep
+ PORTD |= (1<<5); // high
+ wait_ms(5);
+ PORTD &= ~(1<<5); // low
+
+ serial_send(0xFD); // Raw report mode
+ serial_send(9); // length
+ serial_send(1); // descriptor type
+ serial_send(report->mods);
+ serial_send(0x00);
+ serial_send(report->keys[0]);
+ serial_send(report->keys[1]);
+ serial_send(report->keys[2]);
+ serial_send(report->keys[3]);
+ serial_send(report->keys[4]);
+ serial_send(report->keys[5]);
}
static void send_mouse(report_mouse_t *report)
{
+ // wake from deep sleep
+ PORTD |= (1<<5); // high
+ wait_ms(5);
+ PORTD &= ~(1<<5); // low
+
+ serial_send(0xFD); // Raw report mode
+ serial_send(5); // length
+ serial_send(2); // descriptor type
+ serial_send(report->buttons);
+ serial_send(report->x);
+ serial_send(report->y);
+ serial_send(report->v);
}
static void send_system(uint16_t data)
{
+ // Table 5-6 of RN-BT-DATA-UB
+ // 81,82,83 scan codes can be used?
+}
+
+
+static uint16_t usage2bits(uint16_t usage)
+{
+ switch (usage) {
+ case AC_HOME: return 0x01;
+ case AL_EMAIL: return 0x02;
+ case AC_SEARCH: return 0x04;
+ //case AL_KBD_LAYOUT: return 0x08; // Apple virtual keybaord toggle
+ case AUDIO_VOL_UP: return 0x10;
+ case AUDIO_VOL_DOWN: return 0x20;
+ case AUDIO_MUTE: return 0x40;
+ case TRANSPORT_PLAY_PAUSE: return 0x80;
+ case TRANSPORT_NEXT_TRACK: return 0x100;
+ case TRANSPORT_PREV_TRACK: return 0x200;
+ case TRANSPORT_STOP: return 0x400;
+ case TRANSPORT_STOP_EJECT: return 0x800;
+ //case return 0x1000; // Fast forward
+ //case return 0x2000; // Rewind
+ //case return 0x4000; // Stop/eject
+ //case return 0x8000; // Internet browser
+ };
+ return 0;
}
static void send_consumer(uint16_t data)
{
+ uint16_t bits = usage2bits(data);
+ serial_send(0xFD); // Raw report mode
+ serial_send(3); // length
+ serial_send(3); // descriptor type
+ serial_send((bits>>8)&0xFF);
+ serial_send(bits&0xFF);
}
+
+
+/* Null driver for config_mode */
+static uint8_t config_keyboard_leds(void);
+static void config_send_keyboard(report_keyboard_t *report);
+static void config_send_mouse(report_mouse_t *report);
+static void config_send_system(uint16_t data);
+static void config_send_consumer(uint16_t data);
+
+host_driver_t rn42_config_driver = {
+ config_keyboard_leds,
+ config_send_keyboard,
+ config_send_mouse,
+ config_send_system,
+ config_send_consumer
+};
+
+static uint8_t config_keyboard_leds(void) { return 0; }
+static void config_send_keyboard(report_keyboard_t *report) {}
+static void config_send_mouse(report_mouse_t *report) {}
+static void config_send_system(uint16_t data) {}
+static void config_send_consumer(uint16_t data) {}
diff --git a/keyboard/hhkb_rn42/rn42.h b/keyboard/hhkb_rn42/rn42.h
index 57ae17ba17..3e4c2fbe7d 100644
--- a/keyboard/hhkb_rn42/rn42.h
+++ b/keyboard/hhkb_rn42/rn42.h
@@ -1,6 +1,15 @@
#ifndef RN42_H
#define RN42_H
+#include <stdbool.h>
+
host_driver_t rn42_driver;
+host_driver_t rn42_config_driver;
+
+void rn42_init(void);
+void rn42_putc(uint8_t c);
+void rn42_autoconnect(void);
+void rn42_disconnect(void);
+bool rn42_ready(void);
#endif
From cd861043772a2e3d44edb6438d0bdab621a7828c Mon Sep 17 00:00:00 2001
From: tmk <nobody@nowhere>
Date: Tue, 1 Jul 2014 10:16:19 +0900
Subject: [PATCH 18/50] Fix consumer key bug
---
keyboard/hhkb_rn42/rn42.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/keyboard/hhkb_rn42/rn42.c b/keyboard/hhkb_rn42/rn42.c
index dceea72ca0..c25e193719 100644
--- a/keyboard/hhkb_rn42/rn42.c
+++ b/keyboard/hhkb_rn42/rn42.c
@@ -139,8 +139,8 @@ static void send_consumer(uint16_t data)
serial_send(0xFD); // Raw report mode
serial_send(3); // length
serial_send(3); // descriptor type
- serial_send((bits>>8)&0xFF);
serial_send(bits&0xFF);
+ serial_send((bits>>8)&0xFF);
}
From faf9adb315484b47f2bc4cedb099d5becca0cdde Mon Sep 17 00:00:00 2001
From: tmk <nobody@nowhere>
Date: Tue, 1 Jul 2014 10:16:55 +0900
Subject: [PATCH 19/50] Change keymap for rn42
- rn42 doesn't support mouse button 4 and 5
- rn42 deosn't support browser back and forward
---
keyboard/hhkb_rn42/keymap_hasu.c | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
diff --git a/keyboard/hhkb_rn42/keymap_hasu.c b/keyboard/hhkb_rn42/keymap_hasu.c
index e3d951bea7..7b93789082 100644
--- a/keyboard/hhkb_rn42/keymap_hasu.c
+++ b/keyboard/hhkb_rn42/keymap_hasu.c
@@ -85,9 +85,9 @@ const uint8_t keymaps[][MATRIX_ROWS][MATRIX_COLS] PROGMEM = {
*/
[3] = \
KEYMAP(GRV, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, INS, DEL, \
- FN8, NO, NO, NO, NO, NO, WH_L,WH_D,MS_U,WH_U,WH_R,WBAK,WFWD,FN8, \
+ FN8, NO, NO, NO, NO, NO, LEFT,WH_D,MS_U,WH_U,RGHT,FN9, FN10,FN8, \
LCTL,ACL0,ACL1,ACL2,ACL2,NO, NO, MS_L,MS_D,MS_R,TRNS,NO, ENT, \
- LSFT,NO, NO, NO, NO, BTN3,BTN2,BTN1,BTN4,BTN5,NO, RSFT,NO, \
+ LSFT,NO, NO, NO, NO, BTN3,BTN2,BTN1,FN9, FN10,NO, RSFT,NO, \
LGUI,LALT, BTN1, TRNS,TRNS),
/* Layer 5: Mouse mode(IJKL)[Space]
@@ -106,9 +106,9 @@ const uint8_t keymaps[][MATRIX_ROWS][MATRIX_COLS] PROGMEM = {
*/
[4] = \
KEYMAP(GRV, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, INS, DEL, \
- FN8, NO, NO, NO, NO, NO, WH_L,WH_D,MS_U,WH_U,WH_R,WBAK,WFWD,FN8, \
+ FN8, NO, NO, NO, NO, NO, LEFT,WH_D,MS_U,WH_U,RGHT,FN9, FN10,FN8, \
LCTL,VOLD,VOLU,MUTE,NO, NO, NO, MS_L,MS_D,MS_R,BTN1,NO, ENT, \
- LSFT,NO, NO, NO, NO, BTN3,BTN2,BTN1,BTN4,BTN5,NO, RSFT,NO, \
+ LSFT,NO, NO, NO, NO, BTN3,BTN2,BTN1,FN9, FN10,NO, RSFT,NO, \
LGUI,LALT, TRNS, TRNS,TRNS),
#if 0
@@ -127,9 +127,9 @@ const uint8_t keymaps[][MATRIX_ROWS][MATRIX_COLS] PROGMEM = {
* Mc: Mouse Cursor / Mb: Mouse Button / Mw: Mouse Wheel
*/
KEYMAP(GRV, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, INS, DEL, \
- TAB, NO, NO, NO, NO, NO, WH_L,WH_D,WH_U,WH_R,NO, NO, NO, BSPC, \
+ TAB, NO, NO, NO, NO, NO, LEFT,WH_D,WH_U,RGHT,NO, NO, NO, BSPC, \
LCTL,NO, ACL0,ACL1,ACL2,NO, MS_L,MS_D,MS_U,MS_R,TRNS,QUOT,ENT, \
- LSFT,NO, NO, NO, NO, BTN3,BTN2,BTN1,BTN4,BTN5,SLSH,RSFT,NO, \
+ LSFT,NO, NO, NO, NO, BTN3,BTN2,BTN1,FN9, FN10,SLSH,RSFT,NO, \
LGUI,LALT, BTN1, RALT,TRNS),
/* Layer4: Mouse mode(HJKL)[Space]
@@ -147,9 +147,9 @@ const uint8_t keymaps[][MATRIX_ROWS][MATRIX_COLS] PROGMEM = {
* Mc: Mouse Cursor / Mb: Mouse Button / Mw: Mouse Wheel
*/
KEYMAP(GRV, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, INS, DEL, \
- FN8, NO, NO, NO, NO, NO, WH_L,WH_D,WH_U,WH_R,NO, WBAK,WFWD,FN8, \
+ FN8, NO, NO, NO, NO, NO, LEFT,WH_D,WH_U,RGHT,NO, FN9, FN10,FN8, \
LCTL,NO, ACL0,ACL1,ACL2,NO, MS_L,MS_D,MS_U,MS_R,BTN1,NO, ENT, \
- LSFT,NO, NO, NO, NO, BTN3,BTN2,BTN1,BTN4,BTN5,NO, RSFT,NO, \
+ LSFT,NO, NO, NO, NO, BTN3,BTN2,BTN1,FN9, FN10,NO, RSFT,NO, \
LGUI,LALT, TRNS, RALT,RGUI),
#endif
#if 0
@@ -205,6 +205,8 @@ const uint16_t fn_actions[] PROGMEM = {
[6] = ACTION_MODS_TAP_KEY(MOD_RCTL, KC_ENT), // RControl with tap Enter
[7] = ACTION_MODS_ONESHOT(MOD_LSFT), // Oneshot Shift
[8] = ACTION_MACRO(ALT_TAB), // Application switching
+ [9] = ACTION_MODS_KEY(MOD_LALT, KC_LEFT),
+ [10] = ACTION_MODS_KEY(MOD_LALT, KC_RIGHT),
// [x] = ACTION_LMOD_TAP_KEY(KC_LCTL, KC_BSPC), // LControl with tap Backspace
// [x] = ACTION_LMOD_TAP_KEY(KC_LCTL, KC_ESC), // LControl with tap Esc
From 6cec158d1a8abeb7e08117e61a0ff673eb57c2b9 Mon Sep 17 00:00:00 2001
From: tmk <nobody@nowhere>
Date: Tue, 1 Jul 2014 10:19:14 +0900
Subject: [PATCH 20/50] Update TODO
---
keyboard/hhkb_rn42/MEMO.txt | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/keyboard/hhkb_rn42/MEMO.txt b/keyboard/hhkb_rn42/MEMO.txt
index cc5683488a..87907e95f5 100644
--- a/keyboard/hhkb_rn42/MEMO.txt
+++ b/keyboard/hhkb_rn42/MEMO.txt
@@ -4,21 +4,21 @@ Roving RN-42
TODO
----
-- USB connection check
-- BT on/off check: whether RX line is pulled up?
-- CTS/RTS lines are needed? just connect in loop back if no flow control is needed.
-- CTS is needed for waking up from deep sleep?
-- USB/BT switching BT is on -> BT, BT is off -> USB
-
-- Low voltage lock out LVLO of DC converter for protection of Lipo
- Lipo charger configuration: fast charge time
- Low voltage alarm: LED indcates voltage of Lipo
-
-- Power saving: HHKB scan, BT radio control
-
+- CTS/RTS lines are needed? just connect in loop back if no flow control is needed.
+- CTS is needed for waking up from deep sleep?
- Serial API callback when data are available/received(and when send buffer is available)
- Serial API instance several serial ports can be used
+DONE:
+- USB connection check - 07.01
+- BT on/off check: whether RX line is pulled up? - checking RTS 07.01
+- USB/BT switching BT is on -> BT, BT is off -> USB - 07.01
+- Under voltage lock out UVLO for protection of Lipo - Lipo has discharge protection at 3.100V 07.01
+- Power saving: HHKB scan, BT radio control - 9h with 850mAh, this is enough 07.01
+
+
Configuration
From 1619d68cb289529d7e200747e9c9f5c7dd6a6506 Mon Sep 17 00:00:00 2001
From: tmk <nobody@nowhere>
Date: Mon, 7 Jul 2014 11:02:13 +0900
Subject: [PATCH 21/50] Update MEMO.txt
---
keyboard/hhkb_rn42/MEMO.txt | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/keyboard/hhkb_rn42/MEMO.txt b/keyboard/hhkb_rn42/MEMO.txt
index 87907e95f5..5b64398402 100644
--- a/keyboard/hhkb_rn42/MEMO.txt
+++ b/keyboard/hhkb_rn42/MEMO.txt
@@ -4,12 +4,16 @@ Roving RN-42
TODO
----
-- Lipo charger configuration: fast charge time
+- Lipo voltage ADC sensing
+- Lipo charger configuration: fast charge time: USB charger spec?
- Low voltage alarm: LED indcates voltage of Lipo
- CTS/RTS lines are needed? just connect in loop back if no flow control is needed.
- CTS is needed for waking up from deep sleep?
- Serial API callback when data are available/received(and when send buffer is available)
- Serial API instance several serial ports can be used
+- DCDC converter: squeaky inducter with onsemi NCP1402
+- Lipo charger MCP73831: needs capacitor 4.7uF *2
+- Keymap layer bug: during space is pressed(mousekey) press Fn(HHKB) then release space before Fn, in result HHKB layer is locked(toggled) unintentionally.
DONE:
- USB connection check - 07.01
@@ -17,6 +21,7 @@ DONE:
- USB/BT switching BT is on -> BT, BT is off -> USB - 07.01
- Under voltage lock out UVLO for protection of Lipo - Lipo has discharge protection at 3.100V 07.01
- Power saving: HHKB scan, BT radio control - 9h with 850mAh, this is enough 07.01
+- Power selector doesn't work; Q4 MOSFET leaks from Lipo to USB power line. -- use Schottky instead 07/04
From 01fa462e2c26c8dcd2db205faf3a3835b509ac95 Mon Sep 17 00:00:00 2001
From: tmk <nobody@nowhere>
Date: Mon, 7 Jul 2014 11:03:01 +0900
Subject: [PATCH 22/50] Fix configure mode of RN-42
---
keyboard/hhkb_rn42/main.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/keyboard/hhkb_rn42/main.c b/keyboard/hhkb_rn42/main.c
index b0097dfe0d..a2c217a2d3 100644
--- a/keyboard/hhkb_rn42/main.c
+++ b/keyboard/hhkb_rn42/main.c
@@ -121,7 +121,7 @@ int main(void)
}
/* Bluetooth mode when ready */
- if (!force_usb) {
+ if (!config_mode && !force_usb) {
if (rn42_ready() && host_get_driver() != &rn42_driver) {
clear_keyboard();
host_set_driver(&rn42_driver);
From 862f519e241b83113566eebde71841958b2d00b7 Mon Sep 17 00:00:00 2001
From: tmk <nobody@nowhere>
Date: Mon, 14 Jul 2014 15:20:10 +0900
Subject: [PATCH 23/50] Add software UART and battery monitor
---
keyboard/hhkb_rn42/Makefile | 1 +
keyboard/hhkb_rn42/config.h | 7 ++
keyboard/hhkb_rn42/main.c | 49 ++++++++++-
keyboard/hhkb_rn42/rn42.c | 4 +
keyboard/hhkb_rn42/rn42.h | 5 ++
keyboard/hhkb_rn42/suart.S | 156 ++++++++++++++++++++++++++++++++++++
keyboard/hhkb_rn42/suart.h | 8 ++
7 files changed, 227 insertions(+), 3 deletions(-)
create mode 100644 keyboard/hhkb_rn42/suart.S
create mode 100644 keyboard/hhkb_rn42/suart.h
diff --git a/keyboard/hhkb_rn42/Makefile b/keyboard/hhkb_rn42/Makefile
index 8cfe3f1184..9e1acfa442 100644
--- a/keyboard/hhkb_rn42/Makefile
+++ b/keyboard/hhkb_rn42/Makefile
@@ -53,6 +53,7 @@ SRC += keymap_common.c \
matrix.c \
led.c \
serial_uart.c \
+ suart.S \
rn42.c \
main.c
diff --git a/keyboard/hhkb_rn42/config.h b/keyboard/hhkb_rn42/config.h
index a0ab878eb8..5e6d7a6436 100644
--- a/keyboard/hhkb_rn42/config.h
+++ b/keyboard/hhkb_rn42/config.h
@@ -76,6 +76,13 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#endif
+/* for debug */
+#define SUART_OUT_PORT PORTD
+#define SUART_OUT_BIT 0
+#define SUART_IN_PIN PIND
+#define SUART_IN_BIT 1
+
+
/*
* Feature disable options
* These options are also useful to firmware size reduction.
diff --git a/keyboard/hhkb_rn42/main.c b/keyboard/hhkb_rn42/main.c
index a2c217a2d3..0b455193fb 100644
--- a/keyboard/hhkb_rn42/main.c
+++ b/keyboard/hhkb_rn42/main.c
@@ -12,10 +12,16 @@
#include "action.h"
#include "action_util.h"
#include "wait.h"
-
+#include "suart.h"
bool config_mode = false;
+static int8_t sendchar_func(uint8_t c)
+{
+ sendchar(c); // LUFA
+ xmit(c); // SUART
+}
+
static void SetupHardware(void)
{
/* Disable watchdog if enabled by bootloader/fuses */
@@ -32,7 +38,16 @@ static void SetupHardware(void)
// for Console_Task
USB_Device_EnableSOFEvents();
- print_set_sendchar(sendchar);
+ print_set_sendchar(sendchar_func);
+
+ // SUART PD0:output, PD1:input
+ DDRD |= (1<<0);
+ PORTD |= (1<<0);
+ DDRD &= ~(1<<1);
+ PORTD |= (1<<1);
+
+ // CTS control
+ CTS_INIT();
}
static bool force_usb = false;
@@ -70,6 +85,12 @@ int main(void)
sleep_led_init();
#endif
+ // ADC for battery
+ //ADMUX = (1<<REFS0); // Ref:AVCC, Input:ADC0(PF0)
+ ADMUX = (1<<REFS1) | (1<<REFS0); // Ref:AVCC, Input:ADC0(PF0)
+ ADCSRA = (1<<ADPS2) | (1<<ADPS1) | (1<<ADPS0); // Prescale:128
+ ADCSRA |= (1<<ADEN); // enable ADC
+
print("Keyboard start.\n");
while (1) {
/*
@@ -89,7 +110,12 @@ int main(void)
int16_t c;
if (config_mode) {
- while ((c = serial_recv2()) != -1) xprintf("%c", c);
+ while ((c = serial_recv2()) != -1) {
+ // without flow control it'll fail to receive data when flooded
+ CTS_HI();
+ xprintf("%c", c);
+ CTS_LO();
+ }
} else {
while ((c = serial_recv2()) != -1) {
// LED Out report: 0xFE, 0x02, 0x01, <leds>
@@ -146,6 +172,7 @@ bool command_extra(uint8_t code)
print("a: Bluetooth auto connect\n");
print("del: Bluetooth disconnect\n");
print("i: info\n");
+ print("b: battery voltage\n");
if (config_mode) {
return true;
@@ -208,6 +235,22 @@ bool command_extra(uint8_t code)
xprintf("rn42_ready(): %X\n", rn42_ready());
xprintf("config_mode: %X\n", config_mode);
return true;
+ case KC_B:
+ // battery monitor
+ ADCSRA |= (1<<ADEN) | (1<<ADSC);
+ while (ADCSRA & (1<<ADSC)) ;
+ uint16_t bat = ADCL;
+ bat = ADCH<<8 | bat;
+ xprintf("BAT: %04X\n", bat);
+
+ ADCSRA |= (1<<ADEN) | (1<<ADSC);
+ while (ADCSRA & (1<<ADSC)) ;
+ bat = ADCL;
+ bat = ADCH<<8 | bat;
+ xprintf("BAT: %04X\n", bat);
+
+ ADCSRA &= ~(1<<ADEN);
+ return true;
default:
if (config_mode)
return true;
diff --git a/keyboard/hhkb_rn42/rn42.c b/keyboard/hhkb_rn42/rn42.c
index c25e193719..89ecb199ca 100644
--- a/keyboard/hhkb_rn42/rn42.c
+++ b/keyboard/hhkb_rn42/rn42.c
@@ -70,9 +70,11 @@ static uint8_t keyboard_leds(void) { return 0; }
static void send_keyboard(report_keyboard_t *report)
{
// wake from deep sleep
+/*
PORTD |= (1<<5); // high
wait_ms(5);
PORTD &= ~(1<<5); // low
+*/
serial_send(0xFD); // Raw report mode
serial_send(9); // length
@@ -90,9 +92,11 @@ static void send_keyboard(report_keyboard_t *report)
static void send_mouse(report_mouse_t *report)
{
// wake from deep sleep
+/*
PORTD |= (1<<5); // high
wait_ms(5);
PORTD &= ~(1<<5); // low
+*/
serial_send(0xFD); // Raw report mode
serial_send(5); // length
diff --git a/keyboard/hhkb_rn42/rn42.h b/keyboard/hhkb_rn42/rn42.h
index 3e4c2fbe7d..a967a70d8a 100644
--- a/keyboard/hhkb_rn42/rn42.h
+++ b/keyboard/hhkb_rn42/rn42.h
@@ -3,6 +3,11 @@
#include <stdbool.h>
+// RN-42 CTS pin
+#define CTS_INIT() (DDRD |= (1<<5))
+#define CTS_HI() (PORTD |= (1<<5))
+#define CTS_LO() (PORTD &= ~(1<<5))
+
host_driver_t rn42_driver;
host_driver_t rn42_config_driver;
diff --git a/keyboard/hhkb_rn42/suart.S b/keyboard/hhkb_rn42/suart.S
new file mode 100644
index 0000000000..9fa5452928
--- /dev/null
+++ b/keyboard/hhkb_rn42/suart.S
@@ -0,0 +1,156 @@
+;---------------------------------------------------------------------------;
+; Software implemented UART module ;
+; (C)ChaN, 2005 (http://elm-chan.org/) ;
+;---------------------------------------------------------------------------;
+; Bit rate settings:
+;
+; 1MHz 2MHz 4MHz 6MHz 8MHz 10MHz 12MHz 16MHz 20MHz
+; 2.4kbps 138 - - - - - - - -
+; 4.8kbps 68 138 - - - - - - -
+; 9.6kbps 33 68 138 208 - - - - -
+; 19.2kbps - 33 68 102 138 173 208 - -
+; 38.4kbps - - 33 50 68 85 102 138 172
+; 57.6kbps - - 21 33 44 56 68 91 114
+; 115.2kbps - - - - 21 27 33 44 56
+
+.nolist
+#include <avr/io.h>
+.list
+
+#define BPS 44 /* Bit delay. (see above table) */
+#define BIDIR 0 /* 0:Separated Tx/Rx, 1:Shared Tx/Rx */
+
+#define OUT_1 sbi _SFR_IO_ADDR(SUART_OUT_PORT), SUART_OUT_BIT /* Output 1 */
+#define OUT_0 cbi _SFR_IO_ADDR(SUART_OUT_PORT), SUART_OUT_BIT /* Output 0 */
+#define SKIP_IN_1 sbis _SFR_IO_ADDR(SUART_IN_PIN), SUART_IN_BIT /* Skip if 1 */
+#define SKIP_IN_0 sbic _SFR_IO_ADDR(SUART_IN_PIN), SUART_IN_BIT /* Skip if 0 */
+
+
+
+#ifdef SPM_PAGESIZE
+.macro _LPMI reg
+ lpm \reg, Z+
+.endm
+.macro _MOVW dh,dl, sh,sl
+ movw \dl, \sl
+.endm
+#else
+.macro _LPMI reg
+ lpm
+ mov \reg, r0
+ adiw ZL, 1
+.endm
+.macro _MOVW dh,dl, sh,sl
+ mov \dl, \sl
+ mov \dh, \sh
+.endm
+#endif
+
+
+
+;---------------------------------------------------------------------------;
+; Transmit a byte in serial format of N81
+;
+;Prototype: void xmit (uint8_t data);
+;Size: 16 words
+
+.global xmit
+.func xmit
+xmit:
+#if BIDIR
+ ldi r23, BPS-1 ;Pre-idle time for bidirectional data line
+5: dec r23 ;
+ brne 5b ;/
+#endif
+ in r0, _SFR_IO_ADDR(SREG) ;Save flags
+
+ com r24 ;C = start bit
+ ldi r25, 10 ;Bit counter
+ cli ;Start critical section
+
+1: ldi r23, BPS-1 ;----- Bit transferring loop
+2: dec r23 ;Wait for a bit time
+ brne 2b ;/
+ brcs 3f ;MISO = bit to be sent
+ OUT_1 ;
+3: brcc 4f ;
+ OUT_0 ;/
+4: lsr r24 ;Get next bit into C
+ dec r25 ;All bits sent?
+ brne 1b ; no, coutinue
+
+ out _SFR_IO_ADDR(SREG), r0 ;End of critical section
+ ret
+.endfunc
+
+
+
+;---------------------------------------------------------------------------;
+; Receive a byte
+;
+;Prototype: uint8_t rcvr (void);
+;Size: 19 words
+
+.global rcvr
+.func rcvr
+rcvr:
+ in r0, _SFR_IO_ADDR(SREG) ;Save flags
+
+ ldi r24, 0x80 ;Receiving shift reg
+ cli ;Start critical section
+
+1: SKIP_IN_1 ;Wait for idle
+ rjmp 1b
+2: SKIP_IN_0 ;Wait for start bit
+ rjmp 2b
+ ldi r25, BPS/2 ;Wait for half bit time
+3: dec r25
+ brne 3b
+
+4: ldi r25, BPS ;----- Bit receiving loop
+5: dec r25 ;Wait for a bit time
+ brne 5b ;/
+ lsr r24 ;Next bit
+ SKIP_IN_0 ;Get a data bit into r24.7
+ ori r24, 0x80
+ brcc 4b ;All bits received? no, continue
+
+ out _SFR_IO_ADDR(SREG), r0 ;End of critical section
+ ret
+.endfunc
+
+
+; Not wait for start bit. This should be called after detecting start bit.
+.global recv
+.func recv
+recv:
+ in r0, _SFR_IO_ADDR(SREG) ;Save flags
+
+ ldi r24, 0x80 ;Receiving shift reg
+ cli ;Start critical section
+
+;1: SKIP_IN_1 ;Wait for idle
+; rjmp 1b
+;2: SKIP_IN_0 ;Wait for start bit
+; rjmp 2b
+ ldi r25, BPS/2 ;Wait for half bit time
+3: dec r25
+ brne 3b
+
+4: ldi r25, BPS ;----- Bit receiving loop
+5: dec r25 ;Wait for a bit time
+ brne 5b ;/
+ lsr r24 ;Next bit
+ SKIP_IN_0 ;Get a data bit into r24.7
+ ori r24, 0x80
+ brcc 4b ;All bits received? no, continue
+
+ ldi r25, BPS/2 ;Wait for half bit time
+6: dec r25
+ brne 6b
+7: SKIP_IN_1 ;Wait for stop bit
+ rjmp 7b
+
+ out _SFR_IO_ADDR(SREG), r0 ;End of critical section
+ ret
+.endfunc
diff --git a/keyboard/hhkb_rn42/suart.h b/keyboard/hhkb_rn42/suart.h
new file mode 100644
index 0000000000..72725b998f
--- /dev/null
+++ b/keyboard/hhkb_rn42/suart.h
@@ -0,0 +1,8 @@
+#ifndef SUART
+#define SUART
+
+void xmit(uint8_t);
+uint8_t rcvr(void);
+uint8_t recv(void);
+
+#endif /* SUART */
From fa545c87f74833856761572ef631d20accc1d026 Mon Sep 17 00:00:00 2001
From: tmk <nobody@nowhere>
Date: Thu, 17 Jul 2014 13:06:48 +0900
Subject: [PATCH 24/50] Fix rn42.h API
---
keyboard/hhkb_rn42/main.c | 68 ++++++++++++++-------------------------
keyboard/hhkb_rn42/rn42.c | 41 +++++++++++++++++------
keyboard/hhkb_rn42/rn42.h | 10 +++---
3 files changed, 60 insertions(+), 59 deletions(-)
diff --git a/keyboard/hhkb_rn42/main.c b/keyboard/hhkb_rn42/main.c
index 0b455193fb..edab699784 100644
--- a/keyboard/hhkb_rn42/main.c
+++ b/keyboard/hhkb_rn42/main.c
@@ -45,9 +45,6 @@ static void SetupHardware(void)
PORTD |= (1<<0);
DDRD &= ~(1<<1);
PORTD |= (1<<1);
-
- // CTS control
- CTS_INIT();
}
static bool force_usb = false;
@@ -75,7 +72,7 @@ int main(void)
/* init modules */
keyboard_init();
- if (rn42_ready()) {
+ if (!rn42_rts()) {
host_set_driver(&rn42_driver);
} else {
host_set_driver(&lufa_driver);
@@ -112,9 +109,9 @@ int main(void)
if (config_mode) {
while ((c = serial_recv2()) != -1) {
// without flow control it'll fail to receive data when flooded
- CTS_HI();
+ rn42_cts_hi();
xprintf("%c", c);
- CTS_LO();
+ rn42_cts_lo();
}
} else {
while ((c = serial_recv2()) != -1) {
@@ -148,10 +145,10 @@ int main(void)
/* Bluetooth mode when ready */
if (!config_mode && !force_usb) {
- if (rn42_ready() && host_get_driver() != &rn42_driver) {
+ if (!rn42_rts() && host_get_driver() != &rn42_driver) {
clear_keyboard();
host_set_driver(&rn42_driver);
- } else if (!rn42_ready() && host_get_driver() != &lufa_driver) {
+ } else if (rn42_rts() && host_get_driver() != &lufa_driver) {
clear_keyboard();
host_set_driver(&lufa_driver);
}
@@ -159,7 +156,10 @@ int main(void)
}
}
-static bool local_echo = false;
+
+/******************************************************************************
+ * Command
+ ******************************************************************************/
bool command_extra(uint8_t code)
{
static host_driver_t *prev_driver = &rn42_driver;
@@ -167,46 +167,37 @@ bool command_extra(uint8_t code)
case KC_H:
case KC_SLASH: /* ? */
print("\n\n----- Bluetooth RN-42 Help -----\n");
- print("w: toggle RN-42 config mode(enter/exit)\n");
- print("l: toggle print module output(local echo)\n");
- print("a: Bluetooth auto connect\n");
- print("del: Bluetooth disconnect\n");
- print("i: info\n");
+ print("Del: auto_connect/disconnect(enter/exit config mode)\n");
+ print("i: RN-42 info\n");
print("b: battery voltage\n");
if (config_mode) {
return true;
} else {
- print("u: force USB mode\n");
+ print("u: Force USB mode\n");
return false; // to display default command help
}
- case KC_W:
- if (!config_mode) {
- print("\nEnter RN-42 config mode\n");
- print("type $$$ to enter RN-42 command mode\n");
- print("type Delete to disconnect Bluetooth connection\n");
+ case KC_DELETE:
+ if (rn42_autoconnecting()) {
+ rn42_disconnect();
+ print("\nRN-42: disconnect\n");
+ print("Enter config mode\n");
+ print("type $$$ to start and + for local echo\n");
command_state = CONSOLE;
config_mode = true;
prev_driver = host_get_driver();
clear_keyboard();
- host_set_driver(&rn42_config_driver);
+ host_set_driver(&rn42_config_driver); // null driver; not to send a key to host
} else {
- print("\nExit RN-42 config mode\n");
+ rn42_autoconnect();
+ print("\nRN-42: auto_connect\n");
+ print("Exit config mode\n");
command_state = ONESHOT;
config_mode = false;
clear_keyboard();
host_set_driver(prev_driver);
}
return true;
- case KC_L:
- if (local_echo) {
- print("local echo off\n");
- local_echo = false;
- } else {
- print("local echo on\n");
- local_echo = true;
- }
- return true;
case KC_U:
if (config_mode) return false;
if (force_usb) {
@@ -219,20 +210,12 @@ bool command_extra(uint8_t code)
host_set_driver(&lufa_driver);
}
return true;
- case KC_A:
- print("auto connect\n");
- rn42_autoconnect();
- return true;
- case KC_DELETE:
- print("disconnect\n");
- rn42_disconnect();
- //rn42_putc('\0'); // see 5.3.4.4 DISCONNECT KEY of User's Guide
- return true;
case KC_I:
- print("\nRN-42 info\n");
+ print("\n----- RN-42 info -----\n");
xprintf("protocol: %s\n", (host_get_driver() == &rn42_driver) ? "RN-42" : "LUFA");
xprintf("force_usb: %X\n", force_usb);
- xprintf("rn42_ready(): %X\n", rn42_ready());
+ xprintf("rn42_autoconnecting(): %X\n", rn42_autoconnecting());
+ xprintf("rn42_rts(): %X\n", rn42_rts());
xprintf("config_mode: %X\n", config_mode);
return true;
case KC_B:
@@ -266,7 +249,6 @@ bool command_console_extra(uint8_t code)
switch (code) {
default:
rn42_putc(code2asc(code));
- if (local_echo) xprintf("%c", code2asc(code));
return true;
}
return false;
diff --git a/keyboard/hhkb_rn42/rn42.c b/keyboard/hhkb_rn42/rn42.c
index 89ecb199ca..a041cc366f 100644
--- a/keyboard/hhkb_rn42/rn42.c
+++ b/keyboard/hhkb_rn42/rn42.c
@@ -24,17 +24,17 @@ host_driver_t rn42_driver = {
void rn42_init(void)
{
- // PF1: check RTS(active low)
- DDRF &= ~(1<<1);
- PORTF &= ~(1<<1);
-
// PF7: BT connection control(HiZ: connect, low: disconnect)
// JTAG disable for PORT F. write JTD bit twice within four cycles.
MCUCR |= (1<<JTD);
MCUCR |= (1<<JTD);
rn42_autoconnect();
- // PD5: CTS (low: allow to send, high:not allowed)
+ // PF1: RTS(low: allowed to send, high: not allowed)
+ DDRF &= ~(1<<1);
+ PORTF &= ~(1<<1);
+
+ // PD5: CTS(low: allow to send, high:not allow)
DDRD |= (1<<5);
PORTD &= ~(1<<5);
@@ -46,22 +46,43 @@ void rn42_putc(uint8_t c)
serial_send(c);
}
+bool rn42_autoconnecting(void)
+{
+ // GPIO6 for control connection(high: auto connect, low: disconnect)
+ // Note that this needs config: SM,4(Auto-Connect DTR Mode)
+ return (PORTF & (1<<7) ? true : false);
+}
+
void rn42_autoconnect(void)
{
- DDRF &= ~(1<<7);
- PORTF &= ~(1<<7);
+ // hi to auto connect
+ DDRF |= (1<<7);
+ PORTF |= (1<<7);
}
void rn42_disconnect(void)
{
+ // low to disconnect
DDRF |= (1<<7);
PORTF &= ~(1<<7);
}
-bool rn42_ready(void)
+bool rn42_rts(void)
{
- // RTS low
- return PINF&(1<<1) ? false : true;
+ // low when RN-42 is powered and ready to receive
+ return PINF&(1<<1);
+}
+
+void rn42_cts_hi(void)
+{
+ // not allow to send
+ PORTD |= (1<<5);
+}
+
+void rn42_cts_lo(void)
+{
+ // allow to send
+ PORTD &= ~(1<<5);
}
diff --git a/keyboard/hhkb_rn42/rn42.h b/keyboard/hhkb_rn42/rn42.h
index a967a70d8a..4189733b49 100644
--- a/keyboard/hhkb_rn42/rn42.h
+++ b/keyboard/hhkb_rn42/rn42.h
@@ -3,18 +3,16 @@
#include <stdbool.h>
-// RN-42 CTS pin
-#define CTS_INIT() (DDRD |= (1<<5))
-#define CTS_HI() (PORTD |= (1<<5))
-#define CTS_LO() (PORTD &= ~(1<<5))
-
host_driver_t rn42_driver;
host_driver_t rn42_config_driver;
void rn42_init(void);
void rn42_putc(uint8_t c);
+bool rn42_autoconnecting(void);
void rn42_autoconnect(void);
void rn42_disconnect(void);
-bool rn42_ready(void);
+bool rn42_rts(void);
+void rn42_cts_hi(void);
+void rn42_cts_lo(void);
#endif
From b4e4f599dfe1b3ecff69ab248866e7b801c35f1e Mon Sep 17 00:00:00 2001
From: tmk <nobody@nowhere>
Date: Thu, 17 Jul 2014 16:59:22 +0900
Subject: [PATCH 25/50] Add rn42_task
---
keyboard/hhkb_rn42/MEMO.txt | 76 ++++------
keyboard/hhkb_rn42/Makefile | 1 +
keyboard/hhkb_rn42/config.h | 2 +-
keyboard/hhkb_rn42/main.c | 225 +----------------------------
keyboard/hhkb_rn42/rn42.c | 1 +
keyboard/hhkb_rn42/rn42_task.c | 255 +++++++++++++++++++++++++++++++++
keyboard/hhkb_rn42/rn42_task.h | 9 ++
7 files changed, 300 insertions(+), 269 deletions(-)
create mode 100644 keyboard/hhkb_rn42/rn42_task.c
create mode 100644 keyboard/hhkb_rn42/rn42_task.h
diff --git a/keyboard/hhkb_rn42/MEMO.txt b/keyboard/hhkb_rn42/MEMO.txt
index 5b64398402..36d4afb98a 100644
--- a/keyboard/hhkb_rn42/MEMO.txt
+++ b/keyboard/hhkb_rn42/MEMO.txt
@@ -1,9 +1,13 @@
Roving RN-42
============
+07/16 After fix of voltage dividor on GPIO6, had a trouble that it could not send a char to BT module, though could receive.
+ Found R8 had wrong 1K resistor and changed to 10K, after that it can send to the module again. Not sure how it had sent with the wrong 1K before.
+
TODO
----
+- Factroy reset doesn't work; need to test again. 10K pull-up is too high?
- Lipo voltage ADC sensing
- Lipo charger configuration: fast charge time: USB charger spec?
- Low voltage alarm: LED indcates voltage of Lipo
@@ -28,39 +32,6 @@ DONE:
Configuration
-------------
-Ver 6.15 04/26/2013
-(c) Roving Networks
-***Settings***
-BTA=0006664B3AE3
-BTName=tmkBT-3AE3
-Baudrt(SW4)=115K
-Mode =Pair
-Authen=2
-Bonded=1
-Rem=001BDC06415B
-***ADVANCED Settings***
-SrvName= keyboard/mouse
-SrvClass=0000
-DevClass=05C0
-InqWindw=0100
-PagWindw=0100
-CfgTimer=255
-StatuStr=NULL
-HidFlags=3f
-DTRtimer=8
-KeySwapr=0
-***OTHER Settings***
-Profile= HID
-CfgChar= $
-SniffEna=0
-LowPower=0
-TX Power=4
-IOPorts= 0
-IOValues=0
-Sleeptmr=0
-DebugMod=0
-RoleSwch=0
-
Ver 6.15 04/26/2013
(c) Roving Networks
***Settings***
@@ -70,7 +41,7 @@ Baudrt(SW4)=115K
Mode =DTR
Authen=2
Bonded=0
-Rem=BCF5AC9BCB7E
+Rem=000000000000
***ADVANCED Settings***
SrvName= keyboard/mouse
SrvClass=0000
@@ -79,15 +50,15 @@ InqWindw=0100
PagWindw=0100
CfgTimer=255
StatuStr=NULL
-HidFlags=3f
+HidFlags=3c
DTRtimer=8
KeySwapr=0
***OTHER Settings***
Profile= HID
CfgChar= $
-SniffEna=0
+SniffEna=8010
LowPower=0
-TX Power=ffe8
+TX Power=0
IOPorts= 0
IOValues=0
Sleeptmr=0
@@ -95,27 +66,38 @@ DebugMod=0
RoleSwch=0
-command mode
-------------
-To enter command mode disconnect the module from host and type '$$$'.(you will see 'CMD')
-To exit type '---'.(you will see 'END')
+Serial connection
+-----------------
Serial line: 115200bps, 8bit, 1-stopbit, non-parity, no flow control
SSP: 115200bps, 8bit, 1-stopbit, non-parity, no flow control(via Bluetooth)
+To enter command mode disconnect the module from host and type '$$$'.(you will see 'CMD')
+To exit type '---'(you will see 'END') and '+' to get local echo.
-S-,tmkBT // Device name
-SH,0038 // HID register
+
+
+Setting command mode
+--------------------
+S-,tmkBT // Device name
+SS,keyboard/mouse // service name
+SM,4 // Auto Connect DTR mode
+SW,8010 // Sniff enable 0x10*0.625ms=10ms; 50ms is laggish and not much power save
+S~,6 // HID profile
+SH,003C // HID register
+SY,0004 // Transmit power
+
+
+
+
+Other options:
SC,0000 // COD: 000005C0 (see HID spec/Bluegiga doc)
SD,05C0 // bit 12-8 7 6 5-0
// 00101 1 1 0
// peripheral pointing keybaord joystick, gamepad, ...
-S~,6 // HID profile
-SS,keyboard/mouse // service name
SM,6 // Pairing mode: auto connect
SM,4 // Master mode: Connection can be controled with GPIO6
-SY,FEE8 // lower power -20dbM
@@ -197,7 +179,7 @@ Sniff mode Transmit
Deep sleep Idle (3.1.2)
In this mode the module shuts down completly and only draws about 300uA. To enable this set the most signifant bit(0x8000) of Sniff interaval timer.
- SW,8320 // deep sleep enable(interval=0x320*0.625ms)
+ SW,8320 // deep sleep enable(interval=0x320*0.625=500ms)
In normal sleep the firmware is still running in idle mode, and wakes up about 20 times per second to check ports, update LEDs, etc. During deep sleep, the firmware actually stops runnig some tasks and the LEDs only update about once per second.
To wake from deep sleep there are three ways: (in worst case wake up takes 5ms)
*send a charactor to the UART(first charactor will be lost)
diff --git a/keyboard/hhkb_rn42/Makefile b/keyboard/hhkb_rn42/Makefile
index 9e1acfa442..7a27a43c04 100644
--- a/keyboard/hhkb_rn42/Makefile
+++ b/keyboard/hhkb_rn42/Makefile
@@ -55,6 +55,7 @@ SRC += keymap_common.c \
serial_uart.c \
suart.S \
rn42.c \
+ rn42_task.c \
main.c
ifdef KEYMAP
diff --git a/keyboard/hhkb_rn42/config.h b/keyboard/hhkb_rn42/config.h
index 5e6d7a6436..cd8fc176de 100644
--- a/keyboard/hhkb_rn42/config.h
+++ b/keyboard/hhkb_rn42/config.h
@@ -20,7 +20,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define VENDOR_ID 0xFEED
-#define PRODUCT_ID 0xCAFE
+#define PRODUCT_ID 0x4242
#define DEVICE_VER 0x0104
#define MANUFACTURER t.m.k.
#define PRODUCT HHKB mod
diff --git a/keyboard/hhkb_rn42/main.c b/keyboard/hhkb_rn42/main.c
index edab699784..c84f6b0a6a 100644
--- a/keyboard/hhkb_rn42/main.c
+++ b/keyboard/hhkb_rn42/main.c
@@ -5,21 +5,20 @@
#include "print.h"
#include "sendchar.h"
#include "rn42.h"
+#include "rn42_task.h"
#include "serial.h"
#include "keyboard.h"
-#include "command.h"
#include "keycode.h"
#include "action.h"
#include "action_util.h"
#include "wait.h"
#include "suart.h"
-bool config_mode = false;
-
static int8_t sendchar_func(uint8_t c)
{
sendchar(c); // LUFA
xmit(c); // SUART
+ return 0;
}
static void SetupHardware(void)
@@ -47,7 +46,6 @@ static void SetupHardware(void)
PORTD |= (1<<1);
}
-static bool force_usb = false;
int main(void) __attribute__ ((weak));
int main(void)
{
@@ -67,6 +65,7 @@ int main(void)
print("USB configured.\n");
rn42_init();
+ rn42_task_init();
print("RN-42 init\n");
/* init modules */
@@ -82,22 +81,14 @@ int main(void)
sleep_led_init();
#endif
- // ADC for battery
- //ADMUX = (1<<REFS0); // Ref:AVCC, Input:ADC0(PF0)
- ADMUX = (1<<REFS1) | (1<<REFS0); // Ref:AVCC, Input:ADC0(PF0)
- ADCSRA = (1<<ADPS2) | (1<<ADPS1) | (1<<ADPS0); // Prescale:128
- ADCSRA |= (1<<ADEN); // enable ADC
-
print("Keyboard start.\n");
while (1) {
-/*
while (USB_DeviceState == DEVICE_STATE_Suspended) {
suspend_power_down();
if (USB_Device_RemoteWakeupEnabled && suspend_wakeup_condition()) {
USB_Device_SendRemoteWakeup();
}
}
-*/
keyboard_task();
@@ -105,214 +96,6 @@ int main(void)
USB_USBTask();
#endif
- int16_t c;
- if (config_mode) {
- while ((c = serial_recv2()) != -1) {
- // without flow control it'll fail to receive data when flooded
- rn42_cts_hi();
- xprintf("%c", c);
- rn42_cts_lo();
- }
- } else {
- while ((c = serial_recv2()) != -1) {
- // LED Out report: 0xFE, 0x02, 0x01, <leds>
- // To get the report over UART set bit3 with SH, command.
- static enum {LED_INIT, LED_FE, LED_02, LED_01} state = LED_INIT;
- xprintf("%X\n", c);
- switch (state) {
- case LED_INIT:
- if (c == 0xFE) state = LED_FE;
- else state = LED_INIT;
- break;
- case LED_FE:
- if (c == 0x02) state = LED_02;
- else state = LED_INIT;
- break;
- case LED_02:
- if (c == 0x01) state = LED_01;
- else state = LED_INIT;
- break;
- case LED_01:
- // TODO: move to rn42.c and make accessible with keyboard_leds()
- xprintf("LED status: %X\n", c);
- state = LED_INIT;
- break;
- default:
- state = LED_INIT;
- }
- }
- }
-
- /* Bluetooth mode when ready */
- if (!config_mode && !force_usb) {
- if (!rn42_rts() && host_get_driver() != &rn42_driver) {
- clear_keyboard();
- host_set_driver(&rn42_driver);
- } else if (rn42_rts() && host_get_driver() != &lufa_driver) {
- clear_keyboard();
- host_set_driver(&lufa_driver);
- }
- }
- }
-}
-
-
-/******************************************************************************
- * Command
- ******************************************************************************/
-bool command_extra(uint8_t code)
-{
- static host_driver_t *prev_driver = &rn42_driver;
- switch (code) {
- case KC_H:
- case KC_SLASH: /* ? */
- print("\n\n----- Bluetooth RN-42 Help -----\n");
- print("Del: auto_connect/disconnect(enter/exit config mode)\n");
- print("i: RN-42 info\n");
- print("b: battery voltage\n");
-
- if (config_mode) {
- return true;
- } else {
- print("u: Force USB mode\n");
- return false; // to display default command help
- }
- case KC_DELETE:
- if (rn42_autoconnecting()) {
- rn42_disconnect();
- print("\nRN-42: disconnect\n");
- print("Enter config mode\n");
- print("type $$$ to start and + for local echo\n");
- command_state = CONSOLE;
- config_mode = true;
- prev_driver = host_get_driver();
- clear_keyboard();
- host_set_driver(&rn42_config_driver); // null driver; not to send a key to host
- } else {
- rn42_autoconnect();
- print("\nRN-42: auto_connect\n");
- print("Exit config mode\n");
- command_state = ONESHOT;
- config_mode = false;
- clear_keyboard();
- host_set_driver(prev_driver);
- }
- return true;
- case KC_U:
- if (config_mode) return false;
- if (force_usb) {
- print("Auto mode\n");
- force_usb = false;
- } else {
- print("USB mode\n");
- force_usb = true;
- clear_keyboard();
- host_set_driver(&lufa_driver);
- }
- return true;
- case KC_I:
- print("\n----- RN-42 info -----\n");
- xprintf("protocol: %s\n", (host_get_driver() == &rn42_driver) ? "RN-42" : "LUFA");
- xprintf("force_usb: %X\n", force_usb);
- xprintf("rn42_autoconnecting(): %X\n", rn42_autoconnecting());
- xprintf("rn42_rts(): %X\n", rn42_rts());
- xprintf("config_mode: %X\n", config_mode);
- return true;
- case KC_B:
- // battery monitor
- ADCSRA |= (1<<ADEN) | (1<<ADSC);
- while (ADCSRA & (1<<ADSC)) ;
- uint16_t bat = ADCL;
- bat = ADCH<<8 | bat;
- xprintf("BAT: %04X\n", bat);
-
- ADCSRA |= (1<<ADEN) | (1<<ADSC);
- while (ADCSRA & (1<<ADSC)) ;
- bat = ADCL;
- bat = ADCH<<8 | bat;
- xprintf("BAT: %04X\n", bat);
-
- ADCSRA &= ~(1<<ADEN);
- return true;
- default:
- if (config_mode)
- return true;
- else
- return false; // exec default command
- }
- return true;
-}
-
-static uint8_t code2asc(uint8_t code);
-bool command_console_extra(uint8_t code)
-{
- switch (code) {
- default:
- rn42_putc(code2asc(code));
- return true;
- }
- return false;
-}
-
-// convert keycode into ascii charactor
-static uint8_t code2asc(uint8_t code)
-{
- bool shifted = (get_mods() & (MOD_BIT(KC_LSHIFT)|MOD_BIT(KC_RSHIFT))) ? true : false;
- switch (code) {
- case KC_A: return (shifted ? 'A' : 'a');
- case KC_B: return (shifted ? 'B' : 'b');
- case KC_C: return (shifted ? 'C' : 'c');
- case KC_D: return (shifted ? 'D' : 'd');
- case KC_E: return (shifted ? 'E' : 'e');
- case KC_F: return (shifted ? 'F' : 'f');
- case KC_G: return (shifted ? 'G' : 'g');
- case KC_H: return (shifted ? 'H' : 'h');
- case KC_I: return (shifted ? 'I' : 'i');
- case KC_J: return (shifted ? 'J' : 'j');
- case KC_K: return (shifted ? 'K' : 'k');
- case KC_L: return (shifted ? 'L' : 'l');
- case KC_M: return (shifted ? 'M' : 'm');
- case KC_N: return (shifted ? 'N' : 'n');
- case KC_O: return (shifted ? 'O' : 'o');
- case KC_P: return (shifted ? 'P' : 'p');
- case KC_Q: return (shifted ? 'Q' : 'q');
- case KC_R: return (shifted ? 'R' : 'r');
- case KC_S: return (shifted ? 'S' : 's');
- case KC_T: return (shifted ? 'T' : 't');
- case KC_U: return (shifted ? 'U' : 'u');
- case KC_V: return (shifted ? 'V' : 'v');
- case KC_W: return (shifted ? 'W' : 'w');
- case KC_X: return (shifted ? 'X' : 'x');
- case KC_Y: return (shifted ? 'Y' : 'y');
- case KC_Z: return (shifted ? 'Z' : 'z');
- case KC_1: return (shifted ? '!' : '1');
- case KC_2: return (shifted ? '@' : '2');
- case KC_3: return (shifted ? '#' : '3');
- case KC_4: return (shifted ? '$' : '4');
- case KC_5: return (shifted ? '%' : '5');
- case KC_6: return (shifted ? '^' : '6');
- case KC_7: return (shifted ? '&' : '7');
- case KC_8: return (shifted ? '*' : '8');
- case KC_9: return (shifted ? '(' : '9');
- case KC_0: return (shifted ? ')' : '0');
- case KC_ENTER: return '\n';
- case KC_ESCAPE: return 0x1B;
- case KC_BSPACE: return '\b';
- case KC_TAB: return '\t';
- case KC_SPACE: return ' ';
- case KC_MINUS: return (shifted ? '_' : '-');
- case KC_EQUAL: return (shifted ? '+' : '=');
- case KC_LBRACKET: return (shifted ? '{' : '[');
- case KC_RBRACKET: return (shifted ? '}' : ']');
- case KC_BSLASH: return (shifted ? '|' : '\\');
- case KC_NONUS_HASH: return (shifted ? '|' : '\\');
- case KC_SCOLON: return (shifted ? ':' : ';');
- case KC_QUOTE: return (shifted ? '"' : '\'');
- case KC_GRAVE: return (shifted ? '~' : '`');
- case KC_COMMA: return (shifted ? '<' : ',');
- case KC_DOT: return (shifted ? '>' : '.');
- case KC_SLASH: return (shifted ? '?' : '/');
- case KC_DELETE: return '\0'; // Delete to disconnect
- default: return ' ';
+ rn42_task();
}
}
diff --git a/keyboard/hhkb_rn42/rn42.c b/keyboard/hhkb_rn42/rn42.c
index a041cc366f..3fcd64ad6a 100644
--- a/keyboard/hhkb_rn42/rn42.c
+++ b/keyboard/hhkb_rn42/rn42.c
@@ -1,3 +1,4 @@
+#include <avr/io.h>
#include "host.h"
#include "host_driver.h"
#include "serial.h"
diff --git a/keyboard/hhkb_rn42/rn42_task.c b/keyboard/hhkb_rn42/rn42_task.c
new file mode 100644
index 0000000000..7ec4c1b540
--- /dev/null
+++ b/keyboard/hhkb_rn42/rn42_task.c
@@ -0,0 +1,255 @@
+#include <stdint.h>
+#include "keycode.h"
+#include "serial.h"
+#include "host.h"
+#include "action.h"
+#include "action_util.h"
+#include "lufa.h"
+#include "rn42_task.h"
+#include "print.h"
+#include "timer.h"
+#include "command.h"
+
+static bool config_mode = false;
+static bool force_usb = false;
+
+static void battery_adc_init(void)
+{
+ ADMUX = (1<<REFS1) | (1<<REFS0); // Ref:2.56V band-gap, Input:ADC0(PF0)
+ ADCSRA = (1<<ADPS2) | (1<<ADPS1) | (1<<ADPS0); // Prescale:128 16MHz/128=125KHz
+ ADCSRA |= (1<<ADEN); // enable ADC
+}
+
+static uint16_t battery_adc(void)
+{
+ volatile uint16_t bat;
+ ADCSRA |= (1<<ADEN);
+
+ // discard first result
+ ADCSRA |= (1<<ADSC);
+ while (ADCSRA & (1<<ADSC)) ;
+ bat = ADC;
+
+ // discard second result
+ ADCSRA |= (1<<ADSC);
+ while (ADCSRA & (1<<ADSC)) ;
+ bat = ADC;
+
+ ADCSRA |= (1<<ADSC);
+ while (ADCSRA & (1<<ADSC)) ;
+ bat = ADC;
+
+ ADCSRA &= ~(1<<ADEN);
+ return bat;
+}
+
+
+void rn42_task_init(void)
+{
+ battery_adc_init();
+}
+
+void rn42_task(void)
+{
+ int16_t c;
+ if (config_mode) {
+ // Config mode: print output from RN-42
+ while ((c = serial_recv2()) != -1) {
+ // without flow control it'll fail to receive data when flooded
+ rn42_cts_hi();
+ xprintf("%c", c);
+ rn42_cts_lo();
+ }
+ } else {
+ // Raw mode: interpret output report of LED state
+ while ((c = serial_recv2()) != -1) {
+ // LED Out report: 0xFE, 0x02, 0x01, <leds>
+ // To get the report over UART set bit3 with SH, command.
+ static enum {LED_INIT, LED_FE, LED_02, LED_01} state = LED_INIT;
+ xprintf("%02X\n", c);
+ switch (state) {
+ case LED_INIT:
+ if (c == 0xFE) state = LED_FE;
+ else state = LED_INIT;
+ break;
+ case LED_FE:
+ if (c == 0x02) state = LED_02;
+ else state = LED_INIT;
+ break;
+ case LED_02:
+ if (c == 0x01) state = LED_01;
+ else state = LED_INIT;
+ break;
+ case LED_01:
+ // TODO: move to rn42.c and make accessible with keyboard_leds()
+ xprintf("LED status: %02X\n", c);
+ state = LED_INIT;
+ break;
+ default:
+ state = LED_INIT;
+ }
+ }
+ }
+
+ /* Bluetooth mode when ready */
+ if (!config_mode && !force_usb) {
+ if (!rn42_rts() && host_get_driver() != &rn42_driver) {
+ clear_keyboard();
+ host_set_driver(&rn42_driver);
+ } else if (rn42_rts() && host_get_driver() != &lufa_driver) {
+ clear_keyboard();
+ host_set_driver(&lufa_driver);
+ }
+ }
+}
+
+
+
+/******************************************************************************
+ * Command
+ ******************************************************************************/
+bool command_extra(uint8_t code)
+{
+ static host_driver_t *prev_driver = &rn42_driver;
+ switch (code) {
+ case KC_H:
+ case KC_SLASH: /* ? */
+ print("\n\n----- Bluetooth RN-42 Help -----\n");
+ print("Del: enter/exit config mode(auto_connect/disconnect)\n");
+ print("i: RN-42 info\n");
+ print("b: battery voltage\n");
+
+ if (config_mode) {
+ return true;
+ } else {
+ print("u: Force USB mode\n");
+ return false; // to display default command help
+ }
+ case KC_DELETE:
+ if (rn42_autoconnecting()) {
+ prev_driver = host_get_driver();
+ clear_keyboard();
+ _delay_ms(500);
+ host_set_driver(&rn42_config_driver); // null driver; not to send a key to host
+ rn42_disconnect();
+ print("\nRN-42: disconnect\n");
+ print("Enter config mode\n");
+ print("type $$$ to start and + for local echo\n");
+ command_state = CONSOLE;
+ config_mode = true;
+ } else {
+ rn42_autoconnect();
+ print("\nRN-42: auto_connect\n");
+ print("Exit config mode\n");
+ command_state = ONESHOT;
+ config_mode = false;
+ //clear_keyboard();
+ host_set_driver(prev_driver);
+ }
+ return true;
+ case KC_U:
+ if (config_mode) return false;
+ if (force_usb) {
+ print("Auto mode\n");
+ force_usb = false;
+ } else {
+ print("USB mode\n");
+ force_usb = true;
+ clear_keyboard();
+ host_set_driver(&lufa_driver);
+ }
+ return true;
+ case KC_I:
+ print("\n----- RN-42 info -----\n");
+ xprintf("protocol: %s\n", (host_get_driver() == &rn42_driver) ? "RN-42" : "LUFA");
+ xprintf("force_usb: %X\n", force_usb);
+ xprintf("rn42_autoconnecting(): %X\n", rn42_autoconnecting());
+ xprintf("rn42_rts(): %X\n", rn42_rts());
+ xprintf("config_mode: %X\n", config_mode);
+ return true;
+ case KC_B:
+ // battery monitor
+ xprintf("BAT: %04X(%08lX)\n", battery_adc(), timer_read32());
+ return true;
+ default:
+ if (config_mode)
+ return true;
+ else
+ return false; // exec default command
+ }
+ return true;
+}
+
+static uint8_t code2asc(uint8_t code);
+bool command_console_extra(uint8_t code)
+{
+ switch (code) {
+ default:
+ rn42_putc(code2asc(code));
+ return true;
+ }
+ return false;
+}
+
+// convert keycode into ascii charactor
+static uint8_t code2asc(uint8_t code)
+{
+ bool shifted = (get_mods() & (MOD_BIT(KC_LSHIFT)|MOD_BIT(KC_RSHIFT))) ? true : false;
+ switch (code) {
+ case KC_A: return (shifted ? 'A' : 'a');
+ case KC_B: return (shifted ? 'B' : 'b');
+ case KC_C: return (shifted ? 'C' : 'c');
+ case KC_D: return (shifted ? 'D' : 'd');
+ case KC_E: return (shifted ? 'E' : 'e');
+ case KC_F: return (shifted ? 'F' : 'f');
+ case KC_G: return (shifted ? 'G' : 'g');
+ case KC_H: return (shifted ? 'H' : 'h');
+ case KC_I: return (shifted ? 'I' : 'i');
+ case KC_J: return (shifted ? 'J' : 'j');
+ case KC_K: return (shifted ? 'K' : 'k');
+ case KC_L: return (shifted ? 'L' : 'l');
+ case KC_M: return (shifted ? 'M' : 'm');
+ case KC_N: return (shifted ? 'N' : 'n');
+ case KC_O: return (shifted ? 'O' : 'o');
+ case KC_P: return (shifted ? 'P' : 'p');
+ case KC_Q: return (shifted ? 'Q' : 'q');
+ case KC_R: return (shifted ? 'R' : 'r');
+ case KC_S: return (shifted ? 'S' : 's');
+ case KC_T: return (shifted ? 'T' : 't');
+ case KC_U: return (shifted ? 'U' : 'u');
+ case KC_V: return (shifted ? 'V' : 'v');
+ case KC_W: return (shifted ? 'W' : 'w');
+ case KC_X: return (shifted ? 'X' : 'x');
+ case KC_Y: return (shifted ? 'Y' : 'y');
+ case KC_Z: return (shifted ? 'Z' : 'z');
+ case KC_1: return (shifted ? '!' : '1');
+ case KC_2: return (shifted ? '@' : '2');
+ case KC_3: return (shifted ? '#' : '3');
+ case KC_4: return (shifted ? '$' : '4');
+ case KC_5: return (shifted ? '%' : '5');
+ case KC_6: return (shifted ? '^' : '6');
+ case KC_7: return (shifted ? '&' : '7');
+ case KC_8: return (shifted ? '*' : '8');
+ case KC_9: return (shifted ? '(' : '9');
+ case KC_0: return (shifted ? ')' : '0');
+ case KC_ENTER: return '\n';
+ case KC_ESCAPE: return 0x1B;
+ case KC_BSPACE: return '\b';
+ case KC_TAB: return '\t';
+ case KC_SPACE: return ' ';
+ case KC_MINUS: return (shifted ? '_' : '-');
+ case KC_EQUAL: return (shifted ? '+' : '=');
+ case KC_LBRACKET: return (shifted ? '{' : '[');
+ case KC_RBRACKET: return (shifted ? '}' : ']');
+ case KC_BSLASH: return (shifted ? '|' : '\\');
+ case KC_NONUS_HASH: return (shifted ? '|' : '\\');
+ case KC_SCOLON: return (shifted ? ':' : ';');
+ case KC_QUOTE: return (shifted ? '"' : '\'');
+ case KC_GRAVE: return (shifted ? '~' : '`');
+ case KC_COMMA: return (shifted ? '<' : ',');
+ case KC_DOT: return (shifted ? '>' : '.');
+ case KC_SLASH: return (shifted ? '?' : '/');
+ case KC_DELETE: return '\0'; // Delete to disconnect
+ default: return ' ';
+ }
+}
diff --git a/keyboard/hhkb_rn42/rn42_task.h b/keyboard/hhkb_rn42/rn42_task.h
new file mode 100644
index 0000000000..d75b03017a
--- /dev/null
+++ b/keyboard/hhkb_rn42/rn42_task.h
@@ -0,0 +1,9 @@
+#ifndef RN42_TASK_H
+#define RN42_TASK_H
+
+#include <stdbool.h>
+#include "rn42.h"
+
+void rn42_task(void);
+
+#endif
From 59ea5e02f76a37e5021c5f9d02af149e48e7c07c Mon Sep 17 00:00:00 2001
From: tmk <nobody@nowhere>
Date: Sat, 19 Jul 2014 02:33:23 +0900
Subject: [PATCH 26/50] Mkdir rn42
---
keyboard/hhkb_rn42/MEMO.txt | 23 +++++++++++++++++++++++
keyboard/hhkb_rn42/Makefile | 8 ++------
keyboard/hhkb_rn42/rn42.mk | 11 +++++++++++
keyboard/hhkb_rn42/{ => rn42}/main.c | 1 +
keyboard/hhkb_rn42/{ => rn42}/rn42.c | 0
keyboard/hhkb_rn42/{ => rn42}/rn42.h | 0
keyboard/hhkb_rn42/{ => rn42}/rn42_task.c | 0
keyboard/hhkb_rn42/{ => rn42}/rn42_task.h | 1 +
keyboard/hhkb_rn42/{ => rn42}/suart.S | 0
keyboard/hhkb_rn42/{ => rn42}/suart.h | 0
rules.mk | 1 +
11 files changed, 39 insertions(+), 6 deletions(-)
create mode 100644 keyboard/hhkb_rn42/rn42.mk
rename keyboard/hhkb_rn42/{ => rn42}/main.c (99%)
rename keyboard/hhkb_rn42/{ => rn42}/rn42.c (100%)
rename keyboard/hhkb_rn42/{ => rn42}/rn42.h (100%)
rename keyboard/hhkb_rn42/{ => rn42}/rn42_task.c (100%)
rename keyboard/hhkb_rn42/{ => rn42}/rn42_task.h (80%)
rename keyboard/hhkb_rn42/{ => rn42}/suart.S (100%)
rename keyboard/hhkb_rn42/{ => rn42}/suart.h (100%)
diff --git a/keyboard/hhkb_rn42/MEMO.txt b/keyboard/hhkb_rn42/MEMO.txt
index 36d4afb98a..100b4442d6 100644
--- a/keyboard/hhkb_rn42/MEMO.txt
+++ b/keyboard/hhkb_rn42/MEMO.txt
@@ -2,6 +2,7 @@ Roving RN-42
============
07/16 After fix of voltage dividor on GPIO6, had a trouble that it could not send a char to BT module, though could receive.
Found R8 had wrong 1K resistor and changed to 10K, after that it can send to the module again. Not sure how it had sent with the wrong 1K before.
+07/18 On Linux, had an USB related trouble; keyobard or console didn't work for some reason. Changing PID cured this problem. Very annoying, took very long time before resolved it.
@@ -28,6 +29,28 @@ DONE:
- Power selector doesn't work; Q4 MOSFET leaks from Lipo to USB power line. -- use Schottky instead 07/04
+Lipo
+----
+Sparkfun Polymer Lithium Ion Battery 850mAh:
+https://www.sparkfun.com/products/341
+Lipo Cell spec:
+https://www.sparkfun.com/datasheets/Batteries/063048%20Li-polymer.pdf
+Protection spec:
+http://dlnmh9ip6v2uc.cloudfront.net/datasheets/Prototyping/BatteryProtection.pdf
+ min typical max
+over-charge 4.255 4.280 4.305
+over-charge discover? 4.030 4.080 4.130
+over-discharge 2.827 2.900 2.973
+over-discharge discover 3.022 3.100 3.178
+
+ADC voltage monitor: voltage divider 10K+10K(0.5)
+ ADC=V*0.5/2.56*1024
+ V ADC
+ ------------------
+ 4.20 0x347(839)
+ 3.10 0x26b(619)
+
+
Configuration
diff --git a/keyboard/hhkb_rn42/Makefile b/keyboard/hhkb_rn42/Makefile
index 7a27a43c04..b46b777898 100644
--- a/keyboard/hhkb_rn42/Makefile
+++ b/keyboard/hhkb_rn42/Makefile
@@ -51,12 +51,7 @@ TARGET_DIR = .
# List C source files here. (C dependencies are automatically generated.)
SRC += keymap_common.c \
matrix.c \
- led.c \
- serial_uart.c \
- suart.S \
- rn42.c \
- rn42_task.c \
- main.c
+ led.c
ifdef KEYMAP
SRC := keymap_$(KEYMAP).c $(SRC)
@@ -135,6 +130,7 @@ COMMAND_ENABLE = yes # Commands for debug and configuration
VPATH += $(TARGET_DIR)
VPATH += $(TOP_DIR)
+include rn42.mk
include $(TOP_DIR)/protocol.mk
include $(TOP_DIR)/protocol/lufa.mk
include $(TOP_DIR)/common.mk
diff --git a/keyboard/hhkb_rn42/rn42.mk b/keyboard/hhkb_rn42/rn42.mk
new file mode 100644
index 0000000000..653a809242
--- /dev/null
+++ b/keyboard/hhkb_rn42/rn42.mk
@@ -0,0 +1,11 @@
+RN42_DIR = rn42
+
+SRC += serial_uart.c \
+ rn42/suart.S \
+ rn42/rn42.c \
+ rn42/rn42_task.c \
+ rn42/main.c
+
+OPT_DEFS += -DPROTOCOL_RN42
+
+VPATH += $(RN42_DIR)
diff --git a/keyboard/hhkb_rn42/main.c b/keyboard/hhkb_rn42/rn42/main.c
similarity index 99%
rename from keyboard/hhkb_rn42/main.c
rename to keyboard/hhkb_rn42/rn42/main.c
index c84f6b0a6a..a3a37c0747 100644
--- a/keyboard/hhkb_rn42/main.c
+++ b/keyboard/hhkb_rn42/rn42/main.c
@@ -13,6 +13,7 @@
#include "action_util.h"
#include "wait.h"
#include "suart.h"
+#include "suspend.h"
static int8_t sendchar_func(uint8_t c)
{
diff --git a/keyboard/hhkb_rn42/rn42.c b/keyboard/hhkb_rn42/rn42/rn42.c
similarity index 100%
rename from keyboard/hhkb_rn42/rn42.c
rename to keyboard/hhkb_rn42/rn42/rn42.c
diff --git a/keyboard/hhkb_rn42/rn42.h b/keyboard/hhkb_rn42/rn42/rn42.h
similarity index 100%
rename from keyboard/hhkb_rn42/rn42.h
rename to keyboard/hhkb_rn42/rn42/rn42.h
diff --git a/keyboard/hhkb_rn42/rn42_task.c b/keyboard/hhkb_rn42/rn42/rn42_task.c
similarity index 100%
rename from keyboard/hhkb_rn42/rn42_task.c
rename to keyboard/hhkb_rn42/rn42/rn42_task.c
diff --git a/keyboard/hhkb_rn42/rn42_task.h b/keyboard/hhkb_rn42/rn42/rn42_task.h
similarity index 80%
rename from keyboard/hhkb_rn42/rn42_task.h
rename to keyboard/hhkb_rn42/rn42/rn42_task.h
index d75b03017a..8f6c3ab64d 100644
--- a/keyboard/hhkb_rn42/rn42_task.h
+++ b/keyboard/hhkb_rn42/rn42/rn42_task.h
@@ -4,6 +4,7 @@
#include <stdbool.h>
#include "rn42.h"
+void rn42_task_init(void);
void rn42_task(void);
#endif
diff --git a/keyboard/hhkb_rn42/suart.S b/keyboard/hhkb_rn42/rn42/suart.S
similarity index 100%
rename from keyboard/hhkb_rn42/suart.S
rename to keyboard/hhkb_rn42/rn42/suart.S
diff --git a/keyboard/hhkb_rn42/suart.h b/keyboard/hhkb_rn42/rn42/suart.h
similarity index 100%
rename from keyboard/hhkb_rn42/suart.h
rename to keyboard/hhkb_rn42/rn42/suart.h
diff --git a/rules.mk b/rules.mk
index 7a40d1de9f..83c9da5f84 100644
--- a/rules.mk
+++ b/rules.mk
@@ -565,6 +565,7 @@ $(OBJDIR)/%.o : %.cpp
# Assemble: create object files from assembler source files.
$(OBJDIR)/%.o : %.S
@echo
+ mkdir -p $(@D)
@echo $(MSG_ASSEMBLING) $<
$(CC) -c $(ALL_ASFLAGS) $< -o $@
From 50bcaa66c468f350a538279667a0fa68090c55a9 Mon Sep 17 00:00:00 2001
From: tmk <nobody@nowhere>
Date: Sun, 20 Jul 2014 02:24:34 +0900
Subject: [PATCH 27/50] Clean up mbed_onekey
---
keyboard/mbed_onekey/Makefile | 2 +-
keyboard/mbed_onekey/common.mk | 21 ---------------------
keyboard/mbed_onekey/main.cpp | 10 ----------
3 files changed, 1 insertion(+), 32 deletions(-)
delete mode 100644 keyboard/mbed_onekey/common.mk
diff --git a/keyboard/mbed_onekey/Makefile b/keyboard/mbed_onekey/Makefile
index 2f7399ba02..b1e5f5e594 100644
--- a/keyboard/mbed_onekey/Makefile
+++ b/keyboard/mbed_onekey/Makefile
@@ -25,7 +25,7 @@ LIBRARIES =
# Build Options
# Comment out to disable
#BOOTMAGIC_ENABLE = yes
-MOUSEKEY_ENABLE = yes
+#MOUSEKEY_ENABLE = yes
include $(TMK_DIR)/tool/mbed/mbed.mk
diff --git a/keyboard/mbed_onekey/common.mk b/keyboard/mbed_onekey/common.mk
deleted file mode 100644
index 6eb7f76995..0000000000
--- a/keyboard/mbed_onekey/common.mk
+++ /dev/null
@@ -1,21 +0,0 @@
-COMMON_DIR = common
-OBJECTS += \
- $(OBJDIR)/$(COMMON_DIR)/mbed/timer.o \
- $(OBJDIR)/$(COMMON_DIR)/mbed/xprintf.o \
- $(OBJDIR)/$(COMMON_DIR)/action.o \
- $(OBJDIR)/$(COMMON_DIR)/action_tapping.o \
- $(OBJDIR)/$(COMMON_DIR)/action_macro.o \
- $(OBJDIR)/$(COMMON_DIR)/action_layer.o \
- $(OBJDIR)/$(COMMON_DIR)/action_util.o \
- $(OBJDIR)/$(COMMON_DIR)/host.o \
-
-INCLUDE_PATHS += \
- -I$(TMK_DIR)/$(COMMON_DIR)
-
-
-
-
-# $(OBJDIR)/$(COMMON_DIR)/keyboard.o \
-# $(OBJDIR)/$(COMMON_DIR)/keymap.o \
-# $(OBJDIR)/$(COMMON_DIR)/bootloader.o \
-# $(OBJDIR)/$(COMMON_DIR)/suspend.o \
diff --git a/keyboard/mbed_onekey/main.cpp b/keyboard/mbed_onekey/main.cpp
index b2f7243c85..71342e7ec3 100644
--- a/keyboard/mbed_onekey/main.cpp
+++ b/keyboard/mbed_onekey/main.cpp
@@ -1,10 +1,7 @@
#include "mbed.h"
-#include "debug.h"
-#include "timer.h"
#include "action.h"
#include "keycode.h"
#include "host.h"
-#include "host_driver.h"
#include "mbed_driver.h"
@@ -19,21 +16,14 @@ int main(void) {
led_red = 1;
led_green = 0;
- timer_init();
host_set_driver(&mbed_driver);
- //debug_enable = true;
- xprintf("mbed_onekey ver.eee:\r\n");
-
-
bool last_isp = isp;
while (1) {
- //led_green = !led_green;
if (last_isp == isp) continue;
last_isp = isp;
if (last_isp == 0) {
led_red = 0; // on
- dprintf("timer: %i\r\n", timer_read());
register_code(KC_A);
} else {
led_red = 1; // off
From 3e7875455ed392ce5238efa0734e82995e1f8040 Mon Sep 17 00:00:00 2001
From: tmk <nobody@nowhere>
Date: Sun, 20 Jul 2014 14:42:44 +0900
Subject: [PATCH 28/50] Add flow control by firmware to serial_uart
---
keyboard/hhkb_rn42/MEMO.txt | 1 +
keyboard/hhkb_rn42/config.h | 17 ++++++++++-------
keyboard/hhkb_rn42/rn42/rn42_task.c | 2 --
protocol/serial_uart.c | 19 +++++++++++++++++++
4 files changed, 30 insertions(+), 9 deletions(-)
diff --git a/keyboard/hhkb_rn42/MEMO.txt b/keyboard/hhkb_rn42/MEMO.txt
index 100b4442d6..86f5faef2d 100644
--- a/keyboard/hhkb_rn42/MEMO.txt
+++ b/keyboard/hhkb_rn42/MEMO.txt
@@ -8,6 +8,7 @@ Roving RN-42
TODO
----
+- LUFA sendchar should be buffered and serial_uart.c buffur size is too large(256).
- Factroy reset doesn't work; need to test again. 10K pull-up is too high?
- Lipo voltage ADC sensing
- Lipo charger configuration: fast charge time: USB charger spec?
diff --git a/keyboard/hhkb_rn42/config.h b/keyboard/hhkb_rn42/config.h
index cd8fc176de..e641a5a2bb 100644
--- a/keyboard/hhkb_rn42/config.h
+++ b/keyboard/hhkb_rn42/config.h
@@ -57,20 +57,23 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RTSEN 0
#define CTSEN 1
- #define SERIAL_UART_BAUD 115200
- #define SERIAL_UART_DATA UDR1
- #define SERIAL_UART_UBRR ((F_CPU/(16.0*SERIAL_UART_BAUD)-1+0.5))
- #define SERIAL_UART_RXD_VECT USART1_RX_vect
- #define SERIAL_UART_TXD_READY (UCSR1A&(1<<UDRE1))
- #define SERIAL_UART_INIT() do { \
+ #define SERIAL_UART_BAUD 115200
+ #define SERIAL_UART_DATA UDR1
+ #define SERIAL_UART_UBRR ((F_CPU/(16.0*SERIAL_UART_BAUD)-1+0.5))
+ #define SERIAL_UART_RXD_VECT USART1_RX_vect
+ #define SERIAL_UART_TXD_READY (UCSR1A&(1<<UDRE1))
+ #define SERIAL_UART_INIT() do { \
UBRR1L = (uint8_t) SERIAL_UART_UBRR; /* baud rate */ \
UBRR1H = ((uint16_t)SERIAL_UART_UBRR>>8); /* baud rate */ \
UCSR1B |= (1<<RXCIE1) | (1<<RXEN1); /* RX interrupt, RX: enable */ \
UCSR1B |= (0<<TXCIE1) | (1<<TXEN1); /* TX interrupt, TX: enable */ \
UCSR1C |= (0<<UPM11) | (0<<UPM10); /* parity: none(00), even(01), odd(11) */ \
- UCSR1D |= (0<<RTSEN) | (0<<CTSEN); /* RTS, CTS */ \
+ UCSR1D |= (0<<RTSEN) | (0<<CTSEN); /* RTS, CTS(no flow control by hardware) */ \
+ DDRD |= (1<<5); PORTD &= ~(1<<5); /* RTS for flow control by firmware */ \
sei(); \
} while(0)
+ #define SERIAL_UART_RTS_LO() do { PORTD &= ~(1<<5); } while (0)
+ #define SERIAL_UART_RTS_HI() do { PORTD |= (1<<5); } while (0)
#else
#error "USART configuration is needed."
#endif
diff --git a/keyboard/hhkb_rn42/rn42/rn42_task.c b/keyboard/hhkb_rn42/rn42/rn42_task.c
index 7ec4c1b540..2bc1c7fd04 100644
--- a/keyboard/hhkb_rn42/rn42/rn42_task.c
+++ b/keyboard/hhkb_rn42/rn42/rn42_task.c
@@ -56,9 +56,7 @@ void rn42_task(void)
// Config mode: print output from RN-42
while ((c = serial_recv2()) != -1) {
// without flow control it'll fail to receive data when flooded
- rn42_cts_hi();
xprintf("%c", c);
- rn42_cts_lo();
}
} else {
// Raw mode: interpret output report of LED state
diff --git a/protocol/serial_uart.c b/protocol/serial_uart.c
index 600340cd8e..35df27fd6e 100644
--- a/protocol/serial_uart.c
+++ b/protocol/serial_uart.c
@@ -41,6 +41,22 @@ POSSIBILITY OF SUCH DAMAGE.
#include "serial.h"
+#if defined(SERIAL_UART_RTS_LO) && defined(SERIAL_UART_RTS_HI)
+ // Buffer state
+ // Empty: RBUF_SPACE == RBUF_SIZE(head==tail)
+ // Last 1 space: RBUF_SPACE == 2
+ // Full: RBUF_SPACE == 1(last cell of rbuf be never used.)
+ #define RBUF_SPACE() (rbuf_head < rbuf_tail ? (rbuf_tail - rbuf_head) : (RBUF_SIZE - rbuf_head + rbuf_tail))
+ // allow to send
+ #define rbuf_check_rts_lo() do { if (RBUF_SPACE() > 2) SERIAL_UART_RTS_LO(); } while (0)
+ // prohibit to send
+ #define rbuf_check_rts_hi() do { if (RBUF_SPACE() <= 2) SERIAL_UART_RTS_HI(); } while (0)
+#else
+ #define rbuf_check_rts_lo()
+ #define rbuf_check_rts_hi()
+#endif
+
+
void serial_init(void)
{
SERIAL_UART_INIT();
@@ -61,6 +77,7 @@ uint8_t serial_recv(void)
data = rbuf[rbuf_tail];
rbuf_tail = (rbuf_tail + 1) % RBUF_SIZE;
+ rbuf_check_rts_lo();
return data;
}
@@ -73,6 +90,7 @@ int16_t serial_recv2(void)
data = rbuf[rbuf_tail];
rbuf_tail = (rbuf_tail + 1) % RBUF_SIZE;
+ rbuf_check_rts_lo();
return data;
}
@@ -90,4 +108,5 @@ ISR(SERIAL_UART_RXD_VECT)
rbuf[rbuf_head] = SERIAL_UART_DATA;
rbuf_head = next;
}
+ rbuf_check_rts_hi();
}
From 4b2b32a14b805a363c5dc035a2d1384e60865ad3 Mon Sep 17 00:00:00 2001
From: tmk <nobody@nowhere>
Date: Wed, 23 Jul 2014 12:23:00 +0900
Subject: [PATCH 29/50] Add rn42_lined(): connection status(GPIO2)
---
keyboard/hhkb_rn42/rn42/rn42.c | 5 +++++
keyboard/hhkb_rn42/rn42/rn42.h | 1 +
keyboard/hhkb_rn42/rn42/rn42_task.c | 2 ++
3 files changed, 8 insertions(+)
diff --git a/keyboard/hhkb_rn42/rn42/rn42.c b/keyboard/hhkb_rn42/rn42/rn42.c
index 3fcd64ad6a..e7d8ba45cc 100644
--- a/keyboard/hhkb_rn42/rn42/rn42.c
+++ b/keyboard/hhkb_rn42/rn42/rn42.c
@@ -86,6 +86,11 @@ void rn42_cts_lo(void)
PORTD &= ~(1<<5);
}
+bool rn42_linked(void)
+{
+ return PINF&(1<<6);
+}
+
static uint8_t keyboard_leds(void) { return 0; }
diff --git a/keyboard/hhkb_rn42/rn42/rn42.h b/keyboard/hhkb_rn42/rn42/rn42.h
index 4189733b49..72cbb2d724 100644
--- a/keyboard/hhkb_rn42/rn42/rn42.h
+++ b/keyboard/hhkb_rn42/rn42/rn42.h
@@ -14,5 +14,6 @@ void rn42_disconnect(void);
bool rn42_rts(void);
void rn42_cts_hi(void);
void rn42_cts_lo(void);
+bool rn42_linked(void);
#endif
diff --git a/keyboard/hhkb_rn42/rn42/rn42_task.c b/keyboard/hhkb_rn42/rn42/rn42_task.c
index 2bc1c7fd04..437dd46f49 100644
--- a/keyboard/hhkb_rn42/rn42/rn42_task.c
+++ b/keyboard/hhkb_rn42/rn42/rn42_task.c
@@ -162,8 +162,10 @@ bool command_extra(uint8_t code)
xprintf("protocol: %s\n", (host_get_driver() == &rn42_driver) ? "RN-42" : "LUFA");
xprintf("force_usb: %X\n", force_usb);
xprintf("rn42_autoconnecting(): %X\n", rn42_autoconnecting());
+ xprintf("rn42_linked(): %X\n", rn42_linked());
xprintf("rn42_rts(): %X\n", rn42_rts());
xprintf("config_mode: %X\n", config_mode);
+ xprintf("VBUS: %X\n", USBSTA&(1<<VBUS));
return true;
case KC_B:
// battery monitor
From 21e68fbea4fa5076fb9a6d9a6592dd263d65b078 Mon Sep 17 00:00:00 2001
From: tmk <nobody@nowhere>
Date: Wed, 23 Jul 2014 12:24:34 +0900
Subject: [PATCH 30/50] Add help message
---
keyboard/hhkb_rn42/MEMO.txt | 62 +++++++++++++++++++++++++++++++++++++
1 file changed, 62 insertions(+)
diff --git a/keyboard/hhkb_rn42/MEMO.txt b/keyboard/hhkb_rn42/MEMO.txt
index 86f5faef2d..28c5a09d38 100644
--- a/keyboard/hhkb_rn42/MEMO.txt
+++ b/keyboard/hhkb_rn42/MEMO.txt
@@ -303,3 +303,65 @@ U,<baud>,<parity> change UART setting tentatively
V display firmware version
W wake from quiet mode enable discovery and connection
Z deep sleep mode(<2mA)
+
+
+
+help
+----
+*** SET COMMANDS ***
+SA,<3,0> - Authentication
+SC,<hex> - Service Class
+SD,<hex> - Device Class
+SE,<1-16> - UUID
+SF,1 - Factory Defaults
+SH,<hex> - HID flags
+SI,<hex> - Inquiry Scan Window
+SJ,<hex> - Page Scan Window
+SL,<E,O,N> - Parity
+SM,<0-5> - Mode (0=slav,1=mstr,2=trig,3=auto,4=DTR,5=Any)
+SN,<name> - Name
+SO,<text> - conn/discon Status
+SP,<text> - Pin Code
+SR,<adr> - Remote Address
+SS,<text> - Service Name
+ST,<num> - Config Timer
+SU,<rate> - Baudrate
+SW,<hex> - Sniff Rate
+SX,<1,0> - Bonding
+SY,<hex> - TX power
+SZ,<num> - Raw Baudrate
+S~,<0-6> - Profile (0=SPP,1=DCE,2=DTE,3=MDM,4=D&S,6=HID
+S?,<0-1> - role switch
+S$,<char> - CMD mode char
+S@,<hex> - io port dir
+S&,<hex> - io port val
+S%,<hex> - io boot dir
+S^,<hex> - io boot val
+S*,<hex> - pio(8-11) set
+S|,<hex> - low power timers
+S+,<num> - DTR timer
+S=,<hex> - Key mapper
+S:,<num> - sleep timer
+*** DISPLAY ***
+D - Basic Settings
+E - Extended Settings
+G<X> - Stored setting
+GB - BT Address
+GF - BT Address of Last Connection
+GK - Connect Status
+G& - I/O Ports
+V - Firmare version
+*** OTHER ***
+C,<adr> - Connect
+F,1 - Fast Mode
+I,<time>,<cod> - Device Scan Inquiry
+J - Hide Pin Code
+K, - Kill (disconnect)
+L, - toggle local echo
+P,<text> - Pass Thru
+Q - Quiet (no discovery)
+R,1 - Reboot
+T,<0,1> - send data in CMD mode
+U,<rate>,<E,O,N> - Temp Uart Change
+Z - low power sleep
+& - Read switches
From ae28b16fc630cc8219676f1bfb9cee41f0b36a79 Mon Sep 17 00:00:00 2001
From: tmk <nobody@nowhere>
Date: Mon, 28 Jul 2014 11:56:02 +0900
Subject: [PATCH 31/50] Add battery monitor and LED control
---
keyboard/hhkb_rn42/rn42/rn42_task.c | 46 ++++++++++++++++++++++++++++-
1 file changed, 45 insertions(+), 1 deletion(-)
diff --git a/keyboard/hhkb_rn42/rn42/rn42_task.c b/keyboard/hhkb_rn42/rn42/rn42_task.c
index 437dd46f49..fd5a814b29 100644
--- a/keyboard/hhkb_rn42/rn42/rn42_task.c
+++ b/keyboard/hhkb_rn42/rn42/rn42_task.c
@@ -13,6 +13,17 @@
static bool config_mode = false;
static bool force_usb = false;
+static void status_led(bool on)
+{
+ if (on) {
+ DDRE |= (1<<6);
+ PORTE &= ~(1<<6);
+ } else {
+ DDRE |= (1<<6);
+ PORTE |= (1<<6);
+ }
+}
+
static void battery_adc_init(void)
{
ADMUX = (1<<REFS1) | (1<<REFS0); // Ref:2.56V band-gap, Input:ADC0(PF0)
@@ -43,10 +54,35 @@ static uint16_t battery_adc(void)
return bat;
}
+static void battery_led(bool on)
+{
+ if (on) {
+ DDRF |= (1<<5);
+ PORTF &= ~(1<<5);
+ } else {
+ DDRF &= ~(1<<5);
+ PORTF |= (1<<5);
+ }
+}
+
+static bool battery_charging(void)
+{
+ // MCP73831:STAT
+ // Hi-Z: Shutdown/No Battery
+ // Low: Charging
+ // Hi: Charged
+ DDRF &= ~(1<<5);
+ PORTF |= (1<<5);
+ return PINF&(1<<5) ? false : true;
+}
void rn42_task_init(void)
{
battery_adc_init();
+
+ // battery charging(input with pull-up)
+ DDRF &= ~(1<<5);
+ PORTF |= (1<<5);
}
void rn42_task(void)
@@ -108,6 +144,8 @@ void rn42_task(void)
******************************************************************************/
bool command_extra(uint8_t code)
{
+ uint32_t t;
+ uint16_t b;
static host_driver_t *prev_driver = &rn42_driver;
switch (code) {
case KC_H:
@@ -166,10 +204,16 @@ bool command_extra(uint8_t code)
xprintf("rn42_rts(): %X\n", rn42_rts());
xprintf("config_mode: %X\n", config_mode);
xprintf("VBUS: %X\n", USBSTA&(1<<VBUS));
+ xprintf("battery_charging: %X\n", battery_charging());
return true;
case KC_B:
// battery monitor
- xprintf("BAT: %04X(%08lX)\n", battery_adc(), timer_read32());
+ t = timer_read32()/1000;
+ b = battery_adc();
+ xprintf("BAT: %umV(%04X)\t", (b-16)*5, b);
+ xprintf("%02u:", t/3600);
+ xprintf("%02u:", t%3600/60);
+ xprintf("%02u\n", t%60);
return true;
default:
if (config_mode)
From f441ad07ccbb7ed0a6fbe7068f89aacd6dc6ff3d Mon Sep 17 00:00:00 2001
From: tmk <nobody@nowhere>
Date: Mon, 28 Jul 2014 15:12:00 +0900
Subject: [PATCH 32/50] Add initial setting of Linked pin
---
keyboard/hhkb_rn42/rn42/rn42.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/keyboard/hhkb_rn42/rn42/rn42.c b/keyboard/hhkb_rn42/rn42/rn42.c
index e7d8ba45cc..556c61af95 100644
--- a/keyboard/hhkb_rn42/rn42/rn42.c
+++ b/keyboard/hhkb_rn42/rn42/rn42.c
@@ -25,12 +25,17 @@ host_driver_t rn42_driver = {
void rn42_init(void)
{
- // PF7: BT connection control(HiZ: connect, low: disconnect)
// JTAG disable for PORT F. write JTD bit twice within four cycles.
MCUCR |= (1<<JTD);
MCUCR |= (1<<JTD);
+
+ // PF7: BT connection control(high: connect, low: disconnect)
rn42_autoconnect();
+ // PF6: linked(input without pull-up)
+ DDRF &= ~(1<<6);
+ PORTF &= ~(1<<6);
+
// PF1: RTS(low: allowed to send, high: not allowed)
DDRF &= ~(1<<1);
PORTF &= ~(1<<1);
From e4b95410416d98f9d9753a1ce21846256de7c8fa Mon Sep 17 00:00:00 2001
From: tmk <nobody@nowhere>
Date: Mon, 28 Jul 2014 15:52:07 +0900
Subject: [PATCH 33/50] Add connection indicator
---
keyboard/hhkb_rn42/rn42/rn42_task.c | 17 +++++++++++++----
1 file changed, 13 insertions(+), 4 deletions(-)
diff --git a/keyboard/hhkb_rn42/rn42/rn42_task.c b/keyboard/hhkb_rn42/rn42/rn42_task.c
index fd5a814b29..2813b1c5ff 100644
--- a/keyboard/hhkb_rn42/rn42/rn42_task.c
+++ b/keyboard/hhkb_rn42/rn42/rn42_task.c
@@ -58,10 +58,10 @@ static void battery_led(bool on)
{
if (on) {
DDRF |= (1<<5);
- PORTF &= ~(1<<5);
+ PORTF &= ~(1<<5); // Low
} else {
DDRF &= ~(1<<5);
- PORTF |= (1<<5);
+ PORTF &= ~(1<<5); // HiZ
}
}
@@ -80,9 +80,9 @@ void rn42_task_init(void)
{
battery_adc_init();
- // battery charging(input with pull-up)
+ // battery charging(HiZ)
DDRF &= ~(1<<5);
- PORTF |= (1<<5);
+ PORTF &= ~(1<<5);
}
void rn42_task(void)
@@ -135,6 +135,15 @@ void rn42_task(void)
host_set_driver(&lufa_driver);
}
}
+
+ /* Battery monitor */
+
+ /* Connection monitor */
+ if (rn42_linked()) {
+ status_led(true);
+ } else {
+ status_led(false);
+ }
}
From 17f22da3cf3366344347b24b068fa4043a79d64b Mon Sep 17 00:00:00 2001
From: tmk <nobody@nowhere>
Date: Mon, 28 Jul 2014 16:35:01 +0900
Subject: [PATCH 34/50] Update MEMO.txt
---
keyboard/hhkb_rn42/MEMO.txt | 68 +++++++++++++++++++++++++------------
1 file changed, 46 insertions(+), 22 deletions(-)
diff --git a/keyboard/hhkb_rn42/MEMO.txt b/keyboard/hhkb_rn42/MEMO.txt
index 28c5a09d38..02cd2e1883 100644
--- a/keyboard/hhkb_rn42/MEMO.txt
+++ b/keyboard/hhkb_rn42/MEMO.txt
@@ -1,27 +1,35 @@
Roving RN-42
============
-07/16 After fix of voltage dividor on GPIO6, had a trouble that it could not send a char to BT module, though could receive.
- Found R8 had wrong 1K resistor and changed to 10K, after that it can send to the module again. Not sure how it had sent with the wrong 1K before.
-07/18 On Linux, had an USB related trouble; keyobard or console didn't work for some reason. Changing PID cured this problem. Very annoying, took very long time before resolved it.
-
-
TODO
----
+Power saving:
+- When not connected in a few minuts get into deep sleep to save battery life
+- CTS is needed for waking up from deep sleep? How deep sleep is activated?
+
+Improving:
+- Status LED; connecting, liked, low battery, sleeping, deep sleeping
+- Battry voltage display by command; like full(solid), medium(blink), low(flash)
+- move rn42 to protocol directory when it becomes reusable stack
- LUFA sendchar should be buffered and serial_uart.c buffur size is too large(256).
-- Factroy reset doesn't work; need to test again. 10K pull-up is too high?
-- Lipo voltage ADC sensing
-- Lipo charger configuration: fast charge time: USB charger spec?
-- Low voltage alarm: LED indcates voltage of Lipo
-- CTS/RTS lines are needed? just connect in loop back if no flow control is needed.
-- CTS is needed for waking up from deep sleep?
-- Serial API callback when data are available/received(and when send buffer is available)
-- Serial API instance several serial ports can be used
-- DCDC converter: squeaky inducter with onsemi NCP1402
-- Lipo charger MCP73831: needs capacitor 4.7uF *2
+
+Testing:
+- Factroy reset doesn't work; need to **test again** 10K pull-up is too high?
+- Lipo voltage ADC value is not stabilized
+- DCDC converter: squeaky inducter; try other inductors
+
- Keymap layer bug: during space is pressed(mousekey) press Fn(HHKB) then release space before Fn, in result HHKB layer is locked(toggled) unintentionally.
+
DONE:
+- Lipo charger configuration: fast charge time: USB charger spec? -- used 2kohm
+- use LED of charger to alarm low battery. LED should be powered directly from Lipo? - cancel; powered from VUSB
+- Use RTS in serial_uart.c to resolve missing chars from help message of RN-42 - done
+- CTS/RTS lines are needed? just connect in loop back if no flow control is needed. - done
+- add IO pin to charger status CHRG; LED control(low) and detect charge status(input HiZ) 07.24
+- LINKED: add trace on PIO2 to PF6 07.24
+- Lipo voltage ADC sensing
+- Lipo charger MCP73831: needs capacitor 4.7uF *2
- USB connection check - 07.01
- BT on/off check: whether RX line is pulled up? - checking RTS 07.01
- USB/BT switching BT is on -> BT, BT is off -> USB - 07.01
@@ -30,22 +38,35 @@ DONE:
- Power selector doesn't work; Q4 MOSFET leaks from Lipo to USB power line. -- use Schottky instead 07/04
+
+TROUBLE SHOOT
+-------------
+07/16 After fix of voltage dividor on GPIO6, had a trouble that it could not send a char to BT module, though could receive.
+ Found R8 had wrong 1K resistor and changed to 10K, after that it can send to the module again. Not sure how it had sent with the wrong 1K before.
+
+07/18 On Linux, had an USB related trouble; keyobard or console didn't work for some reason. Changing PID cured this problem. Very annoying, took very long time before resolved it.
+
+
+
Lipo
----
+850mA lasts around 9 hours(07/28)
+
Sparkfun Polymer Lithium Ion Battery 850mAh:
https://www.sparkfun.com/products/341
Lipo Cell spec:
https://www.sparkfun.com/datasheets/Batteries/063048%20Li-polymer.pdf
Protection spec:
http://dlnmh9ip6v2uc.cloudfront.net/datasheets/Prototyping/BatteryProtection.pdf
- min typical max
-over-charge 4.255 4.280 4.305
-over-charge discover? 4.030 4.080 4.130
-over-discharge 2.827 2.900 2.973
-over-discharge discover 3.022 3.100 3.178
+ min typical max
+ over-charge 4.255 4.280 4.305
+ over-charge discover? 4.030 4.080 4.130
+ over-discharge 2.827 2.900 2.973
+ over-discharge discover 3.022 3.100 3.178
ADC voltage monitor: voltage divider 10K+10K(0.5)
- ADC=V*0.5/2.56*1024
+ ADC=V*0.5/2.56*1024
+
V ADC
------------------
4.20 0x347(839)
@@ -134,7 +155,9 @@ R,1 reboot
Apple iOS
---------
-Cannot supported without apple iAP authentication chip.
+Keyboard can be used with iPhone, but mouse cannot.
+To operate iOS with keyboard is not so useful, though.
+There may be iOS specific scancodes?
HID flag register
@@ -158,6 +181,7 @@ GH
0100: Joystick
1xxx: reserved
+
Out report - Indicator
----------------------
0xFE 0x02 0x01 <LED_state>
From 4f22a45b99abd6b018ac0ab8be915e45a9f88282 Mon Sep 17 00:00:00 2001
From: tmk <nobody@nowhere>
Date: Wed, 20 Aug 2014 13:36:15 +0900
Subject: [PATCH 35/50] Add support for HHKB JP
---
keyboard/hhkb_rn42/MEMO.txt | 1 +
keyboard/hhkb_rn42/Makefile | 26 ++++--
keyboard/hhkb_rn42/config.h | 6 +-
keyboard/hhkb_rn42/keymap_common.h | 27 ++++++
keyboard/hhkb_rn42/matrix.c | 133 ++---------------------------
5 files changed, 59 insertions(+), 134 deletions(-)
diff --git a/keyboard/hhkb_rn42/MEMO.txt b/keyboard/hhkb_rn42/MEMO.txt
index 02cd2e1883..a5fa04db18 100644
--- a/keyboard/hhkb_rn42/MEMO.txt
+++ b/keyboard/hhkb_rn42/MEMO.txt
@@ -12,6 +12,7 @@ Improving:
- Battry voltage display by command; like full(solid), medium(blink), low(flash)
- move rn42 to protocol directory when it becomes reusable stack
- LUFA sendchar should be buffered and serial_uart.c buffur size is too large(256).
+- keyboard LED update
Testing:
- Factroy reset doesn't work; need to **test again** 10K pull-up is too high?
diff --git a/keyboard/hhkb_rn42/Makefile b/keyboard/hhkb_rn42/Makefile
index b46b777898..e28b3e0be1 100644
--- a/keyboard/hhkb_rn42/Makefile
+++ b/keyboard/hhkb_rn42/Makefile
@@ -53,12 +53,6 @@ SRC += keymap_common.c \
matrix.c \
led.c
-ifdef KEYMAP
- SRC := keymap_$(KEYMAP).c $(SRC)
-else
- SRC := keymap_hasu.c $(SRC)
-endif
-
CONFIG_H = config.h
@@ -124,6 +118,26 @@ CONSOLE_ENABLE = yes # Console for debug
COMMAND_ENABLE = yes # Commands for debug and configuration
#NKRO_ENABLE = yes # USB Nkey Rollover
#KEYMAP_SECTION_ENABLE = yes # fixed address keymap for keymap editor
+#HHKB_JP = yes # HHKB JP support
+
+
+ifdef HHKB_JP
+ OPT_DEFS += -DHHKB_JP
+endif
+
+
+#
+# Keymap file
+#
+ifdef KEYMAP
+ SRC := keymap_$(KEYMAP).c $(SRC)
+else
+ ifdef HHKB_JP
+ SRC := keymap_jp.c $(SRC)
+ else
+ SRC := keymap_hasu.c $(SRC)
+ endif
+endif
# Search Path
diff --git a/keyboard/hhkb_rn42/config.h b/keyboard/hhkb_rn42/config.h
index e641a5a2bb..a46c7a8bf0 100644
--- a/keyboard/hhkb_rn42/config.h
+++ b/keyboard/hhkb_rn42/config.h
@@ -28,7 +28,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* matrix size */
-#define MATRIX_ROWS 8
+#ifdef HHKB_JP
+# define MATRIX_ROWS 16
+#else
+# define MATRIX_ROWS 8
+#endif
#define MATRIX_COLS 8
diff --git a/keyboard/hhkb_rn42/keymap_common.h b/keyboard/hhkb_rn42/keymap_common.h
index ec922a3225..3622665f3a 100644
--- a/keyboard/hhkb_rn42/keymap_common.h
+++ b/keyboard/hhkb_rn42/keymap_common.h
@@ -54,4 +54,31 @@ extern const uint16_t fn_actions[];
{ KC_##K70, KC_##K71, KC_##K72, KC_##K73, KC_##K74, KC_##K75, KC_##K76, KC_NO } \
}
+
+#define KEYMAP_JP( \
+ K02, K32, K62, K22, K12, K52, K72, KA2, K92, K82, KB2, KE2, KF2, KD2, KC2, \
+ K03, K63, K23, K13, K53, K73, KA3, K93, K83, KB3, KE3, KF3, KD3, \
+ K06, K66, K26, K16, K56, K76, KA6, K96, K86, KB6, KE6, KF6, KD6, KC6, \
+ K05, K65, K25, K15, K55, K75, KA5, K95, K85, KB5, KE5, KF5, KD5, KC5, \
+ K04, K34, K64, K24, K14, K74, K94, K84, KB4, KE4, KF4, KD4, KC4 \
+) \
+{ \
+ { KC_NO, KC_NO, KC_##K02, KC_##K03, KC_##K04, KC_##K05, KC_##K06, KC_NO }, \
+ { KC_NO, KC_NO, KC_##K12, KC_##K13, KC_##K14, KC_##K15, KC_##K16, KC_NO }, \
+ { KC_NO, KC_NO, KC_##K22, KC_##K23, KC_##K24, KC_##K25, KC_##K26, KC_NO }, \
+ { KC_NO, KC_NO, KC_##K32, KC_NO, KC_##K34, KC_NO, KC_NO, KC_NO }, \
+ { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
+ { KC_NO, KC_NO, KC_##K52, KC_##K53, KC_NO, KC_##K55, KC_##K56, KC_NO }, \
+ { KC_NO, KC_NO, KC_##K62, KC_##K63, KC_##K64, KC_##K65, KC_##K66, KC_NO }, \
+ { KC_NO, KC_NO, KC_##K72, KC_##K73, KC_##K74, KC_##K75, KC_##K76, KC_NO }, \
+ { KC_NO, KC_NO, KC_##K82, KC_##K83, KC_##K84, KC_##K85, KC_##K86, KC_NO }, \
+ { KC_NO, KC_NO, KC_##K92, KC_##K93, KC_##K94, KC_##K95, KC_##K96, KC_NO }, \
+ { KC_NO, KC_NO, KC_##KA2, KC_##KA3, KC_NO, KC_##KA5, KC_##KA6, KC_NO }, \
+ { KC_NO, KC_NO, KC_##KB2, KC_##KB3, KC_##KB4, KC_##KB5, KC_##KB6, KC_NO }, \
+ { KC_NO, KC_NO, KC_##KC2, KC_NO, KC_##KC4, KC_##KC5, KC_##KC6, KC_NO }, \
+ { KC_NO, KC_NO, KC_##KD2, KC_##KD3, KC_##KD4, KC_##KD5, KC_##KD6, KC_NO }, \
+ { KC_NO, KC_NO, KC_##KE2, KC_##KE3, KC_##KE4, KC_##KE5, KC_##KE6, KC_NO }, \
+ { KC_NO, KC_NO, KC_##KF2, KC_##KF3, KC_##KF4, KC_##KF5, KC_##KF6, KC_NO } \
+}
+
#endif
diff --git a/keyboard/hhkb_rn42/matrix.c b/keyboard/hhkb_rn42/matrix.c
index d0731ef1f8..b0af4baa52 100644
--- a/keyboard/hhkb_rn42/matrix.c
+++ b/keyboard/hhkb_rn42/matrix.c
@@ -20,20 +20,13 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <stdint.h>
#include <stdbool.h>
-#include <avr/io.h>
-#include <avr/interrupt.h>
#include <util/delay.h>
#include "print.h"
#include "debug.h"
#include "util.h"
#include "timer.h"
#include "matrix.h"
-
-
-// Timer resolution check
-#if (1000000/TIMER_RAW_FREQ > 20)
-# error "Timer resolution(>20us) is not enough for HHKB matrix scan tweak on V-USB."
-#endif
+#include "hhkb_avr.h"
// matrix state buffer(1:on, 0:off)
@@ -43,122 +36,6 @@ static matrix_row_t _matrix0[MATRIX_ROWS];
static matrix_row_t _matrix1[MATRIX_ROWS];
-// Matrix I/O ports
-//
-// row: HC4051[A,B,C] selects scan row0-7
-// col: LS145[A,B,C,D] selects scan col0-7 and enable(D)
-// key: on: 0/off: 1
-// prev: unknown: output previous key state(negated)?
-
-#if defined(__AVR_AT90USB1286__)
-// Ports for Teensy++
-// row: PB0-2
-// col: PB3-5,6
-// key: PE6(pull-uped)
-// prev: PE7
-#define KEY_INIT() do { \
- DDRB |= 0x7F; \
- DDRE |= (1<<7); \
- DDRE &= ~(1<<6); \
- PORTE |= (1<<6); \
-} while (0)
-#define KEY_SELECT(ROW, COL) (PORTB = (PORTB & 0xC0) | \
- (((COL) & 0x07)<<3) | \
- ((ROW) & 0x07))
-#define KEY_ENABLE() (PORTB &= ~(1<<6))
-#define KEY_UNABLE() (PORTB |= (1<<6))
-#define KEY_STATE() (PINE & (1<<6))
-#define KEY_PREV_ON() (PORTE |= (1<<7))
-#define KEY_PREV_OFF() (PORTE &= ~(1<<7))
-#define KEY_POWER_ON()
-#define KEY_POWER_OFF()
-
-#elif defined(__AVR_ATmega32U4__)
-// Ports for my designed Alt Controller PCB
-// row: PB0-2
-// col: PB3-5,6
-// key: PD7(pull-uped)
-// prev: PB7
-// power: PD4(L:off/H:on)
-#define KEY_INIT() do { \
- DDRB = 0xFF; \
- PORTB = 0x00; \
- DDRD &= ~0x80; \
- PORTD |= 0x80; \
- /* keyswitch board power on */ \
- DDRD |= (1<<4); \
- PORTD |= (1<<4); \
- KEY_UNABLE(); \
- KEY_PREV_OFF(); \
-} while (0)
-#define KEY_SELECT(ROW, COL) (PORTB = (PORTB & 0xC0) | \
- (((COL) & 0x07)<<3) | \
- ((ROW) & 0x07))
-#define KEY_ENABLE() (PORTB &= ~(1<<6))
-#define KEY_UNABLE() (PORTB |= (1<<6))
-#define KEY_STATE() (PIND & (1<<7))
-#define KEY_PREV_ON() (PORTB |= (1<<7))
-#define KEY_PREV_OFF() (PORTB &= ~(1<<7))
-#define KEY_POWER_ON()
-#define KEY_POWER_OFF()
-/*
-#define KEY_POWER_ON() do { \
- KEY_INIT(); \
- PORTD |= (1<<4); \
- _delay_ms(1); \
-} while (0)
-#define KEY_POWER_OFF() do { \
- PORTD &= ~(1<<4); \
- DDRB &= ~0xFF; \
- PORTB &= ~0xFF; \
- DDRB &= ~0x80; \
- PORTB &= ~0x80; \
-} while (0)
-*/
-
-
-#elif defined(__AVR_ATmega328P__)
-// Ports for V-USB
-// key: PB0(pull-uped)
-// prev: PB1
-// row: PB2-4
-// col: PC0-2,3
-// power: PB5(Low:on/Hi-z:off)
-#define KEY_INIT() do { \
- DDRB |= 0x3E; \
- DDRB &= ~(1<<0); \
- PORTB |= 1<<0; \
- DDRC |= 0x0F; \
- KEY_UNABLE(); \
- KEY_PREV_OFF(); \
-} while (0)
-#define KEY_SELECT(ROW, COL) do { \
- PORTB = (PORTB & 0xE3) | ((ROW) & 0x07)<<2; \
- PORTC = (PORTC & 0xF8) | ((COL) & 0x07); \
-} while (0)
-#define KEY_ENABLE() (PORTC &= ~(1<<3))
-#define KEY_UNABLE() (PORTC |= (1<<3))
-#define KEY_STATE() (PINB & (1<<0))
-#define KEY_PREV_ON() (PORTB |= (1<<1))
-#define KEY_PREV_OFF() (PORTB &= ~(1<<1))
-// Power supply switching
-#define KEY_POWER_ON() do { \
- KEY_INIT(); \
- PORTB &= ~(1<<5); \
- _delay_ms(1); \
-} while (0)
-#define KEY_POWER_OFF() do { \
- DDRB &= ~0x3F; \
- PORTB &= ~0x3F; \
- DDRC &= ~0x0F; \
- PORTC &= ~0x0F; \
-} while (0)
-
-#else
-# error "define code for matrix scan"
-#endif
-
-
inline
uint8_t matrix_rows(void)
{
@@ -199,13 +76,13 @@ uint8_t matrix_scan(void)
for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
for (uint8_t col = 0; col < MATRIX_COLS; col++) {
KEY_SELECT(row, col);
- _delay_us(40);
+ _delay_us(5);
// Not sure this is needed. This just emulates HHKB controller's behaviour.
if (matrix_prev[row] & (1<<col)) {
KEY_PREV_ON();
}
- _delay_us(7);
+ _delay_us(10);
// NOTE: KEY_STATE is valid only in 20us after KEY_ENABLE.
// If V-USB interrupts in this section we could lose 40us or so
@@ -241,11 +118,13 @@ uint8_t matrix_scan(void)
matrix[row] = matrix_prev[row];
}
+ _delay_us(5);
KEY_PREV_OFF();
KEY_UNABLE();
+
// NOTE: KEY_STATE keep its state in 20us after KEY_ENABLE.
// This takes 25us or more to make sure KEY_STATE returns to idle state.
- _delay_us(150);
+ _delay_us(75);
}
}
KEY_POWER_OFF();
From 28c1bf294c223f3a93ec7ee2420ada7f1e27fba0 Mon Sep 17 00:00:00 2001
From: tmk <nobody@nowhere>
Date: Sun, 24 Aug 2014 09:51:21 +0900
Subject: [PATCH 36/50] Add files missing for JP support.
---
keyboard/hhkb_rn42/hhkb_avr.h | 149 +++++++++++++++++++++++++++++++++
keyboard/hhkb_rn42/keymap_jp.c | 50 +++++++++++
2 files changed, 199 insertions(+)
create mode 100644 keyboard/hhkb_rn42/hhkb_avr.h
create mode 100644 keyboard/hhkb_rn42/keymap_jp.c
diff --git a/keyboard/hhkb_rn42/hhkb_avr.h b/keyboard/hhkb_rn42/hhkb_avr.h
new file mode 100644
index 0000000000..b7bd507b5d
--- /dev/null
+++ b/keyboard/hhkb_rn42/hhkb_avr.h
@@ -0,0 +1,149 @@
+#ifndef HHKB_AVR_H
+#define HHKB_AVR_H
+
+#include <stdint.h>
+#include <stdbool.h>
+#include <avr/io.h>
+#include <avr/interrupt.h>
+#include <util/delay.h>
+
+
+// Timer resolution check
+#if (1000000/TIMER_RAW_FREQ > 20)
+# error "Timer resolution(>20us) is not enough for HHKB matrix scan tweak on V-USB."
+#endif
+
+
+/*
+ * HHKB Matrix I/O
+ *
+ * row: HC4051[A,B,C] selects scan row0-7
+ * row-ext: [En0,En1] row extention for JP
+ * col: LS145[A,B,C,D] selects scan col0-7 and enable(D)
+ * key: on: 0/off: 1
+ * prev: hysteresis control: assert(1) when previous key state is on
+ */
+
+
+#if defined(__AVR_ATmega32U4__)
+/*
+ * For TMK HHKB alt controller(ATMega32U4)
+ *
+ * row: PB0-2
+ * col: PB3-5,6
+ * key: PD7(pull-uped)
+ * prev: PB7
+ * power: PD4(L:off/H:on)
+ * row-ext: PC6,7 for HHKB JP(active low)
+ */
+static inline void KEY_ENABLE(void) { (PORTB &= ~(1<<6)); }
+static inline void KEY_UNABLE(void) { (PORTB |= (1<<6)); }
+static inline bool KEY_STATE(void) { return (PIND & (1<<7)); }
+static inline void KEY_PREV_ON(void) { (PORTB |= (1<<7)); }
+static inline void KEY_PREV_OFF(void) { (PORTB &= ~(1<<7)); }
+static inline void KEY_POWER_ON(void) {}
+static inline void KEY_POWER_OFF(void) {}
+static inline void KEY_INIT(void)
+{
+ DDRB = 0xFF;
+ PORTB = 0x00;
+ DDRD &= ~0x80;
+ PORTD |= 0x80;
+ /* keyswitch board power on */
+ DDRD |= (1<<4);
+ PORTD |= (1<<4);
+#ifdef HHKB_JP
+ /* row extention for HHKB JP */
+ DDRC |= (1<<6|1<<7);
+ PORTC |= (1<<6|1<<7);
+#endif
+ KEY_UNABLE();
+ KEY_PREV_OFF();
+}
+static inline void KEY_SELECT(uint8_t ROW, uint8_t COL)
+{
+ PORTB = (PORTB & 0xC0) | (((COL) & 0x07)<<3) | ((ROW) & 0x07);
+#ifdef HHKB_JP
+ if ((ROW) & 0x08) PORTC = (PORTC & ~(1<<6|1<<7)) | (1<<6);
+ else PORTC = (PORTC & ~(1<<6|1<<7)) | (1<<7);
+#endif
+}
+
+
+#elif defined(__AVR_AT90USB1286__)
+/*
+ * For Teensy++(AT90USB1286)
+ *
+ * HHKB pro HHKB pro2
+ * row: PB0-2 (6-8) (5-7)
+ * col: PB3-5,6 (9-12) (8-11)
+ * key: PE6(pull-uped) (4) (3)
+ * prev: PE7 (5) (4)
+ *
+ * TODO: convert into 'staitc inline' function
+ */
+#define KEY_INIT() do { \
+ DDRB |= 0x7F; \
+ DDRE |= (1<<7); \
+ DDRE &= ~(1<<6); \
+ PORTE |= (1<<6); \
+} while (0)
+#define KEY_SELECT(ROW, COL) (PORTB = (PORTB & 0xC0) | \
+ (((COL) & 0x07)<<3) | \
+ ((ROW) & 0x07))
+#define KEY_ENABLE() (PORTB &= ~(1<<6))
+#define KEY_UNABLE() (PORTB |= (1<<6))
+#define KEY_STATE() (PINE & (1<<6))
+#define KEY_PREV_ON() (PORTE |= (1<<7))
+#define KEY_PREV_OFF() (PORTE &= ~(1<<7))
+#define KEY_POWER_ON()
+#define KEY_POWER_OFF()
+
+
+#else
+# error "define code for matrix scan"
+#endif
+
+
+#if 0
+// For ATMega328P with V-USB
+//
+// #elif defined(__AVR_ATmega328P__)
+// Ports for V-USB
+// key: PB0(pull-uped)
+// prev: PB1
+// row: PB2-4
+// col: PC0-2,3
+// power: PB5(Low:on/Hi-z:off)
+#define KEY_INIT() do { \
+ DDRB |= 0x3E; \
+ DDRB &= ~(1<<0); \
+ PORTB |= 1<<0; \
+ DDRC |= 0x0F; \
+ KEY_UNABLE(); \
+ KEY_PREV_OFF(); \
+} while (0)
+#define KEY_SELECT(ROW, COL) do { \
+ PORTB = (PORTB & 0xE3) | ((ROW) & 0x07)<<2; \
+ PORTC = (PORTC & 0xF8) | ((COL) & 0x07); \
+} while (0)
+#define KEY_ENABLE() (PORTC &= ~(1<<3))
+#define KEY_UNABLE() (PORTC |= (1<<3))
+#define KEY_STATE() (PINB & (1<<0))
+#define KEY_PREV_ON() (PORTB |= (1<<1))
+#define KEY_PREV_OFF() (PORTB &= ~(1<<1))
+// Power supply switching
+#define KEY_POWER_ON() do { \
+ KEY_INIT(); \
+ PORTB &= ~(1<<5); \
+ _delay_ms(1); \
+} while (0)
+#define KEY_POWER_OFF() do { \
+ DDRB &= ~0x3F; \
+ PORTB &= ~0x3F; \
+ DDRC &= ~0x0F; \
+ PORTC &= ~0x0F; \
+} while (0)
+#endif
+
+#endif
diff --git a/keyboard/hhkb_rn42/keymap_jp.c b/keyboard/hhkb_rn42/keymap_jp.c
new file mode 100644
index 0000000000..48d0ee70ba
--- /dev/null
+++ b/keyboard/hhkb_rn42/keymap_jp.c
@@ -0,0 +1,50 @@
+/*
+ * HHKB JP Layout
+ */
+#include "keymap_common.h"
+
+
+#ifdef KEYMAP_SECTION_ENABLE
+const uint8_t keymaps[][MATRIX_ROWS][MATRIX_COLS] __attribute__ ((section (".keymap.keymaps"))) = {
+#else
+const uint8_t keymaps[][MATRIX_ROWS][MATRIX_COLS] PROGMEM = {
+#endif
+ /* Layer 0: Default Layer */
+ KEYMAP_JP(ESC, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, MINS,EQL, JYEN,BSPC, \
+ TAB, Q, W, E, R, T, Y, U, I, O, P, LBRC,RBRC, \
+ LCTL,A, S, D, F, G, H, J, K, L, SCLN,QUOT,BSLS,ENT, \
+ LSFT,Z, X, C, V, B, N, M, COMM,DOT, SLSH,RO, UP, RSFT, \
+ FN0, ZKHK,LGUI,LALT,MHEN, SPC, HENK,KANA,RALT,FN0, LEFT,DOWN,RGHT),
+
+ /* Layer 1: HHKB mode (HHKB Fn)
+ * ,-----------------------------------------------------------.
+ * |Pwr| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|Ins|Del|
+ * |-----------------------------------------------------------|
+ * |Caps | | | | | | | |Psc|Slk|Pus|Up | | |
+ * |------------------------------------------------------` |
+ * | |VoD|VoU|Mut| | | *| /|Hom|PgU|Lef|Rig| | |
+ * |-----------------------------------------------------------|
+ * | | | | | | | +| -|End|PgD|Dow| | | |
+ * |-----------------------------------------------------------|
+ * | || | | | | | | | | || | | |
+ * `-----------------------------------------------------------'
+ */
+ KEYMAP_JP(PWR, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, INS, DEL, \
+ CAPS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,PSCR,SLCK,PAUS, UP, TRNS, \
+ TRNS,VOLD,VOLU,MUTE,TRNS,TRNS,PAST,PSLS,HOME,PGUP,LEFT,RGHT,TRNS,PENT, \
+ TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,PPLS,PMNS,END, PGDN,DOWN,TRNS,TRNS,TRNS, \
+ TRNS,TRNS,TRNS,TRNS,TRNS, TRNS, TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS),
+};
+
+
+
+/*
+ * Fn action definition
+ */
+#ifdef KEYMAP_SECTION_ENABLE
+const uint16_t fn_actions[] __attribute__ ((section (".keymap.fn_actions"))) = {
+#else
+const uint16_t fn_actions[] PROGMEM = {
+#endif
+ [0] = ACTION_LAYER_MOMENTARY(1),
+};
From 807ed33a9a29ee3c5248226d0e865d0580d7eebc Mon Sep 17 00:00:00 2001
From: tmk <nobody@nowhere>
Date: Sat, 30 Aug 2014 15:59:41 +0900
Subject: [PATCH 37/50] Fix rn42_linked() to use pullup
---
keyboard/hhkb_rn42/rn42/rn42.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/keyboard/hhkb_rn42/rn42/rn42.c b/keyboard/hhkb_rn42/rn42/rn42.c
index 556c61af95..bdffad7667 100644
--- a/keyboard/hhkb_rn42/rn42/rn42.c
+++ b/keyboard/hhkb_rn42/rn42/rn42.c
@@ -34,7 +34,7 @@ void rn42_init(void)
// PF6: linked(input without pull-up)
DDRF &= ~(1<<6);
- PORTF &= ~(1<<6);
+ PORTF |= (1<<6);
// PF1: RTS(low: allowed to send, high: not allowed)
DDRF &= ~(1<<1);
@@ -93,7 +93,11 @@ void rn42_cts_lo(void)
bool rn42_linked(void)
{
- return PINF&(1<<6);
+ // RN-42 GPIO2
+ // Hi-Z: Not powered
+ // High: Linked
+ // Low: Connecting
+ return !rn42_rts() && PINF&(1<<6);
}
From 02939ab1d831ab7bb02edb28cb0b21fb61bced56 Mon Sep 17 00:00:00 2001
From: tmk <nobody@nowhere>
Date: Thu, 4 Sep 2014 05:30:00 +0900
Subject: [PATCH 38/50] Add battery management
---
keyboard/hhkb_rn42/rn42.mk | 1 +
keyboard/hhkb_rn42/rn42/battery.c | 119 ++++++++++++++++++++++++++++
keyboard/hhkb_rn42/rn42/battery.h | 34 ++++++++
keyboard/hhkb_rn42/rn42/rn42_task.c | 71 +++--------------
4 files changed, 165 insertions(+), 60 deletions(-)
create mode 100644 keyboard/hhkb_rn42/rn42/battery.c
create mode 100644 keyboard/hhkb_rn42/rn42/battery.h
diff --git a/keyboard/hhkb_rn42/rn42.mk b/keyboard/hhkb_rn42/rn42.mk
index 653a809242..fd6f7db1a8 100644
--- a/keyboard/hhkb_rn42/rn42.mk
+++ b/keyboard/hhkb_rn42/rn42.mk
@@ -4,6 +4,7 @@ SRC += serial_uart.c \
rn42/suart.S \
rn42/rn42.c \
rn42/rn42_task.c \
+ rn42/battery.c \
rn42/main.c
OPT_DEFS += -DPROTOCOL_RN42
diff --git a/keyboard/hhkb_rn42/rn42/battery.c b/keyboard/hhkb_rn42/rn42/battery.c
new file mode 100644
index 0000000000..32de864481
--- /dev/null
+++ b/keyboard/hhkb_rn42/rn42/battery.c
@@ -0,0 +1,119 @@
+#include <avr/io.h>
+#include <util/delay.h>
+#include "battery.h"
+
+
+/*
+ * Battery
+ */
+void battery_init(void)
+{
+ // blink
+ battery_led(LED_ON); _delay_ms(500);
+ battery_led(LED_OFF); _delay_ms(500);
+ battery_led(LED_ON); _delay_ms(500);
+ battery_led(LED_OFF); _delay_ms(500);
+ // LED indicates charger status
+ battery_led(LED_CHARGER);
+
+ // ADC setting for voltage monitor
+ // Ref:2.56V band-gap, Input:ADC0(PF0), Prescale:128(16MHz/128=125KHz)
+ ADMUX = (1<<REFS1) | (1<<REFS0);
+ ADCSRA = (1<<ADPS2) | (1<<ADPS1) | (1<<ADPS0);
+ ADCSRA |= (1<<ADEN);
+}
+
+// Indicator for battery
+void battery_led(battery_led_t val)
+{
+ if (val == LED_TOGGLE) {
+ // Toggle LED
+ DDRF |= (1<<5);
+ PINF |= (1<<5);
+ } else if (val == LED_ON) {
+ // On overriding charger status
+ DDRF |= (1<<5);
+ PORTF &= ~(1<<5);
+ } else if (val == LED_OFF) {
+ // Off overriding charger status
+ DDRF |= (1<<5);
+ PORTF |= (1<<5);
+ } else {
+ // Display charger status
+ DDRF &= ~(1<<5);
+ PORTF &= ~(1<<5);
+ }
+}
+
+bool battery_charging(void)
+{
+ if (!(USBSTA&(1<<VBUS))) return false;
+
+ // MCP73831:STAT
+ // HiZ: Shutdown/No Battery
+ // Low: Charging
+ // Hi: Charged
+
+ // preserve last register status
+ uint8_t ddrf_prev = DDRF;
+ uint8_t portf_prev = PORTF;
+
+ // Input with pullup
+ DDRF &= ~(1<<5);
+ PORTF |= (1<<5);
+ _delay_ms(1);
+ bool charging = PINF&(1<<5) ? false : true;
+
+ // restore last register status
+ DDRF = (DDRF&~(1<<5)) | (ddrf_prev&(1<<5));
+ PORTF = (PORTF&~(1<<5)) | (portf_prev&(1<<5));
+
+ return charging;
+}
+
+// Returns voltage in mV
+uint16_t battery_voltage(void)
+{
+ volatile uint16_t bat;
+ //ADCSRA |= (1<<ADEN);
+
+ // discard first result
+ ADCSRA |= (1<<ADSC);
+ while (ADCSRA & (1<<ADSC)) ;
+ bat = ADC;
+
+ // discard second result
+ ADCSRA |= (1<<ADSC);
+ while (ADCSRA & (1<<ADSC)) ;
+ bat = ADC;
+
+ ADCSRA |= (1<<ADSC);
+ while (ADCSRA & (1<<ADSC)) ;
+ bat = ADC;
+
+ //ADCSRA &= ~(1<<ADEN);
+
+ return (bat - BATTERY_ADC_OFFSET) * BATTERY_ADC_RESOLUTION;
+}
+
+static bool low_voltage(void) {
+ static bool low = false;
+ uint16_t v = battery_voltage();
+ if (v < BATTERY_VOLTAGE_LOW_LIMIT) {
+ low = true;
+ } else if (v > BATTERY_VOLTAGE_LOW_RECOVERY) {
+ low = false;
+ }
+ return low;
+}
+
+battery_status_t battery_status(void)
+{
+ if (USBSTA&(1<<VBUS)) {
+ /* powered */
+ return battery_charging() ? CHARGING : FULL_CHARGED;
+ } else {
+ /* not powered */
+ return low_voltage() ? LOW_VOLTAGE : DISCHARGING;
+ }
+}
diff --git a/keyboard/hhkb_rn42/rn42/battery.h b/keyboard/hhkb_rn42/rn42/battery.h
new file mode 100644
index 0000000000..60fc8adfcb
--- /dev/null
+++ b/keyboard/hhkb_rn42/rn42/battery.h
@@ -0,0 +1,34 @@
+#ifndef POWER_H
+#define POWER_H
+
+#include <stdint.h>
+#include <stdbool.h>
+
+typedef enum {
+ FULL_CHARGED,
+ CHARGING,
+ DISCHARGING,
+ LOW_VOLTAGE,
+} battery_status_t;
+
+typedef enum {
+ LED_CHARGER = 0,
+ LED_ON,
+ LED_OFF,
+ LED_TOGGLE,
+} battery_led_t;
+
+/* Battery API */
+void battery_init(void);
+void battery_led(battery_led_t val);
+bool battery_charging(void);
+uint16_t battery_voltage(void);
+battery_status_t battery_status(void);
+
+#define BATTERY_VOLTAGE_LOW_LIMIT 3500
+#define BATTERY_VOLTAGE_LOW_RECOVERY 3700
+// ADC offset:16, resolution:5mV
+#define BATTERY_ADC_OFFSET 16
+#define BATTERY_ADC_RESOLUTION 5
+
+#endif
diff --git a/keyboard/hhkb_rn42/rn42/rn42_task.c b/keyboard/hhkb_rn42/rn42/rn42_task.c
index 2813b1c5ff..07b34e111a 100644
--- a/keyboard/hhkb_rn42/rn42/rn42_task.c
+++ b/keyboard/hhkb_rn42/rn42/rn42_task.c
@@ -9,6 +9,7 @@
#include "print.h"
#include "timer.h"
#include "command.h"
+#include "battery.h"
static bool config_mode = false;
static bool force_usb = false;
@@ -24,65 +25,9 @@ static void status_led(bool on)
}
}
-static void battery_adc_init(void)
-{
- ADMUX = (1<<REFS1) | (1<<REFS0); // Ref:2.56V band-gap, Input:ADC0(PF0)
- ADCSRA = (1<<ADPS2) | (1<<ADPS1) | (1<<ADPS0); // Prescale:128 16MHz/128=125KHz
- ADCSRA |= (1<<ADEN); // enable ADC
-}
-
-static uint16_t battery_adc(void)
-{
- volatile uint16_t bat;
- ADCSRA |= (1<<ADEN);
-
- // discard first result
- ADCSRA |= (1<<ADSC);
- while (ADCSRA & (1<<ADSC)) ;
- bat = ADC;
-
- // discard second result
- ADCSRA |= (1<<ADSC);
- while (ADCSRA & (1<<ADSC)) ;
- bat = ADC;
-
- ADCSRA |= (1<<ADSC);
- while (ADCSRA & (1<<ADSC)) ;
- bat = ADC;
-
- ADCSRA &= ~(1<<ADEN);
- return bat;
-}
-
-static void battery_led(bool on)
-{
- if (on) {
- DDRF |= (1<<5);
- PORTF &= ~(1<<5); // Low
- } else {
- DDRF &= ~(1<<5);
- PORTF &= ~(1<<5); // HiZ
- }
-}
-
-static bool battery_charging(void)
-{
- // MCP73831:STAT
- // Hi-Z: Shutdown/No Battery
- // Low: Charging
- // Hi: Charged
- DDRF &= ~(1<<5);
- PORTF |= (1<<5);
- return PINF&(1<<5) ? false : true;
-}
-
void rn42_task_init(void)
{
- battery_adc_init();
-
- // battery charging(HiZ)
- DDRF &= ~(1<<5);
- PORTF &= ~(1<<5);
+ battery_init();
}
void rn42_task(void)
@@ -136,7 +81,12 @@ void rn42_task(void)
}
}
- /* Battery monitor */
+ /* Low voltage alert */
+ if (battery_status() == LOW_VOLTAGE) {
+ battery_led(LED_ON);
+ } else {
+ battery_led(LED_CHARGER);
+ }
/* Connection monitor */
if (rn42_linked()) {
@@ -214,12 +164,13 @@ bool command_extra(uint8_t code)
xprintf("config_mode: %X\n", config_mode);
xprintf("VBUS: %X\n", USBSTA&(1<<VBUS));
xprintf("battery_charging: %X\n", battery_charging());
+ xprintf("battery_status: %X\n", battery_status());
return true;
case KC_B:
// battery monitor
t = timer_read32()/1000;
- b = battery_adc();
- xprintf("BAT: %umV(%04X)\t", (b-16)*5, b);
+ b = battery_voltage();
+ xprintf("BAT: %umV\t", b);
xprintf("%02u:", t/3600);
xprintf("%02u:", t%3600/60);
xprintf("%02u\n", t%60);
From 3b81ffc16c8cdf260c25f0778d32c721af4f105c Mon Sep 17 00:00:00 2001
From: tmk <nobody@nowhere>
Date: Thu, 4 Sep 2014 17:08:23 +0900
Subject: [PATCH 39/50] Monitor battery and alert low voltage
---
keyboard/hhkb_rn42/rn42/battery.c | 13 +++++---
keyboard/hhkb_rn42/rn42/battery.h | 1 +
keyboard/hhkb_rn42/rn42/rn42_task.c | 47 ++++++++++++++++++++++++++---
3 files changed, 52 insertions(+), 9 deletions(-)
diff --git a/keyboard/hhkb_rn42/rn42/battery.c b/keyboard/hhkb_rn42/rn42/battery.c
index 32de864481..c6988fe336 100644
--- a/keyboard/hhkb_rn42/rn42/battery.c
+++ b/keyboard/hhkb_rn42/rn42/battery.c
@@ -49,10 +49,11 @@ bool battery_charging(void)
{
if (!(USBSTA&(1<<VBUS))) return false;
- // MCP73831:STAT
- // HiZ: Shutdown/No Battery
- // Low: Charging
- // Hi: Charged
+ // Charger Status:
+ // MCP73831 MCP73832 LTC4054 Status
+ // Hi-Z Hi-Z Hi-Z Shutdown/No Battery
+ // Low Low Low Charging
+ // Hi Hi-Z Hi-Z Charged
// preserve last register status
uint8_t ddrf_prev = DDRF;
@@ -68,6 +69,10 @@ bool battery_charging(void)
DDRF = (DDRF&~(1<<5)) | (ddrf_prev&(1<<5));
PORTF = (PORTF&~(1<<5)) | (portf_prev&(1<<5));
+ // TODO: With MCP73831 this can not get stable status when charging.
+ // LED is powered from PSEL line(USB or Lipo)
+ // due to weak low output of STAT pin?
+ // due to pull-up'd via resitor and LED?
return charging;
}
diff --git a/keyboard/hhkb_rn42/rn42/battery.h b/keyboard/hhkb_rn42/rn42/battery.h
index 60fc8adfcb..180d4dcfaa 100644
--- a/keyboard/hhkb_rn42/rn42/battery.h
+++ b/keyboard/hhkb_rn42/rn42/battery.h
@@ -9,6 +9,7 @@ typedef enum {
CHARGING,
DISCHARGING,
LOW_VOLTAGE,
+ UNKNOWN,
} battery_status_t;
typedef enum {
diff --git a/keyboard/hhkb_rn42/rn42/rn42_task.c b/keyboard/hhkb_rn42/rn42/rn42_task.c
index 07b34e111a..30914452e5 100644
--- a/keyboard/hhkb_rn42/rn42/rn42_task.c
+++ b/keyboard/hhkb_rn42/rn42/rn42_task.c
@@ -81,13 +81,50 @@ void rn42_task(void)
}
}
- /* Low voltage alert */
- if (battery_status() == LOW_VOLTAGE) {
- battery_led(LED_ON);
- } else {
- battery_led(LED_CHARGER);
+
+ static uint16_t prev_timer = 0;
+ static uint8_t sec = 0;
+ // NOTE: not exact 1 sec
+ if (timer_elapsed(prev_timer) > 1000) {
+ /* every second */
+ prev_timer = timer_read();
+
+ /* Low voltage alert */
+ uint8_t bs = battery_status();
+ if (bs == LOW_VOLTAGE) {
+ battery_led(LED_ON);
+ } else {
+ battery_led(LED_CHARGER);
+ }
+
+ static uint8_t prev_status = UNKNOWN;
+ if (bs != prev_status) {
+ prev_status = bs;
+ switch (bs) {
+ case FULL_CHARGED: xprintf("FULL_CHARGED\n"); break;
+ case CHARGING: xprintf("CHARGING\n"); break;
+ case DISCHARGING: xprintf("DISCHARGING\n"); break;
+ case LOW_VOLTAGE: xprintf("LOW_VOLTAGE\n"); break;
+ default: xprintf("UNKNOWN STATUS\n"); break;
+ };
+ }
+
+ /* every minute */
+ if (sec == 0) {
+ uint32_t t = timer_read32()/1000;
+ uint16_t v = battery_voltage();
+ uint8_t h = t/3600;
+ uint8_t m = t%3600/60;
+ uint8_t s = t%60;
+ xprintf("%02u:%02u:%02u\t%umV\n", h, m, s, v);
+ /* TODO: xprintf doesn't work for this.
+ xprintf("%02u:%02u:%02u\t%umV\n", (t/3600), (t%3600/60), (t%60), v);
+ */
+ }
+ sec++; sec = sec%60;
}
+
/* Connection monitor */
if (rn42_linked()) {
status_led(true);
From 38714e8c8554f19279f167be0e0fae2404e21e49 Mon Sep 17 00:00:00 2001
From: tmk <nobody@nowhere>
Date: Thu, 4 Sep 2014 17:10:29 +0900
Subject: [PATCH 40/50] Update MEMO and remove a build option to save flash
---
keyboard/hhkb_rn42/MEMO.txt | 100 ++++++++++++++++++++++++++++++++++--
keyboard/hhkb_rn42/Makefile | 2 +-
2 files changed, 97 insertions(+), 5 deletions(-)
diff --git a/keyboard/hhkb_rn42/MEMO.txt b/keyboard/hhkb_rn42/MEMO.txt
index a5fa04db18..11f64b8c4c 100644
--- a/keyboard/hhkb_rn42/MEMO.txt
+++ b/keyboard/hhkb_rn42/MEMO.txt
@@ -3,16 +3,24 @@ Roving RN-42
TODO
----
+Bug:
+- with Nexus5 keyboard and mouse are very laggy.
+
Power saving:
-- When not connected in a few minuts get into deep sleep to save battery life
+- 8MHz clock
+- When not connected in a few minutes get into deep sleep to save battery life
- CTS is needed for waking up from deep sleep? How deep sleep is activated?
+- firmware controlled 3.3V DC converter to switch on/off BT module
+- sleep MCU and BT module(keyboard is not used)
+- deep sleep MCU and BT module(keyboard is not used for long time)
+- deep sleep MCU and turn off BT module(keyboard is not used and not connected)
+- Battery ADC; switching, high resistance
Improving:
-- Status LED; connecting, liked, low battery, sleeping, deep sleeping
-- Battry voltage display by command; like full(solid), medium(blink), low(flash)
+- BT LED; connecting, linked, sleeping, deep sleeping
+- Battry LED; blink(using timer?)
- move rn42 to protocol directory when it becomes reusable stack
- LUFA sendchar should be buffered and serial_uart.c buffur size is too large(256).
-- keyboard LED update
Testing:
- Factroy reset doesn't work; need to **test again** 10K pull-up is too high?
@@ -22,7 +30,91 @@ Testing:
- Keymap layer bug: during space is pressed(mousekey) press Fn(HHKB) then release space before Fn, in result HHKB layer is locked(toggled) unintentionally.
+Done:
+- low battery alert(solid light) 09/04
+
+
+Power routing
+-------------
+Current:
+(USB) +---(Lipo)
+ | | |
+ | | +------+ DPDT
+ | | |Switch/-----------------------+
+ | | +------+ |
+ | +-------+ | |
+ +-|Charger| | |
+ | +-------+ | +---+ |
+ | | |MCU| |
+ | | +---+ |
+ | | | |
+ | | | |
++--------------+ +-----+ +------+ +---/--+ +-----+
+|Power Selector|--|DC 5V|--|DC3.3V|---|Switch|----|RN-42|
++--------------+ +-----+ +------+ +------+ +-----+
+USB Power is boosted unnecessarily, not harmful?
+
+Idea 1:
+(USB) +---(Lipo)
+ | | |
+ | | +------+ DPDT
+ | | |Switch/----------+
+ | | +------+ |
+ | +-------+ | |
+ +-|Charger| | |
+ | +-------+ | +---+ |
+ | +-----+ |MCU| |
+ | |DC 5V| +---+ |
+ | +-----+ | |
+ | | | |
++--------------+ | +---/--+ +------+ +-----+
+|Power Selector|-----+---|Switch|----|DC3.3V|-----|RN-42|
++--------------+ +------+ +------+ +-----+
+To enable BT when USB powered it still needs to turn siwtch on, Lipo consumes quinscent current at 5V converter in vain.(Not good)
+
+Idea 2:
+(USB) +---(Lipo)
+ | | |
+ | | +------+
+ | | |Switch|
+ | | +------+
+ | +-------+ |
+ +-|Charger| |
+ | +-------+ | +---+
+ | +-----+ |MCU|----+ Controlled by firmware
+ | |DC 5V| +---+ | On: Lipo powered
+ | +-----+ | | Off: USB powered
+ | | | |enable
++--------------+ | +------+ +-----+
+|Power Selector|-----+---|DC3.3V|-----|RN-42|
++--------------+ +------+ +-----+
+MCU can controlled power of RN-42 without hardware switch.
+When USB powered and switch is on Lipo consumes quinscent current at 5V converter in vain.(Not good)
+
+Idea 3:
+(USB) +---(Lipo)
+ | | |
+ | | +------+
+ | | |Switch|SPST(or without)
+ | | +------+
+ | +-------+ |
+ +-|Charger| |
+ | +-------+ | +---+
+ | | |MCU|----+ Controlled by firmware
+ | | +---+ | On: Lipo powered
+ | | | | Off: USB powered
+ | | | |enable
++--------------+ +-----+ +------+ +-----+
+|Power Selector|-|DC 5V|-|DC3.3V|-----|RN-42|
++--------------+ +-----+ +------+ +-----+
+Switch is needed to save Lipo when not used because decent power saving is not available now. If firmware can turn off BT module completely and make MCU deep sleep the switch will be not even needed.
+
+
+
+
+
DONE:
+- BT_INDICATOR LED turns on wrongly when touching line or pin. -- pull-up enabled on PF6/GPIO2 08/30
- Lipo charger configuration: fast charge time: USB charger spec? -- used 2kohm
- use LED of charger to alarm low battery. LED should be powered directly from Lipo? - cancel; powered from VUSB
- Use RTS in serial_uart.c to resolve missing chars from help message of RN-42 - done
diff --git a/keyboard/hhkb_rn42/Makefile b/keyboard/hhkb_rn42/Makefile
index e28b3e0be1..3d9a602a58 100644
--- a/keyboard/hhkb_rn42/Makefile
+++ b/keyboard/hhkb_rn42/Makefile
@@ -111,7 +111,7 @@ OPT_DEFS += -DBOOTLOADER_SIZE=4096
# Build Options
# comment out to disable the options.
#
-BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration
+#BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration
MOUSEKEY_ENABLE = yes # Mouse keys
EXTRAKEY_ENABLE = yes # Audio control and System control
CONSOLE_ENABLE = yes # Console for debug
From d8dd18b4217ce56ee3248e3b09598196e0b6731c Mon Sep 17 00:00:00 2001
From: tmk <nobody@nowhere>
Date: Fri, 5 Sep 2014 11:37:05 +0900
Subject: [PATCH 41/50] Improve rn42_task time resolution
---
keyboard/hhkb_rn42/rn42/rn42_task.c | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/keyboard/hhkb_rn42/rn42/rn42_task.c b/keyboard/hhkb_rn42/rn42/rn42_task.c
index 30914452e5..31a415cedf 100644
--- a/keyboard/hhkb_rn42/rn42/rn42_task.c
+++ b/keyboard/hhkb_rn42/rn42/rn42_task.c
@@ -83,11 +83,10 @@ void rn42_task(void)
static uint16_t prev_timer = 0;
- static uint8_t sec = 0;
- // NOTE: not exact 1 sec
- if (timer_elapsed(prev_timer) > 1000) {
+ uint16_t e = timer_elapsed(prev_timer);
+ if (e > 1000) {
/* every second */
- prev_timer = timer_read();
+ prev_timer += e/1000*1000;
/* Low voltage alert */
uint8_t bs = battery_status();
@@ -110,8 +109,8 @@ void rn42_task(void)
}
/* every minute */
- if (sec == 0) {
- uint32_t t = timer_read32()/1000;
+ uint32_t t = timer_read32()/1000;
+ if (t%60 == 0) {
uint16_t v = battery_voltage();
uint8_t h = t/3600;
uint8_t m = t%3600/60;
@@ -121,7 +120,6 @@ void rn42_task(void)
xprintf("%02u:%02u:%02u\t%umV\n", (t/3600), (t%3600/60), (t%60), v);
*/
}
- sec++; sec = sec%60;
}
From 2015027da325e9f9b602af1f36ceeeebbcd6c78d Mon Sep 17 00:00:00 2001
From: tmk <nobody@nowhere>
Date: Sat, 20 Sep 2014 06:12:49 +0900
Subject: [PATCH 42/50] Add FET swtich for battery ADC
---
keyboard/hhkb_rn42/MEMO.txt | 7 +++++++
keyboard/hhkb_rn42/rn42/battery.c | 12 ++++++++++++
2 files changed, 19 insertions(+)
diff --git a/keyboard/hhkb_rn42/MEMO.txt b/keyboard/hhkb_rn42/MEMO.txt
index 11f64b8c4c..2f61574c30 100644
--- a/keyboard/hhkb_rn42/MEMO.txt
+++ b/keyboard/hhkb_rn42/MEMO.txt
@@ -15,12 +15,19 @@ Power saving:
- deep sleep MCU and BT module(keyboard is not used for long time)
- deep sleep MCU and turn off BT module(keyboard is not used and not connected)
- Battery ADC; switching, high resistance
+ - switching gnd end of divider with PF4
+ - high resistor 100K/1M?
+ capacitor 10nF
+ http://www.eevblog.com/forum/beginners/measuring-battery-voltage-without-consuming-current/
Improving:
- BT LED; connecting, linked, sleeping, deep sleeping
- Battry LED; blink(using timer?)
- move rn42 to protocol directory when it becomes reusable stack
- LUFA sendchar should be buffered and serial_uart.c buffur size is too large(256).
+- ADC resolution
+ AVR120
+ AVR32138
Testing:
- Factroy reset doesn't work; need to **test again** 10K pull-up is too high?
diff --git a/keyboard/hhkb_rn42/rn42/battery.c b/keyboard/hhkb_rn42/rn42/battery.c
index c6988fe336..0320e1baf1 100644
--- a/keyboard/hhkb_rn42/rn42/battery.c
+++ b/keyboard/hhkb_rn42/rn42/battery.c
@@ -21,6 +21,10 @@ void battery_init(void)
ADMUX = (1<<REFS1) | (1<<REFS0);
ADCSRA = (1<<ADPS2) | (1<<ADPS1) | (1<<ADPS0);
ADCSRA |= (1<<ADEN);
+
+ // ADC disable voltate divider(PF4)
+ DDRF |= (1<<4);
+ PORTF &= ~(1<<4);
}
// Indicator for battery
@@ -79,6 +83,10 @@ bool battery_charging(void)
// Returns voltage in mV
uint16_t battery_voltage(void)
{
+ // ADC disable voltate divider(PF4)
+ DDRF |= (1<<4);
+ PORTF |= (1<<4);
+
volatile uint16_t bat;
//ADCSRA |= (1<<ADEN);
@@ -98,6 +106,10 @@ uint16_t battery_voltage(void)
//ADCSRA &= ~(1<<ADEN);
+ // ADC disable voltate divider(PF4)
+ DDRF |= (1<<4);
+ PORTF &= ~(1<<4);
+
return (bat - BATTERY_ADC_OFFSET) * BATTERY_ADC_RESOLUTION;
}
From bfd2d969b48eb2f381137383c6262b60e03cf5b1 Mon Sep 17 00:00:00 2001
From: tmk <nobody@nowhere>
Date: Mon, 22 Sep 2014 14:20:49 +0900
Subject: [PATCH 43/50] Add keyboard LED control via Bluetooth
---
keyboard/hhkb_rn42/rn42/rn42.c | 6 ++++--
keyboard/hhkb_rn42/rn42/rn42.h | 1 +
keyboard/hhkb_rn42/rn42/rn42_task.c | 6 +++---
3 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/keyboard/hhkb_rn42/rn42/rn42.c b/keyboard/hhkb_rn42/rn42/rn42.c
index bdffad7667..1565b4cf14 100644
--- a/keyboard/hhkb_rn42/rn42/rn42.c
+++ b/keyboard/hhkb_rn42/rn42/rn42.c
@@ -101,7 +101,9 @@ bool rn42_linked(void)
}
-static uint8_t keyboard_leds(void) { return 0; }
+static uint8_t leds = 0;
+static uint8_t keyboard_leds(void) { return leds; }
+void rn42_set_leds(uint8_t l) { leds = l; }
static void send_keyboard(report_keyboard_t *report)
{
@@ -199,7 +201,7 @@ host_driver_t rn42_config_driver = {
config_send_consumer
};
-static uint8_t config_keyboard_leds(void) { return 0; }
+static uint8_t config_keyboard_leds(void) { return leds; }
static void config_send_keyboard(report_keyboard_t *report) {}
static void config_send_mouse(report_mouse_t *report) {}
static void config_send_system(uint16_t data) {}
diff --git a/keyboard/hhkb_rn42/rn42/rn42.h b/keyboard/hhkb_rn42/rn42/rn42.h
index 72cbb2d724..5283a3648c 100644
--- a/keyboard/hhkb_rn42/rn42/rn42.h
+++ b/keyboard/hhkb_rn42/rn42/rn42.h
@@ -15,5 +15,6 @@ bool rn42_rts(void);
void rn42_cts_hi(void);
void rn42_cts_lo(void);
bool rn42_linked(void);
+void rn42_set_leds(uint8_t l);
#endif
diff --git a/keyboard/hhkb_rn42/rn42/rn42_task.c b/keyboard/hhkb_rn42/rn42/rn42_task.c
index 31a415cedf..c3359ed506 100644
--- a/keyboard/hhkb_rn42/rn42/rn42_task.c
+++ b/keyboard/hhkb_rn42/rn42/rn42_task.c
@@ -7,6 +7,7 @@
#include "lufa.h"
#include "rn42_task.h"
#include "print.h"
+#include "debug.h"
#include "timer.h"
#include "command.h"
#include "battery.h"
@@ -45,7 +46,6 @@ void rn42_task(void)
// LED Out report: 0xFE, 0x02, 0x01, <leds>
// To get the report over UART set bit3 with SH, command.
static enum {LED_INIT, LED_FE, LED_02, LED_01} state = LED_INIT;
- xprintf("%02X\n", c);
switch (state) {
case LED_INIT:
if (c == 0xFE) state = LED_FE;
@@ -60,8 +60,8 @@ void rn42_task(void)
else state = LED_INIT;
break;
case LED_01:
- // TODO: move to rn42.c and make accessible with keyboard_leds()
- xprintf("LED status: %02X\n", c);
+ dprintf("LED status: %02X\n", c);
+ rn42_set_leds(c);
state = LED_INIT;
break;
default:
From 6c06b9031fd09479d552f9750a3b1cfe259678fd Mon Sep 17 00:00:00 2001
From: tmk <nobody@nowhere>
Date: Thu, 2 Oct 2014 09:58:47 +0900
Subject: [PATCH 44/50] Add power control of key switch board
---
keyboard/hhkb_rn42/config.h | 2 ++
keyboard/hhkb_rn42/hhkb_avr.h | 26 +++++++++++++++++++++-----
2 files changed, 23 insertions(+), 5 deletions(-)
diff --git a/keyboard/hhkb_rn42/config.h b/keyboard/hhkb_rn42/config.h
index a46c7a8bf0..21e73f1c53 100644
--- a/keyboard/hhkb_rn42/config.h
+++ b/keyboard/hhkb_rn42/config.h
@@ -50,6 +50,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* Boot Magic salt key: Space */
#define BOOTMAGIC_KEY_SALT KC_FN6
+/* power control of key switch board */
+#define HHKB_POWER_SAVING
/*
* Hardware Serial(UART)
diff --git a/keyboard/hhkb_rn42/hhkb_avr.h b/keyboard/hhkb_rn42/hhkb_avr.h
index b7bd507b5d..313effedfe 100644
--- a/keyboard/hhkb_rn42/hhkb_avr.h
+++ b/keyboard/hhkb_rn42/hhkb_avr.h
@@ -41,17 +41,31 @@ static inline void KEY_UNABLE(void) { (PORTB |= (1<<6)); }
static inline bool KEY_STATE(void) { return (PIND & (1<<7)); }
static inline void KEY_PREV_ON(void) { (PORTB |= (1<<7)); }
static inline void KEY_PREV_OFF(void) { (PORTB &= ~(1<<7)); }
+#ifdef HHKB_POWER_SAVING
+static inline void KEY_POWER_ON(void) {
+ _delay_ms(10); // TODO: sleep to save power
+ DDRB = 0xFF; PORTB = 0x40; // change pins output
+ DDRD |= (1<<4); PORTD |= (1<<4); // MOS FET switch on
+ /* Without this wait you will miss or get false key events. */
+ _delay_ms(1); // wait for powering up
+}
+static inline void KEY_POWER_OFF(void) {
+ /* input with pull-up consumes less than without it when pin is open. */
+ DDRB = 0x00; PORTB = 0xFF; // change pins input with pull-up
+ DDRD |= (1<<4); PORTD &= ~(1<<4); // MOS FET switch off
+}
+#else
static inline void KEY_POWER_ON(void) {}
static inline void KEY_POWER_OFF(void) {}
+#endif
static inline void KEY_INIT(void)
{
+ /* row,col,prev: output */
DDRB = 0xFF;
- PORTB = 0x00;
+ PORTB = 0x40; // unable
+ /* key: input with pull-up */
DDRD &= ~0x80;
- PORTD |= 0x80;
- /* keyswitch board power on */
- DDRD |= (1<<4);
- PORTD |= (1<<4);
+ PORTD |= 0x80;
#ifdef HHKB_JP
/* row extention for HHKB JP */
DDRC |= (1<<6|1<<7);
@@ -59,6 +73,8 @@ static inline void KEY_INIT(void)
#endif
KEY_UNABLE();
KEY_PREV_OFF();
+
+ KEY_POWER_OFF();
}
static inline void KEY_SELECT(uint8_t ROW, uint8_t COL)
{
From c2d830c07c823c48a17c214b093ec1bab989fb6a Mon Sep 17 00:00:00 2001
From: tmk <nobody@nowhere>
Date: Thu, 20 Nov 2014 17:06:46 +0900
Subject: [PATCH 45/50] USB initialize when plug-in during battery powered
---
common/avr/suspend.c | 49 ++++++++++++++++++++++++++++++--------------
common/suspend.h | 3 ++-
protocol/lufa/lufa.c | 15 +++++++++++++-
3 files changed, 50 insertions(+), 17 deletions(-)
diff --git a/common/avr/suspend.c b/common/avr/suspend.c
index f44a036beb..66a579fd78 100644
--- a/common/avr/suspend.c
+++ b/common/avr/suspend.c
@@ -7,6 +7,9 @@
#include "backlight.h"
#include "suspend_avr.h"
#include "suspend.h"
+#ifdef PROTOCOL_LUFA
+#include "lufa.h"
+#endif
#define wdt_intr_enable(value) \
@@ -26,30 +29,45 @@ __asm__ __volatile__ ( \
)
-void suspend_power_down(void)
+void suspend_idle(uint8_t time)
{
-#ifdef BACKLIGHT_ENABLE
- backlight_set(0);
-#endif
-#ifndef NO_SUSPEND_POWER_DOWN
- // Enable watchdog to wake from MCU sleep
cli();
- wdt_reset();
+ set_sleep_mode(SLEEP_MODE_IDLE);
+ sleep_enable();
+ sei();
+ sleep_cpu();
+ sleep_disable();
+}
+
+/* Power down MCU with watchdog timer
+ * wdto: watchdog timer timeout defined in <avr/wdt.h>
+ * WDTO_15MS
+ * WDTO_30MS
+ * WDTO_60MS
+ * WDTO_120MS
+ * WDTO_250MS
+ * WDTO_500MS
+ * WDTO_1S
+ * WDTO_2S
+ * WDTO_4S
+ * WDTO_8S
+ */
+void suspend_power_down(uint8_t wdto)
+{
+#ifdef PROTOCOL_LUFA
+ if (USB_DeviceState == DEVICE_STATE_Configured) return;
+#endif
- // Watchdog Interrupt and System Reset Mode
- //wdt_enable(WDTO_1S);
- //WDTCSR |= _BV(WDIE);
-
// Watchdog Interrupt Mode
- wdt_intr_enable(WDTO_120MS);
-
+ wdt_intr_enable(wdto);
+
// TODO: more power saving
// See PicoPower application note
// - I/O port input with pullup
// - prescale clock
// - BOD disable
// - Power Reduction Register PRR
- // sleep in power down mode
+
set_sleep_mode(SLEEP_MODE_PWR_DOWN);
sleep_enable();
sei();
@@ -58,12 +76,13 @@ void suspend_power_down(void)
// Disable watchdog after sleep
wdt_disable();
-#endif
}
bool suspend_wakeup_condition(void)
{
+ matrix_power_up();
matrix_scan();
+ matrix_power_down();
for (uint8_t r = 0; r < MATRIX_ROWS; r++) {
if (matrix_get_row(r)) return true;
}
diff --git a/common/suspend.h b/common/suspend.h
index 9b76f280d1..f339c670ac 100644
--- a/common/suspend.h
+++ b/common/suspend.h
@@ -5,7 +5,8 @@
#include <stdbool.h>
-void suspend_power_down(void);
+void suspend_idle(uint8_t timeout);
+void suspend_power_down(uint8_t timeout);
bool suspend_wakeup_condition(void);
void suspend_wakeup_init(void);
diff --git a/protocol/lufa/lufa.c b/protocol/lufa/lufa.c
index 16a602df13..6802f3b631 100644
--- a/protocol/lufa/lufa.c
+++ b/protocol/lufa/lufa.c
@@ -148,10 +148,23 @@ static void Console_Task(void)
*/
void EVENT_USB_Device_Connect(void)
{
+ /* For battery powered device */
+ if (!USB_IsInitialized) {
+ USB_Init();
+ USB_Device_EnableSOFEvents();
+ }
}
void EVENT_USB_Device_Disconnect(void)
{
+ /* For battery powered device */
+/* TODO: This doesn't work. After several plug in/outs can not be enumerated.
+ if (USB_IsInitialized) {
+ USB_Disable(); // Disable all interrupts
+ USB_Controller_Enable();
+ USB_INT_Enable(USB_INT_VBUSTI);
+ }
+*/
}
void EVENT_USB_Device_Reset(void)
@@ -574,7 +587,7 @@ int main(void)
print("Keyboard start.\n");
while (1) {
while (USB_DeviceState == DEVICE_STATE_Suspended) {
- suspend_power_down();
+ suspend_power_down(WDTO_120MS);
if (USB_Device_RemoteWakeupEnabled && suspend_wakeup_condition()) {
USB_Device_SendRemoteWakeup();
}
From 608ebe2686bdb3fdbd0426731cabdf6082c57b53 Mon Sep 17 00:00:00 2001
From: tmk <nobody@nowhere>
Date: Sun, 23 Nov 2014 13:08:05 +0900
Subject: [PATCH 46/50] Matrix power saving
---
common/keyboard.c | 23 +++++++++++++++++++++++
common/keyboard.h | 3 +++
common/matrix.h | 5 +++++
keyboard/hhkb_rn42/hhkb_avr.h | 5 ++---
keyboard/hhkb_rn42/matrix.c | 28 ++++++++++++++++++++++++++--
keyboard/hhkb_rn42/rn42/main.c | 2 +-
6 files changed, 60 insertions(+), 6 deletions(-)
diff --git a/common/keyboard.c b/common/keyboard.c
index 9a809ff4a1..dde91a2968 100644
--- a/common/keyboard.c
+++ b/common/keyboard.c
@@ -15,6 +15,8 @@ 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 <stdint.h>
+#include <util/delay.h>
+#include <avr/wdt.h>
#include "keyboard.h"
#include "matrix.h"
#include "keymap.h"
@@ -30,12 +32,14 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "bootmagic.h"
#include "eeconfig.h"
#include "backlight.h"
+#include "suspend.h"
#ifdef MOUSEKEY_ENABLE
# include "mousekey.h"
#endif
#ifdef PS2_MOUSE_ENABLE
# include "ps2_mouse.h"
#endif
+#include "lufa.h"
#ifdef MATRIX_HAS_GHOST
@@ -83,7 +87,25 @@ void keyboard_task(void)
static uint8_t led_status = 0;
matrix_row_t matrix_row = 0;
matrix_row_t matrix_change = 0;
+ static uint32_t last_key_time = 0;
+/*
+#define SLEEP_TIME_MS 10000
+ // (USB_DeviceState == DEVICE_STATE_Suspended) {
+ //if (timer_elapsed32(last_key_time) > SLEEP_TIME_MS) {
+ // TODO: remove LUFA dependent code
+ if (!USB_IsInitialized && timer_elapsed32(last_key_time) > SLEEP_TIME_MS) {
+ matrix_power_down();
+ // TODO: power down only when no USB connection
+ // Or it makes USB connection lost or suspended
+ suspend_power_down(WDTO_15MS);
+ matrix_power_up();
+ }
+ else {
+ matrix_power_down();
+ matrix_power_up();
+ }
+*/
matrix_scan();
for (uint8_t r = 0; r < MATRIX_ROWS; r++) {
matrix_row = matrix_get_row(r);
@@ -105,6 +127,7 @@ void keyboard_task(void)
});
// record a processed key
matrix_prev[r] ^= ((matrix_row_t)1<<c);
+ last_key_time = timer_read32();
// process a key per task call
goto MATRIX_LOOP_END;
}
diff --git a/common/keyboard.h b/common/keyboard.h
index 60f8a89d1d..6442716fc7 100644
--- a/common/keyboard.h
+++ b/common/keyboard.h
@@ -62,6 +62,9 @@ void keyboard_init(void);
void keyboard_task(void);
void keyboard_set_leds(uint8_t leds);
+__attribute__ ((weak)) void matrix_power_up(void) {}
+__attribute__ ((weak)) void matrix_power_down(void) {}
+
#ifdef __cplusplus
}
#endif
diff --git a/common/matrix.h b/common/matrix.h
index d1d14a6ead..23fef78f74 100644
--- a/common/matrix.h
+++ b/common/matrix.h
@@ -53,4 +53,9 @@ matrix_row_t matrix_get_row(uint8_t row);
void matrix_print(void);
+/* power control */
+void matrix_power_up(void);
+void matrix_power_down(void);
+
+
#endif
diff --git a/keyboard/hhkb_rn42/hhkb_avr.h b/keyboard/hhkb_rn42/hhkb_avr.h
index 313effedfe..f007d7667a 100644
--- a/keyboard/hhkb_rn42/hhkb_avr.h
+++ b/keyboard/hhkb_rn42/hhkb_avr.h
@@ -43,11 +43,10 @@ static inline void KEY_PREV_ON(void) { (PORTB |= (1<<7)); }
static inline void KEY_PREV_OFF(void) { (PORTB &= ~(1<<7)); }
#ifdef HHKB_POWER_SAVING
static inline void KEY_POWER_ON(void) {
- _delay_ms(10); // TODO: sleep to save power
DDRB = 0xFF; PORTB = 0x40; // change pins output
DDRD |= (1<<4); PORTD |= (1<<4); // MOS FET switch on
/* Without this wait you will miss or get false key events. */
- _delay_ms(1); // wait for powering up
+ _delay_ms(5); // wait for powering up
}
static inline void KEY_POWER_OFF(void) {
/* input with pull-up consumes less than without it when pin is open. */
@@ -74,7 +73,7 @@ static inline void KEY_INIT(void)
KEY_UNABLE();
KEY_PREV_OFF();
- KEY_POWER_OFF();
+ KEY_POWER_ON();
}
static inline void KEY_SELECT(uint8_t ROW, uint8_t COL)
{
diff --git a/keyboard/hhkb_rn42/matrix.c b/keyboard/hhkb_rn42/matrix.c
index b0af4baa52..c6c444ff52 100644
--- a/keyboard/hhkb_rn42/matrix.c
+++ b/keyboard/hhkb_rn42/matrix.c
@@ -27,8 +27,16 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "timer.h"
#include "matrix.h"
#include "hhkb_avr.h"
+#include <avr/wdt.h>
+#include "suspend.h"
+#include "lufa.h"
+// matrix power saving
+#define MATRIX_POWER_SAVE 10000
+static uint32_t matrix_last_modified = 0;
+static bool matrix_power = true;
+
// matrix state buffer(1:on, 0:off)
static matrix_row_t *matrix;
static matrix_row_t *matrix_prev;
@@ -72,7 +80,7 @@ uint8_t matrix_scan(void)
matrix_prev = matrix;
matrix = tmp;
- KEY_POWER_ON();
+ matrix_power_up();
for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
for (uint8_t col = 0; col < MATRIX_COLS; col++) {
KEY_SELECT(row, col);
@@ -126,8 +134,9 @@ uint8_t matrix_scan(void)
// This takes 25us or more to make sure KEY_STATE returns to idle state.
_delay_us(75);
}
+ if (matrix[row] ^ matrix_prev[row]) matrix_last_modified = timer_read32();
}
- KEY_POWER_OFF();
+ matrix_power_down();
return 1;
}
@@ -165,3 +174,18 @@ void matrix_print(void)
xprintf("%02X: %08b\n", row, bitrev(matrix_get_row(row)));
}
}
+
+void matrix_power_up(void) {
+ if (matrix_power) return;
+ KEY_POWER_ON();
+ matrix_power = true;
+}
+void matrix_power_down(void) {
+ if (!matrix_power) return;
+ // doesn't power save while USB connection is active
+ if (USB_DeviceState == DEVICE_STATE_Configured) return;
+ if (timer_elapsed32(matrix_last_modified) <= MATRIX_POWER_SAVE) return;
+ KEY_POWER_OFF();
+ suspend_power_down(WDTO_15MS);
+ matrix_power = false;
+}
diff --git a/keyboard/hhkb_rn42/rn42/main.c b/keyboard/hhkb_rn42/rn42/main.c
index a3a37c0747..43d887067d 100644
--- a/keyboard/hhkb_rn42/rn42/main.c
+++ b/keyboard/hhkb_rn42/rn42/main.c
@@ -85,7 +85,7 @@ int main(void)
print("Keyboard start.\n");
while (1) {
while (USB_DeviceState == DEVICE_STATE_Suspended) {
- suspend_power_down();
+ suspend_power_down(WDTO_120MS);
if (USB_Device_RemoteWakeupEnabled && suspend_wakeup_condition()) {
USB_Device_SendRemoteWakeup();
}
From 1f96edaed60def1f513ddd8adcdfa3e12b971006 Mon Sep 17 00:00:00 2001
From: tmk <nobody@nowhere>
Date: Sun, 23 Nov 2014 13:38:10 +0900
Subject: [PATCH 47/50] Remove MCU dependent code from common/keyboard.c
---
common/keyboard.c | 23 -----------------------
1 file changed, 23 deletions(-)
diff --git a/common/keyboard.c b/common/keyboard.c
index dde91a2968..9a809ff4a1 100644
--- a/common/keyboard.c
+++ b/common/keyboard.c
@@ -15,8 +15,6 @@ 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 <stdint.h>
-#include <util/delay.h>
-#include <avr/wdt.h>
#include "keyboard.h"
#include "matrix.h"
#include "keymap.h"
@@ -32,14 +30,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "bootmagic.h"
#include "eeconfig.h"
#include "backlight.h"
-#include "suspend.h"
#ifdef MOUSEKEY_ENABLE
# include "mousekey.h"
#endif
#ifdef PS2_MOUSE_ENABLE
# include "ps2_mouse.h"
#endif
-#include "lufa.h"
#ifdef MATRIX_HAS_GHOST
@@ -87,25 +83,7 @@ void keyboard_task(void)
static uint8_t led_status = 0;
matrix_row_t matrix_row = 0;
matrix_row_t matrix_change = 0;
- static uint32_t last_key_time = 0;
-/*
-#define SLEEP_TIME_MS 10000
- // (USB_DeviceState == DEVICE_STATE_Suspended) {
- //if (timer_elapsed32(last_key_time) > SLEEP_TIME_MS) {
- // TODO: remove LUFA dependent code
- if (!USB_IsInitialized && timer_elapsed32(last_key_time) > SLEEP_TIME_MS) {
- matrix_power_down();
- // TODO: power down only when no USB connection
- // Or it makes USB connection lost or suspended
- suspend_power_down(WDTO_15MS);
- matrix_power_up();
- }
- else {
- matrix_power_down();
- matrix_power_up();
- }
-*/
matrix_scan();
for (uint8_t r = 0; r < MATRIX_ROWS; r++) {
matrix_row = matrix_get_row(r);
@@ -127,7 +105,6 @@ void keyboard_task(void)
});
// record a processed key
matrix_prev[r] ^= ((matrix_row_t)1<<c);
- last_key_time = timer_read32();
// process a key per task call
goto MATRIX_LOOP_END;
}
From 60096e11c77980ca6b54674c5b68248e8aa15d8d Mon Sep 17 00:00:00 2001
From: tmk <nobody@nowhere>
Date: Sun, 23 Nov 2014 13:44:11 +0900
Subject: [PATCH 48/50] Update doc
---
keyboard/hhkb_rn42/MEMO.txt | 36 ++++++++++-
keyboard/hhkb_rn42/PowerSave.txt | 102 +++++++++++++++++++++++++++++++
2 files changed, 136 insertions(+), 2 deletions(-)
create mode 100644 keyboard/hhkb_rn42/PowerSave.txt
diff --git a/keyboard/hhkb_rn42/MEMO.txt b/keyboard/hhkb_rn42/MEMO.txt
index 2f61574c30..337dad6039 100644
--- a/keyboard/hhkb_rn42/MEMO.txt
+++ b/keyboard/hhkb_rn42/MEMO.txt
@@ -1,12 +1,37 @@
Roving RN-42
============
-TODO
-----
Bug:
- with Nexus5 keyboard and mouse are very laggy.
+- lose USB connection during power-down mode
+ - USB initialize code in main() causes this - WRONG
+ - Do not power-down during USB connection is active - DONE 11/11
+ (USB_DeviceState == USB_DEVICE_Configured) is used to check USB connection
+ matrix_power_down() matrix.c - 11/23
+
+Todo:
+
+Design:
+- remove MCU dependent power saving code from core/keyboard
+ - it should be located in project matrix.c - DONE 11/23
+- HHKB matrix.c needs matrix_prev?
+ - is_modified() is obsolete now. really needs?
+
+
+LUFA:
+USB connection check: state of USB deivce
+- USB_DeviceState:
+ USB_Deivce_State_t { Unattached, Powered, Default, Addressed, Configured*, Suspended* }
+- USB_IsInitialized: state of LUFA core setup
+ becomes true in USB_Init() USBController_AVR8.c
+ becomes false in USB_Disable() USBController_AVR8.c
+- USB_VBUS_GetStatus(): state of VBUS(power/connection)
+- USB_Disable() detaches, disables all interrupts, controller, PLL, regulater.
+
+
Power saving:
+- confirm suspend mode lufa.c: matrix_power_*, suspend_wakeup_condition
- 8MHz clock
- When not connected in a few minutes get into deep sleep to save battery life
- CTS is needed for waking up from deep sleep? How deep sleep is activated?
@@ -19,6 +44,9 @@ Power saving:
- high resistor 100K/1M?
capacitor 10nF
http://www.eevblog.com/forum/beginners/measuring-battery-voltage-without-consuming-current/
+- During USB suspend change clock source to internal RC from external Xtal(6.8)
+- FRZCLK: you can freeze clock for power saving. still WAKEUPI and VBUSTI interrupts are available while freezing.(21.7.3)
+- Suspend: Clear Suspend Bit, Freeze clock, disable PLL, MCU sleep(21.13)
Improving:
- BT LED; connecting, linked, sleeping, deep sleeping
@@ -306,6 +334,10 @@ SM,5 Auto Connect ANY Mode (Mode =ANY)
SM,6 automatically reconnect(Mode =Pair)
confirm: auto connect works well but difficult to enter command mode.
+SR,Z removes all remote addresses for reconnecting.
+ can be used to connect another host
+SR,I registers last inquiry address
+
Fast data mode
--------------
diff --git a/keyboard/hhkb_rn42/PowerSave.txt b/keyboard/hhkb_rn42/PowerSave.txt
new file mode 100644
index 0000000000..943923c336
--- /dev/null
+++ b/keyboard/hhkb_rn42/PowerSave.txt
@@ -0,0 +1,102 @@
+RN-42
+=====
+
+HHKB key switch power control
+-----------------------------
+MOS FET Nch: BSS138 or IRLML6344T, either works and no apparent difference.
+Normally on(pull-up) or off(pull-down)? interms of power saving it prefers pull-down?
+
+Pull-down will be better for power saving, normally off.
+
+
+
+Used Timer
+----------
+
+8MHz clock
+----------
+1) 16MHz xtal with system prescaler div2: F_CPU=8MHz, F_USB=16MHz
+2) 8MHz xtal with div1: F_CPU=8MHz, F_USB=8MHz
+Hardware USART doesn't work at 115200bps with 8MHz(F_CPU).
+
+workaround:
+a) use Sotwre serial for communcation with RN-42
+b) reduce baud of RN-42 to lower rate;(factory default is 115200bps)
+10/03
+
+
+
+Slave mode
+----------
+Discovery/Inquire
+Connect/Page
+
+SI,0012
+SJ,0012
+InqWindw=0100
+PagWindw=0100
+
+
+Sniff mode
+----------
+0.625ms * <hex>
+SW,0320 Very sluggish. Type is not lost but very slow to register.
+SW,0160 Still sluggish. may transposed? can type but ...
+ Mouse point move intermittently
+SW,0020 feel a bit late like stumble(20ms)
+SW,0010 feel no latency(10ms)
+
+
+Deep sleep
+----------
+SW,8010
+
+
+TX power
+--------
+SY,fff4
+
+
+IO pins
+-------
+S%,1000 status led and connection control don't work
+ GPIO5: status LED
+ GPIO6: Connection control
+ GPIO2: linked status
+
+
+
+
+
+Ver 6.15 04/26/2013
+(c) Roving Networks
+***Settings***
+BTA=00066667BBE9
+BTName=tmkBT-BBE9
+Baudrt(SW4)=115K
+Mode =DTR
+Authen=1
+Bonded=0
+Rem=001BDC06415B
+***ADVANCED Settings***
+SrvName= keyboard/mouse
+SrvClass=0000
+DevClass=1F00
+InqWindw=0012
+PagWindw=0012
+CfgTimer=255
+StatuStr=NULL
+HidFlags=3c
+DTRtimer=8
+KeySwapr=0
+***OTHER Settings***
+Profile= HID
+CfgChar= $
+SniffEna=8010
+LowPower=0 S|,
+TX Power=fff4 SY,
+IOPorts= 0
+IOValues=0
+Sleeptmr=0
+DebugMod=0
+RoleSwch=0
From a9963960459662c0775d8d2f1f5bbc738b7f4ddd Mon Sep 17 00:00:00 2001
From: tmk <nobody@nowhere>
Date: Mon, 24 Nov 2014 14:33:50 +0900
Subject: [PATCH 49/50] Fix debug.h
---
common/debug.h | 15 ++++++-------
common/debug_config.h | 51 -------------------------------------------
2 files changed, 7 insertions(+), 59 deletions(-)
delete mode 100644 common/debug_config.h
diff --git a/common/debug.h b/common/debug.h
index 472dd478c4..3cbe2092d1 100644
--- a/common/debug.h
+++ b/common/debug.h
@@ -18,16 +18,17 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#ifndef DEBUG_H
#define DEBUG_H 1
+#include <stdbool.h>
#include "print.h"
-/*
- * Debug output control
- */
#ifdef __cplusplus
extern "C" {
#endif
+/*
+ * Debug output control
+ */
typedef union {
struct {
bool enable:1;
@@ -40,19 +41,18 @@ typedef union {
} debug_config_t;
extern debug_config_t debug_config;
-debug_config_t debug_config __attribute__ ((weak)) = {};
#ifdef __cplusplus
}
#endif
+/* for backward compatibility */
#define debug_enable (debug_config.enable)
#define debug_matrix (debug_config.matrix)
#define debug_keyboard (debug_config.keyboard)
#define debug_mouse (debug_config.mouse)
-
/*
* Debug print utils
*/
@@ -87,9 +87,8 @@ debug_config_t debug_config __attribute__ ((weak)) = {};
#define debug_bin(data) debug_bin8(data)
#define debug_bin_reverse(data) debug_bin8(data)
-#else
+#else /* NO_DEBUG */
-/* NO_DEBUG */
#define dprint(s)
#define dprintln(s)
#define dprintf(fmt, ...)
@@ -113,6 +112,6 @@ debug_config_t debug_config __attribute__ ((weak)) = {};
#define debug_bin(data)
#define debug_bin_reverse(data)
-#endif
+#endif /* NO_DEBUG */
#endif
diff --git a/common/debug_config.h b/common/debug_config.h
deleted file mode 100644
index 28bc34cd57..0000000000
--- a/common/debug_config.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
-Copyright 2013 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/>.
-*/
-
-#ifndef DEBUG_CONFIG_H
-#define DEBUG_CONFIG_H 1
-
-#include <stdbool.h>
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* NOTE: Not portable. Bit field order depends on implementation */
-typedef union {
- struct {
- bool enable:1;
- bool matrix:1;
- bool keyboard:1;
- bool mouse:1;
- uint8_t reserved:4;
- };
- uint8_t raw;
-} debug_config_t;
-extern debug_config_t debug_config;
-
-/* for backward compatibility */
-#define debug_enable (debug_config.enable)
-#define debug_matrix (debug_config.matrix)
-#define debug_keyboard (debug_config.keyboard)
-#define debug_mouse (debug_config.mouse)
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
From e2077cad45f1736e878e317c43bd94117c61b5e0 Mon Sep 17 00:00:00 2001
From: tmk <nobody@nowhere>
Date: Mon, 24 Nov 2014 15:14:52 +0900
Subject: [PATCH 50/50] Change key_t to keypos_t
---
converter/adb_usb/keymap_common.c | 2 +-
converter/ascii_usb/keymap.c | 2 +-
converter/ibm4704_usb/keymap_common.c | 2 +-
converter/m0110_usb/keymap.c | 2 +-
converter/m0110_usb/keymap_common.c | 2 +-
converter/next_usb/keymap.c | 2 +-
converter/pc98_usb/keymap.c | 2 +-
converter/serialmouse_usb/keymap.c | 2 +-
converter/serialmouse_usb/keymap_common.c | 2 +-
converter/terminal_bluefruit/keymap.c | 2 +-
keyboard/gh60/keymap_common.c | 2 +-
keyboard/hid_liber/keymap.c | 2 +-
keyboard/kitten_paw/keymap.c | 2 +-
keyboard/kmac/keymap.c | 2 +-
keyboard/lightpad/keymap.c | 2 +-
keyboard/lightsaber/keymap.c | 2 +-
keyboard/onekey/keymap.c | 2 +-
keyboard/phantom/keymap.c | 2 +-
18 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/converter/adb_usb/keymap_common.c b/converter/adb_usb/keymap_common.c
index 241d2e33b1..55a13793cb 100644
--- a/converter/adb_usb/keymap_common.c
+++ b/converter/adb_usb/keymap_common.c
@@ -18,7 +18,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* translates key to keycode */
-uint8_t keymap_key_to_keycode(uint8_t layer, key_t key)
+uint8_t keymap_key_to_keycode(uint8_t layer, keypos_t key)
{
return pgm_read_byte(&keymaps[(layer)][(key.row)][(key.col)]);
}
diff --git a/converter/ascii_usb/keymap.c b/converter/ascii_usb/keymap.c
index 5c13beaffa..a0c61ce8de 100644
--- a/converter/ascii_usb/keymap.c
+++ b/converter/ascii_usb/keymap.c
@@ -30,7 +30,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
// Keymap is not used. See matrix.c.
/* translates key to keycode */
-uint8_t keymap_key_to_keycode(uint8_t layer, key_t key)
+uint8_t keymap_key_to_keycode(uint8_t layer, keypos_t key)
{
return KC_NO;
}
diff --git a/converter/ibm4704_usb/keymap_common.c b/converter/ibm4704_usb/keymap_common.c
index 241d2e33b1..55a13793cb 100644
--- a/converter/ibm4704_usb/keymap_common.c
+++ b/converter/ibm4704_usb/keymap_common.c
@@ -18,7 +18,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* translates key to keycode */
-uint8_t keymap_key_to_keycode(uint8_t layer, key_t key)
+uint8_t keymap_key_to_keycode(uint8_t layer, keypos_t key)
{
return pgm_read_byte(&keymaps[(layer)][(key.row)][(key.col)]);
}
diff --git a/converter/m0110_usb/keymap.c b/converter/m0110_usb/keymap.c
index 031c881b72..4570dd2832 100644
--- a/converter/m0110_usb/keymap.c
+++ b/converter/m0110_usb/keymap.c
@@ -209,7 +209,7 @@ static const uint16_t fn_actions[] PROGMEM = {
/* translates key to keycode */
-uint8_t keymap_key_to_keycode(uint8_t layer, key_t key)
+uint8_t keymap_key_to_keycode(uint8_t layer, keypos_t key)
{
return pgm_read_byte(&keymaps[(layer)][(key.row)][(key.col)]);
}
diff --git a/converter/m0110_usb/keymap_common.c b/converter/m0110_usb/keymap_common.c
index bad18c91a8..4ac2d71783 100644
--- a/converter/m0110_usb/keymap_common.c
+++ b/converter/m0110_usb/keymap_common.c
@@ -23,7 +23,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* translates key to keycode */
-uint8_t keymap_key_to_keycode(uint8_t layer, key_t key)
+uint8_t keymap_key_to_keycode(uint8_t layer, keypos_t key)
{
return pgm_read_byte(&keymaps[(layer)][(key.row)][(key.col)]);
}
diff --git a/converter/next_usb/keymap.c b/converter/next_usb/keymap.c
index d844f8a4e2..3a51075483 100644
--- a/converter/next_usb/keymap.c
+++ b/converter/next_usb/keymap.c
@@ -165,7 +165,7 @@ static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
};
/* translates key to keycode */
-uint8_t keymap_key_to_keycode(uint8_t layer, key_t key)
+uint8_t keymap_key_to_keycode(uint8_t layer, keypos_t key)
{
return pgm_read_byte(&keymaps[(layer)][(key.row)][(key.col)]);
}
diff --git a/converter/pc98_usb/keymap.c b/converter/pc98_usb/keymap.c
index 7420e24ac8..8922ea7bab 100644
--- a/converter/pc98_usb/keymap.c
+++ b/converter/pc98_usb/keymap.c
@@ -185,7 +185,7 @@ static const uint16_t PROGMEM fn_actions[] = {
#define FN_ACTIONS_SIZE (sizeof(fn_actions) / sizeof(fn_actions[0]))
/* translates key to keycode */
-uint8_t keymap_key_to_keycode(uint8_t layer, key_t key)
+uint8_t keymap_key_to_keycode(uint8_t layer, keypos_t key)
{
if (layer < KEYMAPS_SIZE) {
return pgm_read_byte(&keymaps[(layer)][(key.row)][(key.col)]);
diff --git a/converter/serialmouse_usb/keymap.c b/converter/serialmouse_usb/keymap.c
index de8f75c2af..cb78b4d195 100644
--- a/converter/serialmouse_usb/keymap.c
+++ b/converter/serialmouse_usb/keymap.c
@@ -20,7 +20,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* translates key to keycode */
-uint8_t keymap_key_to_keycode(uint8_t layer, key_t key)
+uint8_t keymap_key_to_keycode(uint8_t layer, keypos_t key)
{
return KC_NO;
}
diff --git a/converter/serialmouse_usb/keymap_common.c b/converter/serialmouse_usb/keymap_common.c
index 241d2e33b1..55a13793cb 100644
--- a/converter/serialmouse_usb/keymap_common.c
+++ b/converter/serialmouse_usb/keymap_common.c
@@ -18,7 +18,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* translates key to keycode */
-uint8_t keymap_key_to_keycode(uint8_t layer, key_t key)
+uint8_t keymap_key_to_keycode(uint8_t layer, keypos_t key)
{
return pgm_read_byte(&keymaps[(layer)][(key.row)][(key.col)]);
}
diff --git a/converter/terminal_bluefruit/keymap.c b/converter/terminal_bluefruit/keymap.c
index 716590a456..8acd8cfb33 100644
--- a/converter/terminal_bluefruit/keymap.c
+++ b/converter/terminal_bluefruit/keymap.c
@@ -214,7 +214,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
}
*/
-uint8_t keymap_key_to_keycode(uint8_t layer, key_t key)
+uint8_t keymap_key_to_keycode(uint8_t layer, keypos_t key)
{
return pgm_read_byte(&keymaps[(layer)][(key.row)][(key.col)]);
}
diff --git a/keyboard/gh60/keymap_common.c b/keyboard/gh60/keymap_common.c
index 7b6379f6b6..fdb1769e1c 100644
--- a/keyboard/gh60/keymap_common.c
+++ b/keyboard/gh60/keymap_common.c
@@ -18,7 +18,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* translates key to keycode */
-uint8_t keymap_key_to_keycode(uint8_t layer, key_t key)
+uint8_t keymap_key_to_keycode(uint8_t layer, keypos_t key)
{
return pgm_read_byte(&keymaps[(layer)][(key.row)][(key.col)]);
}
diff --git a/keyboard/hid_liber/keymap.c b/keyboard/hid_liber/keymap.c
index f17d3762b9..433a620975 100644
--- a/keyboard/hid_liber/keymap.c
+++ b/keyboard/hid_liber/keymap.c
@@ -103,7 +103,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define FN_ACTIONS_SIZE (sizeof(fn_actions) / sizeof(fn_actions[0]))
/* translates key to keycode */
-uint8_t keymap_key_to_keycode(uint8_t layer, key_t key)
+uint8_t keymap_key_to_keycode(uint8_t layer, keypos_t key)
{
if (layer < KEYMAPS_SIZE) {
return pgm_read_byte(&keymaps[(layer)][(key.row)][(key.col)]);
diff --git a/keyboard/kitten_paw/keymap.c b/keyboard/kitten_paw/keymap.c
index 23db421f9b..e9ad9efe1a 100644
--- a/keyboard/kitten_paw/keymap.c
+++ b/keyboard/kitten_paw/keymap.c
@@ -80,7 +80,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define FN_ACTIONS_SIZE (sizeof(fn_actions) / sizeof(fn_actions[0]))
/* translates key to keycode */
-uint8_t keymap_key_to_keycode(uint8_t layer, key_t key)
+uint8_t keymap_key_to_keycode(uint8_t layer, keypos_t key)
{
if (layer < KEYMAPS_SIZE) {
return pgm_read_byte(&keymaps[(layer)][(key.col)][(key.row)]);
diff --git a/keyboard/kmac/keymap.c b/keyboard/kmac/keymap.c
index 5474b1b65e..1ffa60387e 100644
--- a/keyboard/kmac/keymap.c
+++ b/keyboard/kmac/keymap.c
@@ -74,7 +74,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define FN_ACTIONS_SIZE (sizeof(fn_actions) / sizeof(fn_actions[0]))
/* translates key to keycode */
-uint8_t keymap_key_to_keycode(uint8_t layer, key_t key)
+uint8_t keymap_key_to_keycode(uint8_t layer, keypos_t key)
{
if (layer < KEYMAPS_SIZE) {
return pgm_read_byte(&keymaps[(layer)][(key.row)][(key.col)]);
diff --git a/keyboard/lightpad/keymap.c b/keyboard/lightpad/keymap.c
index 6d078230bb..2ca79a81b5 100644
--- a/keyboard/lightpad/keymap.c
+++ b/keyboard/lightpad/keymap.c
@@ -50,7 +50,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define FN_ACTIONS_SIZE (sizeof(fn_actions) / sizeof(fn_actions[0]))
/* translates key to keycode */
-uint8_t keymap_key_to_keycode(uint8_t layer, key_t key)
+uint8_t keymap_key_to_keycode(uint8_t layer, keypos_t key)
{
if (layer < KEYMAPS_SIZE) {
return pgm_read_byte(&keymaps[(layer)][(key.row)][(key.col)]);
diff --git a/keyboard/lightsaber/keymap.c b/keyboard/lightsaber/keymap.c
index 398e51ec4a..477da9d865 100644
--- a/keyboard/lightsaber/keymap.c
+++ b/keyboard/lightsaber/keymap.c
@@ -54,7 +54,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define FN_ACTIONS_SIZE (sizeof(fn_actions) / sizeof(fn_actions[0]))
/* translates key to keycode */
-uint8_t keymap_key_to_keycode(uint8_t layer, key_t key)
+uint8_t keymap_key_to_keycode(uint8_t layer, keypos_t key)
{
if (layer < KEYMAPS_SIZE) {
return pgm_read_byte(&keymaps[(layer)][(key.row)][(key.col)]);
diff --git a/keyboard/onekey/keymap.c b/keyboard/onekey/keymap.c
index 90f195c2b7..dce4e9191e 100644
--- a/keyboard/onekey/keymap.c
+++ b/keyboard/onekey/keymap.c
@@ -43,7 +43,7 @@ static const uint16_t PROGMEM fn_actions[] = {
#define FN_ACTIONS_SIZE (sizeof(fn_actions) / sizeof(fn_actions[0]))
/* translates key to keycode */
-uint8_t keymap_key_to_keycode(uint8_t layer, key_t key)
+uint8_t keymap_key_to_keycode(uint8_t layer, keypos_t key)
{
if (layer < KEYMAPS_SIZE) {
return pgm_read_byte(&keymaps[(layer)][(key.row)][(key.col)]);
diff --git a/keyboard/phantom/keymap.c b/keyboard/phantom/keymap.c
index 1899874dd7..a040434f24 100644
--- a/keyboard/phantom/keymap.c
+++ b/keyboard/phantom/keymap.c
@@ -128,7 +128,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define FN_ACTIONS_SIZE (sizeof(fn_actions) / sizeof(fn_actions[0]))
/* translates key to keycode */
-uint8_t keymap_key_to_keycode(uint8_t layer, key_t key)
+uint8_t keymap_key_to_keycode(uint8_t layer, keypos_t key)
{
if (layer < KEYMAPS_SIZE) {
return pgm_read_byte(&keymaps[(layer)][(key.row)][(key.col)]);