diff options
Diffstat (limited to 'keyboard/hhkb_rn42')
| -rw-r--r-- | keyboard/hhkb_rn42/Makefile | 157 | ||||
| -rw-r--r-- | keyboard/hhkb_rn42/PowerSave.txt | 115 | ||||
| -rw-r--r-- | keyboard/hhkb_rn42/config.h | 112 | ||||
| -rw-r--r-- | keyboard/hhkb_rn42/hhkb_avr.h | 166 | ||||
| -rw-r--r-- | keyboard/hhkb_rn42/keymap_common.c | 33 | ||||
| -rw-r--r-- | keyboard/hhkb_rn42/keymap_common.h | 84 | ||||
| -rw-r--r-- | keyboard/hhkb_rn42/keymap_hasu.c | 282 | ||||
| -rw-r--r-- | keyboard/hhkb_rn42/keymap_jp.c | 50 | ||||
| -rw-r--r-- | keyboard/hhkb_rn42/led.c | 33 | ||||
| -rw-r--r-- | keyboard/hhkb_rn42/matrix.c | 190 | ||||
| -rw-r--r-- | keyboard/hhkb_rn42/rn42.mk | 12 | ||||
| -rw-r--r-- | keyboard/hhkb_rn42/rn42/MEMO.txt | 255 | ||||
| -rw-r--r-- | keyboard/hhkb_rn42/rn42/RN42.txt | 362 | ||||
| -rw-r--r-- | keyboard/hhkb_rn42/rn42/battery.c | 130 | ||||
| -rw-r--r-- | keyboard/hhkb_rn42/rn42/battery.h | 35 | ||||
| -rw-r--r-- | keyboard/hhkb_rn42/rn42/main.c | 111 | ||||
| -rw-r--r-- | keyboard/hhkb_rn42/rn42/rn42.c | 237 | ||||
| -rw-r--r-- | keyboard/hhkb_rn42/rn42/rn42.h | 23 | ||||
| -rw-r--r-- | keyboard/hhkb_rn42/rn42/rn42_task.c | 478 | ||||
| -rw-r--r-- | keyboard/hhkb_rn42/rn42/rn42_task.h | 10 | ||||
| -rw-r--r-- | keyboard/hhkb_rn42/rn42/suart.S | 156 | ||||
| -rw-r--r-- | keyboard/hhkb_rn42/rn42/suart.h | 8 |
22 files changed, 0 insertions, 3039 deletions
diff --git a/keyboard/hhkb_rn42/Makefile b/keyboard/hhkb_rn42/Makefile deleted file mode 100644 index 3d9a602a58..0000000000 --- a/keyboard/hhkb_rn42/Makefile +++ /dev/null @@ -1,157 +0,0 @@ -#---------------------------------------------------------------------------- -# 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 - -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 -#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 -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 -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/PowerSave.txt b/keyboard/hhkb_rn42/PowerSave.txt deleted file mode 100644 index 9aa89f4416..0000000000 --- a/keyboard/hhkb_rn42/PowerSave.txt +++ /dev/null @@ -1,115 +0,0 @@ -RN-42 -===== - - -12/11 -Power Comsumption -MCU+HHKB --------- -Battery drive: - idle 18.9mA - active 35.8mA - -USB powered: - 40.0mA - - -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 diff --git a/keyboard/hhkb_rn42/config.h b/keyboard/hhkb_rn42/config.h deleted file mode 100644 index 21e73f1c53..0000000000 --- a/keyboard/hhkb_rn42/config.h +++ /dev/null @@ -1,112 +0,0 @@ -/* -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 0x4242 -#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 */ -#ifdef HHKB_JP -# define MATRIX_ROWS 16 -#else -# define MATRIX_ROWS 8 -#endif -#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 - -/* power control of key switch board */ -#define HHKB_POWER_SAVING - -/* - * 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(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 - - -/* 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. - */ -/* 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/hhkb_avr.h b/keyboard/hhkb_rn42/hhkb_avr.h deleted file mode 100644 index 0321977d11..0000000000 --- a/keyboard/hhkb_rn42/hhkb_avr.h +++ /dev/null @@ -1,166 +0,0 @@ -#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)); } -#ifdef HHKB_POWER_SAVING -static inline void KEY_POWER_ON(void) { - 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(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. */ - DDRB = 0x00; PORTB = 0xFF; // change pins input with pull-up - DDRD |= (1<<4); PORTD &= ~(1<<4); // MOS FET switch off -} -static inline bool KEY_POWER_STATE(void) { return PORTD & (1<<4); } -#else -static inline void KEY_POWER_ON(void) {} -static inline void KEY_POWER_OFF(void) {} -static inline bool KEY_POWER_STATE(void) { return true; } -#endif -static inline void KEY_INIT(void) -{ - /* row,col,prev: output */ - DDRB = 0xFF; - PORTB = 0x40; // unable - /* key: input with pull-up */ - DDRD &= ~0x80; - PORTD |= 0x80; -#ifdef HHKB_JP - /* row extention for HHKB JP */ - DDRC |= (1<<6|1<<7); - PORTC |= (1<<6|1<<7); -#endif - KEY_UNABLE(); - KEY_PREV_OFF(); - - KEY_POWER_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_common.c b/keyboard/hhkb_rn42/keymap_common.c deleted file mode 100644 index e938fb6270..0000000000 --- a/keyboard/hhkb_rn42/keymap_common.c +++ /dev/null @@ -1,33 +0,0 @@ -/* -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 deleted file mode 100644 index 3622665f3a..0000000000 --- a/keyboard/hhkb_rn42/keymap_common.h +++ /dev/null @@ -1,84 +0,0 @@ -/* -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 } \ -} - - -#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/keymap_hasu.c b/keyboard/hhkb_rn42/keymap_hasu.c deleted file mode 100644 index 433f9cb270..0000000000 --- a/keyboard/hhkb_rn42/keymap_hasu.c +++ /dev/null @@ -1,282 +0,0 @@ -/* - * 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, TRNS, 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, FN2, RSFT,TRNS, \ - 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 Wheel - */ - [3] = \ - KEYMAP(GRV, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, INS, DEL, \ - FN8, NO, NO, NO, NO, NO, NO, WH_D,MS_U,WH_U,RGHT,FN9, FN10,FN8, \ - LCTL,ACL0,ACL1,ACL2,ACL2,NO, NO, MS_L,MS_D,MS_R,FN3, NO, ENT, \ - LSFT,NO, NO, NO, NO, BTN3,BTN2,BTN1,FN9, FN10,NO, RSFT,TRNS, \ - LGUI,LALT, BTN1, TRNS,TRNS), - - /* Layer 4: 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 Wheel - */ - [4] = \ - KEYMAP(GRV, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, INS, DEL, \ - FN8, NO, NO, NO, NO, NO, NO, 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,FN9, FN10,NO, RSFT,TRNS, \ - 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, NO, 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,FN9, FN10,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, NO, 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,FN9, FN10,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 - [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 -// [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/keymap_jp.c b/keyboard/hhkb_rn42/keymap_jp.c deleted file mode 100644 index 48d0ee70ba..0000000000 --- a/keyboard/hhkb_rn42/keymap_jp.c +++ /dev/null @@ -1,50 +0,0 @@ -/* - * 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), -}; diff --git a/keyboard/hhkb_rn42/led.c b/keyboard/hhkb_rn42/led.c deleted file mode 100644 index 8a08fe27fc..0000000000 --- a/keyboard/hhkb_rn42/led.c +++ /dev/null @@ -1,33 +0,0 @@ -/* -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/matrix.c b/keyboard/hhkb_rn42/matrix.c deleted file mode 100644 index fb96997944..0000000000 --- a/keyboard/hhkb_rn42/matrix.c +++ /dev/null @@ -1,190 +0,0 @@ -/* -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 <util/delay.h> -#include "print.h" -#include "debug.h" -#include "util.h" -#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; - -// 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]; - - -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; - - // power on - if (!KEY_POWER_STATE()) 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(5); - - // Not sure this is needed. This just emulates HHKB controller's behaviour. - if (matrix_prev[row] & (1<<col)) { - KEY_PREV_ON(); - } - _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 - // 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]; - } - - _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(75); - } - if (matrix[row] ^ matrix_prev[row]) matrix_last_modified = timer_read32(); - } - // power off - if (KEY_POWER_STATE() && - (USB_DeviceState == DEVICE_STATE_Suspended || - USB_DeviceState == DEVICE_STATE_Unattached ) && - timer_elapsed32(matrix_last_modified) > MATRIX_POWER_SAVE) { - KEY_POWER_OFF(); - suspend_power_down(); - } - 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))); - } -} - -void matrix_power_up(void) { - KEY_POWER_ON(); -} -void matrix_power_down(void) { - KEY_POWER_OFF(); -} diff --git a/keyboard/hhkb_rn42/rn42.mk b/keyboard/hhkb_rn42/rn42.mk deleted file mode 100644 index fd6f7db1a8..0000000000 --- a/keyboard/hhkb_rn42/rn42.mk +++ /dev/null @@ -1,12 +0,0 @@ -RN42_DIR = rn42 - -SRC += serial_uart.c \ - rn42/suart.S \ - rn42/rn42.c \ - rn42/rn42_task.c \ - rn42/battery.c \ - rn42/main.c - -OPT_DEFS += -DPROTOCOL_RN42 - -VPATH += $(RN42_DIR) diff --git a/keyboard/hhkb_rn42/rn42/MEMO.txt b/keyboard/hhkb_rn42/rn42/MEMO.txt deleted file mode 100644 index f772c4cb53..0000000000 --- a/keyboard/hhkb_rn42/rn42/MEMO.txt +++ /dev/null @@ -1,255 +0,0 @@ -Memo of deveopment -================== -just memo, NOT WORTH READING - -Bug: -- Factory Reset PIO4 doesn't work - - the reason is unclear - 12/08 NOT LOOK INTO ANY MORE - - WORKAROUND: use serial pins(3.3V, GND, RX and TX) - - SF,1 and R,1 to set factory defalult - - -Todo: -- LED cover and switch knob and new Slide Switch -- RN42 auto configuration - - configure the module as HID device every time powering up - - this'll reduce work load of assembly - -- move rn42 to protocol directory when it becomes reusable stack - -- sendchar() in lufa.c no buffer - - no buffering. character lost can be caused. -- LUFA sendchar should be buffered and serial_uart.c buffur size is too large(256). - -- BT operations - - disconnect - - new connection - - remove connection - -- sendchar() in lufa.c block loop - DONE 11/29 - - block loop when powered with AC adapter - - FrameNumber is not updated when adapter powered - -Improving: -- ADC resolution - AVR120 - AVR32138 - - Enhancing ADC resolution by oversampling - AVR121 http://www.atmel.com/images/doc8003.pdf - - disable digital input buffer DIDR(7.8.6) - -Design: -- suspend.h - DONE 11/26 - - remove argument from suspend_power_down() for backward compatitibility -- remove MCU dependent power saving code from core/keyboard - DONE 11/23 - - it should be located in project matrix.c -- HHKB matrix.c needs matrix_prev? - - is_modified() is obsolete now. really needs? -- ADC: removing AREF capacitor C10 - - seems to be better while usb powered - - still bad while battery powered - http://electronics.stackexchange.com/questions/105849/avcc-and-capacitor-using-adc -- ADC: smaller resistors for voltage dividor - - 1K + 1K: not improved. - 11/27 - - -LUFA: -USB connection check: state of USB deivce -- USB_DeviceState: - USB_Deivce_State_t { Unattached, Powered, Default, Addressed, Configured*, Suspended* } - Unattached: unpluged - Powered: pluged with power adapter - Default: enumerate process bigin - Addressed: addressed - Configured: enumerated - Suspended: 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. - -- When connect to power adapter - - event happened: CW or CSW or C or DDC - - USB state: not configured - -- USB evnets - - USB connect: CSWRWRW - - USB connect but fail to enumeration: CWRWRWRWS - - USB disconnect: D - - Power adapter connect: CW, CSW, C - - Power adapter disconnect: D - - -Power saving: -- Pro2 current consumption - - active: 138.2mA(no device on Hub) - - suspended: 30.9mA(WakeUp enabled DIPSW6) - - suspended: 0mA->46.0mA(WakeUp disabled DIPSW6) -- Pro current consumption - - active: 54.0mA - - suspended: 40.5mA(WakeUp enabled DIPSW6) - - suspended: 0.3mA(WakeUp disabled DIPSW6) - -- RN42 3.3V - - disconnected(Idle): 5mA (config mode) - - connected(Active): - SW,0000: 23-26mA - SW,0010: 27-29mA worse than 0000 for unknown reason - SW,0020: 17-19mA mouse NG - SW,0030: 13-16mA laggy mouse NG - SW,0050: 10-13mA laggy mouse NG - -- matrix power saving - - power saving while externally powered and not while unpluged -- 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? -- 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 - - 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/ -- 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) -- Voltage reference(8.1.1) - - to reduce power consumption while power down mode -- unset ADEN before sleep(24.7) - - - - - - - -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 - -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) - - - - -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. - -12/07 rn42_rts() read 1 every time. R12 broke in open mode(no coductive), idk why, too much heat with soldering? and PF1 pin was not soldered. - It resolved with resoldering PF1 and new resistor on R12. - - - - -Done: -- low battery alert(solid light) 09/04 -- *** Rev.E BT test *** - DONE - - with MCP73832, new Schottky, tantalum caps - DONE 12/07 - * MCP73832 doesn't leak from Vcc pin when unpluged and battery powered - 34mV vs 2.07V(MCP73831) at Vcc pin - MCP73832 doesn't need revese protection diode D5 - * PMEG2010ER is very low VF while reverse current/voltage is high - VF=0.96 vs 1.98(RB160M-30TR)with Fluke 175 - Anode of D11 is 680mV vs 20mV(RB160M-30TR) - 780mV is still low < 1.4V VBUS plugin detection(21.11) - this doesn't cause false VBUS detect - and 780mV on MCP73832 Vcc pin is also no problem. - D5 can be removed. - - ADC divider switching - DONE 12/07 - * Drain and Source of Q4 Pch was reversed wrongly on Rev.E. - - - reverse current from Lipo charger - DONE 12/07 - * MCP73832 has no recverse current from Vcc pin unlike MCP73831 - - -- Rev.F design - DONE - - current measure point - DONE 12/08 - - change value of cap 68->47 - DONE 12/08 - - PPTC land pattern: no solder jumper, use 0Ohm resistor instead - CANCEL 12/08 - - Q4 Pch FET: wrong Drain and Source - DONE 12/08 - - D5 can be removed. - DONE 12/08 - - - -- 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 -- 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 -- 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 - -- wrongly suspended when powered from adapter without USB connection - DONE - - suspend event may occur when plug into adapter - - and never wake until conected to real USB line - - without debug print via USB no problem; CSW(wake just after suspend as real USB line) - - seems like USB print causes this problem after suspended - -- lose USB connection during power-down mode - DONE - - 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 - -- with Nexus5 keyboard and mouse are very laggy. - Not confirmed. 01/15 - -- switch BT host connections - CANCEL 01/15 - - switch next connection - cannot switch connection with version 6.15 at least - -- When given power only from wall wart adapter - DONE? not confirmed 01/15 - - it sleeps. it should not sleep - - Configured state without USB connection? - -- timer is slow while power down - DONE 11/26 - - time out interrupt is lost while power down? - - interrupt of watchdog timer compensates timer counter(avr/suspend.c) - -- repeated CHARGING/FULL_CHARGED - No longer problem 01/15 - - In LTC sharp pulses are observed. - - MCP has no pulse but still has a problem. - - needs more wait before read pin state? - NO - -- USB plug-in fails while BT - No longer problem 01/15 - - it ends in suspend state - - maybe, not responsive to host enumeration process due to power-down. - - matrix_power_down() only when state is unattached - 11/26 - - need to observe a while - diff --git a/keyboard/hhkb_rn42/rn42/RN42.txt b/keyboard/hhkb_rn42/rn42/RN42.txt deleted file mode 100644 index ace30da4ed..0000000000 --- a/keyboard/hhkb_rn42/rn42/RN42.txt +++ /dev/null @@ -1,362 +0,0 @@ -RN-42 Bluetooth Module Support -============================== -Bluetooth controller board works with HHKB Pro2, JP, Type-S and Type-S JP and it supports both USB and Bluetooth as keyboard output protocol. Bluetooth module Roving Networks/Microchip RN-42 is installed on the board. - - -Limitations: -- short battery life -- connection switching - the module always connects to the last linked device. Remote address setting does not work as expected. -- HHKB JP requires case modification for power switch and LEDs. - without switch power controlled by MCU? Probably using 3.3V regulator enable pin power of RN-42 can be controlled. -- Wiress certification of RN-42 - Japan, Korea, Taiwan, Europe, FCC, Canada - http://www.microchip.com/wwwproducts/Devices.aspx?product=RN42 - -NOTE: -- Lipo battery is not included. Cannot ship it from Japan due to regulations. - -Bugs: - -Todos: - - - - - -LED Status ----------- -Configuring 10 times per sec -Startup/configuration timer 2 times per sec -Discoverable/Inquiring/Idle once per sec -Connected solid on - - -RN-42 Magic Command --------------------- -Magic key combination is 'LShift+RShift' by default in case of HHKB. - -Here is help. - - ----- Bluetooth RN-42 Help ----- - i: RN-42 info - b: battery voltage - Del: enter/exit RN-42 config mode - Slck: RN-42 initialize - p: pairing - u: toggle Force USB mode - - RN-42 info: displays information of the module on console. - battery voltage: displays current voltage of battery and uptime. - RN-42 initialize: does factory reset and configures RN-42 - pairing: enters Pairing mode. - toggle Force USB mode: switch between USB and Bluetooth - - -RN-42 Config mode ------------------ -You can tune/operate RN-42 yourself with config(command) mode. - -1. hook up USB cable -2. run `hid_listen` command in console -3. turn on Bluetooth switch -4. press LShift+RShift+Delete(Fn+~) you will see output like followings: - - Entering config mode ... - CMD - v - Ver 6.15 04/26/2013 - (c) Roving Networks - -5. do config with RN-42 commands. See documentations of RN-42. -6. to exit also press LShift+RShift+Delete(Fn+~) - - Exiting config mode ... - --- - END - - -RN-42 Initial Configuration ---------------------------- -RN-42 is configured as SPP device at factory reset, you need to configure it as HID device. This is needed just once first time. - -1. hook up USB cable -2. run `hid_listen` command in console -3. turn on Bluetooth switch -4. press LShift+RShift+ScrLk(Fn+O) you will see output like followings: - - Entering config mode ... - CMD - Ver 6.15 04/26/2013 - (c) Roving Networks - ECHO ON - SF,1 - AOK - S-,TmkBT - AOK - SS,Keyboard/Mouse - AOK - SM,4 - AOK - SW,8000 - AOK - S~,6 - AOK - SH,003C - AOK - SY,FFF4 - AOK - R,1 - Reboot! - Exiting config mode ... - -5. output of command 'X' after cofiguration - - Ver 6.15 04/26/2013 - (c) Roving Networks - ***Settings*** - BTA=00066667BBE9 - BTName=TmkBT-BBE9 - Baudrt(SW4)=115K - Mode =DTR - Authen=1 - PinCod=1234 - Bonded=0 - Rem=NONE SET - ***ADVANCED Settings*** - SrvName= Keyboard/Mouse - SrvClass=0000 - DevClass=1F00 - InqWindw=0100 - PagWindw=0100 - CfgTimer=255 - StatuStr=NULL - HidFlags=3c - DTRtimer=8 - KeySwapr=0 - ***OTHER Settings*** - Profile= HID - CfgChar= $ - SniffEna=8000 - LowPower=0 - TX Power=fff4 - IOPorts= 0 - IOValues=0 - Sleeptmr=0 - DebugMod=0 - RoleSwch=0 - - -Switch to USB mode ------------------- -You can switch between USB and Bluetooth with pressing 'LShift+RShift+u'. - - -Pairing mode ------------- -This disconnects current connect and enter pairing mode. - - - - -For deveropment -=============== - -RN-42 Serial Connection ------------------------ -UART: 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') and type '+' to get local echo. To exit type '---'(you will see 'END'). - - -RN-42 Commands --------------- -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 -S~,0 // SPP profile -SH,003C // HID register -SY,0004 // Transmit power -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, ... -SM,6 // Pairing mode: auto connect -SM,4 // Master mode: Connection can be controled with GPIO6 -SF,1 // Factroy reset -R,1 // reboot -SR,Z // removes all remote addresses for reconnecting. - // can be used to connect another host -SR,I // registers last inquiry address - - -Operation Modes ---------------- -SM,3 Auto Connect 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. - - -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> - - -Apple iOS ---------- -Keyboard can be used with iPhone, but mouse cannot. - - -Android -------- -3.7.1.5 Note: To connect with Android phone the modules must wake up 11ms every 2.5seconds. - - -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.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) - *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 - - -Commands --------- -S7, 7bit mode -SA, Authenticaiton -SB, Send break -SC, Service class -SD, Device class -SM,<val> Operation mode -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,<time>,<cod> inquiry scan with <cod>, return without BT name -IR inquiry scan with 0055AA -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,<char> 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) - - -Reset to Factory Default ------------------------- -SF,1 -R,1 diff --git a/keyboard/hhkb_rn42/rn42/battery.c b/keyboard/hhkb_rn42/rn42/battery.c deleted file mode 100644 index 7e868c9646..0000000000 --- a/keyboard/hhkb_rn42/rn42/battery.c +++ /dev/null @@ -1,130 +0,0 @@ -#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); - // digital input buffer disable(24.9.5) - DIDR0 = (1<<ADC0D) | (1<<ADC4D) | (1<<ADC7D); - DIDR1 = (1<<AIN0D); - DIDR2 = (1<<ADC8D) | (1<<ADC9D) | (1<<ADC11D) | (1<<ADC12D) | (1<<ADC13D); - - // ADC disable voltate divider(PF4) - DDRF |= (1<<4); - PORTF &= ~(1<<4); -} - -// 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; - - // 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; - 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)); - - // 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; -} - -// 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); - _delay_ms(1); // wait for charging S/H capacitance - - ADCSRA |= (1<<ADSC); - while (ADCSRA & (1<<ADSC)) ; - bat = ADC; - - ADCSRA &= ~(1<<ADEN); - - // ADC disable voltate divider(PF4) - DDRF |= (1<<4); - PORTF &= ~(1<<4); - - 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 deleted file mode 100644 index 180d4dcfaa..0000000000 --- a/keyboard/hhkb_rn42/rn42/battery.h +++ /dev/null @@ -1,35 +0,0 @@ -#ifndef POWER_H -#define POWER_H - -#include <stdint.h> -#include <stdbool.h> - -typedef enum { - FULL_CHARGED, - CHARGING, - DISCHARGING, - LOW_VOLTAGE, - UNKNOWN, -} 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/main.c b/keyboard/hhkb_rn42/rn42/main.c deleted file mode 100644 index 83d9950388..0000000000 --- a/keyboard/hhkb_rn42/rn42/main.c +++ /dev/null @@ -1,111 +0,0 @@ -#include <avr/io.h> -#include <avr/power.h> -#include <avr/wdt.h> -#include "lufa.h" -#include "print.h" -#include "sendchar.h" -#include "rn42.h" -#include "rn42_task.h" -#include "serial.h" -#include "keyboard.h" -#include "keycode.h" -#include "action.h" -#include "action_util.h" -#include "wait.h" -#include "suart.h" -#include "suspend.h" - -static int8_t sendchar_func(uint8_t c) -{ - xmit(c); // SUART - sendchar(c); // LUFA - return 0; -} - -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_func); - - // SUART PD0:output, PD1:input - DDRD |= (1<<0); - PORTD |= (1<<0); - DDRD &= ~(1<<1); - PORTD |= (1<<1); -} - -int main(void) __attribute__ ((weak)); -int main(void) -{ - SetupHardware(); - sei(); - - /* 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 - USB_USBTask(); -#endif - } - print("\nUSB init\n"); - - rn42_init(); - rn42_task_init(); - print("RN-42 init\n"); - - /* init modules */ - keyboard_init(); - - if (!rn42_rts()) { - 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 (rn42_rts() && // RN42 is off - USB_DeviceState == DEVICE_STATE_Suspended) { - print("[s]"); - matrix_power_down(); - suspend_power_down(); - suspend_power_down(); - suspend_power_down(); - suspend_power_down(); - suspend_power_down(); - suspend_power_down(); - suspend_power_down(); - if (USB_Device_RemoteWakeupEnabled && suspend_wakeup_condition()) { - USB_Device_SendRemoteWakeup(); - } - } - - keyboard_task(); - -#if !defined(INTERRUPT_CONTROL_ENDPOINT) - USB_USBTask(); -#endif - - rn42_task(); - } -} diff --git a/keyboard/hhkb_rn42/rn42/rn42.c b/keyboard/hhkb_rn42/rn42/rn42.c deleted file mode 100644 index 756285d7bb..0000000000 --- a/keyboard/hhkb_rn42/rn42/rn42.c +++ /dev/null @@ -1,237 +0,0 @@ -#include <avr/io.h> -#include "host.h" -#include "host_driver.h" -#include "serial.h" -#include "rn42.h" -#include "print.h" -#include "timer.h" -#include "wait.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 -}; - - -void rn42_init(void) -{ - // 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); - - // PD5: CTS(low: allow to send, high:not allow) - DDRD |= (1<<5); - PORTD &= ~(1<<5); - - serial_init(); -} - -int16_t rn42_getc(void) -{ - return serial_recv2(); -} - -const char *rn42_gets(uint16_t timeout) -{ - static char s[24]; - uint16_t t = timer_read(); - uint8_t i = 0; - int16_t c; - while (i < 23 && timer_elapsed(t) < timeout) { - if ((c = rn42_getc()) != -1) { - if ((char)c == '\r') continue; - if ((char)c == '\n') break; - s[i++] = c; - } - } - s[i] = '\0'; - return s; -} - -void rn42_putc(uint8_t c) -{ - serial_send(c); -} - -void rn42_puts(char *s) -{ - while (*s) - serial_send(*s++); -} - -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) -{ - // 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_rts(void) -{ - // 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); -} - -bool rn42_linked(void) -{ - // RN-42 GPIO2 - // Hi-Z: Not powered - // High: Linked - // Low: Connecting - return PINF&(1<<6); -} - - -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) -{ - // 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&0xFF); - serial_send((bits>>8)&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 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) {} -static void config_send_consumer(uint16_t data) {} diff --git a/keyboard/hhkb_rn42/rn42/rn42.h b/keyboard/hhkb_rn42/rn42/rn42.h deleted file mode 100644 index db6916fe86..0000000000 --- a/keyboard/hhkb_rn42/rn42/rn42.h +++ /dev/null @@ -1,23 +0,0 @@ -#ifndef RN42_H -#define RN42_H - -#include <stdbool.h> - -host_driver_t rn42_driver; -host_driver_t rn42_config_driver; - -void rn42_init(void); -int16_t rn42_getc(void); -const char *rn42_gets(uint16_t timeout); -void rn42_putc(uint8_t c); -void rn42_puts(char *s); -bool rn42_autoconnecting(void); -void rn42_autoconnect(void); -void rn42_disconnect(void); -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 deleted file mode 100644 index 5107fef483..0000000000 --- a/keyboard/hhkb_rn42/rn42/rn42_task.c +++ /dev/null @@ -1,478 +0,0 @@ -#include <stdint.h> -#include <string.h> -#include <avr/pgmspace.h> -#include <avr/eeprom.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 "debug.h" -#include "timer.h" -#include "wait.h" -#include "command.h" -#include "battery.h" - -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); - } -} - -void rn42_task_init(void) -{ - battery_init(); -} - -void rn42_task(void) -{ - int16_t c; - // Raw mode: interpret output report of LED state - while ((c = rn42_getc()) != -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; - switch (state) { - case LED_INIT: - if (c == 0xFE) state = LED_FE; - else { - if (0x0 <= c && c <= 0x7f) xprintf("%c", c); - else xprintf(" %02X", c); - } - 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: - dprintf("LED status: %02X\n", c); - rn42_set_leds(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); - } - } - - - static uint16_t prev_timer = 0; - uint16_t e = timer_elapsed(prev_timer); - if (e > 1000) { - /* every second */ - prev_timer += e/1000*1000; - - /* Low voltage alert */ - uint8_t bs = battery_status(); - if (bs == LOW_VOLTAGE) { - battery_led(LED_ON); - } else { - battery_led(LED_CHARGER); - } - - /* every minute */ - 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; - uint8_t s = t%60; - dprintf("%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); - */ - } - } - - - /* Connection monitor */ - if (!rn42_rts() && rn42_linked()) { - status_led(true); - } else { - status_led(false); - } -} - - - -/****************************************************************************** - * Command - ******************************************************************************/ -static host_driver_t *prev_driver = &rn42_driver; - -static void print_rn42(void) -{ - int16_t c; - while ((c = rn42_getc()) != -1) { - xprintf("%c", c); - } -} - -static void clear_rn42(void) -{ - while (rn42_getc() != -1) ; -} - -#define SEND_STR(str) send_str(PSTR(str)) -#define SEND_COMMAND(cmd) send_command(PSTR(cmd)) - -static void send_str(const char *str) -{ - uint8_t c; - while ((c = pgm_read_byte(str++))) - rn42_putc(c); -} - -static const char *send_command(const char *cmd) -{ - static const char *s; - send_str(cmd); - wait_ms(500); - s = rn42_gets(100); - xprintf("%s\r\n", s); - print_rn42(); - return s; -} - -static void enter_command_mode(void) -{ - prev_driver = host_get_driver(); - clear_keyboard(); - host_set_driver(&rn42_config_driver); // null driver; not to send a key to host - rn42_disconnect(); - while (rn42_linked()) ; - - print("Entering config mode ...\n"); - wait_ms(1100); // need 1 sec - SEND_COMMAND("$$$"); - wait_ms(600); // need 1 sec - print_rn42(); - const char *s = SEND_COMMAND("v\r\n"); - if (strncmp("v", s, 1) != 0) SEND_COMMAND("+\r\n"); // local echo on -} - -static void exit_command_mode(void) -{ - print("Exiting config mode ...\n"); - SEND_COMMAND("---\r\n"); // exit - - rn42_autoconnect(); - clear_keyboard(); - host_set_driver(prev_driver); -} - -static void init_rn42(void) -{ - // RN-42 configure - if (!config_mode) enter_command_mode(); - SEND_COMMAND("SF,1\r\n"); // factory defaults - SEND_COMMAND("S-,TmkBT\r\n"); - SEND_COMMAND("SS,Keyboard/Mouse\r\n"); - SEND_COMMAND("SM,4\r\n"); // auto connect(DTR) - SEND_COMMAND("SW,8000\r\n"); // Sniff disable - SEND_COMMAND("S~,6\r\n"); // HID profile - SEND_COMMAND("SH,003C\r\n"); // combo device, out-report, 4-reconnect - SEND_COMMAND("SY,FFF4\r\n"); // transmit power -12 - SEND_COMMAND("R,1\r\n"); - if (!config_mode) exit_command_mode(); -} - -#if 0 -// Switching connections -// NOTE: Remote Address doesn't work in the way manual says. -// EEPROM address for link store -#define RN42_LINK0 (uint8_t *)128 -#define RN42_LINK1 (uint8_t *)140 -#define RN42_LINK2 (uint8_t *)152 -#define RN42_LINK3 (uint8_t *)164 -static void store_link(uint8_t *eeaddr) -{ - enter_command_mode(); - SEND_STR("GR\r\n"); // remote address - const char *s = rn42_gets(500); - if (strcmp("GR", s) == 0) s = rn42_gets(500); // ignore local echo - xprintf("%s(%d)\r\n", s, strlen(s)); - if (strlen(s) == 12) { - for (int i = 0; i < 12; i++) { - eeprom_write_byte(eeaddr+i, *(s+i)); - dprintf("%c ", *(s+i)); - } - dprint("\r\n"); - } - exit_command_mode(); -} - -static void restore_link(const uint8_t *eeaddr) -{ - enter_command_mode(); - SEND_COMMAND("SR,Z\r\n"); // remove remote address - SEND_STR("SR,"); // set remote address from EEPROM - for (int i = 0; i < 12; i++) { - uint8_t c = eeprom_read_byte(eeaddr+i); - rn42_putc(c); - dprintf("%c ", c); - } - dprintf("\r\n"); - SEND_COMMAND("\r\n"); - SEND_COMMAND("R,1\r\n"); // reboot - exit_command_mode(); -} - -static const char *get_link(uint8_t * eeaddr) -{ - static char s[13]; - for (int i = 0; i < 12; i++) { - uint8_t c = eeprom_read_byte(eeaddr+i); - s[i] = c; - } - s[12] = '\0'; - return s; -} -#endif - -static void pairing(void) -{ - enter_command_mode(); - SEND_COMMAND("SR,Z\r\n"); // remove remote address - SEND_COMMAND("R,1\r\n"); // reboot - exit_command_mode(); -} - -bool command_extra(uint8_t code) -{ - uint32_t t; - uint16_t b; - switch (code) { - case KC_H: - case KC_SLASH: /* ? */ - print("\n\n----- Bluetooth RN-42 Help -----\n"); - print("i: RN-42 info\n"); - print("b: battery voltage\n"); - print("Del: enter/exit RN-42 config mode\n"); - print("Slck: RN-42 initialize\n"); -#if 0 - print("1-4: restore link\n"); - print("F1-F4: store link\n"); -#endif - print("p: pairing\n"); - - if (config_mode) { - return true; - } else { - print("u: toggle Force USB mode\n"); - return false; // to display default command help - } - case KC_P: - pairing(); - return true; -#if 0 - /* Store link address to EEPROM */ - case KC_F1: - store_link(RN42_LINK0); - return true; - case KC_F2: - store_link(RN42_LINK1); - return true; - case KC_F3: - store_link(RN42_LINK2); - return true; - case KC_F4: - store_link(RN42_LINK3); - return true; - /* Restore link address to EEPROM */ - case KC_1: - restore_link(RN42_LINK0); - return true; - case KC_2: - restore_link(RN42_LINK1); - return true; - case KC_3: - restore_link(RN42_LINK2); - return true; - case KC_4: - restore_link(RN42_LINK3); - return true; -#endif - 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: %s\n", rn42_rts() ? "OFF" : (rn42_linked() ? "CONN" : "ON")); - xprintf("rn42_autoconnecting(): %X\n", rn42_autoconnecting()); - xprintf("config_mode: %X\n", config_mode); - xprintf("USB State: %s\n", - (USB_DeviceState == DEVICE_STATE_Unattached) ? "Unattached" : - (USB_DeviceState == DEVICE_STATE_Powered) ? "Powered" : - (USB_DeviceState == DEVICE_STATE_Default) ? "Default" : - (USB_DeviceState == DEVICE_STATE_Addressed) ? "Addressed" : - (USB_DeviceState == DEVICE_STATE_Configured) ? "Configured" : - (USB_DeviceState == DEVICE_STATE_Suspended) ? "Suspended" : "?"); - xprintf("battery: "); - switch (battery_status()) { - case FULL_CHARGED: xprintf("FULL"); break; - case CHARGING: xprintf("CHARG"); break; - case DISCHARGING: xprintf("DISCHG"); break; - case LOW_VOLTAGE: xprintf("LOW"); break; - default: xprintf("?"); break; - }; - xprintf("\n"); - xprintf("RemoteWakeupEnabled: %X\n", USB_Device_RemoteWakeupEnabled); - xprintf("VBUS: %X\n", USBSTA&(1<<VBUS)); - t = timer_read32()/1000; - uint8_t d = t/3600/24; - uint8_t h = t/3600; - uint8_t m = t%3600/60; - uint8_t s = t%60; - xprintf("uptime: %02u %02u:%02u:%02u\n", d, h, m, s); -#if 0 - xprintf("LINK0: %s\r\n", get_link(RN42_LINK0)); - xprintf("LINK1: %s\r\n", get_link(RN42_LINK1)); - xprintf("LINK2: %s\r\n", get_link(RN42_LINK2)); - xprintf("LINK3: %s\r\n", get_link(RN42_LINK3)); -#endif - return true; - case KC_B: - // battery monitor - t = timer_read32()/1000; - b = battery_voltage(); - xprintf("BAT: %umV\t", b); - xprintf("%02u:", t/3600); - xprintf("%02u:", t%3600/60); - xprintf("%02u\n", t%60); - 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_DELETE: - /* RN-42 Command mode */ - if (rn42_autoconnecting()) { - enter_command_mode(); - - command_state = CONSOLE; - config_mode = true; - } else { - exit_command_mode(); - - command_state = ONESHOT; - config_mode = false; - } - return true; - case KC_SCROLLLOCK: - init_rn42(); - return true; - default: - if (config_mode) - return true; - else - return false; // yield to default command - } - return true; -} - -/* - * RN-42 Command mode - * sends charactors to the module - */ -static uint8_t code2asc(uint8_t code); -bool command_console_extra(uint8_t code) -{ - rn42_putc(code2asc(code)); - return true; -} - -// 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/rn42_task.h b/keyboard/hhkb_rn42/rn42/rn42_task.h deleted file mode 100644 index 8f6c3ab64d..0000000000 --- a/keyboard/hhkb_rn42/rn42/rn42_task.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef RN42_TASK_H -#define RN42_TASK_H - -#include <stdbool.h> -#include "rn42.h" - -void rn42_task_init(void); -void rn42_task(void); - -#endif diff --git a/keyboard/hhkb_rn42/rn42/suart.S b/keyboard/hhkb_rn42/rn42/suart.S deleted file mode 100644 index 9fa5452928..0000000000 --- a/keyboard/hhkb_rn42/rn42/suart.S +++ /dev/null @@ -1,156 +0,0 @@ -;---------------------------------------------------------------------------;
-; 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/rn42/suart.h b/keyboard/hhkb_rn42/rn42/suart.h deleted file mode 100644 index 72725b998f..0000000000 --- a/keyboard/hhkb_rn42/rn42/suart.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef SUART
-#define SUART
-
-void xmit(uint8_t);
-uint8_t rcvr(void);
-uint8_t recv(void);
-
-#endif /* SUART */
|