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

Fix: Use action_t in keymap files

Browse source
This commit is contained in:
tmk 2016-03-30 03:40:37 +09:00
parent e5cb8469af
commit c04b6bec89
75 changed files with 84 additions and 83 deletions
Download patch file Download diff file Expand all files Collapse all files

2
converter/usb_usb/keymap.c
View file

@ -119,4 +119,4 @@ const uint8_t keymaps[][MATRIX_ROWS][MATRIX_COLS] PROGMEM = {
#endif
};
const uint16_t fn_actions[] PROGMEM = {};
const action_t fn_actions[] PROGMEM = {};

2
converter/usb_usb/keymap_common.h
View file

@ -29,7 +29,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
extern const uint8_t keymaps[][MATRIX_ROWS][MATRIX_COLS];
extern const uint16_t fn_actions[];
extern const action_t fn_actions[];
/* ,---------------. ,---------------. ,---------------.

2
converter/usb_usb/keymap_editor.c
View file

@ -52,7 +52,7 @@ const uint8_t keymaps[][MATRIX_ROWS][MATRIX_COLS] __attribute__ ((section (".key
),
};
const uint16_t fn_actions[] __attribute__ ((section (".keymap.fn_actions"))) = {
const action_t fn_actions[] __attribute__ ((section (".keymap.fn_actions"))) = {
[0] = ACTION_LAYER_MOMENTARY(1),
[1] = ACTION_LAYER_MOMENTARY(2),
[2] = ACTION_LAYER_MOMENTARY(3),

4
converter/usb_usb/keymap_hasu.c
View file

@ -142,9 +142,9 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
* Fn action definition
*/
#ifdef KEYMAP_SECTION_ENABLE
const uint16_t fn_actions[] __attribute__ ((section (".keymap.fn_actions"))) = {
const action_t fn_actions[] __attribute__ ((section (".keymap.fn_actions"))) = {
#else
const uint16_t fn_actions[] PROGMEM = {
const action_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
converter/usb_usb/keymap_iso.c
View file

@ -32,5 +32,5 @@ const uint8_t keymaps[][MATRIX_ROWS][MATRIX_COLS] PROGMEM = {
/*
* Fn action definition
*/
const uint16_t fn_actions[] PROGMEM = {
const action_t fn_actions[] PROGMEM = {
};

2
converter/usb_usb/keymap_jis.c
View file

@ -32,5 +32,5 @@ const uint8_t keymaps[][MATRIX_ROWS][MATRIX_COLS] PROGMEM = {
/*
* Fn action definition
*/
const uint16_t fn_actions[] PROGMEM = {
const action_t fn_actions[] PROGMEM = {
};

2
converter/usb_usb/keymap_spacefn.c
View file

@ -58,7 +58,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_SPACE),
[1] = ACTION_MODS_KEY(MOD_LSFT, KC_GRV), // tilde
};