Browse Source
Merge remote-tracking branch 'upstream/master'
Conflicts: .gitignore common.mk common/action_util.cledmap
Kai Ryu
9 years ago
100 changed files with 3507 additions and 438 deletions
+ 3
- 1
.gitignore
View File
| @@ -8,4 +8,6 @@ | |||
| *.map | |||
| *.sym | |||
| tags | |||
| *.swp | |||
| *~ | |||
| build/ | |||
| *.bak | |||
+ 16
- 15
common.mk
View File
| @@ -1,24 +1,25 @@ | |||
| COMMON_DIR = common | |||
| SRC += $(COMMON_DIR)/host.c \ | |||
| $(COMMON_DIR)/keyboard.c \ | |||
| $(COMMON_DIR)/action.c \ | |||
| $(COMMON_DIR)/action_tapping.c \ | |||
| $(COMMON_DIR)/action_macro.c \ | |||
| $(COMMON_DIR)/action_layer.c \ | |||
| $(COMMON_DIR)/action_util.c \ | |||
| $(COMMON_DIR)/keymap.c \ | |||
| $(COMMON_DIR)/timer.c \ | |||
| $(COMMON_DIR)/print.c \ | |||
| $(COMMON_DIR)/bootloader.c \ | |||
| $(COMMON_DIR)/suspend.c \ | |||
| $(COMMON_DIR)/xprintf.S \ | |||
| $(COMMON_DIR)/util.c | |||
| SRC += $(COMMON_DIR)/host.c \ | |||
| $(COMMON_DIR)/keyboard.c \ | |||
| $(COMMON_DIR)/action.c \ | |||
| $(COMMON_DIR)/action_tapping.c \ | |||
| $(COMMON_DIR)/action_macro.c \ | |||
| $(COMMON_DIR)/action_layer.c \ | |||
| $(COMMON_DIR)/action_util.c \ | |||
| $(COMMON_DIR)/keymap.c \ | |||
| $(COMMON_DIR)/print.c \ | |||
| $(COMMON_DIR)/debug.c \ | |||
| $(COMMON_DIR)/util.c \ | |||
| $(COMMON_DIR)/avr/suspend.c \ | |||
| $(COMMON_DIR)/avr/xprintf.S \ | |||
| $(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 | |||
+ 11
- 1
common/action.c
View File
| @@ -239,6 +239,16 @@ void process_action(keyrecord_t *record) | |||
| case ACT_LAYER_TAP: | |||
| case ACT_LAYER_TAP_EXT: | |||
| switch (action.layer_tap.code) { | |||
| case 0xe0 ... 0xef: | |||
| /* layer On/Off with modifiers(left only) */ | |||
| if (event.pressed) { | |||
| layer_on(action.layer_tap.val); | |||
| register_mods(action.layer_tap.code & 0x0f); | |||
| } else { | |||
| layer_off(action.layer_tap.val); | |||
| unregister_mods(action.layer_tap.code & 0x0f); | |||
| } | |||
| break; | |||
| case OP_TAP_TOGGLE: | |||
| /* tap toggle */ | |||
| if (event.pressed) { | |||
| @@ -505,7 +515,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); | |||
+ 10
- 3
common/action.h
View File
| @@ -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); | |||
| @@ -68,11 +71,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 */ | |||
+ 2
- 1
common/action_code.h
View File
| @@ -71,7 +71,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| * | |||
| * ACT_LAYER_TAP(101x): | |||
| * 101E|LLLL| keycode On/Off with tap key | |||
| * 101E|LLLL|1110 xxxx Reserved(0xE0-EF) | |||
| * 101E|LLLL|1110 mods On/Off with modifiers(0xE0-EF) | |||
| * 101E|LLLL|1111 0000 Invert with tap toggle(0xF0) | |||
| * 101E|LLLL|1111 0001 On/Off | |||
| * 101E|LLLL|1111 0010 Off/On | |||
| @@ -266,6 +266,7 @@ enum layer_pram_tap_op { | |||
| #define ACTION_LAYER_ON_OFF(layer) ACTION_LAYER_TAP((layer), OP_ON_OFF) | |||
| #define ACTION_LAYER_OFF_ON(layer) ACTION_LAYER_TAP((layer), OP_OFF_ON) | |||
| #define ACTION_LAYER_SET_CLEAR(layer) ACTION_LAYER_TAP((layer), OP_SET_CLEAR) | |||
| #define ACTION_LAYER_MODS(layer, mods) ACTION_LAYER_TAP((layer), 0xe0 | (mods)&0x0f) | |||
| /* With Tapping */ | |||
| #define ACTION_LAYER_TAP_KEY(layer, key) ACTION_LAYER_TAP((layer), (key)) | |||
| #define ACTION_LAYER_TAP_TOGGLE(layer) ACTION_LAYER_TAP((layer), OP_TAP_TOGGLE) | |||
+ 1
- 1
common/action_layer.c
View File
| @@ -118,7 +118,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; | |||
+ 1
- 1
common/action_layer.h
View File
| @@ -80,6 +80,6 @@ void layer_state_change(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 | |||
+ 4
- 4
common/action_macro.c
View File
| @@ -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 | |||
+ 4
- 4
common/action_macro.h
View File
| @@ -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; | |||
+ 10
- 10
common/action_util.c
View File
| @@ -33,8 +33,8 @@ static uint8_t weak_mods = 0; | |||
| #ifdef USB_6KRO_ENABLE | |||
| #undef REPORT_KEYS | |||
| #define REPORT_KEYS 6 | |||
| #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; | |||
| @@ -100,7 +100,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; | |||
| } | |||
| } | |||
| @@ -156,7 +156,7 @@ uint8_t has_anykey(void) | |||
| #endif | |||
| #else | |||
| 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++; | |||
| } | |||
| @@ -174,7 +174,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]); | |||
| } | |||
| @@ -263,7 +263,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; | |||
| } | |||
| @@ -271,7 +271,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; | |||
| } | |||
| @@ -310,7 +310,7 @@ static inline void del_key_byte(uint8_t code) | |||
| dump_report_keys(); | |||
| #endif | |||
| #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; | |||
| } | |||
| @@ -321,7 +321,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); | |||
| @@ -330,7 +330,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); | |||
+ 9
- 0
common/action_util.h
View File
| @@ -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 | |||
common/bootloader.c → common/avr/bootloader.c
View File
common/eeconfig.c → common/avr/eeconfig.c
View File
+ 117
- 0
common/avr/suspend.c
View File
| @@ -0,0 +1,117 @@ | |||
| #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" | |||
| #ifdef PROTOCOL_LUFA | |||
| #include "lufa.h" | |||
| #endif | |||
| #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_idle(uint8_t time) | |||
| { | |||
| cli(); | |||
| 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 Mode | |||
| 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 | |||
| set_sleep_mode(SLEEP_MODE_PWR_DOWN); | |||
| sleep_enable(); | |||
| sei(); | |||
| sleep_cpu(); | |||
| sleep_disable(); | |||
| // Disable watchdog after sleep | |||
| wdt_disable(); | |||
| } | |||
| 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; | |||
| } | |||
| return false; | |||
| } | |||
| // run immediately after wakeup | |||
| void suspend_wakeup_init(void) | |||
| { | |||
| // clear keyboard state | |||
| clear_keyboard(); | |||
| #ifdef BACKLIGHT_ENABLE | |||
| backlight_init(); | |||
| #endif | |||
| } | |||
| #ifndef NO_SUSPEND_POWER_DOWN | |||
| /* watchdog timeout */ | |||
| ISR(WDT_vect) | |||
| { | |||
| /* wakeup from MCU sleep mode */ | |||
| /* | |||
| // blink LED | |||
| static uint8_t led_state = 0; | |||
| static uint8_t led_count = 0; | |||
| led_count++; | |||
| if ((led_count & 0x07) == 0) { | |||
| led_set((led_state ^= (1<<USB_LED_CAPS_LOCK))); | |||
| } | |||
| */ | |||
| } | |||
| #endif | |||
+ 27
- 0
common/avr/suspend_avr.h
View File
| @@ -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 | |||
common/timer.c → common/avr/timer.c
View File
| @@ -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" | |||
+ 42
- 0
common/avr/timer_avr.h
View File
| @@ -0,0 +1,42 @@ | |||
| /* | |||
| Copyright 2011 Jun Wako <[email protected]> | |||
| 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 | |||
common/xprintf.S → common/avr/xprintf.S
View File
common/xprintf.h → common/avr/xprintf.h
View File
| @@ -8,6 +8,10 @@ | |||
| #include <inttypes.h> | |||
| #include <avr/pgmspace.h> | |||
| #ifdef __cplusplus | |||
| extern "C" { | |||
| #endif | |||
| extern void (*xfunc_out)(uint8_t); | |||
| #define xdev_out(func) xfunc_out = (void(*)(uint8_t))(func) | |||
| @@ -99,5 +103,9 @@ char xatoi(char **str, long *ret); | |||
| Pointer to return value | |||
| */ | |||
| #ifdef __cplusplus | |||
| } | |||
| #endif | |||
| #endif | |||
+ 1
- 1
common/bootmagic.c
View File
| @@ -120,7 +120,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; | |||
| } | |||
| } | |||
+ 19
- 9
common/command.c
View File
| @@ -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(); | |||
+ 8
- 2
common/command.h
View File
| @@ -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 | |||
+ 24
- 0
common/debug.c
View File
| @@ -0,0 +1,24 @@ | |||
| #include <stdbool.h> | |||
| #include "debug.h" | |||
| #define GCC_VERSION (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) | |||
| debug_config_t debug_config = { | |||
| /* GCC Bug 10676 - Using unnamed fields in initializers | |||
| * https://gcc.gnu.org/bugzilla/show_bug.cgi?id=10676 */ | |||
| #if GCC_VERSION >= 40600 | |||
| .enable = false, | |||
| .matrix = false, | |||
| .keyboard = false, | |||
| .mouse = false, | |||
| .reserved = 0 | |||
| #else | |||
| { | |||
| false, // .enable | |||
| false, // .matrix | |||
| false, // .keyboard | |||
| false, // .mouse | |||
| 0 // .reserved | |||
| } | |||
| #endif | |||
| }; | |||
+ 86
- 31
common/debug.h
View File
| @@ -18,45 +18,100 @@ 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" | |||
| #include "debug_config.h" | |||
| #ifdef __cplusplus | |||
| extern "C" { | |||
| #endif | |||
| /* | |||
| * Debug output control | |||
| */ | |||
| 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; | |||
| #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 | |||
| */ | |||
| #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 dprintf(fmt, ...) do { if (debug_enable) __xprintf(PSTR(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 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 { \ | |||
| #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)) | |||
| /* 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) | |||
| #else | |||
| #include "nodebug.h" | |||
| #endif | |||
| #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 /* 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 /* NO_DEBUG */ | |||
| #endif | |||
+ 0
- 51
common/debug_config.h
View File
| @@ -1,51 +0,0 @@ | |||
| /* | |||
| Copyright 2013 Jun Wako <[email protected]> | |||
| 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; | |||
| /* 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 | |||
+ 2
- 2
common/host.c
View File
| @@ -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"); | |||
+ 2
- 2
common/host.h
View File
| @@ -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 */ | |||
+ 12
- 2
common/keyboard.c
View File
| @@ -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" | |||
| @@ -45,6 +44,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| #ifdef PS2_MOUSE_ENABLE | |||
| # include "ps2_mouse.h" | |||
| #endif | |||
| #ifdef SERIAL_MOUSE_ENABLE | |||
| #include "serial_mouse.h" | |||
| #endif | |||
| #ifdef MATRIX_HAS_GHOST | |||
| @@ -79,6 +81,10 @@ void keyboard_init(void) | |||
| ps2_mouse_init(); | |||
| } | |||
| #endif | |||
| #ifdef SERIAL_MOUSE_ENABLE | |||
| serial_mouse_init(); | |||
| #endif | |||
| #ifdef BOOTMAGIC_ENABLE | |||
| bootmagic(); | |||
| @@ -134,7 +140,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 */ | |||
| }); | |||
| @@ -162,6 +168,10 @@ MATRIX_LOOP_END: | |||
| } | |||
| #endif | |||
| #ifdef SERIAL_MOUSE_ENABLE | |||
| serial_mouse_task(); | |||
| #endif | |||
| // update LED | |||
| if (led_status != host_keyboard_leds()) { | |||
| led_status = host_keyboard_leds(); | |||
+ 7
- 4
common/keyboard.h
View File
| @@ -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) \ | |||
| } | |||
| @@ -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 | |||
+ 2
- 3
common/keymap.c
View File
| @@ -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" | |||
| @@ -28,7 +27,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 +155,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); | |||
| } | |||
+ 1
- 1
common/keymap.h
View File
| @@ -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); | |||
+ 5
- 0
common/matrix.h
View File
| @@ -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 | |||
+ 4
- 0
common/mbed/bootloader.c
View File
| @@ -0,0 +1,4 @@ | |||
| #include "bootloader.h" | |||
| void bootloader_jump(void) {} | |||
+ 6
- 0
common/mbed/suspend.c
View File
| @@ -0,0 +1,6 @@ | |||
| #include <stdbool.h> | |||
| void suspend_power_down(void) {} | |||
| bool suspend_wakeup_condition(void) { return true; } | |||
| void suspend_wakeup_init(void) {} | |||
+ 41
- 0
common/mbed/timer.c
View File
| @@ -0,0 +1,41 @@ | |||
| #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) | |||
| { | |||
| timer_count = 0; | |||
| 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); | |||
| } | |||
+ 46
- 0
common/mbed/xprintf.cpp
View File
| @@ -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; | |||
| */ | |||
| } | |||
+ 17
- 0
common/mbed/xprintf.h
View File
| @@ -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 | |||
+ 0
- 1
common/mousekey.c
View File
| @@ -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" | |||
+ 14
- 6
common/mousekey.h
View File
| @@ -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 | |||
+ 3
- 27
common/nodebug.h
View File
| @@ -18,32 +18,8 @@ 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, ...) | |||
| #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 | |||
+ 0
- 22
common/print.c
View File
| @@ -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 | |||
+ 75
- 72
common/print.h
View File
| @@ -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 | |||
| #if defined(__AVR__) | |||
| #ifndef NO_PRINT | |||
| #include "avr/xprintf.h" | |||
| #ifdef __cplusplus | |||
| extern "C" { | |||
| // TODO: avoid collision with arduino/Print.h | |||
| #ifndef __cplusplus | |||
| #define print(s) xputs(PSTR(s)) | |||
| #endif | |||
| #define println(s) xputs(PSTR(s "\r\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 defined(__arm__) | |||
| void print_lf(void); | |||
| void print_crlf(void); | |||
| #include "mbed/xprintf.h" | |||
| #define print(s) xprintf(s) | |||
| #define println(s) xprintf(s "\r\n") | |||
| /* 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) | |||
| /* TODO: to select output destinations: UART/USBSerial */ | |||
| #define print_set_sendchar(func) | |||
| /* decimal */ | |||
| #define print_dec(i) xprintf("%u", i) | |||
| #define print_decs(i) xprintf("%d", i) | |||
| #endif /* __AVR__ */ | |||
| /* 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) | |||
| /* decimal */ | |||
| #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) | |||
| /* 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_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 | |||
| #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)) | |||
| #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) | |||
| #endif | |||
| #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 /* 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 | |||
+ 12
- 0
common/progmem.h
View File
| @@ -0,0 +1,12 @@ | |||
| #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) | |||
| # define pgm_read_word(p) *(p) | |||
| #endif | |||
| #endif | |||
+ 11
- 11
common/report.h
View File
| @@ -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; | |||
+ 0
- 76
common/suspend.c
View File
| @@ -1,76 +0,0 @@ | |||
| #include "suspend.h" | |||
| #include "matrix.h" | |||
| #include "action.h" | |||
| #include "backlight.h" | |||
| void suspend_power_down(void) | |||
| { | |||
| #ifdef BACKLIGHT_ENABLE | |||
| backlight_set(0); | |||
| #endif | |||
| #ifndef NO_SUSPEND_POWER_DOWN | |||
| // Enable watchdog to wake from MCU sleep | |||
| cli(); | |||
| wdt_reset(); | |||
| // Watchdog Interrupt and System Reset Mode | |||
| //wdt_enable(WDTO_1S); | |||
| //WDTCSR |= _BV(WDIE); | |||
| // Watchdog Interrupt Mode | |||
| wdt_intr_enable(WDTO_120MS); | |||
| // 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(); | |||
| sleep_cpu(); | |||
| sleep_disable(); | |||
| // Disable watchdog after sleep | |||
| wdt_disable(); | |||
| #endif | |||
| } | |||
| bool suspend_wakeup_condition(void) | |||
| { | |||
| matrix_scan(); | |||
| for (uint8_t r = 0; r < MATRIX_ROWS; r++) { | |||
| if (matrix_get_row(r)) return true; | |||
| } | |||
| return false; | |||
| } | |||
| // run immediately after wakeup | |||
| void suspend_wakeup_init(void) | |||
| { | |||
| // clear keyboard state | |||
| clear_keyboard(); | |||
| #ifdef BACKLIGHT_ENABLE | |||
| backlight_init(); | |||
| #endif | |||
| } | |||
| #ifndef NO_SUSPEND_POWER_DOWN | |||
| /* watchdog timeout */ | |||
| ISR(WDT_vect) | |||
| { | |||
| /* wakeup from MCU sleep mode */ | |||
| /* | |||
| // blink LED | |||
| static uint8_t led_state = 0; | |||
| static uint8_t led_count = 0; | |||
| led_count++; | |||
| if ((led_count & 0x07) == 0) { | |||
| led_set((led_state ^= (1<<USB_LED_CAPS_LOCK))); | |||
| } | |||
| */ | |||
| } | |||
| #endif | |||
+ 2
- 21
common/suspend.h
View File
| @@ -3,29 +3,10 @@ | |||
| #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); | |||
| void suspend_idle(uint8_t timeout); | |||
| void suspend_power_down(uint8_t timeout); | |||
| bool suspend_wakeup_condition(void); | |||
| void suspend_wakeup_init(void); | |||
+ 2
- 16
common/timer.h
View File
| @@ -20,24 +20,10 @@ 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 | |||
| #if defined(__AVR__) | |||
| #include "avr/timer_avr.h" | |||
| #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) | |||
+ 20
- 0
common/wait.h
View File
| @@ -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 | |||
+ 1
- 1
converter/adb_usb/Makefile
View File
| @@ -121,7 +121,7 @@ EXTRAKEY_ENABLE = yes # Audio control and System control(+450) | |||
| CONSOLE_ENABLE = yes # Console for debug(+400) | |||
| COMMAND_ENABLE = yes # Commands for debug and configuration | |||
| #SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend | |||
| #NKRO_ENABLE = yes # USB Nkey Rollover - not yet supported in LUFA | |||
| #NKRO_ENABLE = yes # USB Nkey Rollover | |||
| # Optimize size but this may cause error "relocation truncated to fit" | |||
+ 1
- 1
converter/adb_usb/keymap_common.c
View File
| @@ -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)]); | |||
| } | |||
+ 1
- 1
converter/ascii_usb/keymap.c
View File
| @@ -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; | |||
| } | |||
+ 1
- 1
converter/ibm4704_usb/keymap_common.c
View File
| @@ -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)]); | |||
| } | |||
+ 1
- 1
converter/m0110_usb/keymap.c
View File
| @@ -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)]); | |||
| } | |||
+ 1
- 1
converter/m0110_usb/keymap_common.c
View File
| @@ -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)]); | |||
| } | |||
+ 25
- 1
converter/next_usb/Makefile
View File
| @@ -20,6 +20,7 @@ CONFIG_H = config.h | |||
| MCU = atmega32u4 # Teensy 2.0 | |||
| #MCU = at90usb646 # Teensy++ 1.0 | |||
| #MCU = at90usb1286 # Teensy++ 2.0 | |||
| #MCU = atmega32u2 # TMK converter | |||
| # Processor frequency. | |||
| @@ -30,6 +31,29 @@ MCU = atmega32u4 # Teensy 2.0 | |||
| 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(+60) | |||
| #OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT | |||
| # Boot Section Size in *bytes* | |||
| # Teensy halfKay 512 | |||
| # Teensy++ halfKay 1024 | |||
| @@ -58,6 +82,6 @@ VPATH += $(TOP_DIR) | |||
| include $(TOP_DIR)/protocol.mk | |||
| include $(TOP_DIR)/protocol/pjrc.mk | |||
| include $(TOP_DIR)/protocol/lufa.mk | |||
| include $(TOP_DIR)/common.mk | |||
| include $(TOP_DIR)/rules.mk | |||
+ 63
- 0
converter/next_usb/Makefile.pjrc
View File
| @@ -0,0 +1,63 @@ | |||
| # Target file name (without extension). | |||
| TARGET = next_usb | |||
| # Directory common source filess exist | |||
| TOP_DIR = ../.. | |||
| # Directory keyboard dependent files exist | |||
| TARGET_DIR = . | |||
| # keyboard dependent files | |||
| SRC = keymap.c \ | |||
| matrix.c \ | |||
| led.c | |||
| CONFIG_H = config.h | |||
| # MCU name, you MUST set this to match the board you are using | |||
| # type "make clean" after changing this, so all files will be rebuilt | |||
| #MCU = at90usb162 # Teensy 1.0 | |||
| MCU = atmega32u4 # Teensy 2.0 | |||
| #MCU = at90usb646 # Teensy++ 1.0 | |||
| #MCU = at90usb1286 # Teensy++ 2.0 | |||
| # Processor frequency. | |||
| # Normally the first thing your program should do is set the clock prescaler, | |||
| # so your program will run at the correct speed. You should also set this | |||
| # variable to same clock speed. The _delay_ms() macro uses this, and many | |||
| # examples use this variable to calculate timings. Do not add a "UL" here. | |||
| F_CPU = 16000000 | |||
| # Boot Section Size in *bytes* | |||
| # Teensy halfKay 512 | |||
| # Teensy++ halfKay 1024 | |||
| # Atmel DFU loader 4096 | |||
| # 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(+1000) | |||
| MOUSEKEY_ENABLE = yes # Mouse keys | |||
| EXTRAKEY_ENABLE = yes # Audio control and System control | |||
| CONSOLE_ENABLE = yes # Console for debug(+400) | |||
| COMMAND_ENABLE = yes # Commands for debug and configuration | |||
| #NKRO_ENABLE = yes # USB Nkey Rollover | |||
| SRC += next_kbd.c | |||
| # Search Path | |||
| VPATH += $(TARGET_DIR) | |||
| VPATH += $(TOP_DIR) | |||
| include $(TOP_DIR)/protocol.mk | |||
| include $(TOP_DIR)/protocol/pjrc.mk | |||
| include $(TOP_DIR)/common.mk | |||
| include $(TOP_DIR)/rules.mk | |||
+ 38
- 0
converter/next_usb/config.h
View File
| @@ -60,6 +60,7 @@ POSSIBILITY OF SUCH DAMAGE. | |||
| //#define TEENSY_CONFIG 1 | |||
| #define PRO_MICRO_CONFIG 1 | |||
| //#define TMK_CONFIG 1 | |||
| // comment out if you don't want the keyboard's LEDs to flash upon initialization | |||
| #define NEXT_KBD_INIT_FLASH_LEDS | |||
| @@ -143,6 +144,43 @@ POSSIBILITY OF SUCH DAMAGE. | |||
| #endif | |||
| //================= End of Teensy 2.0 Configuration ================== | |||
| //================ Start of TMK converter Configuration ================= | |||
| #ifdef TMK_CONFIG | |||
| // this is the debugging LED that flashes when a key is being pressed | |||
| // comment out in order to disable debugging LED | |||
| #define NEXT_KBD_LED1_PORT PORTD | |||
| #define NEXT_KBD_LED1_PIN PIND | |||
| #define NEXT_KBD_LED1_DDR DDRD | |||
| #define NEXT_KBD_LED1_BIT 6 | |||
| #define NEXT_KBD_LED1_ON NEXT_KBD_LED1_PORT |= (1<<NEXT_KBD_LED1_BIT); | |||
| #define NEXT_KBD_LED1_OFF NEXT_KBD_LED1_PORT &= ~(1<<NEXT_KBD_LED1_BIT); | |||
| // corresponds to the Keyboard In wire on the NeXT connector | |||
| #define NEXT_KBD_OUT_PORT PORTD | |||
| #define NEXT_KBD_OUT_PIN PIND | |||
| #define NEXT_KBD_OUT_DDR DDRD | |||
| #define NEXT_KBD_OUT_BIT 1 | |||
| // corresponds to the Keyboard Out wire on the NeXT connector | |||
| #define NEXT_KBD_IN_PORT PORTD | |||
| #define NEXT_KBD_IN_PIN PIND | |||
| #define NEXT_KBD_IN_DDR DDRD | |||
| #define NEXT_KBD_IN_BIT 0 | |||
| // this pin is an input for the power key on the NeXT keyboard | |||
| // as the keyboard is powered on this should be normally high; | |||
| // if it is pulled low it means the power button is being preseed | |||
| #define NEXT_KBD_PWR_PORT PORTD | |||
| #define NEXT_KBD_PWR_PIN PIND | |||
| #define NEXT_KBD_PWR_DDR DDRD | |||
| #define NEXT_KBD_PWR_BIT 4 | |||
| #endif | |||
| //================= End of TMK converter Configuration ================== | |||
| /* key combination for command */ | |||
| #define IS_COMMAND() ( \ | |||
| (keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)))|| \ | |||
+ 1
- 1
converter/next_usb/keymap.c
View File
| @@ -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)]); | |||
| } | |||
+ 1
- 1
converter/pc98_usb/keymap.c
View File
| @@ -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)]); | |||
+ 44
- 0
converter/ps2_usb/Makefile.mbed
View File
| @@ -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 | |||
+ 8
- 2
converter/ps2_usb/Makefile.vusb
View File
| @@ -8,10 +8,16 @@ TOP_DIR = ../.. | |||
| TARGET_DIR = . | |||
| # keyboard dependent files | |||
| SRC = keymap.c \ | |||
| SRC = keymap_common.c \ | |||
| matrix.c \ | |||
| led.c | |||
| ifdef KEYMAP | |||
| SRC := keymap_$(KEYMAP).c $(SRC) | |||
| else | |||
| SRC := keymap_plain.c $(SRC) | |||
| endif | |||
| # Use USART for PS/2. With V-USB INT and BUSYWAIT code is not useful. | |||
| SRC += protocol/ps2_usart.c | |||
| OPT_DEFS += -DPS2_USE_USART | |||
| @@ -95,7 +101,7 @@ VPATH += $(TARGET_DIR) | |||
| VPATH += $(TOP_DIR) | |||
| include $(TOP_DIR)/protocol/vusb.mk | |||
| include $(TOP_DIR)/protocol.mk | |||
| include $(TOP_DIR)/common.mk | |||
| include $(TOP_DIR)/protocol/vusb.mk | |||
| include $(TOP_DIR)/rules.mk | |||
+ 1
- 2
converter/ps2_usb/README.md
View File
| @@ -58,8 +58,7 @@ To select method edit Makefile. | |||
| V-USB Support | |||
| ------------- | |||
| You can also use this converter on ATmega(168/328) with V-USB instead of Teensy. | |||
| The converter on V-USB lacks some features for now: USB NKRO and System/Media control. | |||
| With V-USB you can use this converter on ATmega(168/328) but it doesn't support NKRO at this time. | |||
| Circuit: | |||
+ 60
- 0
converter/ps2_usb/config_mbed.h
View File
| @@ -0,0 +1,60 @@ | |||
| /* | |||
| Copyright 2012 Jun Wako <[email protected]> | |||
| 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 | |||
+ 2
- 1
converter/ps2_usb/keymap_common.c
View File
| @@ -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)]); | |||
| } | |||
+ 0
- 1
converter/ps2_usb/keymap_common.h
View File
| @@ -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" | |||
+ 46
- 0
converter/ps2_usb/main.cpp
View File
| @@ -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); | |||
| } | |||
| } | |||
| } | |||
+ 1
- 2
converter/ps2_usb/matrix.c
View File
| @@ -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: | |||
+ 106
- 0
converter/serialmouse_usb/Makefile
View File
| @@ -0,0 +1,106 @@ | |||
| # | |||
| # Makefile for Teensy | |||
| # | |||
| # Target file name (without extension). | |||
| TARGET = serialmouse_usb | |||
| # Directory common source filess exist | |||
| TOP_DIR = ../.. | |||
| # Directory keyboard dependent files exist | |||
| TARGET_DIR = . | |||
| # project specific files | |||
| SRC = keymap.c \ | |||
| matrix.c \ | |||
| led.c | |||
| CONFIG_H = config.h | |||
| # MCU name | |||
| #MCU = at90usb1287 | |||
| 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(+60) | |||
| #OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT | |||
| # Boot Section Size in *bytes* | |||
| # Teensy halfKay 512 | |||
| # Teensy++ halfKay 1024 | |||
| # Atmel DFU loader 4096 | |||
| # LUFA bootloader 4096 | |||
| # USBaspLoader 2048 | |||
| OPT_DEFS += -DBOOTLOADER_SIZE=512 | |||
| # Build Options | |||
| # comment out to disable the options. | |||
| # | |||
| #BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration(+1000) | |||
| #MOUSEKEY_ENABLE = yes # Mouse keys(+4700) | |||
| #EXTRAKEY_ENABLE = yes # Audio control and System control(+450) | |||
| CONSOLE_ENABLE = yes # Console for debug(+400) | |||
| #COMMAND_ENABLE = yes # Commands for debug and configuration | |||
| #NKRO_ENABLE = yes # USB Nkey Rollover - not yet supported in LUFA | |||
| # Serial Mouse Options | |||
| # You can choose a mouse protocol and the implementation of | |||
| # the underlying serial connection. | |||
| # | |||
| SERIAL_MOUSE_MICROSOFT_ENABLE = yes # Enable support for Microsoft-compatible mice | |||
| #SERIAL_MOUSE_MOUSESYSTEMS_ENABLE = yes # Enable support for Mousesystems-compatible mice | |||
| #SERIAL_MOUSE_USE_UART = yes # use hardware UART for serial connection | |||
| SERIAL_MOUSE_USE_SOFT = yes # use software serial implementation | |||
| # Optional serial mouse driver features | |||
| # Support scrolling while holding the middle mouse button | |||
| # (currently only supported for Mousesystems mice): | |||
| #OPT_DEFS += -DSERIAL_MOUSE_CENTER_SCROLL | |||
| # Optimize size but this may cause error "relocation truncated to fit" | |||
| #EXTRALDFLAGS = -Wl,--relax | |||
| # 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 | |||
+ 11
- 0
converter/serialmouse_usb/README.md
View File
| @@ -0,0 +1,11 @@ | |||
| Serial mouse converter | |||
| ====================== | |||
| See https://github.com/tmk/tmk_keyboard/pull/131 | |||
| Supported protocols | |||
| ------------------- | |||
| ### Microsoft | |||
| Not tested. | |||
| ### Mousesystems | |||
+ 119
- 0
converter/serialmouse_usb/config.h
View File
| @@ -0,0 +1,119 @@ | |||
| /* | |||
| Copyright 2012 Jun Wako <[email protected]> | |||
| 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 | |||
| #include <avr/interrupt.h> | |||
| #define VENDOR_ID 0xFEED | |||
| #define PRODUCT_ID 0x2222 | |||
| #define DEVICE_VER 0x0001 | |||
| #define MANUFACTURER t.m.k. | |||
| #define PRODUCT serial mouse converter | |||
| #define DESCRIPTION convert serial mouse into USB | |||
| /* matrix size */ | |||
| #define MATRIX_ROWS 0 | |||
| #define MATRIX_COLS 0 | |||
| /* key combination for command */ | |||
| #define IS_COMMAND() false | |||
| #ifdef SERIAL_MOUSE_MICROSOFT | |||
| /* | |||
| * Serial(USART) configuration (for Microsoft serial mice) | |||
| * asynchronous, positive logic, 1200baud, bit order: LSB first | |||
| * 1-start bit, 7-data bit, no parity, 1-stop bit | |||
| */ | |||
| #define SERIAL_UART_BAUD 1200 | |||
| #define SERIAL_UART_DATA UDR1 | |||
| #define SERIAL_UART_UBRR ((F_CPU/(16UL*SERIAL_UART_BAUD))-1) | |||
| #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 = (uint8_t) (SERIAL_UART_UBRR>>8); /* baud rate */ \ | |||
| UCSR1B |= (1<<RXCIE1) | (1<<RXEN1); /* RX interrupt, RX: enable */ \ | |||
| UCSR1C = (1<<UCSZ11) | (0<<UCSZ10); /* no parity, 1 stop bit, 7-bit characters */ \ | |||
| sei(); \ | |||
| } while(0) | |||
| // for Microsoft mouse protocol | |||
| /* Serial(USART) configuration | |||
| * asynchronous, negative logic, 1200baud, no flow control | |||
| * 1-start bit, 7-data bit, non parity, 1-stop bit | |||
| */ | |||
| #define SERIAL_SOFT_BAUD 1200 | |||
| #define SERIAL_SOFT_DATA_7BIT | |||
| #define SERIAL_SOFT_PARITY_NONE | |||
| #define SERIAL_SOFT_BIT_ORDER_LSB | |||
| #define SERIAL_SOFT_LOGIC_NEGATIVE | |||
| /* RXD Port */ | |||
| #define SERIAL_SOFT_RXD_DDR DDRD | |||
| #define SERIAL_SOFT_RXD_PORT PORTD | |||
| #define SERIAL_SOFT_RXD_PIN PIND | |||
| #define SERIAL_SOFT_RXD_BIT 2 | |||
| #define SERIAL_SOFT_RXD_VECT INT2_vect | |||
| /* RXD Interupt */ | |||
| #define SERIAL_SOFT_RXD_INIT() do { \ | |||
| /* pin configuration: input with pull-up */ \ | |||
| SERIAL_SOFT_RXD_DDR &= ~(1<<SERIAL_SOFT_RXD_BIT); \ | |||
| SERIAL_SOFT_RXD_PORT |= (1<<SERIAL_SOFT_RXD_BIT); \ | |||
| /* enable interrupt: INT2(rising edge) */ \ | |||
| EICRA |= ((1<<ISC21)|(1<<ISC20)); \ | |||
| EIMSK |= (1<<INT2); \ | |||
| sei(); \ | |||
| } while (0) | |||
| #define SERIAL_SOFT_RXD_INT_ENTER() | |||
| #define SERIAL_SOFT_RXD_INT_EXIT() do { \ | |||
| /* clear interrupt flag */ \ | |||
| EIFR = (1<<INTF2); \ | |||
| } while (0) | |||
| #define SERIAL_SOFT_RXD_READ() (SERIAL_SOFT_RXD_PIN&(1<<SERIAL_SOFT_RXD_BIT)) | |||
| /* TXD Port */ | |||
| #define SERIAL_SOFT_TXD_HI() | |||
| #define SERIAL_SOFT_TXD_LO() | |||
| #define SERIAL_SOFT_TXD_INIT() | |||
| #elif defined(SERIAL_MOUSE_MOUSESYSTEMS) | |||
| /* | |||
| * Serial(USART) configuration (for Mousesystems serial mice) | |||
| * asynchronous, positive logic, 1200baud, bit order: LSB first | |||
| * 1-start bit, 8-data bit, no parity, 1-stop bit | |||
| */ | |||
| #define SERIAL_UART_BAUD 1200 | |||
| #define SERIAL_UART_DATA UDR1 | |||
| #define SERIAL_UART_UBRR ((F_CPU/(16UL*SERIAL_UART_BAUD))-1) | |||
| #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 = (uint8_t) (SERIAL_UART_UBRR>>8); /* baud rate */ \ | |||
| UCSR1B |= (1<<RXCIE1) | (1<<RXEN1); /* RX interrupt, RX: enable */ \ | |||
| UCSR1C = (1<<UCSZ11) | (1<<UCSZ10); /* no parity, 1 stop bit, 8-bit characters */ \ | |||
| sei(); \ | |||
| } while(0) | |||
| #endif | |||
| #endif | |||
+ 33
- 0
converter/serialmouse_usb/keymap.c
View File
| @@ -0,0 +1,33 @@ | |||
| /* | |||
| Copyright 2011,2012,2013 Jun Wako <[email protected]> | |||
| 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 <stdbool.h> | |||
| #include "keymap.h" | |||
| /* translates key to keycode */ | |||
| uint8_t keymap_key_to_keycode(uint8_t layer, keypos_t key) | |||
| { | |||
| return KC_NO; | |||
| } | |||
| /* translates Fn keycode to action */ | |||
| action_t keymap_fn_to_action(uint8_t keycode) | |||
| { | |||
| return (action_t){}; | |||
| } | |||
+ 30
- 0
converter/serialmouse_usb/keymap_common.c
View File
| @@ -0,0 +1,30 @@ | |||
| /* | |||
| Copyright 2011,2012,2013 Jun Wako <[email protected]> | |||
| 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 "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)]) }; | |||
| } | |||
+ 174
- 0
converter/serialmouse_usb/keymap_common.h
View File
| @@ -0,0 +1,174 @@ | |||
| /* | |||
| Copyright 2011,2012,2013 Jun Wako <[email protected]> | |||
| 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 <avr/pgmspace.h> | |||
| #include "keycode.h" | |||
| #include "action.h" | |||
| #include "action_macro.h" | |||
| #include "report.h" | |||
| #include "print.h" | |||
| #include "debug.h" | |||
| #include "keymap.h" | |||
| // 32*8(256) byte array which converts PS/2 code into USB code | |||
| extern const uint8_t keymaps[][MATRIX_ROWS][MATRIX_COLS]; | |||
| extern const uint16_t fn_actions[]; | |||
| /* All keys */ | |||
| #define KEYMAP_ALL( \ | |||
| K76,K05,K06,K04,K0C,K03,K0B,K83,K0A,K01,K09,K78,K07, KFC,K7E,KFE, \ | |||
| K0E,K16,K1E,K26,K25,K2E,K36,K3D,K3E,K46,K45,K4E,K55,K66, KF0,KEC,KFD, K77,KCA,K7C,K7B, \ | |||
| K0D,K15,K1D,K24,K2D,K2C,K35,K3C,K43,K44,K4D,K54,K5B,K5D, KF1,KE9,KFA, K6C,K75,K7D, \ | |||
| K58,K1C,K1B,K23,K2B,K34,K33,K3B,K42,K4B,K4C,K52, K5A, K6B,K73,K74,K79, \ | |||
| K12,K1A,K22,K21,K2A,K32,K31,K3A,K41,K49,K4A, K59, KF5, K69,K72,K7A, \ | |||
| K14,K9F,K11, K29, K91,KA7,KAF,K94, KEB,KF2,KF4, K70, K71,KDA, \ | |||
| \ | |||
| K61, /* for European ISO */ \ | |||
| K51, K13, K6A, K64, K67, /* for Japanese JIS */ \ | |||
| K08, K10, K18, K20, K28, K30, K38, K40, K48, K50, K57, K5F, /* F13-24 */ \ | |||
| KB7, KBF, KDE, /* System Power, Sleep, Wake */ \ | |||
| KA3, KB2, KA1, /* Mute, Volume Up, Volume Down */ \ | |||
| KCD, K95, KBB, KB4, KD0, /* Next, Previous, Stop, Pause, Media Select */ \ | |||
| KC8, KAB, KC0, /* Mail, Calculator, My Computer */ \ | |||
| K90, KBA, KB8, KB0, /* WWW Search, Home, Back, Forward */ \ | |||
| KA8, KA0, K98 /* WWW Stop, Refresh, Favorites */ \ | |||
| ) { \ | |||
| { KC_NO, KC_##K01, KC_NO, KC_##K03, KC_##K04, KC_##K05, KC_##K06, KC_##K07 }, \ | |||
| { KC_##K08, KC_##K09, KC_##K0A, KC_##K0B, KC_##K0C, KC_##K0D, KC_##K0E, KC_NO }, \ | |||
| { KC_##K10, KC_##K11, KC_##K12, KC_##K13, KC_##K14, KC_##K15, KC_##K16, KC_NO }, \ | |||
| { KC_##K18, KC_NO, KC_##K1A, KC_##K1B, KC_##K1C, KC_##K1D, KC_##K1E, KC_NO }, \ | |||
| { KC_##K20, KC_##K21, KC_##K22, KC_##K23, KC_##K24, KC_##K25, KC_##K26, KC_NO }, \ | |||
| { KC_##K28, KC_##K29, KC_##K2A, KC_##K2B, KC_##K2C, KC_##K2D, KC_##K2E, KC_NO }, \ | |||
| { KC_##K30, KC_##K31, KC_##K32, KC_##K33, KC_##K34, KC_##K35, KC_##K36, KC_NO }, \ | |||
| { KC_##K38, KC_NO, KC_##K3A, KC_##K3B, KC_##K3C, KC_##K3D, KC_##K3E, KC_NO }, \ | |||
| { KC_##K40, KC_##K41, KC_##K42, KC_##K43, KC_##K44, KC_##K45, KC_##K46, KC_NO }, \ | |||
| { KC_##K48, KC_##K49, KC_##K4A, KC_##K4B, KC_##K4C, KC_##K4D, KC_##K4E, KC_NO }, \ | |||
| { KC_##K50, KC_##K51, KC_##K52, KC_NO, KC_##K54, KC_##K55, KC_NO, KC_##K57 }, \ | |||
| { KC_##K58, KC_##K59, KC_##K5A, KC_##K5B, KC_NO, KC_##K5D, KC_NO, KC_##K5F }, \ | |||
| { KC_NO, KC_##K61, KC_NO, KC_NO, KC_##K64, KC_NO, KC_##K66, KC_##K67 }, \ | |||
| { KC_NO, KC_##K69, KC_##K6A, KC_##K6B, KC_##K6C, KC_NO, KC_NO, KC_NO }, \ | |||
| { KC_##K70, KC_##K71, KC_##K72, KC_##K73, KC_##K74, KC_##K75, KC_##K76, KC_##K77 }, \ | |||
| { KC_##K78, KC_##K79, KC_##K7A, KC_##K7B, KC_##K7C, KC_##K7D, KC_##K7E, KC_NO }, \ | |||
| { KC_NO, KC_NO, KC_NO, KC_##K83, 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_##K90, KC_##K91, KC_NO, KC_NO, KC_##K94, KC_##K95, KC_NO, KC_NO }, \ | |||
| { KC_##K98, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_##K9F }, \ | |||
| { KC_##KA0, KC_##KA1, KC_NO, KC_##KA3, KC_NO, KC_NO, KC_NO, KC_##KA7 }, \ | |||
| { KC_##KA8, KC_NO, KC_NO, KC_##KAB, KC_NO, KC_NO, KC_NO, KC_##KAF }, \ | |||
| { KC_##KB0, KC_NO, KC_##KB2, KC_NO, KC_##KB4, KC_NO, KC_NO, KC_##KB7 }, \ | |||
| { KC_##KB8, KC_NO, KC_##KBA, KC_##KBB, KC_NO, KC_NO, KC_NO, KC_##KBF }, \ | |||
| { KC_##KC0, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \ | |||
| { KC_##KC8, KC_NO, KC_##KCA, KC_NO, KC_NO, KC_##KCD, KC_NO, KC_NO }, \ | |||
| { KC_##KD0, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \ | |||
| { KC_NO, KC_NO, KC_##KDA, KC_NO, KC_NO, KC_NO, KC_##KDE, KC_NO }, \ | |||
| { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \ | |||
| { KC_NO, KC_##KE9, KC_NO, KC_##KEB, KC_##KEC, KC_NO, KC_NO, KC_NO }, \ | |||
| { KC_##KF0, KC_##KF1, KC_##KF2, KC_NO, KC_##KF4, KC_##KF5, KC_NO, KC_NO }, \ | |||
| { KC_NO, KC_NO, KC_##KFA, KC_NO, KC_##KFC, KC_##KFD, KC_##KFE, KC_NO }, \ | |||
| } | |||
| /* US layout */ | |||
| #define KEYMAP( \ | |||
| K76,K05,K06,K04,K0C,K03,K0B,K83,K0A,K01,K09,K78,K07, KFC,K7E,KFE, \ | |||
| K0E,K16,K1E,K26,K25,K2E,K36,K3D,K3E,K46,K45,K4E,K55,K66, KF0,KEC,KFD, K77,KCA,K7C,K7B, \ | |||
| K0D,K15,K1D,K24,K2D,K2C,K35,K3C,K43,K44,K4D,K54,K5B,K5D, KF1,KE9,KFA, K6C,K75,K7D, \ | |||
| K58,K1C,K1B,K23,K2B,K34,K33,K3B,K42,K4B,K4C,K52, K5A, K6B,K73,K74,K79, \ | |||
| K12,K1A,K22,K21,K2A,K32,K31,K3A,K41,K49,K4A, K59, KF5, K69,K72,K7A, \ | |||
| K14,K9F,K11, K29, K91,KA7,KAF,K94, KEB,KF2,KF4, K70, K71,KDA \ | |||
| ) \ | |||
| KEYMAP_ALL( \ | |||
| K76,K05,K06,K04,K0C,K03,K0B,K83,K0A,K01,K09,K78,K07, KFC,K7E,KFE, \ | |||
| K0E,K16,K1E,K26,K25,K2E,K36,K3D,K3E,K46,K45,K4E,K55,K66, KF0,KEC,KFD, K77,KCA,K7C,K7B, \ | |||
| K0D,K15,K1D,K24,K2D,K2C,K35,K3C,K43,K44,K4D,K54,K5B,K5D, KF1,KE9,KFA, K6C,K75,K7D, \ | |||
| K58,K1C,K1B,K23,K2B,K34,K33,K3B,K42,K4B,K4C,K52, K5A, K6B,K73,K74,K79, \ | |||
| K12,K1A,K22,K21,K2A,K32,K31,K3A,K41,K49,K4A, K59, KF5, K69,K72,K7A, \ | |||
| K14,K9F,K11, K29, K91,KA7,KAF,K94, KEB,KF2,KF4, K70, K71,KDA, \ | |||
| \ | |||
| NUBS, \ | |||
| RO, KANA, JYEN, HENK, MHEN, \ | |||
| F13, F14, F15, F16, F17, F18, F19, F20, F21, F22, F23, F24, \ | |||
| SYSTEM_POWER, SYSTEM_SLEEP, SYSTEM_WAKE, \ | |||
| AUDIO_MUTE, AUDIO_VOL_UP, AUDIO_VOL_DOWN, \ | |||
| MEDIA_NEXT_TRACK, MEDIA_PREV_TRACK, MEDIA_STOP, MEDIA_PLAY_PAUSE, MEDIA_SELECT, \ | |||
| MAIL, CALCULATOR, MY_COMPUTER, \ | |||
| WWW_SEARCH, WWW_HOME, WWW_BACK, WWW_FORWARD, \ | |||
| WWW_STOP, WWW_REFRESH, WWW_FAVORITES \ | |||
| ) | |||
| /* ISO layout */ | |||
| #define KEYMAP_ISO( \ | |||
| K76,K05,K06,K04,K0C,K03,K0B,K83,K0A,K01,K09,K78,K07, KFC,K7E,KFE, \ | |||
| K0E,K16,K1E,K26,K25,K2E,K36,K3D,K3E,K46,K45,K4E,K55,K66, KF0,KEC,KFD, K77,KCA,K7C,K7B, \ | |||
| K0D,K15,K1D,K24,K2D,K2C,K35,K3C,K43,K44,K4D,K54,K5B, KF1,KE9,KFA, K6C,K75,K7D, \ | |||
| K58,K1C,K1B,K23,K2B,K34,K33,K3B,K42,K4B,K4C,K52,K5D,K5A, K6B,K73,K74,K79, \ | |||
| K12,K61,K1A,K22,K21,K2A,K32,K31,K3A,K41,K49,K4A, K59, KF5, K69,K72,K7A, \ | |||
| K14,K9F,K11, K29, K91,KA7,KAF,K94, KEB,KF2,KF4, K70, K71,KDA \ | |||
| ) \ | |||
| KEYMAP_ALL( \ | |||
| K76,K05,K06,K04,K0C,K03,K0B,K83,K0A,K01,K09,K78,K07, KFC,K7E,KFE, \ | |||
| K0E,K16,K1E,K26,K25,K2E,K36,K3D,K3E,K46,K45,K4E,K55,K66, KF0,KEC,KFD, K77,KCA,K7C,K7B, \ | |||
| K0D,K15,K1D,K24,K2D,K2C,K35,K3C,K43,K44,K4D,K54,K5B,K5D, KF1,KE9,KFA, K6C,K75,K7D, \ | |||
| K58,K1C,K1B,K23,K2B,K34,K33,K3B,K42,K4B,K4C,K52, K5A, K6B,K73,K74,K79, \ | |||
| K12,K1A,K22,K21,K2A,K32,K31,K3A,K41,K49,K4A, K59, KF5, K69,K72,K7A, \ | |||
| K14,K9F,K11, K29, K91,KA7,KAF,K94, KEB,KF2,KF4, K70, K71,KDA, \ | |||
| \ | |||
| K61, \ | |||
| RO, KANA, JYEN, HENK, MHEN, \ | |||
| F13, F14, F15, F16, F17, F18, F19, F20, F21, F22, F23, F24, \ | |||
| SYSTEM_POWER, SYSTEM_SLEEP, SYSTEM_WAKE, \ | |||
| AUDIO_MUTE, AUDIO_VOL_UP, AUDIO_VOL_DOWN, \ | |||
| MEDIA_NEXT_TRACK, MEDIA_PREV_TRACK, MEDIA_STOP, MEDIA_PLAY_PAUSE, MEDIA_SELECT, \ | |||
| MAIL, CALCULATOR, MY_COMPUTER, \ | |||
| WWW_SEARCH, WWW_HOME, WWW_BACK, WWW_FORWARD, \ | |||
| WWW_STOP, WWW_REFRESH, WWW_FAVORITES \ | |||
| ) | |||
| /* JIS layout */ | |||
| #define KEYMAP_JIS( \ | |||
| K76,K05,K06,K04,K0C,K03,K0B,K83,K0A,K01,K09,K78,K07, KFC,K7E,KFE, \ | |||
| K0E,K16,K1E,K26,K25,K2E,K36,K3D,K3E,K46,K45,K4E,K55,K6A,K66, KF0,KEC,KFD, K77,KCA,K7C,K7B, \ | |||
| K0D,K15,K1D,K24,K2D,K2C,K35,K3C,K43,K44,K4D,K54,K5B, KF1,KE9,KFA, K6C,K75,K7D, \ | |||
| K58,K1C,K1B,K23,K2B,K34,K33,K3B,K42,K4B,K4C,K52,K5D, K5A, K6B,K73,K74,K79, \ | |||
| K12,K1A,K22,K21,K2A,K32,K31,K3A,K41,K49,K4A,K51, K59, KF5, K69,K72,K7A, \ | |||
| K14,K9F,K11, K67,K29,K64,K13, K91,KA7,KAF,K94, KEB,KF2,KF4, K70, K71,KDA \ | |||
| ) \ | |||
| KEYMAP_ALL( \ | |||
| K76,K05,K06,K04,K0C,K03,K0B,K83,K0A,K01,K09,K78,K07, KFC,K7E,KFE, \ | |||
| K0E,K16,K1E,K26,K25,K2E,K36,K3D,K3E,K46,K45,K4E,K55,K66, KF0,KEC,KFD, K77,KCA,K7C,K7B, \ | |||
| K0D,K15,K1D,K24,K2D,K2C,K35,K3C,K43,K44,K4D,K54,K5B,K5D, KF1,KE9,KFA, K6C,K75,K7D, \ | |||
| K58,K1C,K1B,K23,K2B,K34,K33,K3B,K42,K4B,K4C,K52, K5A, K6B,K73,K74,K79, \ | |||
| K12,K1A,K22,K21,K2A,K32,K31,K3A,K41,K49,K4A, K59, KF5, K69,K72,K7A, \ | |||
| K14,K9F,K11, K29, K91,KA7,KAF,K94, KEB,KF2,KF4, K70, K71,KDA, \ | |||
| \ | |||
| NUBS, \ | |||
| K51, K13, K6A, K64, K67, \ | |||
| F13, F14, F15, F16, F17, F18, F19, F20, F21, F22, F23, F24, \ | |||
| SYSTEM_POWER, SYSTEM_SLEEP, SYSTEM_WAKE, \ | |||
| AUDIO_MUTE, AUDIO_VOL_UP, AUDIO_VOL_DOWN, \ | |||
| MEDIA_NEXT_TRACK, MEDIA_PREV_TRACK, MEDIA_STOP, MEDIA_PLAY_PAUSE, MEDIA_SELECT, \ | |||
| MAIL, CALCULATOR, MY_COMPUTER, \ | |||
| WWW_SEARCH, WWW_HOME, WWW_BACK, WWW_FORWARD, \ | |||
| WWW_STOP, WWW_REFRESH, WWW_FAVORITES \ | |||
| ) | |||
| #endif | |||
+ 24
- 0
converter/serialmouse_usb/led.c
View File
| @@ -0,0 +1,24 @@ | |||
| /* | |||
| Copyright 2011 Jun Wako <[email protected]> | |||
| 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 "led.h" | |||
| void led_set(uint8_t usb_led) | |||
| { | |||
| } | |||
+ 83
- 0
converter/serialmouse_usb/matrix.c
View File
| @@ -0,0 +1,83 @@ | |||
| /* | |||
| Copyright 2011 Jun Wako <[email protected]> | |||
| 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 <stdbool.h> | |||
| #include <avr/io.h> | |||
| #include <util/delay.h> | |||
| #include "action.h" | |||
| #include "print.h" | |||
| #include "util.h" | |||
| #include "debug.h" | |||
| #include "matrix.h" | |||
| inline | |||
| uint8_t matrix_rows(void) | |||
| { | |||
| return MATRIX_ROWS; | |||
| } | |||
| inline | |||
| uint8_t matrix_cols(void) | |||
| { | |||
| return MATRIX_COLS; | |||
| } | |||
| void matrix_init(void) | |||
| { | |||
| debug_enable = true; | |||
| debug_mouse=true; | |||
| return; | |||
| } | |||
| uint8_t matrix_scan(void) | |||
| { | |||
| return 0; | |||
| } | |||
| bool matrix_is_modified(void) | |||
| { | |||
| return false; | |||
| } | |||
| inline | |||
| bool matrix_has_ghost(void) | |||
| { | |||
| return false; | |||
| } | |||
| inline | |||
| bool matrix_is_on(uint8_t row, uint8_t col) | |||
| { | |||
| return false; | |||
| } | |||
| inline | |||
| uint8_t matrix_get_row(uint8_t row) | |||
| { | |||
| return 0; | |||
| } | |||
| void matrix_print(void) | |||
| { | |||
| } | |||
| uint8_t matrix_key_count(void) | |||
| { | |||
| return 0; | |||
| } | |||
+ 1
- 0
converter/sun_usb/Makefile
View File
| @@ -63,6 +63,7 @@ OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT | |||
| 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 | |||
+ 20
- 0
converter/sun_usb/README
View File
| @@ -77,3 +77,23 @@ Just use 'make' | |||
| $ cd sun_usb | |||
| $ make | |||
| Then, load the binary to MCU with your favorite programmer. | |||
| Sun commands | |||
| ------------ | |||
| You can send Sun protocol commands with TMK `Magic` key combo. By default `Magic` key is `LShift` + `RShift`, `LAlt` + `RAlt' or `LMeta` + `RMeta`. | |||
| https://github.com/tmk/tmk_keyboard#magic-commands | |||
| Following Sun specific commands are available. For example, to send 'Bell On' you can press `LShift` + `RShift` + `Up` keys simultaneously. | |||
| ``` | |||
| ----- Sun converter Help ----- | |||
| Up: Bell On | |||
| Down: Bell Off | |||
| Left: Click On | |||
| Right: Click Off | |||
| PgUp: LED all On | |||
| PgDown: LED all On | |||
| Insert: Layout | |||
| Delete: Reset | |||
| ``` | |||
+ 23
- 5
converter/sun_usb/command_extra.c
View File
| @@ -11,11 +11,19 @@ bool command_extra(uint8_t code) | |||
| case KC_H: | |||
| case KC_SLASH: /* ? */ | |||
| print("\n\n----- Sun converter Help -----\n"); | |||
| print("UP: Bell On\n"); | |||
| print("DOWN: Bell Off\n"); | |||
| print("LEFT: Click On\n"); | |||
| print("RIGHT: Click Off\n"); | |||
| print("Up: Bell On\n"); | |||
| print("Down: Bell Off\n"); | |||
| print("Left: Click On\n"); | |||
| print("Right: Click Off\n"); | |||
| print("PgUp: LED all On\n"); | |||
| print("PgDown: LED all On\n"); | |||
| print("Insert: Layout\n"); | |||
| print("Delete: Reset\n"); | |||
| return false; | |||
| case KC_DEL: | |||
| print("Reset\n"); | |||
| serial_send(0x01); | |||
| break; | |||
| case KC_UP: | |||
| print("Bell On\n"); | |||
| serial_send(0x02); | |||
| @@ -32,7 +40,17 @@ bool command_extra(uint8_t code) | |||
| print("Click Off\n"); | |||
| serial_send(0x0B); | |||
| break; | |||
| case KC_NUMLOCK: | |||
| case KC_PGUP: | |||
| print("LED all on\n"); | |||
| serial_send(0x0E); | |||
| serial_send(0xFF); | |||
| break; | |||
| case KC_PGDOWN: | |||
| print("LED all off\n"); | |||
| serial_send(0x0E); | |||
| serial_send(0x00); | |||
| break; | |||
| case KC_INSERT: | |||
| print("layout\n"); | |||
| serial_send(0x0F); | |||
| break; | |||
+ 9
- 7
converter/sun_usb/matrix.c
View File
| @@ -65,7 +65,7 @@ void matrix_init(void) | |||
| { | |||
| DDRD |= (1<<6); | |||
| PORTD |= (1<<6); | |||
| debug_enable = true; | |||
| //debug_enable = true; | |||
| serial_init(); | |||
| @@ -86,14 +86,16 @@ uint8_t matrix_scan(void) | |||
| debug_hex(code); debug(" "); | |||
| switch (code) { | |||
| case 0x7E: // reset fail | |||
| case 0xFE: // layout | |||
| case 0xFF: // reset success | |||
| case 0xFE: // layout | |||
| case 0x7E: // reset fail | |||
| if (code == 0xFF) print("reset: 0xFF "); | |||
| if (code == 0x7E) print("reset fail: 0x7E "); | |||
| if (code == 0xFE) print("layout: 0xFE "); | |||
| // response byte | |||
| _delay_ms(500); | |||
| // ignore response byte | |||
| debug("(response ignored:"); | |||
| while ((code = serial_recv())) { debug(" "); debug_hex(code); } | |||
| debug(") "); | |||
| if (code = serial_recv()) print_hex8(code); | |||
| print("\n"); | |||
| // FALL THROUGH | |||
| case 0x7F: | |||
| // all keys up | |||
+ 1
- 1
converter/terminal_bluefruit/keymap.c
View File
| @@ -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)]); | |||
| } | |||
+ 0
- 4
converter/usb_usb/README
View File
| @@ -14,12 +14,8 @@ Build firmware | |||
| -------------- | |||
| $ git clone git://github.com/tmk/tmk_keyboard.git | |||
| $ cd tmk_keyboard | |||
| $ git checkout usb_hid | |||
| $ git submodule init | |||
| $ git submodule update | |||
| and download LUFA and unzip under protocol/lufa and edit LUFA_PATH in protocol/lufa.mk. Then, | |||
| $ cd converter/usb_usb | |||
| $ make | |||
+ 1
- 0
converter/usb_usb/config.h
View File
| @@ -33,6 +33,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| #define MATRIX_ROWS 32 | |||
| #define MATRIX_COLS 8 | |||
| #define USE_LEGACY_KEYMAP | |||
| /* key combination for command */ | |||
| #define IS_COMMAND() (keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT))) | |||
+ 0
- 1
converter/usb_usb/main.cpp
View File
| @@ -59,7 +59,6 @@ int main(void) | |||
| LED_TX_INIT; | |||
| LED_TX_ON; | |||
| print_enable = true; | |||
| debug_enable = true; | |||
| debug_matrix = true; | |||
| debug_keyboard = true; | |||
+ 7
- 0
doc/keymap.md
View File
| @@ -497,6 +497,13 @@ Number of taps can be configured with `TAPPING_TOGGLE` in `config.h`, `5` by def | |||
| ### 3.5 Momentary switching with Modifiers | |||
| This registers modifier key(s) simultaneously with layer switching. | |||
| ACTION_LAYER_MODS(2, MOD_LSFT | MOD_LALT) | |||
| ## 4. Tapping | |||
| Tapping is to press and release a key quickly. Tapping speed is determined with setting of `TAPPING_TERM`, which can be defined in `config.h`, 200ms by default. | |||
+ 1
- 1
keyboard/gh60/keymap_common.c
View File
| @@ -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) | |||
| { | |||
| #ifndef KEYMAP_IN_EEPROM_ENABLE | |||
| return pgm_read_byte(&keymaps[(layer)][(key.row)][(key.col)]); | |||
+ 1
- 1
keyboard/hhkb/keymap_common.c
View File
| @@ -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)]); | |||
| } | |||
+ 523
- 0
keyboard/hhkb_rn42/MEMO.txt
View File
| @@ -0,0 +1,523 @@ | |||
| Roving RN-42 | |||
| ============ | |||
| 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? | |||
| - 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) | |||
| 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? | |||
| - 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: | |||
| - 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 | |||
| - 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 | |||
| 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 | |||
| 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 | |||
| ------------- | |||
| 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=000000000000 | |||
| ***ADVANCED Settings*** | |||
| SrvName= keyboard/mouse | |||
| SrvClass=0000 | |||
| DevClass=0000 | |||
| InqWindw=0100 | |||
| PagWindw=0100 | |||
| CfgTimer=255 | |||
| StatuStr=NULL | |||
| HidFlags=3c | |||
| DTRtimer=8 | |||
| KeySwapr=0 | |||
| ***OTHER Settings*** | |||
| Profile= HID | |||
| CfgChar= $ | |||
| SniffEna=8010 | |||
| LowPower=0 | |||
| TX Power=0 | |||
| IOPorts= 0 | |||
| IOValues=0 | |||
| Sleeptmr=0 | |||
| DebugMod=0 | |||
| RoleSwch=0 | |||
| 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. | |||
| 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, ... | |||
| SM,6 // Pairing mode: auto connect | |||
| SM,4 // Master mode: Connection can be controled with GPIO6 | |||
| HID profile | |||
| ----------- | |||
| S~,6 HID profile | |||
| S~,0 SPP profile | |||
| R,1 reboot | |||
| Apple iOS | |||
| --------- | |||
| 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 | |||
| ----------------- | |||
| 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. | |||
| SR,Z removes all remote addresses for reconnecting. | |||
| can be used to connect another host | |||
| SR,I registers last inquiry address | |||
| 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.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 | |||
| 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) | |||
| 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 | |||
+ 157
- 0
keyboard/hhkb_rn42/Makefile
View File
| @@ -0,0 +1,157 @@ | |||
| #---------------------------------------------------------------------------- | |||
| # 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 | |||
+ 102
- 0
keyboard/hhkb_rn42/PowerSave.txt
View File
| @@ -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 | |||
+ 112
- 0
keyboard/hhkb_rn42/config.h
View File
| @@ -0,0 +1,112 @@ | |||
| /* | |||
| Copyright 2011 Jun Wako <[email protected]> | |||
| 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 | |||
+ 164
- 0
keyboard/hhkb_rn42/hhkb_avr.h
View File
| @@ -0,0 +1,164 @@ | |||
| #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 | |||
| } | |||
| #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 = 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_ON(); | |||
| } | |||
| 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 | |||
+ 33
- 0
keyboard/hhkb_rn42/keymap_common.c
View File
| @@ -0,0 +1,33 @@ | |||
| /* | |||
| Copyright 2012,2013 Jun Wako <[email protected]> | |||
| 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)]) }; | |||
| } | |||
+ 84
- 0
keyboard/hhkb_rn42/keymap_common.h
View File
| @@ -0,0 +1,84 @@ | |||
| /* | |||
| Copyright 2012,2013 Jun Wako <[email protected]> | |||
| 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 | |||
+ 282
- 0
keyboard/hhkb_rn42/keymap_hasu.c
View File
| @@ -0,0 +1,282 @@ | |||
| /* | |||
| * 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, 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,FN9, FN10,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, 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,FN9, FN10,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, 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,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, 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,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; | |||
| } | |||
| } | |||
+ 50
- 0
keyboard/hhkb_rn42/keymap_jp.c
View File
| @@ -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), | |||
| }; | |||
+ 33
- 0
keyboard/hhkb_rn42/led.c
View File
| @@ -0,0 +1,33 @@ | |||
| /* | |||
| Copyright 2011 Jun Wako <[email protected]> | |||
| 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); | |||
| } | |||
| } | |||
+ 191
- 0
keyboard/hhkb_rn42/matrix.c
View File
| @@ -0,0 +1,191 @@ | |||
| /* | |||
| Copyright 2011 Jun Wako <[email protected]> | |||
| 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; | |||
| static bool matrix_power = true; | |||
| // 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; | |||
| 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); | |||
| _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(); | |||
| } | |||
| matrix_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) { | |||
| 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; | |||
| } | |||
+ 12
- 0
keyboard/hhkb_rn42/rn42.mk
View File
| @@ -0,0 +1,12 @@ | |||
| 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) | |||
+ 136
- 0
keyboard/hhkb_rn42/rn42/battery.c
View File
| @@ -0,0 +1,136 @@ | |||
| #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); | |||
| // 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); | |||
| // 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); | |||
| // 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; | |||
| } | |||
| } | |||