|
@@ -26,6 +26,7 @@ along with this program. If not, see <http:
|
|
#include "print.h"
|
|
#include "print.h"
|
|
#include "debug.h"
|
|
#include "debug.h"
|
|
#include "util.h"
|
|
#include "util.h"
|
|
|
|
+#include "action.h"
|
|
#include "keymap.h"
|
|
#include "keymap.h"
|
|
|
|
|
|
|
|
|
|
@@ -49,33 +50,18 @@ along with this program. If not, see <http:
|
|
{ KC_##K70, KC_##K71, KC_##K72, KC_##K73, KC_##K74, KC_##K75, KC_##K76, KC_NO } \
|
|
{ KC_##K70, KC_##K71, KC_##K72, KC_##K73, KC_##K74, KC_##K75, KC_##K76, KC_NO } \
|
|
}
|
|
}
|
|
|
|
|
|
-#define KEYCODE(layer, row, col) (pgm_read_byte(&keymaps[(layer)][(row)][(col)]))
|
|
|
|
-
|
|
|
|
|
|
|
|
-
|
|
+static const action_t PROGMEM fn_actions[] = {
|
|
-static const uint8_t PROGMEM fn_layer[] = {
|
|
+ ACTION_LAYER(0),
|
|
- 0,
|
|
+ ACTION_LAYER(1),
|
|
- 1,
|
|
+ ACTION_LAYER_KEY(2, KC_SLASH),
|
|
- 2,
|
|
+ ACTION_LAYER_KEY(3, KC_SCLN),
|
|
- 3,
|
|
+ ACTION_LAYER(3),
|
|
- 3,
|
|
+ ACTION_LAYER_KEY(5, KC_SPC),
|
|
- 5,
|
|
+ NO_ACTION,
|
|
- 0,
|
|
+ NO_ACTION,
|
|
- 0
|
|
|
|
};
|
|
};
|
|
|
|
|
|
-
|
|
|
|
-
|
|
|
|
-static const uint8_t PROGMEM fn_keycode[] = {
|
|
|
|
- KC_NO,
|
|
|
|
- KC_NO,
|
|
|
|
- KC_SLSH,
|
|
|
|
- KC_SCLN,
|
|
|
|
- KC_NO,
|
|
|
|
- KC_SPC,
|
|
|
|
- KC_NO,
|
|
|
|
- KC_NO
|
|
|
|
-};
|
|
|
|
|
|
|
|
static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
|
static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
|
|
|
|
|
@@ -149,24 +135,11 @@ static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
|
* `--------------------------------------------'
|
|
* `--------------------------------------------'
|
|
* Mc: Mouse Cursor / Mb: Mouse Button / Mw: Mouse Wheel
|
|
* Mc: Mouse Cursor / Mb: Mouse Button / Mw: Mouse Wheel
|
|
*/
|
|
*/
|
|
-#ifdef HOST_IWRAP
|
|
|
|
-
|
|
|
|
-#define KC_KPPL KC_KP_PLUS
|
|
|
|
-#define KC_KPMI KC_KP_MINUS
|
|
|
|
-#define KC_KPAS KC_KP_ASTERISK
|
|
|
|
-#define KC_KPSL KC_KP_SLASH
|
|
|
|
- KEYMAP(ESC, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, INS, DEL, \
|
|
|
|
- TAB, KPAS,KPPL,MS_U,KPMI,KPSL,KPAS,KPPL,KPMI,KPSL,NO, NO, NO, BSPC, \
|
|
|
|
- LCTL,NO, MS_L,MS_D,MS_R,NO, MS_L,MS_D,MS_U,MS_R,FN3, NO, ENT, \
|
|
|
|
- LSFT,BTN4,BTN5,BTN1,BTN2,BTN3,BTN2,BTN1,NO, NO, NO, RSFT,NO, \
|
|
|
|
- LGUI,LALT, BTN1, RALT,FN4),
|
|
|
|
-#else
|
|
|
|
KEYMAP(ESC, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, INS, DEL, \
|
|
KEYMAP(ESC, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, INS, DEL, \
|
|
TAB, NO, NO, NO, NO, NO, WH_L,WH_D,WH_U,WH_R,NO, NO, NO, BSPC, \
|
|
TAB, NO, NO, NO, NO, NO, WH_L,WH_D,WH_U,WH_R,NO, NO, NO, BSPC, \
|
|
LCTL,NO, ACL0,ACL1,ACL2,NO, MS_L,MS_D,MS_U,MS_R,FN3, NO, ENT, \
|
|
LCTL,NO, ACL0,ACL1,ACL2,NO, MS_L,MS_D,MS_U,MS_R,FN3, NO, ENT, \
|
|
LSFT,NO, NO, NO, NO, BTN3,BTN2,BTN1,BTN4,BTN5,NO, RSFT,NO, \
|
|
LSFT,NO, NO, NO, NO, BTN3,BTN2,BTN1,BTN4,BTN5,NO, RSFT,NO, \
|
|
LGUI,LALT, BTN1, RALT,FN4),
|
|
LGUI,LALT, BTN1, RALT,FN4),
|
|
-#endif
|
|
|
|
|
|
|
|
|
|
|
|
* ,-----------------------------------------------------------.
|
|
* ,-----------------------------------------------------------.
|
|
@@ -188,33 +161,61 @@ static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
|
LGUI,LALT, FN5, RALT,RGUI),
|
|
LGUI,LALT, FN5, RALT,RGUI),
|
|
|
|
|
|
|
|
|
|
-#ifdef HOST_IWRAP
|
|
|
|
- KEYMAP(ESC, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, INS, DEL, \
|
|
|
|
- TAB, KPAS,KPPL,MS_U,KPMI,KPSL,KPAS,KPPL,KPMI,KPSL,NO, NO, NO, BSPC, \
|
|
|
|
- LCTL,NO, MS_L,MS_D,MS_R,NO, MS_L,MS_D,MS_U,MS_R,FN3, NO, ENT, \
|
|
|
|
- LSFT,BTN4,BTN5,BTN1,BTN2,BTN3,BTN2,BTN1,BTN4,BTN5,NO, RSFT,NO, \
|
|
|
|
- LGUI,LALT, FN5, RALT,RGUI),
|
|
|
|
-#else
|
|
|
|
KEYMAP(ESC, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, INS, DEL, \
|
|
KEYMAP(ESC, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, INS, DEL, \
|
|
TAB, NO, NO, NO, NO, NO, WH_L,WH_D,WH_U,WH_R,NO, NO, NO, BSPC, \
|
|
TAB, NO, NO, NO, NO, NO, WH_L,WH_D,WH_U,WH_R,NO, NO, NO, BSPC, \
|
|
LCTL,NO, ACL0,ACL1,ACL2,NO, MS_L,MS_D,MS_U,MS_R,FN3, NO, ENT, \
|
|
LCTL,NO, ACL0,ACL1,ACL2,NO, MS_L,MS_D,MS_U,MS_R,FN3, NO, ENT, \
|
|
LSFT,NO, NO, NO, NO, BTN3,BTN2,BTN1,BTN4,BTN5,NO, RSFT,NO, \
|
|
LSFT,NO, NO, NO, NO, BTN3,BTN2,BTN1,BTN4,BTN5,NO, RSFT,NO, \
|
|
LGUI,LALT, FN5, RALT,RGUI),
|
|
LGUI,LALT, FN5, RALT,RGUI),
|
|
-#endif
|
|
|
|
};
|
|
};
|
|
|
|
|
|
|
|
+#define KEYCODE(layer, row, col) (pgm_read_byte(&keymaps[(layer)][(row)][(col)]))
|
|
|
|
|
|
-uint8_t keymap_get_keycode(uint8_t layer, uint8_t row, uint8_t col)
|
|
|
|
-{
|
|
|
|
- return KEYCODE(layer, row, col);
|
|
|
|
-}
|
|
|
|
|
|
|
|
-uint8_t keymap_fn_layer(uint8_t index)
|
|
+
|
|
-{
|
|
+uint8_t keymap_get_keycode(uint8_t layer, uint8_t row, uint8_t col) { return 0; }
|
|
- return pgm_read_byte(&fn_layer[index]);
|
|
+uint8_t keymap_fn_layer(uint8_t fn_bits) { return 0; }
|
|
|
|
+uint8_t keymap_fn_keycode(uint8_t fn_bits) { return 0; }
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+action_t keymap_get_action(uint8_t layer, uint8_t row, uint8_t col) {
|
|
|
|
+
|
|
|
|
+ uint8_t key = KEYCODE(layer, row, col);
|
|
|
|
+ action_t action;
|
|
|
|
+ switch (key) {
|
|
|
|
+ case KC_A ... KC_EXSEL:
|
|
|
|
+ action = (action_t)ACTION_KEY(key);
|
|
|
|
+ break;
|
|
|
|
+ case KC_SYSTEM_POWER ... KC_SYSTEM_WAKE:
|
|
|
|
+ action = (action_t)ACTION_USAGE_SYSTEM(key2system(key));
|
|
|
|
+ break;
|
|
|
|
+ case KC_AUDIO_MUTE ... KC_WWW_FAVORITES:
|
|
|
|
+ action = (action_t)ACTION_USAGE_CONSUMER(key2consumer(key));
|
|
|
|
+ break;
|
|
|
|
+ case KC_MS_UP ... KC_MS_ACCEL2:
|
|
|
|
+ action = (action_t)ACTION_MOUSEKEY(key);
|
|
|
|
+ break;
|
|
|
|
+ case KC_LCTRL ... KC_LGUI:
|
|
|
|
+ action = (action_t)ACTION_LMODS(MOD_BIT(key));
|
|
|
|
+ break;
|
|
|
|
+ case KC_RCTRL ... KC_RGUI:
|
|
|
|
+ action = (action_t)ACTION_RMODS(MOD_BIT(key)>>4);
|
|
|
|
+ break;
|
|
|
|
+ case KC_FN0 ... KC_FN7:
|
|
|
|
+ action = (action_t)pgm_read_word(&fn_actions[FN_INDEX(key)]);
|
|
|
|
+ break;
|
|
|
|
+ case KC_NO ... KC_UNDEFINED:
|
|
|
|
+ default:
|
|
|
|
+ action = (action_t)NO_ACTION;
|
|
|
|
+ break;
|
|
|
|
+ }
|
|
|
|
+ debug("action: "); debug_hex16(action.code); debug("\n");
|
|
|
|
+ return action;
|
|
}
|
|
}
|
|
|
|
|
|
-uint8_t keymap_fn_keycode(uint8_t index)
|
|
+
|
|
|
|
+uint8_t keymap_process_event(keyevent_t event)
|
|
{
|
|
{
|
|
- return pgm_read_byte(&fn_keycode[index]);
|
|
+ action_t action = keymap_get_action(current_layer, event.key.row, event.key.col);
|
|
|
|
+ action_exec(action, event);
|
|
|
|
+ return 0;
|
|
}
|
|
}
|