~ruther/qmk_firmware

3793abe44a318c300835b16ff04932a95e2f5a9e — QMK Bot 3 years ago 5101313 + 1989eb1
Merge remote-tracking branch 'origin/master' into develop
M keyboards/teleport/numpad/keymaps/default/keymap.c => keyboards/teleport/numpad/keymaps/default/keymap.c +8 -7
@@ 19,16 19,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {

  [0] = LAYOUT_numpad_5x4(
    LT(1, KC_NLCK), KC_PSLS,  KC_PAST, KC_PMNS,
    KC_P7,          KC_P8,    KC_P9,           
    KC_P4,          KC_P5,    KC_P6,   KC_PPLS, 
    KC_P1,          KC_P2,    KC_P3,            
              KC_P0,          KC_PDOT,  KC_PENT  
    KC_P7,          KC_P8,    KC_P9,
    KC_P4,          KC_P5,    KC_P6,   KC_PPLS,
    KC_P1,          KC_P2,    KC_P3,
              KC_P0,          KC_PDOT,  KC_PENT
  ),

  [1] = LAYOUT_numpad_5x4(
    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
    KC_TRNS, KC_TRNS, KC_TRNS,
    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
    KC_TRNS, KC_TRNS, KC_TRNS, 
             KC_TRNS, KC_TRNS, RESET    
    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
    KC_TRNS, KC_TRNS, KC_TRNS,
             KC_TRNS, KC_TRNS, RESET
  ),
};

M keyboards/teleport/numpad/keymaps/via/keymap.c => keyboards/teleport/numpad/keymaps/via/keymap.c +23 -7
@@ 19,17 19,33 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {

  [0] = LAYOUT_numpad_5x4(
    LT(1, KC_NLCK), KC_PSLS,  KC_PAST, KC_PMNS,
    KC_P7,          KC_P8,    KC_P9,           
    KC_P4,          KC_P5,    KC_P6,   KC_PPLS, 
    KC_P1,          KC_P2,    KC_P3,            
              KC_P0,          KC_PDOT,  KC_PENT  
    KC_P7,          KC_P8,    KC_P9,
    KC_P4,          KC_P5,    KC_P6,   KC_PPLS,
    KC_P1,          KC_P2,    KC_P3,
              KC_P0,          KC_PDOT,  KC_PENT
  ),

  [1] = LAYOUT_numpad_5x4(
    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
    KC_TRNS, KC_TRNS, KC_TRNS,
    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
    KC_TRNS, KC_TRNS, KC_TRNS, 
             KC_TRNS, KC_TRNS, RESET    
    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
    KC_TRNS, KC_TRNS, KC_TRNS,
             KC_TRNS, KC_TRNS, RESET
  ),

  [2] = LAYOUT_numpad_5x4(
    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
    KC_TRNS, KC_TRNS, KC_TRNS,
    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
    KC_TRNS, KC_TRNS, KC_TRNS,
             KC_TRNS, KC_TRNS, RESET
  ),

  [3] = LAYOUT_numpad_5x4(
    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
    KC_TRNS, KC_TRNS, KC_TRNS,
    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
    KC_TRNS, KC_TRNS, KC_TRNS,
             KC_TRNS, KC_TRNS, RESET
  ),
};