max/tmk_keyboard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove keymap read code from project directories

Browse source
This commit is contained in:
tmk 2016-06-25 23:23:22 +09:00
parent 19dca3def8
commit 7b31d1b9d9
62 changed files with 36 additions and 620 deletions
Download patch file Download diff file Expand all files Collapse all files

3
converter/adb_usb/Makefile
View file

@ -48,8 +48,7 @@ TMK_DIR = ../../tmk_core
TARGET_DIR = .
# project specific files
SRC = keymap_common.c \
matrix.c \
SRC = matrix.c \
led.c \
adb.c

3
converter/adb_usb/Makefile.rev1
View file

@ -48,8 +48,7 @@ TMK_DIR = ../../tmk_core
TARGET_DIR = .
# project specific files
SRC = keymap_common.c \
matrix.c \
SRC = matrix.c \
led.c \
adb.c

3
converter/adb_usb/Makefile.teensy
View file

@ -48,8 +48,7 @@ TMK_DIR = ../../tmk_core
TARGET_DIR = .
# project specific files
SRC = keymap_common.c \
matrix.c \
SRC = matrix.c \
led.c \
adb.c

4
converter/adb_usb/config.h
View file

@ -40,10 +40,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define LOCKING_RESYNC_ENABLE
/* legacy keymap support */
#define USE_LEGACY_KEYMAP
/* ADB port setting */
#define ADB_PORT PORTD
#define ADB_PIN PIND

30
converter/adb_usb/keymap_common.c
View file

@ -1,30 +0,0 @@
/*
Copyright 2011,2012,2013 Jun Wako <wakojun@gmail.com>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "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)]) };
}

5
converter/adb_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"
@ -29,10 +28,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "keymap.h"
extern const uint8_t keymaps[][MATRIX_ROWS][MATRIX_COLS];
extern const action_t fn_actions[];
/* Common layout: ANSI+ISO
* ,---. .---------------. ,---------------. ,---------------. ,-----------. ,---------------.
* |Esc| |F1 |F2 |F3 |F4 | |F5 |F6 |F7 |F8 | |F9 |F10|F11|F12| |PrS|ScL|Pau| |VDn|VUp|Mut|Pwr|

2
converter/adb_usb/keymap_plain.c
View file

@ -36,7 +36,7 @@ const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
),
};
const uint16_t PROGMEM fn_actions[] = {
const action_t PROGMEM fn_actions[] = {
[0] = ACTION_LAYER_TAP_KEY(1, KC_GRV),
[1] = ACTION_LAYER_TAP_KEY(1, KC_BSLS),
};