Update to current tmk_keyboard/tmk_core code.

master
flabbergast 7 years ago
parent d3780a1018
commit 5735053085

@ -2,7 +2,7 @@
PROJECT = ch
# Directory common source files exist
TMK_DIR = ../../tmk_core
TMK_DIR = ../../tmk_keyboard/tmk_core
# Directory keyboard dependent files exist
TARGET_DIR = .

@ -26,5 +26,5 @@ uint8_t keymap_key_to_keycode(uint8_t layer, keypos_t key)
/* translates Fn keycode to action */
action_t keymap_fn_to_action(uint8_t keycode)
{
return (action_t){ .code = fn_actions[FN_INDEX(keycode)] };
}
return (action_t)fn_actions[FN_INDEX(keycode)];
}

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

@ -24,7 +24,7 @@ const uint8_t keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
),
};
const uint16_t fn_actions[] = {
const action_t fn_actions[] = {
[0] = ACTION_LAYER_MOMENTARY(1),
[1] = ACTION_LAYER_MOMENTARY(2),
};

Loading…
Cancel
Save