aboutsummaryrefslogtreecommitdiffstats
path: root/keyboards/1upkeyboards
diff options
context:
space:
mode:
authorMechMerlin <30334081+mechmerlin@users.noreply.github.com>2020-04-03 22:52:05 -0700
committerGitHub <noreply@github.com>2020-04-04 16:52:05 +1100
commit38d7145da280a3fad108327ac849832aa2c75d2f (patch)
treebccbdef5e62fac2947da6fcc6bcd306a6b657e9a /keyboards/1upkeyboards
parent6e8876be39f829b0327f567d673b23be0f4f28c6 (diff)
downloadfirmware-38d7145da280a3fad108327ac849832aa2c75d2f.tar.gz
firmware-38d7145da280a3fad108327ac849832aa2c75d2f.tar.bz2
firmware-38d7145da280a3fad108327ac849832aa2c75d2f.zip
VIA Support: 1upkeyboards Sweet16 (#8652)
* update VID and PID to match the rest of 1up's collection * add VIA keymap
Diffstat (limited to 'keyboards/1upkeyboards')
-rw-r--r--keyboards/1upkeyboards/sweet16/config.h2
-rw-r--r--keyboards/1upkeyboards/sweet16/keymaps/via/keymap.c37
-rw-r--r--keyboards/1upkeyboards/sweet16/keymaps/via/rules.mk2
-rw-r--r--keyboards/1upkeyboards/sweet16/v1/config.h2
-rw-r--r--keyboards/1upkeyboards/sweet16/v2/promicro/config.h2
-rw-r--r--keyboards/1upkeyboards/sweet16/v2/proton_c/config.h2
6 files changed, 43 insertions, 4 deletions
diff --git a/keyboards/1upkeyboards/sweet16/config.h b/keyboards/1upkeyboards/sweet16/config.h
index 803d9f115..0fc117c5a 100644
--- a/keyboards/1upkeyboards/sweet16/config.h
+++ b/keyboards/1upkeyboards/sweet16/config.h
@@ -3,7 +3,7 @@
#include "config_common.h"
/* USB Device descriptor parameter */
-#define VENDOR_ID 0xFEED
+#define VENDOR_ID 0x6F75 // OU
#define MANUFACTURER 1up Keyboards
#define PRODUCT Sweet16
#define DESCRIPTION 4x4 grid
diff --git a/keyboards/1upkeyboards/sweet16/keymaps/via/keymap.c b/keyboards/1upkeyboards/sweet16/keymaps/via/keymap.c
new file mode 100644
index 000000000..bd3466814
--- /dev/null
+++ b/keyboards/1upkeyboards/sweet16/keymaps/via/keymap.c
@@ -0,0 +1,37 @@
+#include QMK_KEYBOARD_H
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [0] = LAYOUT_ortho_4x4(
+ KC_7, KC_8, KC_9, KC_ASTR,
+ KC_4, KC_5, KC_6, KC_SLSH,
+ KC_1, KC_2, KC_3, KC_MINS,
+ KC_0, KC_ENT, KC_DOT, MO(1)
+ ),
+
+ [1] = LAYOUT_ortho_4x4(
+ RESET, 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
+ ),
+
+ [2] = LAYOUT_ortho_4x4(
+ 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_ortho_4x4(
+ 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
+ ),
+
+};
+
+
+
+
diff --git a/keyboards/1upkeyboards/sweet16/keymaps/via/rules.mk b/keyboards/1upkeyboards/sweet16/keymaps/via/rules.mk
new file mode 100644
index 000000000..36b7ba9cb
--- /dev/null
+++ b/keyboards/1upkeyboards/sweet16/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
diff --git a/keyboards/1upkeyboards/sweet16/v1/config.h b/keyboards/1upkeyboards/sweet16/v1/config.h
index 56fd16650..5264ef698 100644
--- a/keyboards/1upkeyboards/sweet16/v1/config.h
+++ b/keyboards/1upkeyboards/sweet16/v1/config.h
@@ -3,7 +3,7 @@
#include "config_common.h"
/* USB Device descriptor parameter */
-#define PRODUCT_ID 0x2010
+#define PRODUCT_ID 0x0161
#define DEVICE_VER 0x0001
/* key matrix pins */
diff --git a/keyboards/1upkeyboards/sweet16/v2/promicro/config.h b/keyboards/1upkeyboards/sweet16/v2/promicro/config.h
index bd50b6960..d344b0750 100644
--- a/keyboards/1upkeyboards/sweet16/v2/promicro/config.h
+++ b/keyboards/1upkeyboards/sweet16/v2/promicro/config.h
@@ -3,7 +3,7 @@
#include "config_common.h"
/* USB Device descriptor parameter */
-#define PRODUCT_ID 0x2011
+#define PRODUCT_ID 0x0162
#define DEVICE_VER 0x0001
/* key matrix pins */
diff --git a/keyboards/1upkeyboards/sweet16/v2/proton_c/config.h b/keyboards/1upkeyboards/sweet16/v2/proton_c/config.h
index 6f27f0b62..30abf28ee 100644
--- a/keyboards/1upkeyboards/sweet16/v2/proton_c/config.h
+++ b/keyboards/1upkeyboards/sweet16/v2/proton_c/config.h
@@ -3,7 +3,7 @@
#include "config_common.h"
/* USB Device descriptor parameter */
-#define PRODUCT_ID 0x2011
+#define PRODUCT_ID 0x0162
#define DEVICE_VER 0x0001
/* key matrix pins */