From 8b12ca3a4ac03c3e50856c80e62397e9e33d0013 Mon Sep 17 00:00:00 2001 From: Luigi311 Date: Tue, 22 Jun 2021 11:15:00 -0600 Subject: [PATCH 1/4] Handwired/Stream_Cheap/2x4: Add via support Signed-off-by: Luigi311 --- keyboards/handwired/stream_cheap/2x4/config.h | 5 ++-- .../stream_cheap/2x4/keymaps/via/keymap.c | 22 +++++++++++++++++ .../stream_cheap/2x4/keymaps/via/rules.mk | 1 + .../2x4/keymaps/via/stream_cheap_2x4.json | 24 +++++++++++++++++++ keyboards/handwired/stream_cheap/2x4/rules.mk | 1 + 5 files changed, 50 insertions(+), 3 deletions(-) create mode 100644 keyboards/handwired/stream_cheap/2x4/keymaps/via/keymap.c create mode 100644 keyboards/handwired/stream_cheap/2x4/keymaps/via/rules.mk create mode 100644 keyboards/handwired/stream_cheap/2x4/keymaps/via/stream_cheap_2x4.json diff --git a/keyboards/handwired/stream_cheap/2x4/config.h b/keyboards/handwired/stream_cheap/2x4/config.h index 14b4d9e36845..708f4cc07eb0 100644 --- a/keyboards/handwired/stream_cheap/2x4/config.h +++ b/keyboards/handwired/stream_cheap/2x4/config.h @@ -3,8 +3,8 @@ #include "config_common.h" /* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x1214 +#define VENDOR_ID 0x7363 +#define PRODUCT_ID 0x3032 #define DEVICE_VER 0x0001 #define MANUFACTURER Kyle Hart #define PRODUCT Stream Cheap 2x4 @@ -16,7 +16,6 @@ /* define direct pins used */ #define DIRECT_PINS { { B5,D7,C6,D1}, { B4,E6,D4,D0} } - /* Set 0 if debouncing isn't needed */ #define DEBOUNCE 5 diff --git a/keyboards/handwired/stream_cheap/2x4/keymaps/via/keymap.c b/keyboards/handwired/stream_cheap/2x4/keymaps/via/keymap.c new file mode 100644 index 000000000000..92cec6b5c2a3 --- /dev/null +++ b/keyboards/handwired/stream_cheap/2x4/keymaps/via/keymap.c @@ -0,0 +1,22 @@ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + // Default layer + [0] = LAYOUT_ortho_2x4( + KC_F13, KC_F14, KC_F15, KC_F16, + KC_F17, KC_F18, KC_F19, KC_F20 + ), + [1] = LAYOUT_ortho_2x4( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + [2] = LAYOUT_ortho_2x4( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + [3] = LAYOUT_ortho_2x4( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), +}; diff --git a/keyboards/handwired/stream_cheap/2x4/keymaps/via/rules.mk b/keyboards/handwired/stream_cheap/2x4/keymaps/via/rules.mk new file mode 100644 index 000000000000..0dd05fa1d902 --- /dev/null +++ b/keyboards/handwired/stream_cheap/2x4/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes # Enable VIA diff --git a/keyboards/handwired/stream_cheap/2x4/keymaps/via/stream_cheap_2x4.json b/keyboards/handwired/stream_cheap/2x4/keymaps/via/stream_cheap_2x4.json new file mode 100644 index 000000000000..edcede381cc8 --- /dev/null +++ b/keyboards/handwired/stream_cheap/2x4/keymaps/via/stream_cheap_2x4.json @@ -0,0 +1,24 @@ +{ + "name": "Stream Cheap", + "vendorId": "0x7363", + "productId": "0x3032", + "lighting": "none", + "matrix": {"rows": 2, "cols": 4}, + "layouts": { + "keymap": [ + {"name": "Stream Cheap"}, + [ + "0,0", + "0,1", + "0,2", + "0,3" + ], + [ + "1,0", + "1,1", + "1,2", + "1,3" + ] + ] + } +} diff --git a/keyboards/handwired/stream_cheap/2x4/rules.mk b/keyboards/handwired/stream_cheap/2x4/rules.mk index e4ffb10d0494..a647bbea60b6 100644 --- a/keyboards/handwired/stream_cheap/2x4/rules.mk +++ b/keyboards/handwired/stream_cheap/2x4/rules.mk @@ -20,3 +20,4 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow BLUETOOTH_ENABLE = no # Enable Bluetooth AUDIO_ENABLE = no # Audio output +LTO_ENABLE = yes # Enable optimizations From 24d86e3f7035d728d368690424628a1eeef663de Mon Sep 17 00:00:00 2001 From: Luigi311 Date: Tue, 22 Jun 2021 11:17:38 -0600 Subject: [PATCH 2/4] Handwired/Stream_Cheap: Update readme for via Signed-off-by: Luigi311 --- keyboards/handwired/stream_cheap/readme.md | 1 + 1 file changed, 1 insertion(+) diff --git a/keyboards/handwired/stream_cheap/readme.md b/keyboards/handwired/stream_cheap/readme.md index 1b4d77ea9f4a..4343e2312d5a 100644 --- a/keyboards/handwired/stream_cheap/readme.md +++ b/keyboards/handwired/stream_cheap/readme.md @@ -18,6 +18,7 @@ Make example for this keyboard (after setting up your build environment): make handwired/stream_cheap/2x3:default make handwired/stream_cheap/2x4:default + make handwired/stream_cheap/2x4:via make handwired/stream_cheap/2x5:default See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). From 58d3f0132ddfe006a34c1a9d361a879c7947a411 Mon Sep 17 00:00:00 2001 From: Luigi311 Date: Tue, 22 Jun 2021 11:24:36 -0600 Subject: [PATCH 3/4] Handwired/Stream_Cheap/2x4: Add 2x4 to via json Signed-off-by: Luigi311 --- .../stream_cheap/2x4/keymaps/via/stream_cheap_2x4.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/handwired/stream_cheap/2x4/keymaps/via/stream_cheap_2x4.json b/keyboards/handwired/stream_cheap/2x4/keymaps/via/stream_cheap_2x4.json index edcede381cc8..78f41b174e2a 100644 --- a/keyboards/handwired/stream_cheap/2x4/keymaps/via/stream_cheap_2x4.json +++ b/keyboards/handwired/stream_cheap/2x4/keymaps/via/stream_cheap_2x4.json @@ -1,12 +1,12 @@ { - "name": "Stream Cheap", + "name": "Stream Cheap 2x4", "vendorId": "0x7363", "productId": "0x3032", "lighting": "none", "matrix": {"rows": 2, "cols": 4}, "layouts": { "keymap": [ - {"name": "Stream Cheap"}, + {"name": "Stream Cheap 2x4"}, [ "0,0", "0,1", From 21d50ed4fd166f68ecf9937000870710c80bf5c4 Mon Sep 17 00:00:00 2001 From: Luigi311 Date: Tue, 22 Jun 2021 11:27:24 -0600 Subject: [PATCH 4/4] Handwired/Stream_Cheap/2x4: Add GPL2+ License to keymap Signed-off-by: Luigi311 --- .../stream_cheap/2x4/keymaps/via/keymap.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/keyboards/handwired/stream_cheap/2x4/keymaps/via/keymap.c b/keyboards/handwired/stream_cheap/2x4/keymaps/via/keymap.c index 92cec6b5c2a3..5bd92beb650f 100644 --- a/keyboards/handwired/stream_cheap/2x4/keymaps/via/keymap.c +++ b/keyboards/handwired/stream_cheap/2x4/keymaps/via/keymap.c @@ -1,3 +1,17 @@ +/* +Copyright 2021 Luigi311 +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 . +*/ + #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {