1
0
Fork 0

Move kbdpad_mk2 to kbdpad/mk2, add numpad layout to mk2.h (#15892)

This commit is contained in:
Felipe Bastos 2022-01-29 13:28:00 -05:00 committed by GitHub
parent 3307a8e057
commit 2100a7ca7b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
15 changed files with 33 additions and 16 deletions

View file

@ -19,10 +19,10 @@
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT_ortho_6x4( /* Base */ [0] = LAYOUT_ortho_6x4( /* Base */
KC_ESC, KC_LCTL, KC_LALT, KC_BSPC, KC_ESC, KC_LCTL, KC_LALT, KC_BSPC,
KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
KC_P7, KC_P8, KC_P9, KC_PPLS, KC_P7, KC_P8, KC_P9, KC_PPLS,
KC_P4, KC_P5, KC_P6, KC_PPLS, KC_P4, KC_P5, KC_P6, KC_PPLS,
KC_P1, KC_P2, KC_P3, KC_PENT, KC_P1, KC_P2, KC_P3, KC_PENT,
KC_P0, KC_P0, KC_PDOT, KC_PENT KC_P0, KC_P0, KC_PDOT, KC_PENT
), ),
}; };

View file

@ -13,4 +13,4 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "kbdpad_mk2.h" #include "mk2.h"

View file

@ -27,17 +27,34 @@
*/ */
#define LAYOUT_ortho_6x4( \ #define LAYOUT_ortho_6x4( \
K00, K01, K02, K03, \ K00, K01, K02, K03, \
K10, K11, K12, K13, \ K10, K11, K12, K13, \
K20, K21, K22, K23, \ K20, K21, K22, K23, \
K30, K31, K32, K33, \ K30, K31, K32, K33, \
K40, K41, K42, K43, \ K40, K41, K42, K43, \
K50, K51, K52, K53 \ K50, K51, K52, K53 \
) \ ) \
{ \ { \
{ K00, K01, K02, K03 }, \ { K00, K01, K02, K03 }, \
{ K10, K11, K12, K13 }, \ { K10, K11, K12, K13 }, \
{ K20, K21, K22, K23 }, \ { K20, K21, K22, K23 }, \
{ K30, K31, K32, K33 }, \ { K30, K31, K32, K33 }, \
{ K40, K41, K42, K43 }, \ { K40, K41, K42, K43 }, \
{ K50, K51, K52, K53 } \ { K50, K51, K52, K53 } \
}
#define LAYOUT_numpad_6x4( \
K00, K01, K02, K03, \
K10, K11, K12, K13, \
K20, K21, K22, \
K30, K31, K32, K33, \
K40, K41, K42, \
K50, K52, K53 \
) \
{ \
{ K00, K01, K02, K03 }, \
{ K10, K11, K12, K13 }, \
{ K20, K21, K22, KC_NO }, \
{ K30, K31, K32, K33 }, \
{ K40, K41, K42, KC_NO }, \
{ K50, KC_NO, K52, K53 } \
} }