Nulo/qmk_firmware
1
0
Fork 0
Code Releases Activity

Rename file layer_switch to action_layer

Browse source
This commit is contained in:
tmk 2013-04-02 17:44:24 +09:00
parent cc8e66754b
commit c6d88d2795
10 changed files with 20 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common.mk
View file

@ -5,7 +5,7 @@ SRC += $(COMMON_DIR)/host.c \
$(COMMON_DIR)/action_tapping.c \ $(COMMON_DIR)/action_tapping.c \
$(COMMON_DIR)/action_oneshot.c \ $(COMMON_DIR)/action_oneshot.c \
$(COMMON_DIR)/action_macro.c \ $(COMMON_DIR)/action_macro.c \
$(COMMON_DIR)/layer_switch.c \ $(COMMON_DIR)/action_layer.c \
$(COMMON_DIR)/keymap.c \ $(COMMON_DIR)/keymap.c \
$(COMMON_DIR)/timer.c \ $(COMMON_DIR)/timer.c \
$(COMMON_DIR)/print.c \ $(COMMON_DIR)/print.c \

2
common/action.c
View file

@ -21,7 +21,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "command.h" #include "command.h"
#include "debug.h" #include "debug.h"
#include "led.h" #include "led.h"
#include "layer_switch.h" #include "action_layer.h"
#include "action_tapping.h" #include "action_tapping.h"
#include "action_oneshot.h" #include "action_oneshot.h"
#include "action_macro.h" #include "action_macro.h"

2
common/layer_switch.c → common/action_layer.c
View file

@ -3,7 +3,7 @@
#include "action.h" #include "action.h"
#include "debug.h" #include "debug.h"
#include "util.h" #include "util.h"
#include "layer_switch.h" #include "action_layer.h"
/* /*

4
common/layer_switch.h → common/action_layer.h
View file

@ -14,8 +14,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef LAYER_SWITCH_H #ifndef ACTION_LAYER_H
#define LAYER_SWITCH_H #define ACTION_LAYER_H
#include <stdint.h> #include <stdint.h>
#include "keyboard.h" #include "keyboard.h"

2
common/command.c
View file

@ -26,7 +26,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "timer.h" #include "timer.h"
#include "keyboard.h" #include "keyboard.h"
#include "bootloader.h" #include "bootloader.h"
#include "layer_switch.h" #include "action_layer.h"
#include "eeconfig.h" #include "eeconfig.h"
#include "sleep_led.h" #include "sleep_led.h"
#include "led.h" #include "led.h"

2
common/keymap.c
View file

@ -18,7 +18,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "keymap.h" #include "keymap.h"
#include "report.h" #include "report.h"
#include "keycode.h" #include "keycode.h"
#include "layer_switch.h" #include "action_layer.h"
#include "action.h" #include "action.h"
#include "action_macro.h" #include "action_macro.h"
#include "debug.h" #include "debug.h"

32
converter/pc98_usb/keymap.c
View file

@ -21,7 +21,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "keycode.h" #include "keycode.h"
#include "action.h" #include "action.h"
#include "action_macro.h" #include "action_macro.h"
#include "layer_switch.h"
#include "util.h" #include "util.h"
#include "keymap.h" #include "keymap.h"
@ -165,10 +164,10 @@ void action_function(keyrecord_t *record, uint8_t id, uint8_t opt)
* Fn actions * Fn actions
*/ */
static const uint16_t PROGMEM fn_actions[] = { static const uint16_t PROGMEM fn_actions[] = {
ACTION_KEYMAP_TAP_TOGGLE(0), // FN0 ACTION_LAYER_TAP_TOGGLE(0), // FN0
ACTION_KEYMAP_TAP_KEY(1, KC_SLASH), // FN1 ACTION_LAYER_TAP_KEY(1, KC_SLASH), // FN1
ACTION_KEYMAP_TAP_KEY(2, KC_SCLN), // FN2 ACTION_LAYER_TAP_KEY(2, KC_SCLN), // FN2
ACTION_KEYMAP_MOMENTARY(2), // FN3 ACTION_LAYER_MOMENTARY(2), // FN3
ACTION_MACRO(LBRACKET), // FN4 ACTION_MACRO(LBRACKET), // FN4
ACTION_MACRO(RBRACKET), // FN5 ACTION_MACRO(RBRACKET), // FN5
ACTION_MACRO(DUMMY), // FN6 ACTION_MACRO(DUMMY), // FN6
@ -183,29 +182,16 @@ static const uint16_t PROGMEM fn_actions[] = {
* No need to edit. * No need to edit.
*/ */
#define KEYMAPS_SIZE (sizeof(keymaps) / sizeof(keymaps[0])) #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])) #define FN_ACTIONS_SIZE (sizeof(fn_actions) / sizeof(fn_actions[0]))
/* translates key to keycode */ /* 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, key_t key)
{ {
/* Overlay: 16-31(OVERLAY_BIT(0x10) | overlay_layer) */ if (layer < KEYMAPS_SIZE) {
if (layer & OVERLAY_BIT) { return pgm_read_byte(&keymaps[(layer)][(key.row)][(key.col)]);
layer &= OVERLAY_MASK; } else {
if (layer < OVERLAYS_SIZE) { // fall back to layer 0
return pgm_read_byte(&overlays[(layer)][(key.row)][(key.col)]); return pgm_read_byte(&keymaps[0][(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)]);
}
} }
} }

4
converter/pc98_usb/matrix.c
View file

@ -93,10 +93,6 @@ RETRY:
void matrix_init(void) void matrix_init(void)
{ {
print_enable = true;
// debug_enable = true;
// debug_matrix = true;
PC98_RST_DDR |= (1<<PC98_RST_BIT); PC98_RST_DDR |= (1<<PC98_RST_BIT);
PC98_RDY_DDR |= (1<<PC98_RDY_BIT); PC98_RDY_DDR |= (1<<PC98_RDY_BIT);
PC98_RTY_DDR |= (1<<PC98_RTY_BIT); PC98_RTY_DDR |= (1<<PC98_RTY_BIT);

1
keyboard/gh60/keymap.c
View file

@ -20,7 +20,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "keycode.h" #include "keycode.h"
#include "action.h" #include "action.h"
#include "action_macro.h" #include "action_macro.h"
#include "layer_switch.h"
#include "report.h" #include "report.h"
#include "host.h" #include "host.h"
#include "print.h" #include "print.h"

29
keyboard/hid_liber/keymap.c
View file

@ -24,7 +24,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "keycode.h" #include "keycode.h"
#include "action.h" #include "action.h"
#include "action_macro.h" #include "action_macro.h"
#include "layer_switch.h"
#include "report.h" #include "report.h"
#include "host.h" #include "host.h"
#include "print.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 * Fn action definition
*/ */
@ -179,33 +176,15 @@ static const uint16_t PROGMEM fn_actions[] = {
#endif #endif
#define KEYMAPS_SIZE (sizeof(keymaps) / sizeof(keymaps[0])) #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])) #define FN_ACTIONS_SIZE (sizeof(fn_actions) / sizeof(fn_actions[0]))
/* translates key to keycode */ /* 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, key_t key)
{ {
/* Overlay: 16-31(OVERLAY_BIT(0x10) | overlay_layer) */ if (layer < KEYMAPS_SIZE) {
if (layer & OVERLAY_BIT) { return pgm_read_byte(&keymaps[(layer)][(key.row)][(key.col)]);
layer &= OVERLAY_MASK; } else {
if (layer < OVERLAYS_SIZE) { return pgm_read_byte(&keymaps[0][(key.row)][(key.col)]);
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)]);
}
} }
} }