Merge remote-tracking branch 'origin/master' into develop

author: QMK Bot <hello@qmk.fm> 2021-02-05 06:19:03 +0000
committer: QMK Bot <hello@qmk.fm> 2021-02-05 06:19:03 +0000
commit: f554e290f7a64665b9ccc2f2ad3431662e507931 (patch)
tree: fea7fc1de65ee30dc4772fc0d2723f501fcaed31
parent: 325c2b14871600513b1c8caaea421ab04d985674 (diff)
parent: 237dd23491cff3dc60df123a8992301bd1d8a9c8 (diff)
download: qmk_firmware-f554e290f7a64665b9ccc2f2ad3431662e507931.tar.gz
qmk_firmware-f554e290f7a64665b9ccc2f2ad3431662e507931.zip
3 files changed, 80 insertions, 2 deletions
diff --git a/keyboards/v60_type_r/config.h b/keyboards/v60_type_r/config.h
index 74a4bcef9..38758d4ad 100644
--- a/keyboards/v60_type_r/config.h
+++ b/keyboards/v60_type_r/config.h
@@ -20,8 +20,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "config_common.h"
 /* USB Device descriptor parameter */
-#define VENDOR_ID       0xFEED
+#define VENDOR_ID       0x7432
-#define PRODUCT_ID      0x6060
+#define PRODUCT_ID      0x0658
 #define DEVICE_VER      0x0001
 #define MANUFACTURER    KB Paradise
 #define PRODUCT         V60 Type R
diff --git a/keyboards/v60_type_r/keymaps/via/keymap.c b/keyboards/v60_type_r/keymaps/via/keymap.c
new file mode 100644
index 000000000..5a494588e
--- /dev/null
+++ b/keyboards/v60_type_r/keymaps/via/keymap.c
@@ -0,0 +1,77 @@
+/* Copyright 2017 benlyall, MechMerlin
+ *
+ * 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
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+/* This is the default ANSI layout provided by the KBP V60 Type R
+* as depicted in their manual and on the stock keycaps.
+*/
+#include QMK_KEYBOARD_H
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+/* Keymap 0: Default Layer (Qwerty)
+ * ,-----------------------------------------------------------.
+ * |Esc|  1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|   Bs  |
+ * |-----------------------------------------------------------|
+ * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|    \|
+ * |-----------------------------------------------------------|
+ * |Caps   |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Return |
+ * |-----------------------------------------------------------|
+ * |LShift  |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /| RShift   |
+ * |-----------------------------------------------------------|
+ * |Ctrl|Gui |Alt |      Space              |Fn0 |Gui |App|Ctrl|
+ * `-----------------------------------------------------------'
+ */
+[0] = LAYOUT_60_ansi(
+      KC_ESC,  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_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_BSLS,
+      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_ENT,
+      KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,
+      KC_LCTL, KC_LGUI, KC_LALT,          KC_SPC,                                      MO(1),   KC_RGUI, KC_APP,  KC_RCTL),
+/* Keymap 1: FN Layer
+ * ,-----------------------------------------------------------.
+ * |`  | F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|  Del  |
+ * |-----------------------------------------------------------|
+ * |     |   |Up |   |   |   |   |   |Prt|Scl|Pau|Up|   | Ins  |
+ * |-----------------------------------------------------------|
+ * |      |Lft|Dwn|Rig|   |   |   |   |Hme|PgU|Lef|Rig|        |
+ * |-----------------------------------------------------------|
+ * |        |   |   |   |   |VolD|VolU|Mut|End|PgD|Dwn|        |
+ * |-----------------------------------------------------------|
+ * |    |    |    |                        |    |    |    |    |
+ * `-----------------------------------------------------------'
+ */
+[1] = LAYOUT_60_ansi(
+      KC_GRV,    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_DEL,
+      KC_TRNS,   KC_TRNS,  KC_UP,    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,    KC_TRNS,          KC_INS,
+      KC_TRNS,   KC_LEFT,  KC_DOWN,  KC_RIGHT, KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS, KC_HOME, KC_PGUP, KC_LEFT, KC_RIGHT,          KC_TRNS,
+      KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_VOLD,   KC_VOLU, KC_MUTE, KC_END,  KC_PGDN,  KC_DOWN,           KC_TRNS,
+      KC_TRNS,   KC_TRNS,  KC_TRNS,            KC_TRNS,                                                           KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS),
+[2] = LAYOUT_60_ansi(
+      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, 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, 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, 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),
+[3] = LAYOUT_60_ansi(
+      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, 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, 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, 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),
+};
+\ No newline at end of file
diff --git a/keyboards/v60_type_r/keymaps/via/rules.mk b/keyboards/v60_type_r/keymaps/via/rules.mk
new file mode 100644
index 000000000..1e5b99807
--- /dev/null
+++ b/keyboards/v60_type_r/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
author	QMK Bot <hello@qmk.fm>	2021-02-05 06:19:03 +0000
committer	QMK Bot <hello@qmk.fm>	2021-02-05 06:19:03 +0000
commit	f554e290f7a64665b9ccc2f2ad3431662e507931 (patch)
tree	fea7fc1de65ee30dc4772fc0d2723f501fcaed31
parent	325c2b14871600513b1c8caaea421ab04d985674 (diff)
parent	237dd23491cff3dc60df123a8992301bd1d8a9c8 (diff)
download	qmk_firmware-f554e290f7a64665b9ccc2f2ad3431662e507931.tar.gz qmk_firmware-f554e290f7a64665b9ccc2f2ad3431662e507931.zip

