Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
@qmk-bot
qmk-bot committed Jul 14, 2022
2 parents 9b04e9b + 928be32 commit 82685fc
Show file tree
Hide file tree
Showing 8 changed files with 150 additions and 144 deletions.
2 changes: 1 addition & 1 deletion keyboards/kprepublic/bm80v2_iso/bm80v2_iso.c
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Copyright 2022 bdtc123 *
/* Copyright 2022 edwardslau *
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
Expand Down
28 changes: 15 additions & 13 deletions keyboards/kprepublic/bm80v2_iso/bm80v2_iso.h
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Copyright 2022 bdtc123 *
/* Copyright 2022 edwardslau *
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
Expand All @@ -16,19 +16,21 @@

#include "quantum.h"

#define ___ KC_NO

#define LAYOUT_tkl_iso( \
K0_0, K0_2, K0_3, K0_4, K0_5, K0_6,K0_7, K0_8, K0_9, K0_A, K0_B, K0_C, K0_D, K0_E, K0_F, K0_10, \
K1_0, K1_1, K1_2, K1_3, K1_4, K1_5, K1_6, K1_7, K1_8, K1_9, K1_A, K1_B, K1_C, K1_D, K1_E, K1_F, K1_10, \
K2_0, K2_1, K2_2, K2_3, K2_4, K2_5, K2_6, K2_7, K2_8, K2_9, K2_A, K2_B, K2_C, K2_D, K2_E, K2_F, K2_10, \
K3_0, K3_1, K3_2, K3_3, K3_4, K3_5, K3_6, K3_7, K3_8, K3_9, K3_A, K3_B, K3_C, \
K4_0, K4_1, K4_2, K4_3, K4_4, K4_5, K4_6, K4_7, K4_8, K4_9, K4_A, K4_B, K4_C, K4_F, \
K5_0, K5_1, K5_2, K5_5, K5_A, K5_B, K5_C, K5_D, K5_E, K5_F, K5_10 \
K00, K02, K03, K04, K05, K06,K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, \
K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, \
K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2E, K2F, K2G, \
K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K2D, \
K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4F, \
K50, K51, K52, K55, K5A, K5B, K5C, K5D, K5E, K5F, K5G \
) { \
{ K0_0, KC_NO, K0_2, K0_3, K0_4, K0_5, K0_6, K0_7, K0_8, K0_9, K0_A, K0_B, K0_C, K0_D, K0_E, K0_F, K0_10 }, \
{ K1_0, K1_1, K1_2, K1_3, K1_4, K1_5, K1_6, K1_7, K1_8, K1_9, K1_A, K1_B, K1_C, K1_D, K1_E, K1_F, K1_10 }, \
{ K2_0, K2_1, K2_2, K2_3, K2_4, K2_5, K2_6, K2_7, K2_8, K2_9, K2_A, K2_B, K2_C, K2_D, K2_E, K2_F, K2_10 }, \
{ K3_0, K3_1, K3_2, K3_3, K3_4, K3_5, K3_6, K3_7, K3_8, K3_9, K3_A, K3_B, K3_C, KC_NO, KC_NO, KC_NO, KC_NO }, \
{ K4_0, K4_1, K4_2, K4_3, K4_4, K4_5, K4_6, K4_7, K4_8, K4_9, K4_A, K4_B, K4_C, KC_NO, KC_NO, K4_F, KC_NO }, \
{ K5_0, K5_1, K5_2, KC_NO, KC_NO, K5_5, KC_NO, KC_NO, KC_NO, KC_NO, K5_A, K5_B, K5_C, K5_D, K5_E, K5_F, K5_10 } \
{ K00, ___, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G }, \
{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G }, \
{ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G }, \
{ K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, ___, ___, ___, ___ }, \
{ K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, ___, ___, K4F, ___ }, \
{ K50, K51, K52, ___, ___, K55, ___, ___, ___, ___, K5A, K5B, K5C, K5D, K5E, K5F, K5G } \
}

2 changes: 1 addition & 1 deletion keyboards/kprepublic/bm80v2_iso/config.h
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Copyright 2022 bdtc123 *
/* Copyright 2022 edwardslau *
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
Expand Down
178 changes: 89 additions & 89 deletions keyboards/kprepublic/bm80v2_iso/info.json
View file
Original file line number Diff line number Diff line change
@@ -1,103 +1,103 @@
{
"keyboard_name": "bm80v2_iso",
"url": "",
"maintainer": "qmk",
"maintainer": "edwardslau",
"layouts": {
"LAYOUT_tkl_iso": {
"layout": [
{ "x":0, "y":0},
{ "x":2, "y":0},
{ "x":3, "y":0},
{ "x":4, "y":0},
{ "x":5, "y":0},
{ "x":6.5, "y":0},
{ "x":7.5, "y":0},
{ "x":8.5, "y":0},
{ "x":9.5, "y":0},
{ "x":11, "y":0},
{ "x":12, "y":0},
{ "x":13, "y":0},
{ "x":14, "y":0},
{ "x":15.25, "y":0},
{ "x":16.25, "y":0},
{ "x":17.25, "y":0},
{"x":0, "y":0},
{"x":2, "y":0},
{"x":3, "y":0},
{"x":4, "y":0},
{"x":5, "y":0},
{"x":6.5, "y":0},
{"x":7.5, "y":0},
{"x":8.5, "y":0},
{"x":9.5, "y":0},
{"x":11, "y":0},
{"x":12, "y":0},
{"x":13, "y":0},
{"x":14, "y":0},
{"x":15.25, "y":0},
{"x":16.25, "y":0},
{"x":17.25, "y":0},

{ "x":0, "y":1.5},
{ "x":1, "y":1.5},
{ "x":2, "y":1.5},
{ "x":3, "y":1.5},
{ "x":4, "y":1.5},
{ "x":5, "y":1.5},
{ "x":6, "y":1.5},
{ "x":7, "y":1.5},
{ "x":8, "y":1.5},
{ "x":9, "y":1.5},
{ "x":10, "y":1.5},
{ "x":11, "y":1.5},
{ "x":12, "y":1.5},
{ "x":13, "y":1.5, "w":2},
{ "x":15.25, "y":1.5},
{ "x":16.25, "y":1.5},
{ "x":17.25, "y":1.5},
{"x":0, "y":1.5},
{"x":1, "y":1.5},
{"x":2, "y":1.5},
{"x":3, "y":1.5},
{"x":4, "y":1.5},
{"x":5, "y":1.5},
{"x":6, "y":1.5},
{"x":7, "y":1.5},
{"x":8, "y":1.5},
{"x":9, "y":1.5},
{"x":10, "y":1.5},
{"x":11, "y":1.5},
{"x":12, "y":1.5},
{"x":13, "y":1.5, "w":2},
{"x":15.25, "y":1.5},
{"x":16.25, "y":1.5},
{"x":17.25, "y":1.5},

{ "x":0, "y":2.5, "w":1.5},
{ "x":1.5, "y":2.5},
{ "x":2.5, "y":2.5},
{ "x":3.5, "y":2.5},
{ "x":4.5, "y":2.5},
{ "x":5.5, "y":2.5},
{ "x":6.5, "y":2.5},
{ "x":7.5, "y":2.5},
{ "x":8.5, "y":2.5},
{ "x":9.5, "y":2.5},
{ "x":10.5, "y":2.5},
{ "x":11.5, "y":2.5},
{ "x":12.5, "y":2.5},
{ "x":13.75,"y":2.5},
{ "x":15.25, "y":2.5},
{ "x":16.25, "y":2.5},
{ "x":17.25, "y":2.5},
{"x":0, "y":2.5, "w":1.5},
{"x":1.5, "y":2.5},
{"x":2.5, "y":2.5},
{"x":3.5, "y":2.5},
{"x":4.5, "y":2.5},
{"x":5.5, "y":2.5},
{"x":6.5, "y":2.5},
{"x":7.5, "y":2.5},
{"x":8.5, "y":2.5},
{"x":9.5, "y":2.5},
{"x":10.5, "y":2.5},
{"x":11.5, "y":2.5},
{"x":12.5, "y":2.5},
{"x":15.25, "y":2.5},
{"x":16.25, "y":2.5},
{"x":17.25, "y":2.5},

{ "x":0, "y":3.5, "w":1.75},
{ "x":1.75, "y":3.5},
{ "x":2.75, "y":3.5},
{ "x":3.75, "y":3.5},
{ "x":4.75, "y":3.5},
{ "x":5.75, "y":3.5},
{ "x":6.75, "y":3.5},
{ "x":7.75, "y":3.5},
{ "x":8.75, "y":3.5},
{ "x":9.75, "y":3.5},
{ "x":10.75, "y":3.5},
{ "x":11.75, "y":3.5},
{ "x":13.75, "y":3.5, "w":1.25, "h":2},
{"x":0, "y":3.5, "w":1.75},
{"x":1.75, "y":3.5},
{"x":2.75, "y":3.5},
{"x":3.75, "y":3.5},
{"x":4.75, "y":3.5},
{"x":5.75, "y":3.5},
{"x":6.75, "y":3.5},
{"x":7.75, "y":3.5},
{"x":8.75, "y":3.5},
{"x":9.75, "y":3.5},
{"x":10.75, "y":3.5},
{"x":11.75, "y":3.5},
{"x":12.75, "y":3.5},
{"x":13.75, "y":2.5, "w":1.25, "h":2},

{ "x":0, "y":4.5, "w":1.25},
{ "x":1.25, "y":4.5},
{ "x":2.25, "y":4.5},
{ "x":3.25, "y":4.5},
{ "x":4.25, "y":4.5},
{ "x":5.25, "y":4.5},
{ "x":6.25, "y":4.5},
{ "x":7.25, "y":4.5},
{ "x":8.25, "y":4.5},
{ "x":9.25, "y":4.5},
{ "x":10.25, "y":4.5},
{ "x":11.25, "y":4.5},
{ "x":12.25, "y":4.5, "w":2.75},
{ "x":16.25, "y":4.5},
{"x":0, "y":4.5, "w":1.25},
{"x":1.25, "y":4.5},
{"x":2.25, "y":4.5},
{"x":3.25, "y":4.5},
{"x":4.25, "y":4.5},
{"x":5.25, "y":4.5},
{"x":6.25, "y":4.5},
{"x":7.25, "y":4.5},
{"x":8.25, "y":4.5},
{"x":9.25, "y":4.5},
{"x":10.25, "y":4.5},
{"x":11.25, "y":4.5},
{"x":12.25, "y":4.5, "w":2.75},
{"x":16.25, "y":4.5},

{ "x":0, "y":5.5, "w":1.25},
{ "x":1.25, "y":5.5, "w":1.25},
{ "x":2.5, "y":5.5, "w":1.25},
{ "x":3.75, "y":5.5, "w":6.25},
{ "x":10, "y":5.5, "w":1.25},
{ "x":11.25, "y":5.5, "w":1.25},
{ "x":12.5, "y":5.5, "w":1.25},
{ "x":13.75, "y":5.5, "w":1.25},
{ "x":15.25, "y":5.5},
{ "x":16.25, "y":5.5},
{ "x":17.25, "y":5.5}
{"x":0, "y":5.5, "w":1.25},
{"x":1.25, "y":5.5, "w":1.25},
{"x":2.5, "y":5.5, "w":1.25},
{"x":3.75, "y":5.5, "w":6.25},
{"x":10, "y":5.5, "w":1.25},
{"x":11.25, "y":5.5, "w":1.25},
{"x":12.5, "y":5.5, "w":1.25},
{"x":13.75, "y":5.5, "w":1.25},
{"x":15.25, "y":5.5},
{"x":16.25, "y":5.5},
{"x":17.25, "y":5.5}
]
}
}
Expand Down
24 changes: 12 additions & 12 deletions keyboards/kprepublic/bm80v2_iso/keymaps/default/keymap.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,36 +7,36 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT_tkl_iso(
KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SLCK, KC_PAUS,
KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_ENT, KC_DEL, KC_END, KC_PGDN,
KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_BSLS,
KC_LSFT, KC_SPC, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_DEL, KC_END, KC_PGDN,
KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,
KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP,
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
),

[1] = LAYOUT_tkl_iso(
RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
),

[2] = LAYOUT_tkl_iso(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
),

[3] = LAYOUT_tkl_iso(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
)

Expand Down
Loading

0 comments on commit 82685fc

Please sign in to comment.