aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--common.mk2
-rw-r--r--common/action.c2
-rw-r--r--common/action_layer.c (renamed from common/layer_switch.c)2
-rw-r--r--common/action_layer.h (renamed from common/layer_switch.h)4
-rw-r--r--common/command.c2
-rw-r--r--common/keymap.c2
-rw-r--r--converter/pc98_usb/keymap.c32
-rw-r--r--converter/pc98_usb/matrix.c4
-rw-r--r--keyboard/gh60/keymap.c1
-rw-r--r--keyboard/hid_liber/keymap.c29
10 files changed, 20 insertions, 60 deletions
diff --git a/common.mk b/common.mk
index be9f289c9..6759e6ef9 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 596831d4d..158522dd0 100644
--- a/common/action.c
+++ b/common/action.c
@@ -21,7 +21,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#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
index 9905741f4..3413c53e6 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
index ed8dfb502..23f8a00bb 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 <http://www.gnu.org/licenses/>.
*/
-#ifndef LAYER_SWITCH_H
-#define LAYER_SWITCH_H
+#ifndef ACTION_LAYER_H
+#define ACTION_LAYER_H
#include <stdint.h>
#include "keyboard.h"
diff --git a/common/command.c b/common/command.c
index c954ff02f..dc06c6da3 100644
--- a/common/command.c
+++ b/common/command.c
@@ -26,7 +26,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#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 ace3f49b6..c98ce09b6 100644
--- a/common/keymap.c
+++ b/common/keymap.c
@@ -18,7 +18,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#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 279b2b60c..3ab0a4dbe 100644
--- a/converter/pc98_usb/keymap.c
+++ b/converter/pc98_usb/keymap.c
@@ -21,7 +21,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#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 d03aaf10d..8833e0a85 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<<PC98_RST_BIT);
PC98_RDY_DDR |= (1<<PC98_RDY_BIT);
PC98_RTY_DDR |= (1<<PC98_RTY_BIT);
diff --git a/keyboard/gh60/keymap.c b/keyboard/gh60/keymap.c
index 2f41ad4fd..6db4d3db0 100644
--- a/keyboard/gh60/keymap.c
+++ b/keyboard/gh60/keymap.c
@@ -20,7 +20,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#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 f3d6bfa2e..609edb5e1 100644
--- a/keyboard/hid_liber/keymap.c
+++ b/keyboard/hid_liber/keymap.c
@@ -24,7 +24,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#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)]);
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-31 16:36:39 +0000