From 84d8ce04e821fc61c0004f759ec460df9700d418 Mon Sep 17 00:00:00 2001 From: atechofficials Date: Sat, 20 Apr 2024 22:46:28 +0530 Subject: [PATCH] Added ProtoKeeb Via Support --- keyboards/protokeeb/keymaps/default/rules.mk | 8 +++ keyboards/protokeeb/keymaps/midi/rules.mk | 8 ++- keyboards/protokeeb/keymaps/via/config.h | 6 +- keyboards/protokeeb/keymaps/via/keymap.c | 62 ++++++++++++++++++++ keyboards/protokeeb/keymaps/via/rules.mk | 12 ++++ keyboards/protokeeb/rev1/info.json | 36 ++++++------ keyboards/protokeeb/rev1/rev1.h | 15 ----- keyboards/protokeeb/rules.mk | 11 ++-- 8 files changed, 117 insertions(+), 41 deletions(-) create mode 100644 keyboards/protokeeb/keymaps/default/rules.mk diff --git a/keyboards/protokeeb/keymaps/default/rules.mk b/keyboards/protokeeb/keymaps/default/rules.mk new file mode 100644 index 00000000000..5f850d00da3 --- /dev/null +++ b/keyboards/protokeeb/keymaps/default/rules.mk @@ -0,0 +1,8 @@ +# Build Options Protokeeb rev1 +# Change yes to no to diable features + +# Rotary Encoder Keymap support +ENCODER_MAP_ENABLE = yes + +# DIP Switch Keymap support +DIP_SWITCH_MAP_ENABLE = no \ No newline at end of file diff --git a/keyboards/protokeeb/keymaps/midi/rules.mk b/keyboards/protokeeb/keymaps/midi/rules.mk index dafa785f47f..b837918166f 100644 --- a/keyboards/protokeeb/keymaps/midi/rules.mk +++ b/keyboards/protokeeb/keymaps/midi/rules.mk @@ -1,4 +1,10 @@ # Build Options # Change yes to no to diable feature -MIDI_ENABLE = yes \ No newline at end of file +MIDI_ENABLE = yes + +# Rotary Encoder Keymap support +ENCODER_MAP_ENABLE = yes + +# DIP Switch Keymap support +DIP_SWITCH_MAP_ENABLE = no \ No newline at end of file diff --git a/keyboards/protokeeb/keymaps/via/config.h b/keyboards/protokeeb/keymaps/via/config.h index 6c8d30f4959..702200693e3 100644 --- a/keyboards/protokeeb/keymaps/via/config.h +++ b/keyboards/protokeeb/keymaps/via/config.h @@ -15,5 +15,7 @@ */ #pragma once -#define DYNAMIC_KEYMAP_LAYER_COUNT 2 -// #define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 1 // default value \ No newline at end of file + +#define DYNAMIC_KEYMAP_LAYER_COUNT 4 // default value 4-layers +// #define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 1 // default value 1-byte +// #define VIA_EEPROM_CUSTOM_CONFIG_SIZE 0 // default value 0-bytes diff --git a/keyboards/protokeeb/keymaps/via/keymap.c b/keyboards/protokeeb/keymaps/via/keymap.c index 425344e353c..513abbd8e3c 100644 --- a/keyboards/protokeeb/keymaps/via/keymap.c +++ b/keyboards/protokeeb/keymaps/via/keymap.c @@ -15,4 +15,66 @@ */ #include QMK_KEYBOARD_H +#include "quantum.h" +enum protokeeb_keymap_layers { + LAYER_BASE = 0, + LAYER_LOWER = 1, + DYNAMIC_LAYER1 = 2, + DYNAMIC_LAYER2 = 3 +}; + +#define LOWER MO(LAYER_LOWER) + +/* +#define LAYOUT( \ + K00, K01, K02, K03, \ + K10, K11, K12, K13, \ + K20, K21, K22, K23, \ + K30, K31, K32, K33, \ +) { \ + { k00, k01, k02, k03, }, \ + { k10, k11, k12, k13, }, \ + { k20, k21, k22, k23, }, \ + { k30, k31, k32, k33, } \ +} +*/ + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [LAYER_BASE] = LAYOUT( /* Base */ + KC_KP_7, KC_KP_8, KC_KP_9, KC_KP_SLASH, + KC_KP_4, KC_KP_5, KC_KP_6, KC_KP_ASTERISK, + KC_KP_1, KC_KP_2, KC_KP_3, KC_KP_MINUS, + LOWER, KC_KP_0, KC_KP_PLUS, KC_KP_ENTER + ), + + [LAYER_LOWER] = LAYOUT( /* RGB Control */ + RGB_MODE_PLAIN, RGB_MODE_FORWARD, RGB_MODE_REVERSE, RGB_TOG, + RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, + RGB_VAI, RGB_VAD, RGB_SPI, RGB_SPD, + KC_TRNS, RGB_MODE_SWIRL, QK_DEBUG_TOGGLE, QK_BOOT + ), + + [DYNAMIC_LAYER1] = LAYOUT( /* Empty for dynamic keymaps */ + 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 + ), + + [DYNAMIC_LAYER2] = LAYOUT( /* Empty for dynamic keymaps */ + 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 + ), +}; + +#if defined(ENCODER_MAP_ENABLE) +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { + [LAYER_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, + [LAYER_LOWER] = { ENCODER_CCW_CW(KC_BRIGHTNESS_DOWN, KC_BRIGHTNESS_UP) }, + [DYNAMIC_LAYER1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, + [DYNAMIC_LAYER2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, +}; +#endif \ No newline at end of file diff --git a/keyboards/protokeeb/keymaps/via/rules.mk b/keyboards/protokeeb/keymaps/via/rules.mk index efb2c7a4d46..a43d01ad113 100644 --- a/keyboards/protokeeb/keymaps/via/rules.mk +++ b/keyboards/protokeeb/keymaps/via/rules.mk @@ -1,4 +1,16 @@ # Build Options Protokeeb rev1 # Change yes to no to diable features +# Enable Via support VIA_ENABLE = yes + +# Rotary Encoder Keymap support +ENCODER_MAP_ENABLE = yes + +# DIP Switch Keymap support +DIP_SWITCH_MAP_ENABLE = no + +# To reduce firmware size, consider turning on link time optimization +# Note: This may have unexpected side effects on keyboards +# using ARM processors, so test thoroughly with it enabled and disabled. +# LTO_ENABLE = yes \ No newline at end of file diff --git a/keyboards/protokeeb/rev1/info.json b/keyboards/protokeeb/rev1/info.json index 9a4b1390d56..eab8209c721 100644 --- a/keyboards/protokeeb/rev1/info.json +++ b/keyboards/protokeeb/rev1/info.json @@ -1,5 +1,4 @@ { - "keyboard_name": "Protokeeb", "usb": { "pid": "0x1717", "device_version": "1.0.0", @@ -52,7 +51,7 @@ "label": "7", "matrix": [0, 0], "x": 0, - "y": 0, + "y": 1.3, "w": 1, "h": 1 }, @@ -60,7 +59,7 @@ "label": "8", "matrix": [0, 1], "x": 1, - "y": 0, + "y": 1.3, "w": 1, "h": 1 }, @@ -68,7 +67,7 @@ "label": "9", "matrix": [0, 2], "x": 2, - "y": 0, + "y": 1.3, "w": 1, "h": 1 }, @@ -76,7 +75,7 @@ "label": "/", "matrix": [0, 3], "x": 3, - "y": 0, + "y": 1.3, "w": 1, "h": 1 }, @@ -84,7 +83,7 @@ "label": "4", "matrix": [1, 0], "x": 0, - "y": 1, + "y": 2.3, "w": 1, "h": 1 }, @@ -92,7 +91,7 @@ "label": "5", "matrix": [1, 1], "x": 1, - "y": 1, + "y": 2.3, "w": 1, "h": 1 }, @@ -100,7 +99,7 @@ "label": "6", "matrix": [1, 2], "x": 2, - "y": 1, + "y": 2.3, "w": 1, "h": 1 }, @@ -108,7 +107,7 @@ "label": "*", "matrix": [1, 3], "x": 3, - "y": 1, + "y": 2.3, "w": 1, "h": 1 }, @@ -116,7 +115,7 @@ "label": "1", "matrix": [2, 0], "x": 0, - "y": 2, + "y": 3.3, "w": 1, "h": 1 }, @@ -124,7 +123,7 @@ "label": "2", "matrix": [2, 1], "x": 1, - "y": 2, + "y": 3.3, "w": 1, "h": 1 }, @@ -132,7 +131,7 @@ "label": "3", "matrix": [2, 2], "x": 2, - "y": 2, + "y": 3.3, "w": 1, "h": 1 }, @@ -140,7 +139,7 @@ "label": "-", "matrix": [2, 3], "x": 3, - "y": 2, + "y": 3.3, "w": 1, "h": 1 }, @@ -148,7 +147,7 @@ "label": "MO(1)", "matrix": [3, 0], "x": 0, - "y": 3, + "y": 4.3, "w": 1, "h": 1 }, @@ -156,7 +155,7 @@ "label": "0", "matrix": [3, 1], "x": 1, - "y": 3, + "y": 4.3, "w": 1, "h": 1 }, @@ -164,7 +163,7 @@ "label": "+", "matrix": [3, 2], "x": 2, - "y": 3, + "y": 4.3, "w": 1, "h": 1 }, @@ -172,7 +171,7 @@ "label": "N.ENT", "matrix": [3, 3], "x": 3, - "y": 3, + "y": 4.3, "w": 1, "h": 1 } @@ -234,8 +233,9 @@ "layers": { "blink": false, "enabled": false, - "max": 8 + "max": 4 }, + "led_map": [0, 1, 2, 3], "max_brightness": 127, "rgbw": false, "sleep": true, diff --git a/keyboards/protokeeb/rev1/rev1.h b/keyboards/protokeeb/rev1/rev1.h index 66c087ed3f3..1d09f7d7c31 100644 --- a/keyboards/protokeeb/rev1/rev1.h +++ b/keyboards/protokeeb/rev1/rev1.h @@ -17,18 +17,3 @@ #pragma once #include "quantum.h" -// #define ____ KC_NO - -/* -#define LAYOUT( \ - k00, k01, k02, k03, \ - k10, k11, k12, k13, \ - k20, k21, k22, k23, \ - k30, k31, k32, k33 \ -) { \ - { k00, k01, k02, k03, }, \ - { k10, k11, k12, k13, }, \ - { k20, k21, k22, k23, }, \ - { k30, k31, k32, k33, } \ -} -*/ \ No newline at end of file diff --git a/keyboards/protokeeb/rules.mk b/keyboards/protokeeb/rules.mk index 639ba18ee7d..68691d55fca 100644 --- a/keyboards/protokeeb/rules.mk +++ b/keyboards/protokeeb/rules.mk @@ -35,15 +35,16 @@ OS_DETECTION_ENABLE = yes # Rotary Encoder support ENCODER_ENABLE = yes -# Rotary Encoder Keymap support -ENCODER_MAP_ENABLE = yes # DIP Switch support # Note: Here using for Encoder Push Button Functionality #DIP_SWITCH_ENABLE = yes -# DIP Switch Keymap support -DIP_SWITCH_MAP_ENABLE = no # Refer: USB Endpoint Limitations #KEYBOARD_SHARED_EP = yes -#MOUSE_SHARED_EP = no \ No newline at end of file +#MOUSE_SHARED_EP = no + +# To reduce firmware size, consider turning on link time optimization +# Note: This may have unexpected side effects on keyboards +# using ARM processors, so test thoroughly with it enabled and disabled. +# LTO_ENABLE = yes \ No newline at end of file