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
keyboard/alps64/actionmap_hasu.c
View file

@ -37,7 +37,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
}
const uint16_t PROGMEM actionmaps[][MATRIX_ROWS][MATRIX_COLS] = {
const action_t PROGMEM actionmaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* Default Layer
* ,-----------------------------------------------------------.
* |Esc| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =| \ |

2
keyboard/alps64/actionmap_plain.c
View file

@ -10,7 +10,7 @@
#define AC_LM1 ACTION_LAYER_MOMENTARY(1) // HHKB layer
const uint16_t PROGMEM actionmaps[][MATRIX_ROWS][MATRIX_COLS] = {
const action_t PROGMEM actionmaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* Default Layer
* ,-----------------------------------------------------------.
* |Esc| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =|BSpc |

2
keyboard/alps64/keymap_common.h
View file

@ -31,7 +31,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[];
/* Alps64 keymap definition macro */

4
keyboard/alps64/keymap_editor.c
View file

@ -27,9 +27,9 @@ const uint8_t keymaps[][MATRIX_ROWS][MATRIX_COLS] PROGMEM = {
};
#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_LAYER_MOMENTARY(1),
[1] = ACTION_LAYER_MOMENTARY(2),

2
keyboard/alps64/keymap_hasu.c
View file

@ -121,7 +121,7 @@ enum macro_id {
/*
* Fn action definition
*/
const uint16_t PROGMEM fn_actions[] = {
const action_t PROGMEM fn_actions[] = {
[0] = ACTION_LAYER_MOMENTARY(1), // HHKB layer
[1] = ACTION_LAYER_TAP_KEY(1, KC_ENTER), // HHKB layer
[2] = ACTION_LAYER_TAP_KEY(2, KC_SLASH), // Cursor layer with Slash*

2
keyboard/alps64/keymap_plain.c
View file

@ -28,6 +28,6 @@ const uint8_t keymaps[][MATRIX_ROWS][MATRIX_COLS] PROGMEM = {
TRNS,TRNS,TRNS, TRNS, TRNS,TRNS,TRNS,TRNS),
};
const uint16_t fn_actions[] PROGMEM = {
const action_t fn_actions[] PROGMEM = {
[0] = ACTION_LAYER_MOMENTARY(1),
};