diff --git a/keyboards/protokeeb/keymaps/debug/keymap.c b/keyboards/protokeeb/keymaps/debug/keymap.c index efd4528eb7b..ea46d8bd614 100644 --- a/keyboards/protokeeb/keymaps/debug/keymap.c +++ b/keyboards/protokeeb/keymaps/debug/keymap.c @@ -15,7 +15,38 @@ */ /* Protokeeb v1.0 - * Keymap: Debug Mode + * Keymap: Debug */ #include QMK_KEYBOARD_H +#include "quantum.h" + +enum protokeeb_keymap_layers { + LAYER_BASE = 0, + LAYER_LOWER = 1, +}; + +#define LOWER MO(LAYER_LOWER) + +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 + ), +}; + +#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) }, +}; +#endif \ No newline at end of file diff --git a/keyboards/protokeeb/keymaps/midi/config.h b/keyboards/protokeeb/keymaps/midi/config.h index 02ef0312c1a..00a0418c4cc 100644 --- a/keyboards/protokeeb/keymaps/midi/config.h +++ b/keyboards/protokeeb/keymaps/midi/config.h @@ -1,4 +1,4 @@ -/* Protokeeb Copyright 2024 A-Tech Officials +/* Protokeeb Copyright 2024 A-Tech Officials (@atechofficials) * 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 3 of the License, or diff --git a/keyboards/protokeeb/keymaps/via/config.h b/keyboards/protokeeb/keymaps/via/config.h index 702200693e3..4daa1b38b00 100644 --- a/keyboards/protokeeb/keymaps/via/config.h +++ b/keyboards/protokeeb/keymaps/via/config.h @@ -1,4 +1,4 @@ -/* Protokeeb Copyright 2024 A-Tech Officials +/* Protokeeb Copyright 2024 A-Tech Officials (@atechofficials) * 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 3 of the License, or diff --git a/keyboards/protokeeb/keymaps/via/keymap.c b/keyboards/protokeeb/keymaps/via/keymap.c index 513abbd8e3c..7f9535564cd 100644 --- a/keyboards/protokeeb/keymaps/via/keymap.c +++ b/keyboards/protokeeb/keymaps/via/keymap.c @@ -14,6 +14,10 @@ * If not, see . */ +/* Protokeeb v1.0 + * Keymap: Via + */ + #include QMK_KEYBOARD_H #include "quantum.h" @@ -26,20 +30,6 @@ enum protokeeb_keymap_layers { #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, @@ -55,14 +45,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, RGB_MODE_SWIRL, QK_DEBUG_TOGGLE, QK_BOOT ), - [DYNAMIC_LAYER1] = LAYOUT( /* Empty for dynamic keymaps */ + [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 */ + [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, diff --git a/keyboards/protokeeb/rev1/config.h b/keyboards/protokeeb/rev1/config.h index 515d6f89980..45deb3af8d6 100644 --- a/keyboards/protokeeb/rev1/config.h +++ b/keyboards/protokeeb/rev1/config.h @@ -1,4 +1,4 @@ -/* Protokeeb Copyright 2024 A-Tech Officials +/* Protokeeb Copyright 2024 A-Tech Officials (@atechofficials) * 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 3 of the License, or @@ -155,10 +155,10 @@ //#define RP2040_FLASH_GENERIC_03H /* Mechanical lcoking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE +//#define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE +//#define LOCKING_RESYNC_ENABLE #if defined (ENCODER_ENABLE) //#define ENCODER_PAD_A { GP12 } diff --git a/keyboards/protokeeb/rev1/halconf.h b/keyboards/protokeeb/rev1/halconf.h index 4634b0e16ff..2996e46b2ba 100644 --- a/keyboards/protokeeb/rev1/halconf.h +++ b/keyboards/protokeeb/rev1/halconf.h @@ -1,4 +1,4 @@ -/* Protokeeb Copyright 2024 A-Tech Officials +/* Protokeeb Copyright 2024 A-Tech Officials (@atechofficials) * 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 3 of the License, or diff --git a/keyboards/protokeeb/rev1/info.json b/keyboards/protokeeb/rev1/info.json index eab8209c721..d2f6623b53d 100644 --- a/keyboards/protokeeb/rev1/info.json +++ b/keyboards/protokeeb/rev1/info.json @@ -28,7 +28,8 @@ "rgblight": true, "extrakey": true, "mousekey": false, - "nkro": true + "nkro": true, + "midi": false }, "qmk": { "locking": { @@ -51,7 +52,7 @@ "label": "7", "matrix": [0, 0], "x": 0, - "y": 1.3, + "y": 0, "w": 1, "h": 1 }, @@ -59,7 +60,7 @@ "label": "8", "matrix": [0, 1], "x": 1, - "y": 1.3, + "y": 0, "w": 1, "h": 1 }, @@ -67,7 +68,7 @@ "label": "9", "matrix": [0, 2], "x": 2, - "y": 1.3, + "y": 0, "w": 1, "h": 1 }, @@ -75,7 +76,7 @@ "label": "/", "matrix": [0, 3], "x": 3, - "y": 1.3, + "y": 0, "w": 1, "h": 1 }, @@ -83,7 +84,7 @@ "label": "4", "matrix": [1, 0], "x": 0, - "y": 2.3, + "y": 1, "w": 1, "h": 1 }, @@ -91,7 +92,7 @@ "label": "5", "matrix": [1, 1], "x": 1, - "y": 2.3, + "y": 1, "w": 1, "h": 1 }, @@ -99,7 +100,7 @@ "label": "6", "matrix": [1, 2], "x": 2, - "y": 2.3, + "y": 1, "w": 1, "h": 1 }, @@ -107,7 +108,7 @@ "label": "*", "matrix": [1, 3], "x": 3, - "y": 2.3, + "y": 1, "w": 1, "h": 1 }, @@ -115,7 +116,7 @@ "label": "1", "matrix": [2, 0], "x": 0, - "y": 3.3, + "y": 2, "w": 1, "h": 1 }, @@ -123,7 +124,7 @@ "label": "2", "matrix": [2, 1], "x": 1, - "y": 3.3, + "y": 2, "w": 1, "h": 1 }, @@ -131,7 +132,7 @@ "label": "3", "matrix": [2, 2], "x": 2, - "y": 3.3, + "y": 2, "w": 1, "h": 1 }, @@ -139,7 +140,7 @@ "label": "-", "matrix": [2, 3], "x": 3, - "y": 3.3, + "y": 2, "w": 1, "h": 1 }, @@ -147,7 +148,7 @@ "label": "MO(1)", "matrix": [3, 0], "x": 0, - "y": 4.3, + "y": 3, "w": 1, "h": 1 }, @@ -155,7 +156,7 @@ "label": "0", "matrix": [3, 1], "x": 1, - "y": 4.3, + "y": 3, "w": 1, "h": 1 }, @@ -163,7 +164,7 @@ "label": "+", "matrix": [3, 2], "x": 2, - "y": 4.3, + "y": 3, "w": 1, "h": 1 }, @@ -171,7 +172,7 @@ "label": "N.ENT", "matrix": [3, 3], "x": 3, - "y": 4.3, + "y": 3, "w": 1, "h": 1 } @@ -235,7 +236,7 @@ "enabled": false, "max": 4 }, - "led_map": [0, 1, 2, 3], + "led_map": [3, 2, 1, 0], "max_brightness": 127, "rgbw": false, "sleep": true, diff --git a/keyboards/protokeeb/rev1/mcuconf.h b/keyboards/protokeeb/rev1/mcuconf.h index 9ccd9c48aa6..59b14b5b3fb 100644 --- a/keyboards/protokeeb/rev1/mcuconf.h +++ b/keyboards/protokeeb/rev1/mcuconf.h @@ -1,4 +1,4 @@ -/* Protokeeb Copyright 2024 A-Tech Officials +/* Protokeeb Copyright 2024 A-Tech Officials (@atechofficials) * 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 3 of the License, or diff --git a/keyboards/protokeeb/rev1/rev1.c b/keyboards/protokeeb/rev1/rev1.c index c8869f1285e..58f05128c92 100644 --- a/keyboards/protokeeb/rev1/rev1.c +++ b/keyboards/protokeeb/rev1/rev1.c @@ -1,4 +1,4 @@ -/* Protokeeb Copyright 2024 A-Tech Officials +/* Protokeeb Copyright 2024 A-Tech Officials (@atechofficials) * 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 3 of the License, or diff --git a/keyboards/protokeeb/rev1/rev1.h b/keyboards/protokeeb/rev1/rev1.h index 1d09f7d7c31..70a8257b47e 100644 --- a/keyboards/protokeeb/rev1/rev1.h +++ b/keyboards/protokeeb/rev1/rev1.h @@ -1,4 +1,4 @@ -/* Protokeeb Copyright 2024 A-Tech Officials +/* Protokeeb Copyright 2024 A-Tech Officials (@atechofficials) * 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 3 of the License, or diff --git a/keyboards/protokeeb/rev1/rules.mk b/keyboards/protokeeb/rev1/rules.mk index bebac097109..c35911b2a2e 100644 --- a/keyboards/protokeeb/rev1/rules.mk +++ b/keyboards/protokeeb/rev1/rules.mk @@ -4,24 +4,5 @@ # Default keyboard folder DEFAULT_FOLDER = protokeeb/rev1 -# Mouse keys -#MOUSEKEY_ENABLE = no - -# Audio Control and System Control keys -#EXTRAKEY_ENABLE = yes - -# Console for keyboard debug -#CONSOLE_ENABLE = no - -# Commands for debug and configuration -#COMMAND_ENABLE = no - -# Enable keyboard RGB underglow -#RGBLIGHT_ENABLE = yes -#RGBLIGHT_DRIVER = ws2812 - -# Enable Audio output -#AUDIO_ENABLE = no - -# MIDI Enable -MIDI_ENABLE = no \ No newline at end of file +# Custom scanning of matrix +#CUSTOM_MATRIX = lite diff --git a/keyboards/protokeeb/rules.mk b/keyboards/protokeeb/rules.mk index 68691d55fca..3edb570ac40 100644 --- a/keyboards/protokeeb/rules.mk +++ b/keyboards/protokeeb/rules.mk @@ -1,50 +1,8 @@ # Build Options # Change yes to no to diable feature -# Custom scanning of matrix -#CUSTOM_MATRIX = lite - -# SPI Flash driver -#FLASH_DRIVER = spi - -# EEPROM driver -#EEPROM_DRIVER = spi -#EEPROM_DRIVER = wear_leveling -#WEAR_LEVELING_DRIVER = spi_flash - -# Debounce Method -#DEBOUNCE_TYPE = sym_defer_g # Default Method - # OS detection OS_DETECTION_ENABLE = yes -# Enable Bootmagic Lite -#BOOTMAGIC_ENABLE = yes - -# Development Board used -#BOARD = GENERIC_RP_RP2040 - -# Bootlader Selection -#BOOTLOADER = rp2040 - -# Enable N-Key Rollover -#NKRO_ENABLE = yes - -# ARGB LED Driver used -#WS2812_DRIVER = vendor # For RP2040 MCU - # Rotary Encoder support ENCODER_ENABLE = yes - -# DIP Switch support -# Note: Here using for Encoder Push Button Functionality -#DIP_SWITCH_ENABLE = yes - -# Refer: USB Endpoint Limitations -#KEYBOARD_SHARED_EP = yes -#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