From c6d88d27956c4b76f8819fcdb076bf94a8f55868 Mon Sep 17 00:00:00 2001 From: tmk Date: Tue, 2 Apr 2013 17:44:24 +0900 Subject: [PATCH] Rename file layer_switch to action_layer --- common.mk | 2 +- common/action.c | 2 +- common/{layer_switch.c => action_layer.c} | 2 +- common/{layer_switch.h => action_layer.h} | 4 +-- common/command.c | 2 +- common/keymap.c | 2 +- converter/pc98_usb/keymap.c | 32 +++++++---------------- converter/pc98_usb/matrix.c | 4 --- keyboard/gh60/keymap.c | 1 - keyboard/hid_liber/keymap.c | 29 +++----------------- 10 files changed, 20 insertions(+), 60 deletions(-) rename common/{layer_switch.c => action_layer.c} (99%) rename common/{layer_switch.h => action_layer.h} (97%) diff --git a/common.mk b/common.mk index be9f289c94f400d871e1f8bef318230a977d80b1..6759e6ef939752ed868d2dd7fe4a4957b375e3ab 100644 --- a/common.mk +++ b/common.mk @@ -5,7 +5,7 @@ SRC += $(COMMON_DIR)/host.c \ $(COMMON_DIR)/action_tapping.c \ $(COMMON_DIR)/action_oneshot.c \ $(COMMON_DIR)/action_macro.c \ - $(COMMON_DIR)/layer_switch.c \ + $(COMMON_DIR)/action_layer.c \ $(COMMON_DIR)/keymap.c \ $(COMMON_DIR)/timer.c \ $(COMMON_DIR)/print.c \ diff --git a/common/action.c b/common/action.c index 596831d4de948b0f3dca5c4cecd2acd36b17ce35..158522dd034518f51f653cb3f0a7d1da3df24e10 100644 --- a/common/action.c +++ b/common/action.c @@ -21,7 +21,7 @@ along with this program. If not, see . #include "command.h" #include "debug.h" #include "led.h" -#include "layer_switch.h" +#include "action_layer.h" #include "action_tapping.h" #include "action_oneshot.h" #include "action_macro.h" diff --git a/common/layer_switch.c b/common/action_layer.c similarity index 99% rename from common/layer_switch.c rename to common/action_layer.c index 9905741f4875fdaa773212e31060270c2f37b1fa..3413c53e6514c7415f170ce32d50d881dd114e8c 100644 --- a/common/layer_switch.c +++ b/common/action_layer.c @@ -3,7 +3,7 @@ #include "action.h" #include "debug.h" #include "util.h" -#include "layer_switch.h" +#include "action_layer.h" /* diff --git a/common/layer_switch.h b/common/action_layer.h similarity index 97% rename from common/layer_switch.h rename to common/action_layer.h index ed8dfb50250a98b1491447c917933cdc9957caf6..23f8a00bb7bd231e3b1b63d44f0b2d157e922452 100644 --- a/common/layer_switch.h +++ b/common/action_layer.h @@ -14,8 +14,8 @@ 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 . */ -#ifndef LAYER_SWITCH_H -#define LAYER_SWITCH_H +#ifndef ACTION_LAYER_H +#define ACTION_LAYER_H #include #include "keyboard.h" diff --git a/common/command.c b/common/command.c index c954ff02f4fc2ed7101e74ef02fde998dc340fd0..dc06c6da35d642d7d5ae42a940dfeed308ae68ac 100644 --- a/common/command.c +++ b/common/command.c @@ -26,7 +26,7 @@ along with this program. If not, see . #include "timer.h" #include "keyboard.h" #include "bootloader.h" -#include "layer_switch.h" +#include "action_layer.h" #include "eeconfig.h" #include "sleep_led.h" #include "led.h" diff --git a/common/keymap.c b/common/keymap.c index ace3f49b69c01303a9a601b7f097086c4ec9b214..c98ce09b66f7efb3df3f9ea093a7a22efdbcc3d3 100644 --- a/common/keymap.c +++ b/common/keymap.c @@ -18,7 +18,7 @@ along with this program. If not, see . #include "keymap.h" #include "report.h" #include "keycode.h" -#include "layer_switch.h" +#include "action_layer.h" #include "action.h" #include "action_macro.h" #include "debug.h" diff --git a/converter/pc98_usb/keymap.c b/converter/pc98_usb/keymap.c index 279b2b60c0532513fa99549c177f0224baaaaede..3ab0a4dbea0d8c43c0e668ab083bae3259d07a8a 100644 --- a/converter/pc98_usb/keymap.c +++ b/converter/pc98_usb/keymap.c @@ -21,7 +21,6 @@ along with this program. If not, see . #include "keycode.h" #include "action.h" #include "action_macro.h" -#include "layer_switch.h" #include "util.h" #include "keymap.h" @@ -165,10 +164,10 @@ void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) * Fn actions */ static const uint16_t PROGMEM fn_actions[] = { - ACTION_KEYMAP_TAP_TOGGLE(0), // FN0 - ACTION_KEYMAP_TAP_KEY(1, KC_SLASH), // FN1 - ACTION_KEYMAP_TAP_KEY(2, KC_SCLN), // FN2 - ACTION_KEYMAP_MOMENTARY(2), // FN3 + ACTION_LAYER_TAP_TOGGLE(0), // FN0 + ACTION_LAYER_TAP_KEY(1, KC_SLASH), // FN1 + ACTION_LAYER_TAP_KEY(2, KC_SCLN), // FN2 + ACTION_LAYER_MOMENTARY(2), // FN3 ACTION_MACRO(LBRACKET), // FN4 ACTION_MACRO(RBRACKET), // FN5 ACTION_MACRO(DUMMY), // FN6 @@ -183,29 +182,16 @@ static const uint16_t PROGMEM fn_actions[] = { * No need to edit. */ #define KEYMAPS_SIZE (sizeof(keymaps) / sizeof(keymaps[0])) -#define OVERLAYS_SIZE (sizeof(overlays) / sizeof(overlays[0])) #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) { - /* Overlay: 16-31(OVERLAY_BIT(0x10) | overlay_layer) */ - if (layer & OVERLAY_BIT) { - layer &= OVERLAY_MASK; - if (layer < OVERLAYS_SIZE) { - return pgm_read_byte(&overlays[(layer)][(key.row)][(key.col)]); - } else { - return KC_TRANSPARENT; - } - } - /* Keymap: 0-15 */ - else { - if (layer < KEYMAPS_SIZE) { - return pgm_read_byte(&keymaps[(layer)][(key.row)][(key.col)]); - } else { - // fall back to layer 0 - return pgm_read_byte(&keymaps[0][(key.row)][(key.col)]); - } + if (layer < KEYMAPS_SIZE) { + return pgm_read_byte(&keymaps[(layer)][(key.row)][(key.col)]); + } else { + // fall back to layer 0 + return pgm_read_byte(&keymaps[0][(key.row)][(key.col)]); } } diff --git a/converter/pc98_usb/matrix.c b/converter/pc98_usb/matrix.c index d03aaf10d1b3d562998c0008cbc03232225b1e9b..8833e0a851badc6cc1693771a48fe64e5f07554b 100644 --- a/converter/pc98_usb/matrix.c +++ b/converter/pc98_usb/matrix.c @@ -93,10 +93,6 @@ RETRY: void matrix_init(void) { - print_enable = true; -// debug_enable = true; -// debug_matrix = true; - PC98_RST_DDR |= (1<. #include "keycode.h" #include "action.h" #include "action_macro.h" -#include "layer_switch.h" #include "report.h" #include "host.h" #include "print.h" diff --git a/keyboard/hid_liber/keymap.c b/keyboard/hid_liber/keymap.c index f3d6bfa2efb435bba9224778dea2b7952f108069..609edb5e1b9ba5f01ca580b87beafda66603e1fe 100644 --- a/keyboard/hid_liber/keymap.c +++ b/keyboard/hid_liber/keymap.c @@ -24,7 +24,6 @@ along with this program. If not, see . #include "keycode.h" #include "action.h" #include "action_macro.h" -#include "layer_switch.h" #include "report.h" #include "host.h" #include "print.h" @@ -160,8 +159,6 @@ static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; -static const uint8_t PROGMEM overlays[][MATRIX_ROWS][MATRIX_COLS] = {}; - /* * Fn action definition */ @@ -179,33 +176,15 @@ static const uint16_t PROGMEM fn_actions[] = { #endif #define KEYMAPS_SIZE (sizeof(keymaps) / sizeof(keymaps[0])) -#define OVERLAYS_SIZE (sizeof(overlays) / sizeof(overlays[0])) #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) { - /* Overlay: 16-31(OVERLAY_BIT(0x10) | overlay_layer) */ - if (layer & OVERLAY_BIT) { - layer &= OVERLAY_MASK; - if (layer < OVERLAYS_SIZE) { - return pgm_read_byte(&overlays[(layer)][(key.row)][(key.col)]); - } else { - // XXX: this may cuaes bootlaoder_jump incositent fail. - //debug("key_to_keycode: overlay "); debug_dec(layer); debug(" is invalid.\n"); - return KC_TRANSPARENT; - } - } - /* Keymap: 0-15 */ - else { - if (layer < KEYMAPS_SIZE) { - return pgm_read_byte(&keymaps[(layer)][(key.row)][(key.col)]); - } else { - // XXX: this may cuaes bootlaoder_jump incositent fail. - //debug("key_to_keycode: base "); debug_dec(layer); debug(" is invalid.\n"); - // fall back to layer 0 - return pgm_read_byte(&keymaps[0][(key.row)][(key.col)]); - } + if (layer < KEYMAPS_SIZE) { + return pgm_read_byte(&keymaps[(layer)][(key.row)][(key.col)]); + } else { + return pgm_read_byte(&keymaps[0][(key.row)][(key.col)]); } }