Kinesis refactor and Configurator update (#3245)

[qmk_firmware.git] / keyboards / kinesis / keymaps / milestogo / keymap.c

diff --git a/keyboards/kinesis/keymaps/milestogo/keymap.c b/keyboards/kinesis/keymaps/milestogo/keymap.c
index bf1f9c59100a276d8329f9bb66430c8dbe4f8d33..1ae7d9082a82082bca88c013bf8b321a2d28dd70 100644 (file)
--- a/keyboards/kinesis/keymaps/milestogo/keymap.c
+++ b/keyboards/kinesis/keymaps/milestogo/keymap.c
@@ -1,5 +1,4 @@
-#include "kinesis.h"
-#include "action_layer.h"
+#include QMK_KEYBOARD_H
 #include "mousekey.h"
 
 #define _QWERTY 0 // Base qerty
@@ -23,7 +22,7 @@ enum {
 };
 
 
-//  Train out of using uncomfortable esc  and GUI keys. 
+//  Train out of using uncomfortable esc  and GUI keys.
 /****************************************************************************************************
 *
 * Keymap: Default Layer in Qwerty
@@ -51,7 +50,7 @@ enum {
 */
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[_QWERTY] = KEYMAP(
+[_QWERTY] = LAYOUT(
            XXXXXXX, KC_F1  ,KC_F2  ,KC_F3  ,KC_F4  ,KC_F5  ,KC_F6  ,KC_F7  ,KC_F8,
            KC_GRAVE, KC_1   ,KC_2   ,KC_3   ,KC_4   ,KC_5   ,
            KC_TAB, KC_Q   ,KC_W   ,KC_E   ,KC_R   ,KC_T   ,
@@ -66,13 +65,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        KC_Y   ,KC_U   ,KC_I   ,KC_O   ,KC_P   ,KC_BSLS,
        KC_H   ,KC_J   ,KC_K   ,KC_L   ,KC_SCLN,KC_QUOT,
        KC_N   ,KC_M   ,KC_COMM,KC_DOT ,KC_SLSH,KC_RSFT,
-               KC_FN6, KC_FN7,  KC_LBRC ,KC_RBRC, 
+               KC_FN6, KC_FN7,  KC_LBRC ,KC_RBRC,
            KC_RALT,KC_RGUI,
            KC_PGUP,
            KC_PGDN,KC_ENTER ,KC_SPC
     ),
-    
-    
+
+
 /* _SYMB level, more planck like. Much work to make sequences into multi-finger rolls. eg ([1,0]), !=0
 * Also sorted by frequency / strength of finger.
 *
@@ -100,7 +99,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 
 
-[_SYMB] = KEYMAP( 
+[_SYMB] = LAYOUT(
          _______,  _______,  _______,  _______,  _______,  _______, _______, _______, _______,
          _______,  _______,  _______,  _______,  _______,  _______,
          _______,  KC_CIRC,  KC_LCBR, KC_RCBR,  KC_AT,  KC_PERC,
@@ -120,8 +119,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
          _______,
          _______,  _______,  _______
     ),
-    
-    
+
+
 /* _SYMB2ol level, more ergodox like
 *
 * ,-------------------------------------------------------------------------------------------------------------------.
@@ -148,7 +147,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 
 
-[_SYMB2] = KEYMAP( 
+[_SYMB2] = LAYOUT(
          _______,  _______,  _______,  _______,  _______,  _______, _______, _______, _______,
          _______,  _______,  KC_ASTR,  KC_HASH,  _______,  _______,
          _______,  KC_SLSH,  RSFT(KC_COMM), RSFT(KC_DOT),  _______,  _______,
@@ -175,7 +174,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 * |--------+------+------+------+------+------+---------------------------+------+------+------+------+------+--------|
 * | =+     |  !   |   @  |   #  |   $  |   %  |                           |  ^   |   &  |   *  |  (   |   )  |MS Fast |
 * |--------+------+------+------+------+------|                           +------+------+------+------+------+--------|
-* | Tab    |      |      |      |      |PgUp  |                           | MwU  |MS_UL | MS_U |MS_UR |      | Ms Norm| 
+* | Tab    |      |      |      |      |PgUp  |                           | MwU  |MS_UL | MS_U |MS_UR |      | Ms Norm|
 * |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
 * |MouseFN1|GUI_V |GUI X |GUI C |GUI_V |      |                           |      | MS_L |Mouse1| MS_R |      |MS Slow |
 * |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
@@ -193,7 +192,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 */
 
 
-[_MOUSE] = KEYMAP(
+[_MOUSE] = LAYOUT(
          KC_CAPS,  _______,  _______,  _______,  _______,  _______, _______, _______, _______,
          _______,  KC_EXLM  ,KC_AT,    KC_HASH,  KC_DLR   ,KC_PERC   ,
          _______,  KC_NO,    KC_NO,    KC_UP,    KC_NO,    KC_PGUP,
@@ -203,8 +202,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                              _______,  _______,
                                        _______,
                     _______, _______,  _______,
-         _______,  _______,  _______,  _______,  _______,  _______, _______, KC_FN0,RESET, 
-         KC_CIRC,  KC_AMPR,  KC_ASTR,  KC_LPRN,  KC_RPRN,  KC_ACL2,  
+         _______,  _______,  _______,  _______,  _______,  _______, _______, KC_FN0,RESET,
+         KC_CIRC,  KC_AMPR,  KC_ASTR,  KC_LPRN,  KC_RPRN,  KC_ACL2,
          KC_WH_U,  M(A_MUL), KC_MS_U,  M(A_MUR), KC_NO,  KC_ACL1,
          KC_NO,    KC_MS_L,  KC_MS_D,  KC_MS_R,  KC_NO,  KC_ACL0,
          KC_WH_D,  M(A_MDL), KC_MS_D,  M(A_MDR), RSFT(KC_LBRC), RSFT(KC_RBRC),
@@ -242,7 +241,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 
 
-[_TRANS] = KEYMAP( 
+[_TRANS] = LAYOUT(
          _______,  _______,  _______,  _______,  _______,  _______, _______, _______, _______,
          _______,  _______,  _______,  _______,  _______,  _______,
           _______,  _______,  _______,  _______,  _______,  _______,
@@ -262,22 +261,22 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
          _______,
          _______,  _______,  _______
     ),
-    
-    
+
+
 };
 
 
 
 const uint16_t PROGMEM fn_actions[] = {
-   [0] = ACTION_LAYER_TAP_TOGGLE(_MOUSE) ,             
-   [1] = ACTION_LAYER_TOGGLE(_MOUSE) ,                
-   [2] = ACTION_LAYER_TAP_TOGGLE(_SYMB) ,              
-       [5]= ACTION_LAYER_TAP_KEY(_SYMB,KC_RIGHT), 
+   [0] = ACTION_LAYER_TAP_TOGGLE(_MOUSE) ,
+   [1] = ACTION_LAYER_TOGGLE(_MOUSE) ,
+   [2] = ACTION_LAYER_TAP_TOGGLE(_SYMB) ,
+       [5]= ACTION_LAYER_TAP_KEY(_SYMB,KC_RIGHT),
        [4]= ACTION_MODS_TAP_KEY(MOD_LGUI,KC_LEFT),
-       [6]= ACTION_LAYER_TAP_KEY(_SYMB,KC_UP), 
+       [6]= ACTION_LAYER_TAP_KEY(_SYMB,KC_UP),
        [7]= ACTION_MODS_TAP_KEY(MOD_LGUI,KC_DOWN),
 
-       
+
 };
 
 const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
@@ -292,7 +291,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
           }
         break;
 
-       // from  algernon's ErgoDox EZ layout, 
+       // from  algernon's ErgoDox EZ layout,
        case A_MUL:
         if (record->event.pressed) {
           mousekey_on(KC_MS_UP);
@@ -336,7 +335,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
         }
         mousekey_send();
         break;
-     } 
+     }
     return MACRO_NONE;
 };
 
@@ -358,7 +357,7 @@ void matrix_scan_user(void) {
                         caps_lock_led_on();
                 }
                 break;
-                
+
         case 2:
                 if (!(host_keyboard_leds() & (1 << USB_LED_SCROLL_LOCK))) {
                         all_led_off();