diff --git a/keyboards/v60_type_r/config.h b/keyboards/v60_type_r/config.h index 74a4bcef9..38758d4ad 100644 --- a/keyboards/v60_type_r/config.h +++ b/keyboards/v60_type_r/config.h
@@ -20,8 +20,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
20	#include "config_common.h"	20	#include "config_common.h"
21		21
22	/* USB Device descriptor parameter */	22	/* USB Device descriptor parameter */
23	#define VENDOR_ID 0xFEED	23	#define VENDOR_ID 0x7432
24	#define PRODUCT_ID 0x6060	24	#define PRODUCT_ID 0x0658
25	#define DEVICE_VER 0x0001	25	#define DEVICE_VER 0x0001
26	#define MANUFACTURER KB Paradise	26	#define MANUFACTURER KB Paradise
27	#define PRODUCT V60 Type R	27	#define PRODUCT V60 Type R


diff --git a/keyboards/v60_type_r/keymaps/via/keymap.c b/keyboards/v60_type_r/keymaps/via/keymap.c new file mode 100644 index 000000000..5a494588e --- /dev/null +++ b/keyboards/v60_type_r/keymaps/via/keymap.c
@@ -0,0 +1,77 @@
		1	/* Copyright 2017 benlyall, MechMerlin
		2	*
		3	* This program is free software: you can redistribute it and/or modify
		4	* it under the terms of the GNU General Public License as published by
		5	* the Free Software Foundation, either version 2 of the License, or
		6	* (at your option) any later version.
		7	*
		8	* This program is distributed in the hope that it will be useful,
		9	* but WITHOUT ANY WARRANTY; without even the implied warranty of
		10	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		11	* GNU General Public License for more details.
		12	*
		13	* You should have received a copy of the GNU General Public License
		14	* along with this program. If not, see <http://www.gnu.org/licenses/>.
		15	*/
		16
		17	/* This is the default ANSI layout provided by the KBP V60 Type R
		18	* as depicted in their manual and on the stock keycaps.
		19	*/
		20	#include QMK_KEYBOARD_H
		21
		22	const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
		23	/* Keymap 0: Default Layer (Qwerty)
		24	* ,-----------------------------------------------------------.
		25	* \|Esc\| 1\| 2\| 3\| 4\| 5\| 6\| 7\| 8\| 9\| 0\| -\| =\| Bs \|
		26	* \|-----------------------------------------------------------\|
		27	* \|Tab \| Q\| W\| E\| R\| T\| Y\| U\| I\| O\| P\| [\| ]\| \\|
		28	* \|-----------------------------------------------------------\|
		29	* \|Caps \| A\| S\| D\| F\| G\| H\| J\| K\| L\| ;\| '\|Return \|
		30	* \|-----------------------------------------------------------\|
		31	* \|LShift \| Z\| X\| C\| V\| B\| N\| M\| ,\| .\| /\| RShift \|
		32	* \|-----------------------------------------------------------\|
		33	* \|Ctrl\|Gui \|Alt \| Space \|Fn0 \|Gui \|App\|Ctrl\|
		34	* `-----------------------------------------------------------'
		35	*/
		36	[0] = LAYOUT_60_ansi(
		37	KC_ESC, 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,
		38	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_BSLS,
		39	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_ENT,
		40	KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,
		41	KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), KC_RGUI, KC_APP, KC_RCTL),
		42
		43	/* Keymap 1: FN Layer
		44	* ,-----------------------------------------------------------.
		45	* \|` \| F1\| F2\| F3\| F4\| F5\| F6\| F7\| F8\| F9\|F10\|F11\|F12\| Del \|
		46	* \|-----------------------------------------------------------\|
		47	* \| \| \|Up \| \| \| \| \| \|Prt\|Scl\|Pau\|Up\| \| Ins \|
		48	* \|-----------------------------------------------------------\|
		49	* \| \|Lft\|Dwn\|Rig\| \| \| \| \|Hme\|PgU\|Lef\|Rig\| \|
		50	* \|-----------------------------------------------------------\|
		51	* \| \| \| \| \| \|VolD\|VolU\|Mut\|End\|PgD\|Dwn\| \|
		52	* \|-----------------------------------------------------------\|
		53	* \| \| \| \| \| \| \| \| \|
		54	* `-----------------------------------------------------------'
		55	*/
		56	[1] = LAYOUT_60_ansi(
		57	KC_GRV, 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_DEL,
		58	KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP, KC_TRNS, KC_INS,
		59	KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGUP, KC_LEFT, KC_RIGHT, KC_TRNS,
		60	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_END, KC_PGDN, KC_DOWN, KC_TRNS,
		61	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
		62
		63	[2] = LAYOUT_60_ansi(
		64	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,
		65	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,
		66	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,
		67	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
		68	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
		69
		70	[3] = LAYOUT_60_ansi(
		71	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,
		72	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,
		73	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,
		74	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
		75	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
		76
		77	}; \ No newline at end of file


diff --git a/keyboards/v60_type_r/keymaps/via/rules.mk b/keyboards/v60_type_r/keymaps/via/rules.mk new file mode 100644 index 000000000..1e5b99807 --- /dev/null +++ b/keyboards/v60_type_r/keymaps/via/rules.mk
@@ -0,0 +1 @@
			VIA_ENABLE = yes