From bb2704c719ceb3546d8952f6583f318e81f28f20 Mon Sep 17 00:00:00 2001 From: gzowski Date: Thu, 9 Nov 2023 22:41:15 +0000 Subject: [PATCH 01/75] Create file --- keyboards/proteus67/file | 1 + 1 file changed, 1 insertion(+) create mode 100644 keyboards/proteus67/file diff --git a/keyboards/proteus67/file b/keyboards/proteus67/file new file mode 100644 index 000000000000..f73f3093ff86 --- /dev/null +++ b/keyboards/proteus67/file @@ -0,0 +1 @@ +file From 346250a3d48c643e748998a25538d916492d7954 Mon Sep 17 00:00:00 2001 From: gzowski Date: Thu, 9 Nov 2023 22:42:19 +0000 Subject: [PATCH 02/75] Add files via upload --- keyboards/proteus67/config.h | 30 ++++++ keyboards/proteus67/info.json | 122 ++++++++++++++++++++++++ keyboards/proteus67/proteus67.c | 4 + keyboards/proteus67/proteus67.h | 21 +++++ keyboards/proteus67/proteus67.json | 143 +++++++++++++++++++++++++++++ keyboards/proteus67/readme.md | 29 ++++++ keyboards/proteus67/rules.mk | 11 +++ 7 files changed, 360 insertions(+) create mode 100644 keyboards/proteus67/config.h create mode 100644 keyboards/proteus67/info.json create mode 100644 keyboards/proteus67/proteus67.c create mode 100644 keyboards/proteus67/proteus67.h create mode 100644 keyboards/proteus67/proteus67.json create mode 100644 keyboards/proteus67/readme.md create mode 100644 keyboards/proteus67/rules.mk diff --git a/keyboards/proteus67/config.h b/keyboards/proteus67/config.h new file mode 100644 index 000000000000..c4e872d3c06d --- /dev/null +++ b/keyboards/proteus67/config.h @@ -0,0 +1,30 @@ +/* +Copyright 2012 Jun Wako +Copyright 2015 Jack Humbert + +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 . +*/ + +#pragma once + +#define ENCODER_DIRECTION_FLIP +#define ENCODER_MAP_KEY_DELAY 10 +#define ENCODER_DEFAULT_POS 0x3 +#define RGB_DISABLE_TIMEOUT 900000 // milliseconds +#define RGB_DISABLE_WHEN_USB_SUSPENDED 1 +#define RGBLIGHT_LAYERS +#define RGBLIGHT_MAX_LAYERS 3 +#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET // Activates the double-tap behavior +#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 200U // Timeout window in ms in which the double tap can occur. +#define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF diff --git a/keyboards/proteus67/info.json b/keyboards/proteus67/info.json new file mode 100644 index 000000000000..d7aa7d412186 --- /dev/null +++ b/keyboards/proteus67/info.json @@ -0,0 +1,122 @@ +{ + "keyboard_name": "Proteus67", + "manufacturer": "gzowski", + "url": "https://github.com/gzowski", + "maintainer": "gzowski", + "usb": { + "vid": "0x7072", + "pid": "0x6F64", + "device_version": "1.0.0" + }, + "diode_direction": "COL2ROW", + "matrix_pins": { + "cols": ["D1", "D0", "D4", "C6", "D7", "E6", "B4", "B2", "B3", "B1", "F7", "F6", "F5", "F4"], + "rows": ["B7", "D5", "C7", "F1", "F0"] + }, + "features": { + "encoder": true + }, + "encoder": { + "enabled": true, + "rotary": [ + {"pin_a": "B5", "pin_b": "B6", "resolution": 4} + ] + }, + "ws2812": { + "pin": "D3" + }, + "rgblight": { + "saturation_steps": 5, + "brightness_steps": 5, + "led_count": 21, + "max_brightness": 255, + "sleep": true, + "animations": { + "breathing": true, + "rainbow_mood": true, + "rainbow_swirl": true, + "snake": true, + "knight": true, + "christmas": true, + "static_gradient": true, + "rgb_test": false, + "alternating": true, + "twinkle": true + } + }, + "processor": "atmega32u4", + "bootloader": "caterina", + "layouts": { + "LAYOUT_5x14": { + "layout": [ + {"x": 0, "y": 0}, + {"x": 1, "y": 0}, + {"x": 2, "y": 0}, + {"x": 3, "y": 0}, + {"x": 4, "y": 0}, + {"x": 5, "y": 0}, + {"x": 6, "y": 0}, + {"x": 7, "y": 0}, + {"x": 8, "y": 0}, + {"x": 9, "y": 0}, + {"x": 10, "y": 0}, + {"x": 11, "y": 0}, + {"x": 12, "y": 0}, + {"x": 13, "y": 0}, + {"x": 0, "y": 1}, + {"x": 1, "y": 1}, + {"x": 2, "y": 1}, + {"x": 3, "y": 1}, + {"x": 4, "y": 1}, + {"x": 5, "y": 1}, + {"x": 6, "y": 1}, + {"x": 7, "y": 1}, + {"x": 8, "y": 1}, + {"x": 9, "y": 1}, + {"x": 10, "y": 1}, + {"x": 11, "y": 1}, + {"x": 12, "y": 1}, + {"x": 13, "y": 1}, + {"x": 0, "y": 2}, + {"x": 1, "y": 2}, + {"x": 2, "y": 2}, + {"x": 3, "y": 2}, + {"x": 4, "y": 2}, + {"x": 5, "y": 2}, + {"x": 6, "y": 2}, + {"x": 7, "y": 2}, + {"x": 8, "y": 2}, + {"x": 9, "y": 2}, + {"x": 10, "y": 2}, + {"x": 11, "y": 2}, + {"x": 12, "y": 2}, + {"x": 13, "y": 2}, + {"x": 0, "y": 3}, + {"x": 1, "y": 3}, + {"x": 2, "y": 3}, + {"x": 3, "y": 3}, + {"x": 4, "y": 3}, + {"x": 5, "y": 3}, + {"x": 6, "y": 3}, + {"x": 7, "y": 3}, + {"x": 8, "y": 3}, + {"x": 9, "y": 3}, + {"x": 10, "y": 3}, + {"x": 11, "y": 3}, + {"x": 12, "y": 3}, + {"x": 13, "y": 3}, + {"x": 0, "y": 4}, + {"x": 1, "y": 4}, + {"x": 2, "y": 4}, + {"x": 3, "y": 4}, + {"x": 4, "y": 4}, + {"x": 5, "y": 4}, + {"x": 7, "y": 4}, + {"x": 8, "y": 4}, + {"x": 9, "y": 4}, + {"x": 10, "y": 4}, + {"x": 11, "y": 4} + ] + } + } +} diff --git a/keyboards/proteus67/proteus67.c b/keyboards/proteus67/proteus67.c new file mode 100644 index 000000000000..cc24e03915bc --- /dev/null +++ b/keyboards/proteus67/proteus67.c @@ -0,0 +1,4 @@ +// Copyright 2022 Matthew Dews (@matthew-dews) +// SPDX-License-Identifier: GPL-2.0-or-later + +#include "proteus67.h" diff --git a/keyboards/proteus67/proteus67.h b/keyboards/proteus67/proteus67.h new file mode 100644 index 000000000000..e0e6832d8534 --- /dev/null +++ b/keyboards/proteus67/proteus67.h @@ -0,0 +1,21 @@ +// CopyKight 2022 Matthew Dews (@matthew-dews) +// SPDX-Kicense-IdentifieK: GPK-2.0-oK-KateK +#pragma once + +#include "quantum.h" + +#define XXX KC_NO + +#define LAYOUT_5x14( \ + K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K10, K11, K12, K13, \ + K14, K15, K16, K17, K18, K19, K20, K21, K22, K23, K24, K25, K26, K27, \ + K28, K29, K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K40, K41, \ + K42, K43, K44, K45, K46, K47, K48, K49, K50, K51, K52, K53, K54, K55, \ + K56, K57, K58, K59, K60, K61, K62, K63, K64, K65, K66 \ +) { \ + { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K10, K11, K12 ,K13 }, \ + { K14, K15, K16, K17, K18, K19, K20, K21, K22, K23, K24, K25, K26, K27 }, \ + { K28, K29, K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K40, K41 }, \ + { K42, K43, K44, K45, K46, K47, K48, K49, K50, K51, K52, K53, K54, K55 }, \ + { K56, K57, K58, K59, K60, K61, XXX, K62, K63, K64, K65, K66, XXX, XXX }, \ +} diff --git a/keyboards/proteus67/proteus67.json b/keyboards/proteus67/proteus67.json new file mode 100644 index 000000000000..93032324d4e6 --- /dev/null +++ b/keyboards/proteus67/proteus67.json @@ -0,0 +1,143 @@ +[ + [ + { + "c": "#777777" + }, + "0,0\n\n\n0,0", + { + "c": "#cccccc" + }, + "0,1", + "0,2", + "0,3", + "0,4", + "0,5", + "0,6", + { + "x": 2 + }, + "0,7", + "0,8", + "0,9", + "0,10", + "0,11", + "0,12", + "0,13" + ], + [ + { + "c": "#aaaaaa" + }, + "1,0", + { + "c": "#cccccc" + }, + "1,1", + "1,2", + "1,3", + "1,4", + "1,5", + "1,6", + { + "x": 2 + }, + "1,7", + "1,8", + "1,9", + "1,10", + "1,11", + "1,12", + "1,13" + ], + [ + { + "c": "#aaaaaa" + }, + "2,0", + { + "c": "#cccccc" + }, + "2,1", + "2,2", + "2,3", + "2,4", + "2,5", + "2,6", + { + "x": 2 + }, + "2,7", + "2,8", + "2,9", + "2,10", + "2,11", + "2,12", + { + "c": "#aaaaaa" + }, + "2,13" + ], + [ + "3,0", + { + "c": "#cccccc" + }, + "3,1", + "3,2", + "3,3", + "3,4", + "3,5", + "3,6", + { + "x": 2 + }, + "3,7", + "3,8", + "3,9", + "3,10", + "3,11", + "3,12", + { + "c": "#aaaaaa" + }, + "3,13" + ], + [ + { + "y": -0.25, + "x": 7.5, + "c": "#cccccc" + }, + "4,5\n\n\n\n\n\n\n\n\ne0" + ], + [ + { + "y": -0.25, + "x": 0.5, + "c": "#aaaaaa" + }, + "4,0", + "4,1", + "4,2", + "4,3", + { + "x": 0.5, + "c": "#777777", + "w": 2 + }, + "4,4\n\n\n1,0", + { + "x": 2, + "w": 2 + }, + "4,7\n\n\n1,1", + { + "x": 0.5, + "c": "#aaaaaa" + }, + "4,8", + "4,9", + "4,10", + "4,11" + ] +] \ No newline at end of file diff --git a/keyboards/proteus67/readme.md b/keyboards/proteus67/readme.md new file mode 100644 index 000000000000..f305b75071d3 --- /dev/null +++ b/keyboards/proteus67/readme.md @@ -0,0 +1,29 @@ +# proteus67 + +![proteus67](https://i.imgur.com/mYhl7Ja.png) + +*A short description of the keyboard/project* + +* Keyboard Maintainer: [James Gzowski](https://github.com/gzowski) +* Hardware Supported: Elite-C, Elite-Pi or equivilent Pro-Micro with additional I/O along bottom. +* Build Guide: [Proteus67](https://github.com/gzowski/Proteus67) + +Generate firmware: + +Default firmware: +qmk flash --kb proteus67 --km default + +VIA supported firmware: +qmk flash --kb proteus67 --km via + +* Not curently listed within VIA, requires design json from [here](https://github.com/gzowski/Proteus67/blob/main/QMK%20Firmware/via.json) +* Enable design mode on [usevia.app](https://usevia.app/settings) and Load Draft definition within the design tab +* Choose the json file linked above. + +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). + +## Bootloader + +* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard +* **Physical reset button**: Briefly press the button on the back of the PCB, if using a RP2040 press repeatidly to enter boot mode. +* **Hold down boot loader button on MCU** Hold down the boot loader button on the MCU while plugging in the keyboard diff --git a/keyboards/proteus67/rules.mk b/keyboards/proteus67/rules.mk new file mode 100644 index 000000000000..0584a63f4bcf --- /dev/null +++ b/keyboards/proteus67/rules.mk @@ -0,0 +1,11 @@ +MOUSEKEY_ENABLE = yes # Mouse keys +EXTRAKEY_ENABLE = yes # Audio control and System control +COMMAND_ENABLE = yes +NKRO_ENABLE = yes # Enable N-Key Rollover +VIA_ENABLE = yes #If you wish to use the VIA keymap +AUTO_SHIFT_ENABLE = no +ENCODER_MAP_ENABLE = yes +RGBLIGHT_ENABLE = yes +PIN_COMPATIBLE = elite_c +CONVERT_TO = elite_pi +BOOTMAGIC_ENABLE = yes From 11eebfcb81ce0b58123af41ff3b4b04aea78e267 Mon Sep 17 00:00:00 2001 From: gzowski Date: Thu, 9 Nov 2023 22:43:37 +0000 Subject: [PATCH 03/75] Create keymap.c --- keyboards/proteus67/keymaps/default/keymap.c | 1 + 1 file changed, 1 insertion(+) create mode 100644 keyboards/proteus67/keymaps/default/keymap.c diff --git a/keyboards/proteus67/keymaps/default/keymap.c b/keyboards/proteus67/keymaps/default/keymap.c new file mode 100644 index 000000000000..8b137891791f --- /dev/null +++ b/keyboards/proteus67/keymaps/default/keymap.c @@ -0,0 +1 @@ + From 8e608ae066bd8573ea7798c5c199071ba79f2a77 Mon Sep 17 00:00:00 2001 From: gzowski Date: Thu, 9 Nov 2023 22:44:16 +0000 Subject: [PATCH 04/75] Create keymap.c --- keyboards/proteus67/keymaps/via/keymap.c | 1 + 1 file changed, 1 insertion(+) create mode 100644 keyboards/proteus67/keymaps/via/keymap.c diff --git a/keyboards/proteus67/keymaps/via/keymap.c b/keyboards/proteus67/keymaps/via/keymap.c new file mode 100644 index 000000000000..8b137891791f --- /dev/null +++ b/keyboards/proteus67/keymaps/via/keymap.c @@ -0,0 +1 @@ + From fc34a251031a1724bf7fa1c24e6c873331221cf6 Mon Sep 17 00:00:00 2001 From: gzowski Date: Thu, 9 Nov 2023 22:44:33 +0000 Subject: [PATCH 05/75] Add files via upload --- keyboards/proteus67/keymaps/via/keymap.c | 76 ++++++++++++++++++++++++ 1 file changed, 76 insertions(+) diff --git a/keyboards/proteus67/keymaps/via/keymap.c b/keyboards/proteus67/keymaps/via/keymap.c index 8b137891791f..48a53c5aef05 100644 --- a/keyboards/proteus67/keymaps/via/keymap.c +++ b/keyboards/proteus67/keymaps/via/keymap.c @@ -1 +1,77 @@ +// Copyright 2022 Matthew Dews (@matthew-dews) +// SPDX-License-Identifier: GPL-2.0-or-later +#include QMK_KEYBOARD_H +enum custom_layer { + _QWERTY, + _ADJUST, + _RAISE, +}; + +#define RAISE MO(_RAISE) +#define ADJUST MO(_ADJUST) + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [_QWERTY] = LAYOUT_5x14( + KC_ESC , KC_1 ,KC_2 ,KC_3 , KC_4 , KC_5 , KC_MINUS , KC_EQL , KC_6 , KC_7 , KC_8 , KC_9 , KC_0 , KC_GRV , + KC_TAB , KC_Q ,KC_W ,KC_E , KC_R , KC_T , KC_END , KC_HOME , KC_Y , KC_U , KC_I , KC_O , KC_P ,KC_MINUS, + KC_LCTL, KC_A ,KC_S ,KC_D , KC_F , KC_G , KC_PGDN , KC_PGUP , KC_H , KC_J , KC_K , KC_L , KC_SCLN,KC_QUOT , + KC_LSFT, KC_Z ,KC_X ,KC_C , KC_V , KC_B , KC_LBRC, KC_RBRC, KC_N , KC_M , KC_COMM , KC_DOT , KC_SLSH, KC_RSFT, + KC_NO , MO(_ADJUST) ,KC_LGUI,KC_LALT, KC_SPC , KC_MUTE, KC_ENT , KC_BSPC , MO(_RAISE) , KC_INS , KC_DEL +), + [_ADJUST] = LAYOUT_5x14( + RGB_TOG , RGB_HUI ,RGB_HUD ,RGB_SAI , RGB_SAD , RGB_VAI , RGB_VAD , RGB_M_P , RGB_M_B , RGB_M_R , RGB_M_SW , RGB_M_K , RGB_M_X , RGB_M_G , + KC_TRNS , KC_TRNS, KC_TRNS ,KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_BTN1 , KC_MS_U , KC_BTN2 , KC_TRNS ,KC_TRNS, + KC_TRNS, KC_TRNS ,KC_TRNS ,KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_MS_L , KC_MS_D , KC_MS_R , KC_SCLN,KC_QUOT , + 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_NUBS, KC_TRNS, + KC_TRNS , KC_TRNS ,KC_TRNS,KC_TRNS, KC_TRNS , RGB_RMOD, KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS +), + [_RAISE] = LAYOUT_5x14( + KC_TRNS , KC_F1 ,KC_F2 ,KC_F3 , KC_F4 , KC_F5 , KC_TRNS , KC_TRNS , KC_F6 , KC_F7 , KC_F8 , KC_F9 , KC_F10 , KC_GRV , + KC_TRNS , KC_TRNS, KC_TRNS ,KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_UP , 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_LEFT , KC_DOWN , KC_RIGHT , KC_SCLN,KC_QUOT , + 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_NUBS, KC_TRNS, + KC_TRNS , KC_TRNS ,KC_TRNS,KC_TRNS, KC_TRNS , RGB_MOD, 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] = { + [_QWERTY] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, + [_ADJUST] = { ENCODER_CCW_CW(RGB_HUD, RGB_HUI)}, + [_RAISE] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI)} +}; +#endif + +const uint8_t RGBLED_RAINBOW_MOOD_INTERVALS[] PROGMEM = {50, 20, 10}; + +// MO(_ADJUST) +const rgblight_segment_t PROGMEM backlight_layer_adjust[] = RGBLIGHT_LAYER_SEGMENTS( + {0, 4, HSV_CYAN} +); +// MO(_RAISE) +const rgblight_segment_t PROGMEM backlight_layer_raise[] = RGBLIGHT_LAYER_SEGMENTS( + {0, 4, HSV_PURPLE} +); + +const rgblight_segment_t* const PROGMEM set_backlight_mode[] = RGBLIGHT_LAYERS_LIST( + backlight_layer_adjust, + backlight_layer_raise +); + +layer_state_t default_layer_state_set_user(layer_state_t state) { + rgblight_sethsv_noeeprom(HSV_GREEN); + +return state; +} +layer_state_t layer_state_set_user(layer_state_t state) { + rgblight_set_layer_state(0, layer_state_cmp(state, _ADJUST)); + rgblight_set_layer_state(1, layer_state_cmp(state, _RAISE)); + return state; +} + +void keyboard_post_init_user(void) { + rgblight_enable_noeeprom(); + rgblight_sethsv(HSV_GREEN); + rgblight_layers = set_backlight_mode; +} From 6d898c2998bed5fcca038bc49e9b7a57012182c8 Mon Sep 17 00:00:00 2001 From: gzowski Date: Thu, 9 Nov 2023 22:45:28 +0000 Subject: [PATCH 06/75] Add files via upload --- keyboards/proteus67/keymaps/default/keymap.c | 77 ++++++++++++++++++++ 1 file changed, 77 insertions(+) diff --git a/keyboards/proteus67/keymaps/default/keymap.c b/keyboards/proteus67/keymaps/default/keymap.c index 8b137891791f..be8950717a21 100644 --- a/keyboards/proteus67/keymaps/default/keymap.c +++ b/keyboards/proteus67/keymaps/default/keymap.c @@ -1 +1,78 @@ +// Copyright 2022 Matthew Dews (@matthew-dews) +// SPDX-License-Identifier: GPL-2.0-or-later +#include QMK_KEYBOARD_H +enum custom_layer { + _QWERTY, + _ADJUST, + _RAISE, +}; + +#define RAISE MO(_RAISE) +#define ADJUST MO(_ADJUST) + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [_QWERTY] = LAYOUT_5x14( + KC_ESC , KC_1 ,KC_2 ,KC_3 , KC_4 , KC_5 , KC_MINUS , KC_EQL , KC_6 , KC_7 , KC_8 , KC_9 , KC_0 , KC_GRV , + KC_TAB , KC_Q ,KC_W ,KC_E , KC_R , KC_T , KC_END , KC_HOME , KC_Y , KC_U , KC_I , KC_O , KC_P ,KC_MINUS, + KC_LCTL, KC_A ,KC_S ,KC_D , KC_F , KC_G , KC_PGDN , KC_PGUP , KC_H , KC_J , KC_K , KC_L , KC_SCLN,KC_QUOT , + KC_LSFT, KC_Z ,KC_X ,KC_C , KC_V , KC_B , KC_LBRC, KC_RBRC, KC_N , KC_M , KC_COMM , KC_DOT , KC_SLSH, KC_RSFT, + KC_NO , MO(_ADJUST) ,KC_LGUI,KC_LALT, KC_SPC , KC_MUTE, KC_ENT , KC_BSPC , MO(_RAISE) , KC_INS , KC_DEL +), + [_ADJUST] = LAYOUT_5x14( + RGB_TOG , RGB_HUI ,RGB_HUD ,RGB_SAI , RGB_SAD , RGB_VAI , RGB_VAD , RGB_M_P , RGB_M_B , RGB_M_R , RGB_M_SW , RGB_M_K , RGB_M_X , RGB_M_G , + KC_TRNS , KC_TRNS, KC_TRNS ,KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_BTN1 , KC_MS_U , KC_BTN2 , KC_TRNS ,KC_TRNS, + KC_TRNS, KC_TRNS ,KC_TRNS ,KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_MS_L , KC_MS_D , KC_MS_R , KC_SCLN,KC_QUOT , + 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_NUBS, KC_TRNS, + KC_TRNS , KC_TRNS ,KC_TRNS,KC_TRNS, KC_TRNS , RGB_RMOD, KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS +), + [_RAISE] = LAYOUT_5x14( + KC_TRNS , KC_F1 ,KC_F2 ,KC_F3 , KC_F4 , KC_F5 , KC_TRNS , KC_TRNS , KC_F6 , KC_F7 , KC_F8 , KC_F9 , KC_F10 , KC_GRV , + KC_TRNS , KC_TRNS, KC_TRNS ,KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_UP , 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_LEFT , KC_DOWN , KC_RIGHT , KC_SCLN,KC_QUOT , + 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_NUBS, KC_TRNS, + KC_TRNS , KC_TRNS ,KC_TRNS,KC_TRNS, KC_TRNS , RGB_MOD, 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] = { + [_QWERTY] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, + [_ADJUST] = { ENCODER_CCW_CW(RGB_HUD, RGB_HUI)}, + [_RAISE] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI)} +}; +#endif + +const uint8_t RGBLED_RAINBOW_MOOD_INTERVALS[] PROGMEM = {50, 20, 10}; + +// MO(_ADJUST) +const rgblight_segment_t PROGMEM backlight_layer_adjust[] = RGBLIGHT_LAYER_SEGMENTS( + {0, 4, HSV_RED} +); +// MO(_RAISE) +const rgblight_segment_t PROGMEM backlight_layer_raise[] = RGBLIGHT_LAYER_SEGMENTS( + {0, 4, HSV_BLUE} +); + +const rgblight_segment_t* const PROGMEM set_backlight_mode[] = RGBLIGHT_LAYERS_LIST( + backlight_layer_adjust, + backlight_layer_raise +); + +layer_state_t default_layer_state_set_user(layer_state_t state) { + rgblight_sethsv_noeeprom(HSV_GREEN); + +return state; +} +layer_state_t layer_state_set_user(layer_state_t state) { + rgblight_set_layer_state(0, layer_state_cmp(state, _ADJUST)); + rgblight_set_layer_state(1, layer_state_cmp(state, _RAISE)); + return state; +} + +void keyboard_post_init_user(void) { + rgblight_enable_noeeprom(); + rgblight_sethsv(HSV_GREEN); + rgblight_layers = set_backlight_mode; +} +; From 30d754d7b3143f3345885236ac49c62a64eec59b Mon Sep 17 00:00:00 2001 From: gzowski Date: Thu, 9 Nov 2023 22:46:02 +0000 Subject: [PATCH 07/75] Delete keyboards/proteus67/file --- keyboards/proteus67/file | 1 - 1 file changed, 1 deletion(-) delete mode 100644 keyboards/proteus67/file diff --git a/keyboards/proteus67/file b/keyboards/proteus67/file deleted file mode 100644 index f73f3093ff86..000000000000 --- a/keyboards/proteus67/file +++ /dev/null @@ -1 +0,0 @@ -file From d52e4b84a7a531edb0a3f1da36683a9ef15003bf Mon Sep 17 00:00:00 2001 From: gzowski Date: Thu, 9 Nov 2023 22:49:16 +0000 Subject: [PATCH 08/75] Update readme.md --- keyboards/proteus67/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/proteus67/readme.md b/keyboards/proteus67/readme.md index f305b75071d3..c10bea662e23 100644 --- a/keyboards/proteus67/readme.md +++ b/keyboards/proteus67/readme.md @@ -2,7 +2,7 @@ ![proteus67](https://i.imgur.com/mYhl7Ja.png) -*A short description of the keyboard/project* +* 67 key ortholinear split keyboard with rotary encoder * Keyboard Maintainer: [James Gzowski](https://github.com/gzowski) * Hardware Supported: Elite-C, Elite-Pi or equivilent Pro-Micro with additional I/O along bottom. From d942bec598c6c4ed8f1d62631fdadc890aed2ce8 Mon Sep 17 00:00:00 2001 From: gzowski Date: Fri, 10 Nov 2023 11:23:07 +0000 Subject: [PATCH 09/75] Update readme.md --- keyboards/proteus67/readme.md | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/keyboards/proteus67/readme.md b/keyboards/proteus67/readme.md index c10bea662e23..abb808c9c56b 100644 --- a/keyboards/proteus67/readme.md +++ b/keyboards/proteus67/readme.md @@ -8,13 +8,14 @@ * Hardware Supported: Elite-C, Elite-Pi or equivilent Pro-Micro with additional I/O along bottom. * Build Guide: [Proteus67](https://github.com/gzowski/Proteus67) -Generate firmware: +Make example for this keyboard (after setting up your build environment): -Default firmware: -qmk flash --kb proteus67 --km default + make proteus67:default + +Flashing example for this keyboard: + + make proteus67:default:flash -VIA supported firmware: -qmk flash --kb proteus67 --km via * Not curently listed within VIA, requires design json from [here](https://github.com/gzowski/Proteus67/blob/main/QMK%20Firmware/via.json) * Enable design mode on [usevia.app](https://usevia.app/settings) and Load Draft definition within the design tab From 0b5d8451a4938f921cb321956f5d789ab9f84142 Mon Sep 17 00:00:00 2001 From: gzowski Date: Fri, 10 Nov 2023 11:36:41 +0000 Subject: [PATCH 10/75] Update keymap.c --- keyboards/proteus67/keymaps/via/keymap.c | 30 ++++++++++++------------ 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/keyboards/proteus67/keymaps/via/keymap.c b/keyboards/proteus67/keymaps/via/keymap.c index 48a53c5aef05..c475c4ea11f6 100644 --- a/keyboards/proteus67/keymaps/via/keymap.c +++ b/keyboards/proteus67/keymaps/via/keymap.c @@ -13,25 +13,25 @@ enum custom_layer { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_QWERTY] = LAYOUT_5x14( - KC_ESC , KC_1 ,KC_2 ,KC_3 , KC_4 , KC_5 , KC_MINUS , KC_EQL , KC_6 , KC_7 , KC_8 , KC_9 , KC_0 , KC_GRV , - KC_TAB , KC_Q ,KC_W ,KC_E , KC_R , KC_T , KC_END , KC_HOME , KC_Y , KC_U , KC_I , KC_O , KC_P ,KC_MINUS, - KC_LCTL, KC_A ,KC_S ,KC_D , KC_F , KC_G , KC_PGDN , KC_PGUP , KC_H , KC_J , KC_K , KC_L , KC_SCLN,KC_QUOT , - KC_LSFT, KC_Z ,KC_X ,KC_C , KC_V , KC_B , KC_LBRC, KC_RBRC, KC_N , KC_M , KC_COMM , KC_DOT , KC_SLSH, KC_RSFT, - KC_NO , MO(_ADJUST) ,KC_LGUI,KC_LALT, KC_SPC , KC_MUTE, KC_ENT , KC_BSPC , MO(_RAISE) , KC_INS , KC_DEL + KC_ESC , KC_1 ,KC_2 ,KC_3 , KC_4 , KC_5 , KC_MINUS , KC_EQL , KC_6 , KC_7 , KC_8 , KC_9 , KC_0 , KC_GRV , + KC_TAB , KC_Q ,KC_W ,KC_E , KC_R , KC_T , KC_END , KC_HOME , KC_Y , KC_U , KC_I , KC_O , KC_P ,KC_MINUS, + KC_LCTL, KC_A ,KC_S ,KC_D , KC_F , KC_G , KC_PGDN , KC_PGUP , KC_H , KC_J , KC_K , KC_L , KC_SCLN,KC_QUOT , + KC_LSFT, KC_Z ,KC_X ,KC_C , KC_V , KC_B , KC_LBRC, KC_RBRC , KC_N , KC_M , KC_COMM , KC_DOT , KC_SLSH, KC_RSFT, + KC_NO ,MO(_ADJUST) ,KC_LGUI ,KC_LALT ,KC_SPC , KC_MUTE, KC_ENT , KC_BSPC , MO(_RAISE) , KC_INS , KC_DEL ), [_ADJUST] = LAYOUT_5x14( - RGB_TOG , RGB_HUI ,RGB_HUD ,RGB_SAI , RGB_SAD , RGB_VAI , RGB_VAD , RGB_M_P , RGB_M_B , RGB_M_R , RGB_M_SW , RGB_M_K , RGB_M_X , RGB_M_G , - KC_TRNS , KC_TRNS, KC_TRNS ,KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_BTN1 , KC_MS_U , KC_BTN2 , KC_TRNS ,KC_TRNS, - KC_TRNS, KC_TRNS ,KC_TRNS ,KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_MS_L , KC_MS_D , KC_MS_R , KC_SCLN,KC_QUOT , - 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_NUBS, KC_TRNS, - KC_TRNS , KC_TRNS ,KC_TRNS,KC_TRNS, KC_TRNS , RGB_RMOD, KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS + RGB_TOG, RGB_HUI ,RGB_HUD ,RGB_SAI ,RGB_SAD ,RGB_VAI ,RGB_VAD , RGB_M_P ,RGB_M_B ,RGB_M_R ,RGB_M_SW,RGB_M_K ,RGB_M_X ,RGB_M_G , + KC_TRNS, KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS , KC_TRNS ,KC_TRNS ,KC_BTN1 ,KC_MS_U ,KC_BTN2 ,KC_TRNS ,KC_TRNS , + KC_TRNS, KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS , KC_TRNS ,KC_TRNS ,KC_MS_L ,KC_MS_D ,KC_MS_R ,KC_SCLN ,KC_QUOT , + 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_NUBS ,KC_TRNS , + KC_TRNS ,KC_TRNS ,KC_TRNS, KC_TRNS, KC_TRNS , RGB_RMOD, KC_TRNS, KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ), [_RAISE] = LAYOUT_5x14( - KC_TRNS , KC_F1 ,KC_F2 ,KC_F3 , KC_F4 , KC_F5 , KC_TRNS , KC_TRNS , KC_F6 , KC_F7 , KC_F8 , KC_F9 , KC_F10 , KC_GRV , - KC_TRNS , KC_TRNS, KC_TRNS ,KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_UP , 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_LEFT , KC_DOWN , KC_RIGHT , KC_SCLN,KC_QUOT , - 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_NUBS, KC_TRNS, - KC_TRNS , KC_TRNS ,KC_TRNS,KC_TRNS, KC_TRNS , RGB_MOD, KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS + KC_TRNS, KC_F1 ,KC_F2 ,KC_F3 ,KC_F4 ,KC_F5 ,KC_TRNS , KC_TRNS ,KC_F6 ,KC_F7 ,KC_F8 ,KC_F9 ,KC_F10 ,KC_TRNS , + KC_TRNS, KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS , KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_UP ,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_LEFT ,KC_DOWN ,KC_RIGHT,KC_SCLN ,KC_QUOT , + 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_NUBS ,KC_TRNS , + KC_TRNS ,KC_TRNS ,KC_TRNS, KC_TRNS, KC_TRNS , RGB_MOD, KC_TRNS, KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ) }; From 1d27b2af7fe58e2a269a5bd745a060c4da8e9808 Mon Sep 17 00:00:00 2001 From: gzowski Date: Fri, 10 Nov 2023 11:37:34 +0000 Subject: [PATCH 11/75] Update keymap.c From 209390b6021003055ad1cbae430ceaa6e4180fc3 Mon Sep 17 00:00:00 2001 From: gzowski Date: Fri, 10 Nov 2023 13:53:29 +0000 Subject: [PATCH 12/75] Add files via upload --- keyboards/proteus67/config.h | 7 ------- keyboards/proteus67/rules.mk | 5 ----- 2 files changed, 12 deletions(-) diff --git a/keyboards/proteus67/config.h b/keyboards/proteus67/config.h index c4e872d3c06d..23a64456da9e 100644 --- a/keyboards/proteus67/config.h +++ b/keyboards/proteus67/config.h @@ -21,10 +21,3 @@ along with this program. If not, see . #define ENCODER_DIRECTION_FLIP #define ENCODER_MAP_KEY_DELAY 10 #define ENCODER_DEFAULT_POS 0x3 -#define RGB_DISABLE_TIMEOUT 900000 // milliseconds -#define RGB_DISABLE_WHEN_USB_SUSPENDED 1 -#define RGBLIGHT_LAYERS -#define RGBLIGHT_MAX_LAYERS 3 -#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET // Activates the double-tap behavior -#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 200U // Timeout window in ms in which the double tap can occur. -#define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF diff --git a/keyboards/proteus67/rules.mk b/keyboards/proteus67/rules.mk index 0584a63f4bcf..d2aa3931404c 100644 --- a/keyboards/proteus67/rules.mk +++ b/keyboards/proteus67/rules.mk @@ -2,10 +2,5 @@ MOUSEKEY_ENABLE = yes # Mouse keys EXTRAKEY_ENABLE = yes # Audio control and System control COMMAND_ENABLE = yes NKRO_ENABLE = yes # Enable N-Key Rollover -VIA_ENABLE = yes #If you wish to use the VIA keymap -AUTO_SHIFT_ENABLE = no -ENCODER_MAP_ENABLE = yes -RGBLIGHT_ENABLE = yes PIN_COMPATIBLE = elite_c -CONVERT_TO = elite_pi BOOTMAGIC_ENABLE = yes From 4e88685f8e63e0f497dfcc4bfe4f3602c729ed7c Mon Sep 17 00:00:00 2001 From: gzowski Date: Fri, 10 Nov 2023 13:54:02 +0000 Subject: [PATCH 13/75] Add files via upload --- keyboards/proteus67/keymaps/default/config.h | 5 +++++ keyboards/proteus67/keymaps/default/rules.mk | 3 +++ 2 files changed, 8 insertions(+) create mode 100644 keyboards/proteus67/keymaps/default/config.h create mode 100644 keyboards/proteus67/keymaps/default/rules.mk diff --git a/keyboards/proteus67/keymaps/default/config.h b/keyboards/proteus67/keymaps/default/config.h new file mode 100644 index 000000000000..2bf68d53e526 --- /dev/null +++ b/keyboards/proteus67/keymaps/default/config.h @@ -0,0 +1,5 @@ +#define RGB_DISABLE_TIMEOUT 900000 +#define RGB_DISABLE_WHEN_USB_SUSPENDED 1 +#define RGBLIGHT_LAYERS +#define RGBLIGHT_MAX_LAYERS 3 +#define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF diff --git a/keyboards/proteus67/keymaps/default/rules.mk b/keyboards/proteus67/keymaps/default/rules.mk new file mode 100644 index 000000000000..419de305cc5f --- /dev/null +++ b/keyboards/proteus67/keymaps/default/rules.mk @@ -0,0 +1,3 @@ +RGBLIGHT_ENABLE = yes +ENCODER_MAP_ENABLE = yes +CONVERT_TO = elite_pi From 11d5b392340a377d8bef7a11fa6647e8ae3b2119 Mon Sep 17 00:00:00 2001 From: gzowski Date: Fri, 10 Nov 2023 13:54:36 +0000 Subject: [PATCH 14/75] Add files via upload --- keyboards/proteus67/keymaps/via/config.h | 5 ++++ keyboards/proteus67/keymaps/via/keymap.c | 30 ++++++++++++------------ keyboards/proteus67/keymaps/via/rules.mk | 4 ++++ 3 files changed, 24 insertions(+), 15 deletions(-) create mode 100644 keyboards/proteus67/keymaps/via/config.h create mode 100644 keyboards/proteus67/keymaps/via/rules.mk diff --git a/keyboards/proteus67/keymaps/via/config.h b/keyboards/proteus67/keymaps/via/config.h new file mode 100644 index 000000000000..2bf68d53e526 --- /dev/null +++ b/keyboards/proteus67/keymaps/via/config.h @@ -0,0 +1,5 @@ +#define RGB_DISABLE_TIMEOUT 900000 +#define RGB_DISABLE_WHEN_USB_SUSPENDED 1 +#define RGBLIGHT_LAYERS +#define RGBLIGHT_MAX_LAYERS 3 +#define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF diff --git a/keyboards/proteus67/keymaps/via/keymap.c b/keyboards/proteus67/keymaps/via/keymap.c index c475c4ea11f6..48a53c5aef05 100644 --- a/keyboards/proteus67/keymaps/via/keymap.c +++ b/keyboards/proteus67/keymaps/via/keymap.c @@ -13,25 +13,25 @@ enum custom_layer { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_QWERTY] = LAYOUT_5x14( - KC_ESC , KC_1 ,KC_2 ,KC_3 , KC_4 , KC_5 , KC_MINUS , KC_EQL , KC_6 , KC_7 , KC_8 , KC_9 , KC_0 , KC_GRV , - KC_TAB , KC_Q ,KC_W ,KC_E , KC_R , KC_T , KC_END , KC_HOME , KC_Y , KC_U , KC_I , KC_O , KC_P ,KC_MINUS, - KC_LCTL, KC_A ,KC_S ,KC_D , KC_F , KC_G , KC_PGDN , KC_PGUP , KC_H , KC_J , KC_K , KC_L , KC_SCLN,KC_QUOT , - KC_LSFT, KC_Z ,KC_X ,KC_C , KC_V , KC_B , KC_LBRC, KC_RBRC , KC_N , KC_M , KC_COMM , KC_DOT , KC_SLSH, KC_RSFT, - KC_NO ,MO(_ADJUST) ,KC_LGUI ,KC_LALT ,KC_SPC , KC_MUTE, KC_ENT , KC_BSPC , MO(_RAISE) , KC_INS , KC_DEL + KC_ESC , KC_1 ,KC_2 ,KC_3 , KC_4 , KC_5 , KC_MINUS , KC_EQL , KC_6 , KC_7 , KC_8 , KC_9 , KC_0 , KC_GRV , + KC_TAB , KC_Q ,KC_W ,KC_E , KC_R , KC_T , KC_END , KC_HOME , KC_Y , KC_U , KC_I , KC_O , KC_P ,KC_MINUS, + KC_LCTL, KC_A ,KC_S ,KC_D , KC_F , KC_G , KC_PGDN , KC_PGUP , KC_H , KC_J , KC_K , KC_L , KC_SCLN,KC_QUOT , + KC_LSFT, KC_Z ,KC_X ,KC_C , KC_V , KC_B , KC_LBRC, KC_RBRC, KC_N , KC_M , KC_COMM , KC_DOT , KC_SLSH, KC_RSFT, + KC_NO , MO(_ADJUST) ,KC_LGUI,KC_LALT, KC_SPC , KC_MUTE, KC_ENT , KC_BSPC , MO(_RAISE) , KC_INS , KC_DEL ), [_ADJUST] = LAYOUT_5x14( - RGB_TOG, RGB_HUI ,RGB_HUD ,RGB_SAI ,RGB_SAD ,RGB_VAI ,RGB_VAD , RGB_M_P ,RGB_M_B ,RGB_M_R ,RGB_M_SW,RGB_M_K ,RGB_M_X ,RGB_M_G , - KC_TRNS, KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS , KC_TRNS ,KC_TRNS ,KC_BTN1 ,KC_MS_U ,KC_BTN2 ,KC_TRNS ,KC_TRNS , - KC_TRNS, KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS , KC_TRNS ,KC_TRNS ,KC_MS_L ,KC_MS_D ,KC_MS_R ,KC_SCLN ,KC_QUOT , - 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_NUBS ,KC_TRNS , - KC_TRNS ,KC_TRNS ,KC_TRNS, KC_TRNS, KC_TRNS , RGB_RMOD, KC_TRNS, KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS + RGB_TOG , RGB_HUI ,RGB_HUD ,RGB_SAI , RGB_SAD , RGB_VAI , RGB_VAD , RGB_M_P , RGB_M_B , RGB_M_R , RGB_M_SW , RGB_M_K , RGB_M_X , RGB_M_G , + KC_TRNS , KC_TRNS, KC_TRNS ,KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_BTN1 , KC_MS_U , KC_BTN2 , KC_TRNS ,KC_TRNS, + KC_TRNS, KC_TRNS ,KC_TRNS ,KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_MS_L , KC_MS_D , KC_MS_R , KC_SCLN,KC_QUOT , + 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_NUBS, KC_TRNS, + KC_TRNS , KC_TRNS ,KC_TRNS,KC_TRNS, KC_TRNS , RGB_RMOD, KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS ), [_RAISE] = LAYOUT_5x14( - KC_TRNS, KC_F1 ,KC_F2 ,KC_F3 ,KC_F4 ,KC_F5 ,KC_TRNS , KC_TRNS ,KC_F6 ,KC_F7 ,KC_F8 ,KC_F9 ,KC_F10 ,KC_TRNS , - KC_TRNS, KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS , KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_UP ,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_LEFT ,KC_DOWN ,KC_RIGHT,KC_SCLN ,KC_QUOT , - 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_NUBS ,KC_TRNS , - KC_TRNS ,KC_TRNS ,KC_TRNS, KC_TRNS, KC_TRNS , RGB_MOD, KC_TRNS, KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS + KC_TRNS , KC_F1 ,KC_F2 ,KC_F3 , KC_F4 , KC_F5 , KC_TRNS , KC_TRNS , KC_F6 , KC_F7 , KC_F8 , KC_F9 , KC_F10 , KC_GRV , + KC_TRNS , KC_TRNS, KC_TRNS ,KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_UP , 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_LEFT , KC_DOWN , KC_RIGHT , KC_SCLN,KC_QUOT , + 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_NUBS, KC_TRNS, + KC_TRNS , KC_TRNS ,KC_TRNS,KC_TRNS, KC_TRNS , RGB_MOD, KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS ) }; diff --git a/keyboards/proteus67/keymaps/via/rules.mk b/keyboards/proteus67/keymaps/via/rules.mk new file mode 100644 index 000000000000..66778dec3581 --- /dev/null +++ b/keyboards/proteus67/keymaps/via/rules.mk @@ -0,0 +1,4 @@ +VIA_ENABLE = yes +RGBLIGHT_ENABLE = yes +ENCODER_MAP_ENABLE = yes +CONVERT_TO = elite_pi From 7ef7159ac12df70691d52d25a1d2ff0665bb6f6a Mon Sep 17 00:00:00 2001 From: gzowski Date: Fri, 10 Nov 2023 14:01:52 +0000 Subject: [PATCH 15/75] Add files via upload --- keyboards/proteus67/keymaps/default/config.h | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/keyboards/proteus67/keymaps/default/config.h b/keyboards/proteus67/keymaps/default/config.h index 2bf68d53e526..66d3794b4dc1 100644 --- a/keyboards/proteus67/keymaps/default/config.h +++ b/keyboards/proteus67/keymaps/default/config.h @@ -1,3 +1,20 @@ +/* +Copyright 2012 Jun Wako +Copyright 2015 Jack Humbert + +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 . +*/ #define RGB_DISABLE_TIMEOUT 900000 #define RGB_DISABLE_WHEN_USB_SUSPENDED 1 #define RGBLIGHT_LAYERS From 440bac6f48bfe6152201a96f8d742c392d4c4433 Mon Sep 17 00:00:00 2001 From: gzowski Date: Fri, 10 Nov 2023 14:02:04 +0000 Subject: [PATCH 16/75] Add files via upload --- keyboards/proteus67/keymaps/via/config.h | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/keyboards/proteus67/keymaps/via/config.h b/keyboards/proteus67/keymaps/via/config.h index 2bf68d53e526..66d3794b4dc1 100644 --- a/keyboards/proteus67/keymaps/via/config.h +++ b/keyboards/proteus67/keymaps/via/config.h @@ -1,3 +1,20 @@ +/* +Copyright 2012 Jun Wako +Copyright 2015 Jack Humbert + +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 . +*/ #define RGB_DISABLE_TIMEOUT 900000 #define RGB_DISABLE_WHEN_USB_SUSPENDED 1 #define RGBLIGHT_LAYERS From 501c9640062d52fa3096d35292cc437773f5ef2a Mon Sep 17 00:00:00 2001 From: gzowski Date: Fri, 10 Nov 2023 16:50:28 +0000 Subject: [PATCH 17/75] Add files via upload --- keyboards/proteus67/config.h | 1 - keyboards/proteus67/info.json | 198 +++++++++++++++++----------------- keyboards/proteus67/readme.md | 11 +- keyboards/proteus67/rules.mk | 1 - 4 files changed, 103 insertions(+), 108 deletions(-) diff --git a/keyboards/proteus67/config.h b/keyboards/proteus67/config.h index 23a64456da9e..e34899503c22 100644 --- a/keyboards/proteus67/config.h +++ b/keyboards/proteus67/config.h @@ -18,6 +18,5 @@ along with this program. If not, see . #pragma once -#define ENCODER_DIRECTION_FLIP #define ENCODER_MAP_KEY_DELAY 10 #define ENCODER_DEFAULT_POS 0x3 diff --git a/keyboards/proteus67/info.json b/keyboards/proteus67/info.json index d7aa7d412186..f5d3387085df 100644 --- a/keyboards/proteus67/info.json +++ b/keyboards/proteus67/info.json @@ -1,121 +1,121 @@ { - "keyboard_name": "Proteus67", "manufacturer": "gzowski", - "url": "https://github.com/gzowski", + "keyboard_name": "Proteus67", "maintainer": "gzowski", - "usb": { - "vid": "0x7072", - "pid": "0x6F64", - "device_version": "1.0.0" - }, + "development_board": "elite_pi", "diode_direction": "COL2ROW", - "matrix_pins": { - "cols": ["D1", "D0", "D4", "C6", "D7", "E6", "B4", "B2", "B3", "B1", "F7", "F6", "F5", "F4"], - "rows": ["B7", "D5", "C7", "F1", "F0"] + "encoder": { + "rotary": [ + {"pin_a": "GP9", "pin_b": "GP21"} + ] }, "features": { - "encoder": true - }, - "encoder": { - "enabled": true, - "rotary": [ - {"pin_a": "B5", "pin_b": "B6", "resolution": 4} - ] + "encoder": true + "rgblight": true }, - "ws2812": { - "pin": "D3" + "matrix_pins": { + "cols": ["GP2", "GP3", "GP4", "GP5", "GP6", "GP7", "GP8", "GP23", "GP20", "GP22", "GP26", "GP27", "GP28", "GP29"], + "rows": ["GP12", "GP13", "GP14", "GP15", "GP16"] }, "rgblight": { - "saturation_steps": 5, - "brightness_steps": 5, - "led_count": 21, - "max_brightness": 255, - "sleep": true, "animations": { + "alternating": true, "breathing": true, + "christmas": true, + "knight": true, "rainbow_mood": true, "rainbow_swirl": true, + "rgb_test": false, "snake": true, - "knight": true, - "christmas": true, "static_gradient": true, - "rgb_test": false, - "alternating": true, "twinkle": true - } + }, + "brightness_steps": 5, + "led_count": 21, + "max_brightness": 255, + "saturation_steps": 5, + "sleep": true + }, + "url": "https://github.com/gzowski", + "usb": { + "device_version": "1.0.0", + "pid": "0x6F64", + "vid": "0x7072" + }, + "ws2812": { + "pin": "GP0", + "driver": "vendor" }, - "processor": "atmega32u4", - "bootloader": "caterina", "layouts": { - "LAYOUT_5x14": { + "LAYOUT_ortho_5x14": { "layout": [ - {"x": 0, "y": 0}, - {"x": 1, "y": 0}, - {"x": 2, "y": 0}, - {"x": 3, "y": 0}, - {"x": 4, "y": 0}, - {"x": 5, "y": 0}, - {"x": 6, "y": 0}, - {"x": 7, "y": 0}, - {"x": 8, "y": 0}, - {"x": 9, "y": 0}, - {"x": 10, "y": 0}, - {"x": 11, "y": 0}, - {"x": 12, "y": 0}, - {"x": 13, "y": 0}, - {"x": 0, "y": 1}, - {"x": 1, "y": 1}, - {"x": 2, "y": 1}, - {"x": 3, "y": 1}, - {"x": 4, "y": 1}, - {"x": 5, "y": 1}, - {"x": 6, "y": 1}, - {"x": 7, "y": 1}, - {"x": 8, "y": 1}, - {"x": 9, "y": 1}, - {"x": 10, "y": 1}, - {"x": 11, "y": 1}, - {"x": 12, "y": 1}, - {"x": 13, "y": 1}, - {"x": 0, "y": 2}, - {"x": 1, "y": 2}, - {"x": 2, "y": 2}, - {"x": 3, "y": 2}, - {"x": 4, "y": 2}, - {"x": 5, "y": 2}, - {"x": 6, "y": 2}, - {"x": 7, "y": 2}, - {"x": 8, "y": 2}, - {"x": 9, "y": 2}, - {"x": 10, "y": 2}, - {"x": 11, "y": 2}, - {"x": 12, "y": 2}, - {"x": 13, "y": 2}, - {"x": 0, "y": 3}, - {"x": 1, "y": 3}, - {"x": 2, "y": 3}, - {"x": 3, "y": 3}, - {"x": 4, "y": 3}, - {"x": 5, "y": 3}, - {"x": 6, "y": 3}, - {"x": 7, "y": 3}, - {"x": 8, "y": 3}, - {"x": 9, "y": 3}, - {"x": 10, "y": 3}, - {"x": 11, "y": 3}, - {"x": 12, "y": 3}, - {"x": 13, "y": 3}, - {"x": 0, "y": 4}, - {"x": 1, "y": 4}, - {"x": 2, "y": 4}, - {"x": 3, "y": 4}, - {"x": 4, "y": 4}, - {"x": 5, "y": 4}, - {"x": 7, "y": 4}, - {"x": 8, "y": 4}, - {"x": 9, "y": 4}, - {"x": 10, "y": 4}, - {"x": 11, "y": 4} + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "y": 1}, + {"matrix": [1, 10], "x": 10, "y": 1}, + {"matrix": [1, 11], "x": 11, "y": 1}, + {"matrix": [1, 12], "x": 12, "y": 1}, + {"matrix": [1, 13], "x": 13, "y": 1}, + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [2, 6], "x": 6, "y": 2}, + {"matrix": [2, 7], "x": 7, "y": 2}, + {"matrix": [2, 8], "x": 8, "y": 2}, + {"matrix": [2, 9], "x": 9, "y": 2}, + {"matrix": [2, 10], "x": 10, "y": 2}, + {"matrix": [2, 11], "x": 11, "y": 2}, + {"matrix": [2, 12], "x": 12, "y": 2}, + {"matrix": [2, 13], "x": 13, "y": 2}, + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3}, + {"matrix": [3, 5], "x": 5, "y": 3}, + {"matrix": [3, 6], "x": 6, "y": 3}, + {"matrix": [3, 7], "x": 7, "y": 3}, + {"matrix": [3, 8], "x": 8, "y": 3}, + {"matrix": [3, 9], "x": 9, "y": 3}, + {"matrix": [3, 10], "x": 10, "y": 3}, + {"matrix": [3, 11], "x": 11, "y": 3}, + {"matrix": [3, 12], "x": 12, "y": 3}, + {"matrix": [3, 13], "x": 13, "y": 3}, + {"matrix": [4, 0], "x": 0, "y": 4}, + {"matrix": [4, 1], "x": 1, "y": 4}, + {"matrix": [4, 2], "x": 2, "y": 4}, + {"matrix": [4, 3], "x": 3, "y": 4}, + {"matrix": [4, 4], "x": 4, "y": 4}, + {"matrix": [4, 5], "x": 5, "y": 4}, + {"matrix": [4, 7], "x": 7, "y": 4}, + {"matrix": [4, 8], "x": 8, "y": 4}, + {"matrix": [4, 9], "x": 9, "y": 4}, + {"matrix": [4, 10], "x": 10, "y": 4}, + {"matrix": [4, 11], "x": 11, "y": 4} ] } } diff --git a/keyboards/proteus67/readme.md b/keyboards/proteus67/readme.md index abb808c9c56b..a64d8812a9e1 100644 --- a/keyboards/proteus67/readme.md +++ b/keyboards/proteus67/readme.md @@ -2,24 +2,21 @@ ![proteus67](https://i.imgur.com/mYhl7Ja.png) -* 67 key ortholinear split keyboard with rotary encoder +*A short description of the keyboard/project* * Keyboard Maintainer: [James Gzowski](https://github.com/gzowski) -* Hardware Supported: Elite-C, Elite-Pi or equivilent Pro-Micro with additional I/O along bottom. +* Hardware Supported: Elite-Pi or equivilent RP2040 controller with additional I/O along bottom. * Build Guide: [Proteus67](https://github.com/gzowski/Proteus67) Make example for this keyboard (after setting up your build environment): - + make proteus67:default Flashing example for this keyboard: make proteus67:default:flash - -* Not curently listed within VIA, requires design json from [here](https://github.com/gzowski/Proteus67/blob/main/QMK%20Firmware/via.json) -* Enable design mode on [usevia.app](https://usevia.app/settings) and Load Draft definition within the design tab -* Choose the json file linked above. +* VIA support using the via keymap instead of 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). diff --git a/keyboards/proteus67/rules.mk b/keyboards/proteus67/rules.mk index d2aa3931404c..7f4098641cc0 100644 --- a/keyboards/proteus67/rules.mk +++ b/keyboards/proteus67/rules.mk @@ -2,5 +2,4 @@ MOUSEKEY_ENABLE = yes # Mouse keys EXTRAKEY_ENABLE = yes # Audio control and System control COMMAND_ENABLE = yes NKRO_ENABLE = yes # Enable N-Key Rollover -PIN_COMPATIBLE = elite_c BOOTMAGIC_ENABLE = yes From 8d488ba36b29de062a7c226aea2a3ffa46112ee8 Mon Sep 17 00:00:00 2001 From: gzowski Date: Fri, 10 Nov 2023 16:51:07 +0000 Subject: [PATCH 18/75] Delete keyboards/proteus67/proteus67.c --- keyboards/proteus67/proteus67.c | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 keyboards/proteus67/proteus67.c diff --git a/keyboards/proteus67/proteus67.c b/keyboards/proteus67/proteus67.c deleted file mode 100644 index cc24e03915bc..000000000000 --- a/keyboards/proteus67/proteus67.c +++ /dev/null @@ -1,4 +0,0 @@ -// Copyright 2022 Matthew Dews (@matthew-dews) -// SPDX-License-Identifier: GPL-2.0-or-later - -#include "proteus67.h" From 6c630e4344103d2b0c8f644b2bbff862f4f68b72 Mon Sep 17 00:00:00 2001 From: gzowski Date: Fri, 10 Nov 2023 16:51:09 +0000 Subject: [PATCH 19/75] Delete keyboards/proteus67/proteus67.h --- keyboards/proteus67/proteus67.h | 21 --------------------- 1 file changed, 21 deletions(-) delete mode 100644 keyboards/proteus67/proteus67.h diff --git a/keyboards/proteus67/proteus67.h b/keyboards/proteus67/proteus67.h deleted file mode 100644 index e0e6832d8534..000000000000 --- a/keyboards/proteus67/proteus67.h +++ /dev/null @@ -1,21 +0,0 @@ -// CopyKight 2022 Matthew Dews (@matthew-dews) -// SPDX-Kicense-IdentifieK: GPK-2.0-oK-KateK -#pragma once - -#include "quantum.h" - -#define XXX KC_NO - -#define LAYOUT_5x14( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K10, K11, K12, K13, \ - K14, K15, K16, K17, K18, K19, K20, K21, K22, K23, K24, K25, K26, K27, \ - K28, K29, K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K40, K41, \ - K42, K43, K44, K45, K46, K47, K48, K49, K50, K51, K52, K53, K54, K55, \ - K56, K57, K58, K59, K60, K61, K62, K63, K64, K65, K66 \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K10, K11, K12 ,K13 }, \ - { K14, K15, K16, K17, K18, K19, K20, K21, K22, K23, K24, K25, K26, K27 }, \ - { K28, K29, K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K40, K41 }, \ - { K42, K43, K44, K45, K46, K47, K48, K49, K50, K51, K52, K53, K54, K55 }, \ - { K56, K57, K58, K59, K60, K61, XXX, K62, K63, K64, K65, K66, XXX, XXX }, \ -} From 90e107249551ae9ab192f7528b12f4e70b0b0207 Mon Sep 17 00:00:00 2001 From: gzowski Date: Fri, 10 Nov 2023 16:51:12 +0000 Subject: [PATCH 20/75] Delete keyboards/proteus67/proteus67.json --- keyboards/proteus67/proteus67.json | 143 ----------------------------- 1 file changed, 143 deletions(-) delete mode 100644 keyboards/proteus67/proteus67.json diff --git a/keyboards/proteus67/proteus67.json b/keyboards/proteus67/proteus67.json deleted file mode 100644 index 93032324d4e6..000000000000 --- a/keyboards/proteus67/proteus67.json +++ /dev/null @@ -1,143 +0,0 @@ -[ - [ - { - "c": "#777777" - }, - "0,0\n\n\n0,0", - { - "c": "#cccccc" - }, - "0,1", - "0,2", - "0,3", - "0,4", - "0,5", - "0,6", - { - "x": 2 - }, - "0,7", - "0,8", - "0,9", - "0,10", - "0,11", - "0,12", - "0,13" - ], - [ - { - "c": "#aaaaaa" - }, - "1,0", - { - "c": "#cccccc" - }, - "1,1", - "1,2", - "1,3", - "1,4", - "1,5", - "1,6", - { - "x": 2 - }, - "1,7", - "1,8", - "1,9", - "1,10", - "1,11", - "1,12", - "1,13" - ], - [ - { - "c": "#aaaaaa" - }, - "2,0", - { - "c": "#cccccc" - }, - "2,1", - "2,2", - "2,3", - "2,4", - "2,5", - "2,6", - { - "x": 2 - }, - "2,7", - "2,8", - "2,9", - "2,10", - "2,11", - "2,12", - { - "c": "#aaaaaa" - }, - "2,13" - ], - [ - "3,0", - { - "c": "#cccccc" - }, - "3,1", - "3,2", - "3,3", - "3,4", - "3,5", - "3,6", - { - "x": 2 - }, - "3,7", - "3,8", - "3,9", - "3,10", - "3,11", - "3,12", - { - "c": "#aaaaaa" - }, - "3,13" - ], - [ - { - "y": -0.25, - "x": 7.5, - "c": "#cccccc" - }, - "4,5\n\n\n\n\n\n\n\n\ne0" - ], - [ - { - "y": -0.25, - "x": 0.5, - "c": "#aaaaaa" - }, - "4,0", - "4,1", - "4,2", - "4,3", - { - "x": 0.5, - "c": "#777777", - "w": 2 - }, - "4,4\n\n\n1,0", - { - "x": 2, - "w": 2 - }, - "4,7\n\n\n1,1", - { - "x": 0.5, - "c": "#aaaaaa" - }, - "4,8", - "4,9", - "4,10", - "4,11" - ] -] \ No newline at end of file From d7bbd3121d4fb15c530ee7608843cf00366b86bd Mon Sep 17 00:00:00 2001 From: gzowski Date: Fri, 10 Nov 2023 16:51:32 +0000 Subject: [PATCH 21/75] Add files via upload --- keyboards/proteus67/keymaps/default/config.h | 1 + keyboards/proteus67/keymaps/default/keymap.c | 6 +++--- keyboards/proteus67/keymaps/default/rules.mk | 1 - 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/keyboards/proteus67/keymaps/default/config.h b/keyboards/proteus67/keymaps/default/config.h index 66d3794b4dc1..33504174ca80 100644 --- a/keyboards/proteus67/keymaps/default/config.h +++ b/keyboards/proteus67/keymaps/default/config.h @@ -20,3 +20,4 @@ along with this program. If not, see . #define RGBLIGHT_LAYERS #define RGBLIGHT_MAX_LAYERS 3 #define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF +#define ENCODER_DIRECTION_FLIP diff --git a/keyboards/proteus67/keymaps/default/keymap.c b/keyboards/proteus67/keymaps/default/keymap.c index be8950717a21..d0f807c02f8e 100644 --- a/keyboards/proteus67/keymaps/default/keymap.c +++ b/keyboards/proteus67/keymaps/default/keymap.c @@ -12,21 +12,21 @@ enum custom_layer { #define ADJUST MO(_ADJUST) const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [_QWERTY] = LAYOUT_5x14( + [_QWERTY] = LAYOUT_ortho_5x14( KC_ESC , KC_1 ,KC_2 ,KC_3 , KC_4 , KC_5 , KC_MINUS , KC_EQL , KC_6 , KC_7 , KC_8 , KC_9 , KC_0 , KC_GRV , KC_TAB , KC_Q ,KC_W ,KC_E , KC_R , KC_T , KC_END , KC_HOME , KC_Y , KC_U , KC_I , KC_O , KC_P ,KC_MINUS, KC_LCTL, KC_A ,KC_S ,KC_D , KC_F , KC_G , KC_PGDN , KC_PGUP , KC_H , KC_J , KC_K , KC_L , KC_SCLN,KC_QUOT , KC_LSFT, KC_Z ,KC_X ,KC_C , KC_V , KC_B , KC_LBRC, KC_RBRC, KC_N , KC_M , KC_COMM , KC_DOT , KC_SLSH, KC_RSFT, KC_NO , MO(_ADJUST) ,KC_LGUI,KC_LALT, KC_SPC , KC_MUTE, KC_ENT , KC_BSPC , MO(_RAISE) , KC_INS , KC_DEL ), - [_ADJUST] = LAYOUT_5x14( + [_ADJUST] = LAYOUT_ortho_5x14( RGB_TOG , RGB_HUI ,RGB_HUD ,RGB_SAI , RGB_SAD , RGB_VAI , RGB_VAD , RGB_M_P , RGB_M_B , RGB_M_R , RGB_M_SW , RGB_M_K , RGB_M_X , RGB_M_G , KC_TRNS , KC_TRNS, KC_TRNS ,KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_BTN1 , KC_MS_U , KC_BTN2 , KC_TRNS ,KC_TRNS, KC_TRNS, KC_TRNS ,KC_TRNS ,KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_MS_L , KC_MS_D , KC_MS_R , KC_SCLN,KC_QUOT , 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_NUBS, KC_TRNS, KC_TRNS , KC_TRNS ,KC_TRNS,KC_TRNS, KC_TRNS , RGB_RMOD, KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS ), - [_RAISE] = LAYOUT_5x14( + [_RAISE] = LAYOUT_ortho_5x14( KC_TRNS , KC_F1 ,KC_F2 ,KC_F3 , KC_F4 , KC_F5 , KC_TRNS , KC_TRNS , KC_F6 , KC_F7 , KC_F8 , KC_F9 , KC_F10 , KC_GRV , KC_TRNS , KC_TRNS, KC_TRNS ,KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_UP , 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_LEFT , KC_DOWN , KC_RIGHT , KC_SCLN,KC_QUOT , diff --git a/keyboards/proteus67/keymaps/default/rules.mk b/keyboards/proteus67/keymaps/default/rules.mk index 419de305cc5f..bf71165d2f3c 100644 --- a/keyboards/proteus67/keymaps/default/rules.mk +++ b/keyboards/proteus67/keymaps/default/rules.mk @@ -1,3 +1,2 @@ RGBLIGHT_ENABLE = yes ENCODER_MAP_ENABLE = yes -CONVERT_TO = elite_pi From c3f8b079d08fe97a117a77484cb5cf93c01441f1 Mon Sep 17 00:00:00 2001 From: gzowski Date: Fri, 10 Nov 2023 16:52:10 +0000 Subject: [PATCH 22/75] Add files via upload --- keyboards/proteus67/keymaps/via/config.h | 1 + keyboards/proteus67/keymaps/via/keymap.c | 6 +++--- keyboards/proteus67/keymaps/via/rules.mk | 1 - 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/keyboards/proteus67/keymaps/via/config.h b/keyboards/proteus67/keymaps/via/config.h index 66d3794b4dc1..33504174ca80 100644 --- a/keyboards/proteus67/keymaps/via/config.h +++ b/keyboards/proteus67/keymaps/via/config.h @@ -20,3 +20,4 @@ along with this program. If not, see . #define RGBLIGHT_LAYERS #define RGBLIGHT_MAX_LAYERS 3 #define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF +#define ENCODER_DIRECTION_FLIP diff --git a/keyboards/proteus67/keymaps/via/keymap.c b/keyboards/proteus67/keymaps/via/keymap.c index 48a53c5aef05..65c7ca716a66 100644 --- a/keyboards/proteus67/keymaps/via/keymap.c +++ b/keyboards/proteus67/keymaps/via/keymap.c @@ -12,21 +12,21 @@ enum custom_layer { #define ADJUST MO(_ADJUST) const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [_QWERTY] = LAYOUT_5x14( + [_QWERTY] = LAYOUT_ortho_5x14( KC_ESC , KC_1 ,KC_2 ,KC_3 , KC_4 , KC_5 , KC_MINUS , KC_EQL , KC_6 , KC_7 , KC_8 , KC_9 , KC_0 , KC_GRV , KC_TAB , KC_Q ,KC_W ,KC_E , KC_R , KC_T , KC_END , KC_HOME , KC_Y , KC_U , KC_I , KC_O , KC_P ,KC_MINUS, KC_LCTL, KC_A ,KC_S ,KC_D , KC_F , KC_G , KC_PGDN , KC_PGUP , KC_H , KC_J , KC_K , KC_L , KC_SCLN,KC_QUOT , KC_LSFT, KC_Z ,KC_X ,KC_C , KC_V , KC_B , KC_LBRC, KC_RBRC, KC_N , KC_M , KC_COMM , KC_DOT , KC_SLSH, KC_RSFT, KC_NO , MO(_ADJUST) ,KC_LGUI,KC_LALT, KC_SPC , KC_MUTE, KC_ENT , KC_BSPC , MO(_RAISE) , KC_INS , KC_DEL ), - [_ADJUST] = LAYOUT_5x14( + [_ADJUST] = LAYOUT_ortho_5x14( RGB_TOG , RGB_HUI ,RGB_HUD ,RGB_SAI , RGB_SAD , RGB_VAI , RGB_VAD , RGB_M_P , RGB_M_B , RGB_M_R , RGB_M_SW , RGB_M_K , RGB_M_X , RGB_M_G , KC_TRNS , KC_TRNS, KC_TRNS ,KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_BTN1 , KC_MS_U , KC_BTN2 , KC_TRNS ,KC_TRNS, KC_TRNS, KC_TRNS ,KC_TRNS ,KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_MS_L , KC_MS_D , KC_MS_R , KC_SCLN,KC_QUOT , 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_NUBS, KC_TRNS, KC_TRNS , KC_TRNS ,KC_TRNS,KC_TRNS, KC_TRNS , RGB_RMOD, KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS ), - [_RAISE] = LAYOUT_5x14( + [_RAISE] = LAYOUT_ortho_5x14( KC_TRNS , KC_F1 ,KC_F2 ,KC_F3 , KC_F4 , KC_F5 , KC_TRNS , KC_TRNS , KC_F6 , KC_F7 , KC_F8 , KC_F9 , KC_F10 , KC_GRV , KC_TRNS , KC_TRNS, KC_TRNS ,KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_UP , 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_LEFT , KC_DOWN , KC_RIGHT , KC_SCLN,KC_QUOT , diff --git a/keyboards/proteus67/keymaps/via/rules.mk b/keyboards/proteus67/keymaps/via/rules.mk index 66778dec3581..c7fce92a4f67 100644 --- a/keyboards/proteus67/keymaps/via/rules.mk +++ b/keyboards/proteus67/keymaps/via/rules.mk @@ -1,4 +1,3 @@ VIA_ENABLE = yes RGBLIGHT_ENABLE = yes ENCODER_MAP_ENABLE = yes -CONVERT_TO = elite_pi From bad67f7eaaf98c2962c281af4f22e7e785a6de70 Mon Sep 17 00:00:00 2001 From: gzowski Date: Fri, 10 Nov 2023 21:33:20 +0000 Subject: [PATCH 23/75] Update keyboards/proteus67/readme.md Co-authored-by: jack <0x6a73@protonmail.com> --- keyboards/proteus67/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/proteus67/readme.md b/keyboards/proteus67/readme.md index a64d8812a9e1..ec554a9938a9 100644 --- a/keyboards/proteus67/readme.md +++ b/keyboards/proteus67/readme.md @@ -1,6 +1,6 @@ # proteus67 -![proteus67](https://i.imgur.com/mYhl7Ja.png) +![proteus67](https://i.imgur.com/mYhl7Jah.png) *A short description of the keyboard/project* From 7e5841eca9e4bc07e8433f531cc82af742afd4b8 Mon Sep 17 00:00:00 2001 From: gzowski Date: Fri, 10 Nov 2023 21:33:42 +0000 Subject: [PATCH 24/75] Update keyboards/proteus67/info.json Co-authored-by: jack <0x6a73@protonmail.com> --- keyboards/proteus67/info.json | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/proteus67/info.json b/keyboards/proteus67/info.json index f5d3387085df..c1fc3636b38e 100644 --- a/keyboards/proteus67/info.json +++ b/keyboards/proteus67/info.json @@ -32,7 +32,6 @@ }, "brightness_steps": 5, "led_count": 21, - "max_brightness": 255, "saturation_steps": 5, "sleep": true }, From 165aadca2f47e403589790e71c129e1262879fa2 Mon Sep 17 00:00:00 2001 From: gzowski Date: Fri, 10 Nov 2023 21:34:39 +0000 Subject: [PATCH 25/75] Update keyboards/proteus67/keymaps/default/keymap.c Co-authored-by: jack <0x6a73@protonmail.com> --- keyboards/proteus67/keymaps/default/keymap.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/keyboards/proteus67/keymaps/default/keymap.c b/keyboards/proteus67/keymaps/default/keymap.c index d0f807c02f8e..0ae4cd0269a3 100644 --- a/keyboards/proteus67/keymaps/default/keymap.c +++ b/keyboards/proteus67/keymaps/default/keymap.c @@ -8,9 +8,6 @@ enum custom_layer { _RAISE, }; -#define RAISE MO(_RAISE) -#define ADJUST MO(_ADJUST) - const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_QWERTY] = LAYOUT_ortho_5x14( KC_ESC , KC_1 ,KC_2 ,KC_3 , KC_4 , KC_5 , KC_MINUS , KC_EQL , KC_6 , KC_7 , KC_8 , KC_9 , KC_0 , KC_GRV , From dfb0e8d2e3b912de664fa732f8ae8ca0d9ea35df Mon Sep 17 00:00:00 2001 From: gzowski Date: Fri, 10 Nov 2023 21:35:17 +0000 Subject: [PATCH 26/75] Update keyboards/proteus67/keymaps/via/keymap.c Co-authored-by: jack <0x6a73@protonmail.com> --- keyboards/proteus67/keymaps/via/keymap.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/keyboards/proteus67/keymaps/via/keymap.c b/keyboards/proteus67/keymaps/via/keymap.c index 65c7ca716a66..25b51abf4f82 100644 --- a/keyboards/proteus67/keymaps/via/keymap.c +++ b/keyboards/proteus67/keymaps/via/keymap.c @@ -8,9 +8,6 @@ enum custom_layer { _RAISE, }; -#define RAISE MO(_RAISE) -#define ADJUST MO(_ADJUST) - const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_QWERTY] = LAYOUT_ortho_5x14( KC_ESC , KC_1 ,KC_2 ,KC_3 , KC_4 , KC_5 , KC_MINUS , KC_EQL , KC_6 , KC_7 , KC_8 , KC_9 , KC_0 , KC_GRV , From 915e2e4febc9aeb29511f6277ba08692e3619e4e Mon Sep 17 00:00:00 2001 From: gzowski Date: Fri, 10 Nov 2023 21:35:57 +0000 Subject: [PATCH 27/75] Update keyboards/proteus67/keymaps/via/config.h Co-authored-by: jack <0x6a73@protonmail.com> --- keyboards/proteus67/keymaps/via/config.h | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/keyboards/proteus67/keymaps/via/config.h b/keyboards/proteus67/keymaps/via/config.h index 33504174ca80..dc5b9fcbc86d 100644 --- a/keyboards/proteus67/keymaps/via/config.h +++ b/keyboards/proteus67/keymaps/via/config.h @@ -1,23 +1,6 @@ -/* -Copyright 2012 Jun Wako -Copyright 2015 Jack Humbert +// Copyright 2023 QMK +// SPDX-License-Identifier: GPL-2.0-or-later -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 . -*/ -#define RGB_DISABLE_TIMEOUT 900000 -#define RGB_DISABLE_WHEN_USB_SUSPENDED 1 #define RGBLIGHT_LAYERS #define RGBLIGHT_MAX_LAYERS 3 #define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF -#define ENCODER_DIRECTION_FLIP From 36e3df4d72b14383e972c35038c50974f9b35444 Mon Sep 17 00:00:00 2001 From: gzowski Date: Fri, 10 Nov 2023 21:36:09 +0000 Subject: [PATCH 28/75] Update keyboards/proteus67/keymaps/default/config.h Co-authored-by: jack <0x6a73@protonmail.com> --- keyboards/proteus67/keymaps/default/config.h | 21 ++------------------ 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/keyboards/proteus67/keymaps/default/config.h b/keyboards/proteus67/keymaps/default/config.h index 33504174ca80..dc5b9fcbc86d 100644 --- a/keyboards/proteus67/keymaps/default/config.h +++ b/keyboards/proteus67/keymaps/default/config.h @@ -1,23 +1,6 @@ -/* -Copyright 2012 Jun Wako -Copyright 2015 Jack Humbert +// Copyright 2023 QMK +// SPDX-License-Identifier: GPL-2.0-or-later -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 . -*/ -#define RGB_DISABLE_TIMEOUT 900000 -#define RGB_DISABLE_WHEN_USB_SUSPENDED 1 #define RGBLIGHT_LAYERS #define RGBLIGHT_MAX_LAYERS 3 #define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF -#define ENCODER_DIRECTION_FLIP From f3a6dadc82c5c0029e9b169a3c9396368183a4a8 Mon Sep 17 00:00:00 2001 From: gzowski Date: Fri, 10 Nov 2023 21:36:23 +0000 Subject: [PATCH 29/75] Update keyboards/proteus67/keymaps/default/rules.mk Co-authored-by: jack <0x6a73@protonmail.com> --- keyboards/proteus67/keymaps/default/rules.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/proteus67/keymaps/default/rules.mk b/keyboards/proteus67/keymaps/default/rules.mk index bf71165d2f3c..ee325681483f 100644 --- a/keyboards/proteus67/keymaps/default/rules.mk +++ b/keyboards/proteus67/keymaps/default/rules.mk @@ -1,2 +1 @@ -RGBLIGHT_ENABLE = yes ENCODER_MAP_ENABLE = yes From 7bb83eb136f41c1b0143c1ab5d2991be9b8cdb20 Mon Sep 17 00:00:00 2001 From: gzowski Date: Fri, 10 Nov 2023 21:36:41 +0000 Subject: [PATCH 30/75] Update keyboards/proteus67/info.json Co-authored-by: jack <0x6a73@protonmail.com> --- keyboards/proteus67/info.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/keyboards/proteus67/info.json b/keyboards/proteus67/info.json index c1fc3636b38e..1dae1245f87b 100644 --- a/keyboards/proteus67/info.json +++ b/keyboards/proteus67/info.json @@ -10,7 +10,11 @@ ] }, "features": { - "encoder": true + "encoder": true, + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "nkro": true, "rgblight": true }, "matrix_pins": { From 12b48400a0f81575a48ae4588d164fad0a1f11f0 Mon Sep 17 00:00:00 2001 From: gzowski Date: Fri, 10 Nov 2023 21:36:55 +0000 Subject: [PATCH 31/75] Update keyboards/proteus67/keymaps/via/rules.mk Co-authored-by: jack <0x6a73@protonmail.com> --- keyboards/proteus67/keymaps/via/rules.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/proteus67/keymaps/via/rules.mk b/keyboards/proteus67/keymaps/via/rules.mk index c7fce92a4f67..f1adcab005e8 100644 --- a/keyboards/proteus67/keymaps/via/rules.mk +++ b/keyboards/proteus67/keymaps/via/rules.mk @@ -1,3 +1,2 @@ VIA_ENABLE = yes -RGBLIGHT_ENABLE = yes ENCODER_MAP_ENABLE = yes From b7520ce5b7add183fec9d16f72cd938a7f1b04b4 Mon Sep 17 00:00:00 2001 From: gzowski Date: Fri, 10 Nov 2023 21:37:10 +0000 Subject: [PATCH 32/75] Update keyboards/proteus67/rules.mk Co-authored-by: jack <0x6a73@protonmail.com> --- keyboards/proteus67/rules.mk | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/keyboards/proteus67/rules.mk b/keyboards/proteus67/rules.mk index 7f4098641cc0..6e7633bfe015 100644 --- a/keyboards/proteus67/rules.mk +++ b/keyboards/proteus67/rules.mk @@ -1,5 +1 @@ -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -COMMAND_ENABLE = yes -NKRO_ENABLE = yes # Enable N-Key Rollover -BOOTMAGIC_ENABLE = yes +# This file intentionally left blank From 921ba33a50377f181edb0e73a6e49d8ad011c392 Mon Sep 17 00:00:00 2001 From: gzowski Date: Fri, 10 Nov 2023 21:50:07 +0000 Subject: [PATCH 33/75] Update info.json --- keyboards/proteus67/info.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/proteus67/info.json b/keyboards/proteus67/info.json index 1dae1245f87b..76dd178fb844 100644 --- a/keyboards/proteus67/info.json +++ b/keyboards/proteus67/info.json @@ -6,7 +6,7 @@ "diode_direction": "COL2ROW", "encoder": { "rotary": [ - {"pin_a": "GP9", "pin_b": "GP21"} + {"pin_a": "GP21", "pin_b": "GP9"} ] }, "features": { From 8391cef2b6ed4fea99ce45539a3b45a2dc6b2d7b Mon Sep 17 00:00:00 2001 From: James Gzowski Date: Sat, 11 Nov 2023 15:28:03 +0000 Subject: [PATCH 34/75] Update keyboards/proteus67/keymaps/default/config.h Co-authored-by: Joel Challis --- keyboards/proteus67/keymaps/default/config.h | 1 + 1 file changed, 1 insertion(+) diff --git a/keyboards/proteus67/keymaps/default/config.h b/keyboards/proteus67/keymaps/default/config.h index dc5b9fcbc86d..becdb2dc05cb 100644 --- a/keyboards/proteus67/keymaps/default/config.h +++ b/keyboards/proteus67/keymaps/default/config.h @@ -1,5 +1,6 @@ // Copyright 2023 QMK // SPDX-License-Identifier: GPL-2.0-or-later +#pragma once #define RGBLIGHT_LAYERS #define RGBLIGHT_MAX_LAYERS 3 From 3adaf13681cdf9b793fa9956d003fc49a66e760f Mon Sep 17 00:00:00 2001 From: James Gzowski Date: Sat, 11 Nov 2023 15:28:21 +0000 Subject: [PATCH 35/75] Update keyboards/proteus67/keymaps/via/config.h Co-authored-by: Joel Challis --- keyboards/proteus67/keymaps/via/config.h | 1 + 1 file changed, 1 insertion(+) diff --git a/keyboards/proteus67/keymaps/via/config.h b/keyboards/proteus67/keymaps/via/config.h index dc5b9fcbc86d..becdb2dc05cb 100644 --- a/keyboards/proteus67/keymaps/via/config.h +++ b/keyboards/proteus67/keymaps/via/config.h @@ -1,5 +1,6 @@ // Copyright 2023 QMK // SPDX-License-Identifier: GPL-2.0-or-later +#pragma once #define RGBLIGHT_LAYERS #define RGBLIGHT_MAX_LAYERS 3 From db5fdad7df1e6fc850e33b87980c015d609b8d50 Mon Sep 17 00:00:00 2001 From: James Gzowski Date: Sat, 11 Nov 2023 15:29:00 +0000 Subject: [PATCH 36/75] Update keyboards/proteus67/readme.md Co-authored-by: Joel Challis --- keyboards/proteus67/readme.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/keyboards/proteus67/readme.md b/keyboards/proteus67/readme.md index ec554a9938a9..6b4948119fb8 100644 --- a/keyboards/proteus67/readme.md +++ b/keyboards/proteus67/readme.md @@ -16,8 +16,6 @@ Flashing example for this keyboard: make proteus67:default:flash -* VIA support using the via keymap instead of 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). ## Bootloader From e9e8a86a77a43a53d53c63c7c9a5c23cab570f1d Mon Sep 17 00:00:00 2001 From: James Gzowski Date: Sat, 11 Nov 2023 15:30:59 +0000 Subject: [PATCH 37/75] Update readme.md --- keyboards/proteus67/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/proteus67/readme.md b/keyboards/proteus67/readme.md index 6b4948119fb8..da4ca942ecb7 100644 --- a/keyboards/proteus67/readme.md +++ b/keyboards/proteus67/readme.md @@ -2,7 +2,7 @@ ![proteus67](https://i.imgur.com/mYhl7Jah.png) -*A short description of the keyboard/project* +*67 key ortholinear layout with rotary encoder* * Keyboard Maintainer: [James Gzowski](https://github.com/gzowski) * Hardware Supported: Elite-Pi or equivilent RP2040 controller with additional I/O along bottom. From 487c6c2e39e2f2af61d68a06ebd4c3edb96d7e1a Mon Sep 17 00:00:00 2001 From: James Gzowski Date: Sat, 11 Nov 2023 21:15:38 +0000 Subject: [PATCH 38/75] Update keymap.c --- keyboards/proteus67/keymaps/default/keymap.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/keyboards/proteus67/keymaps/default/keymap.c b/keyboards/proteus67/keymaps/default/keymap.c index 0ae4cd0269a3..41ba09bfd715 100644 --- a/keyboards/proteus67/keymaps/default/keymap.c +++ b/keyboards/proteus67/keymaps/default/keymap.c @@ -1,5 +1,3 @@ -// Copyright 2022 Matthew Dews (@matthew-dews) -// SPDX-License-Identifier: GPL-2.0-or-later #include QMK_KEYBOARD_H enum custom_layer { From 0286326ff30e6788abdd9b69c55976e660659a15 Mon Sep 17 00:00:00 2001 From: James Gzowski Date: Sat, 11 Nov 2023 21:16:04 +0000 Subject: [PATCH 39/75] Update keymap.c --- keyboards/proteus67/keymaps/via/keymap.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/keyboards/proteus67/keymaps/via/keymap.c b/keyboards/proteus67/keymaps/via/keymap.c index 25b51abf4f82..07fd0e1c161f 100644 --- a/keyboards/proteus67/keymaps/via/keymap.c +++ b/keyboards/proteus67/keymaps/via/keymap.c @@ -1,5 +1,3 @@ -// Copyright 2022 Matthew Dews (@matthew-dews) -// SPDX-License-Identifier: GPL-2.0-or-later #include QMK_KEYBOARD_H enum custom_layer { From 5e07c028312312e1eb0f85a479a19f048720d08e Mon Sep 17 00:00:00 2001 From: James Gzowski Date: Sat, 11 Nov 2023 21:16:40 +0000 Subject: [PATCH 40/75] Update config.h --- keyboards/proteus67/config.h | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/keyboards/proteus67/config.h b/keyboards/proteus67/config.h index e34899503c22..4ab97c308ff4 100644 --- a/keyboards/proteus67/config.h +++ b/keyboards/proteus67/config.h @@ -1,20 +1,5 @@ -/* -Copyright 2012 Jun Wako -Copyright 2015 Jack Humbert - -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 . -*/ +// Copyright 2023 QMK +// SPDX-License-Identifier: GPL-2.0-or-later #pragma once From b1dcb26f2de50e25a7d9094a4db875c8b36f60e3 Mon Sep 17 00:00:00 2001 From: James Gzowski Date: Sat, 11 Nov 2023 21:17:05 +0000 Subject: [PATCH 41/75] Update config.h --- keyboards/proteus67/config.h | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/proteus67/config.h b/keyboards/proteus67/config.h index 4ab97c308ff4..344ff3270691 100644 --- a/keyboards/proteus67/config.h +++ b/keyboards/proteus67/config.h @@ -1,6 +1,5 @@ // Copyright 2023 QMK // SPDX-License-Identifier: GPL-2.0-or-later - #pragma once #define ENCODER_MAP_KEY_DELAY 10 From 2d66318826e7c94125b869a63af7bf9b145410b2 Mon Sep 17 00:00:00 2001 From: James Gzowski Date: Sat, 11 Nov 2023 21:39:29 +0000 Subject: [PATCH 42/75] Update keymap.c --- keyboards/proteus67/keymaps/default/keymap.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/keyboards/proteus67/keymaps/default/keymap.c b/keyboards/proteus67/keymaps/default/keymap.c index 41ba09bfd715..7ee420303ee3 100644 --- a/keyboards/proteus67/keymaps/default/keymap.c +++ b/keyboards/proteus67/keymaps/default/keymap.c @@ -1,3 +1,5 @@ +// Copyright 2023 James Gzowski +// SPDX-License-Identifier: GPL-2.0-or-later #include QMK_KEYBOARD_H enum custom_layer { From 4a7889e2040c92f2cc01ccf7c33c7bbdc070bcc8 Mon Sep 17 00:00:00 2001 From: James Gzowski Date: Sat, 11 Nov 2023 21:39:45 +0000 Subject: [PATCH 43/75] Update keymap.c --- keyboards/proteus67/keymaps/via/keymap.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/keyboards/proteus67/keymaps/via/keymap.c b/keyboards/proteus67/keymaps/via/keymap.c index 07fd0e1c161f..3e2eb730873d 100644 --- a/keyboards/proteus67/keymaps/via/keymap.c +++ b/keyboards/proteus67/keymaps/via/keymap.c @@ -1,3 +1,5 @@ +// Copyright 2023 James Gzowski +// SPDX-License-Identifier: GPL-2.0-or-later #include QMK_KEYBOARD_H enum custom_layer { From 4bc08d44567d443bf7da594e9a9abf478ab6c6d0 Mon Sep 17 00:00:00 2001 From: James Gzowski Date: Fri, 17 Nov 2023 02:42:18 +0000 Subject: [PATCH 44/75] Fri Nov 17 02:42:18 AM GMT 2023 --- keyboards/proteus67/keymaps/via/keymap.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/keyboards/proteus67/keymaps/via/keymap.c b/keyboards/proteus67/keymaps/via/keymap.c index 3e2eb730873d..05348b60a0d4 100644 --- a/keyboards/proteus67/keymaps/via/keymap.c +++ b/keyboards/proteus67/keymaps/via/keymap.c @@ -17,7 +17,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_NO , MO(_ADJUST) ,KC_LGUI,KC_LALT, KC_SPC , KC_MUTE, KC_ENT , KC_BSPC , MO(_RAISE) , KC_INS , KC_DEL ), [_ADJUST] = LAYOUT_ortho_5x14( - RGB_TOG , RGB_HUI ,RGB_HUD ,RGB_SAI , RGB_SAD , RGB_VAI , RGB_VAD , RGB_M_P , RGB_M_B , RGB_M_R , RGB_M_SW , RGB_M_K , RGB_M_X , RGB_M_G , + RGB_TOG , RGB_HUD ,RGB_HUI ,RGB_SAD , RGB_SAI , RGB_VAD , RGB_VAI , RGB_M_P , RGB_M_B , RGB_M_R , RGB_M_SW , RGB_M_K , RGB_M_TW , RGB_M_G , KC_TRNS , KC_TRNS, KC_TRNS ,KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_BTN1 , KC_MS_U , KC_BTN2 , KC_TRNS ,KC_TRNS, KC_TRNS, KC_TRNS ,KC_TRNS ,KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_MS_L , KC_MS_D , KC_MS_R , KC_SCLN,KC_QUOT , 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_NUBS, KC_TRNS, @@ -40,35 +40,36 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { }; #endif -const uint8_t RGBLED_RAINBOW_MOOD_INTERVALS[] PROGMEM = {50, 20, 10}; - // MO(_ADJUST) const rgblight_segment_t PROGMEM backlight_layer_adjust[] = RGBLIGHT_LAYER_SEGMENTS( - {0, 4, HSV_CYAN} + {0, 4, HSV_GOLD} ); // MO(_RAISE) const rgblight_segment_t PROGMEM backlight_layer_raise[] = RGBLIGHT_LAYER_SEGMENTS( - {0, 4, HSV_PURPLE} + {0, 4, HSV_CYAN} +); +const rgblight_segment_t PROGMEM backlight_layer_qwerty[] = RGBLIGHT_LAYER_SEGMENTS( + {0, 4, HSV_BLACK} ); const rgblight_segment_t* const PROGMEM set_backlight_mode[] = RGBLIGHT_LAYERS_LIST( backlight_layer_adjust, - backlight_layer_raise + backlight_layer_raise, + backlight_layer_qwerty ); layer_state_t default_layer_state_set_user(layer_state_t state) { - rgblight_sethsv_noeeprom(HSV_GREEN); - return state; } + layer_state_t layer_state_set_user(layer_state_t state) { rgblight_set_layer_state(0, layer_state_cmp(state, _ADJUST)); rgblight_set_layer_state(1, layer_state_cmp(state, _RAISE)); + rgblight_set_layer_state(2, layer_state_cmp(state, _QWERTY)); return state; } - void keyboard_post_init_user(void) { - rgblight_enable_noeeprom(); - rgblight_sethsv(HSV_GREEN); + rgblight_set_effect_range(4, 17); + rgblight_sethsv_range(HSV_BLACK, 0, 4); rgblight_layers = set_backlight_mode; } From 05fa0c166973b4f15605ba3450d01d8ae09dcbc4 Mon Sep 17 00:00:00 2001 From: James Gzowski Date: Tue, 5 Dec 2023 09:20:54 +0000 Subject: [PATCH 45/75] Update keyboards/proteus67/keymaps/default/keymap.c Co-authored-by: Drashna Jaelre --- keyboards/proteus67/keymaps/default/keymap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/proteus67/keymaps/default/keymap.c b/keyboards/proteus67/keymaps/default/keymap.c index 7ee420303ee3..24831087d652 100644 --- a/keyboards/proteus67/keymaps/default/keymap.c +++ b/keyboards/proteus67/keymaps/default/keymap.c @@ -11,8 +11,8 @@ enum custom_layer { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_QWERTY] = LAYOUT_ortho_5x14( KC_ESC , KC_1 ,KC_2 ,KC_3 , KC_4 , KC_5 , KC_MINUS , KC_EQL , KC_6 , KC_7 , KC_8 , KC_9 , KC_0 , KC_GRV , - KC_TAB , KC_Q ,KC_W ,KC_E , KC_R , KC_T , KC_END , KC_HOME , KC_Y , KC_U , KC_I , KC_O , KC_P ,KC_MINUS, - KC_LCTL, KC_A ,KC_S ,KC_D , KC_F , KC_G , KC_PGDN , KC_PGUP , KC_H , KC_J , KC_K , KC_L , KC_SCLN,KC_QUOT , + KC_TAB , KC_Q ,KC_W ,KC_E , KC_R , KC_T , KC_END , KC_HOME , KC_Y , KC_U , KC_I , KC_O , KC_P ,KC_MINUS, + KC_LCTL, KC_A ,KC_S ,KC_D , KC_F , KC_G , KC_PGDN , KC_PGUP , KC_H , KC_J , KC_K , KC_L , KC_SCLN,KC_QUOT , KC_LSFT, KC_Z ,KC_X ,KC_C , KC_V , KC_B , KC_LBRC, KC_RBRC, KC_N , KC_M , KC_COMM , KC_DOT , KC_SLSH, KC_RSFT, KC_NO , MO(_ADJUST) ,KC_LGUI,KC_LALT, KC_SPC , KC_MUTE, KC_ENT , KC_BSPC , MO(_RAISE) , KC_INS , KC_DEL ), From 12871fe597d61d514bc6beef16a1f9f112b51995 Mon Sep 17 00:00:00 2001 From: James Gzowski Date: Tue, 5 Dec 2023 09:21:07 +0000 Subject: [PATCH 46/75] Update keyboards/proteus67/info.json Co-authored-by: Drashna Jaelre --- keyboards/proteus67/info.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/proteus67/info.json b/keyboards/proteus67/info.json index 76dd178fb844..ced6dec25ca8 100644 --- a/keyboards/proteus67/info.json +++ b/keyboards/proteus67/info.json @@ -15,7 +15,7 @@ "extrakey": true, "mousekey": true, "nkro": true, - "rgblight": true + "rgblight": true }, "matrix_pins": { "cols": ["GP2", "GP3", "GP4", "GP5", "GP6", "GP7", "GP8", "GP23", "GP20", "GP22", "GP26", "GP27", "GP28", "GP29"], From c5f9860443fab2b4bb6d1bd9ebb6e0c045c1d2ea Mon Sep 17 00:00:00 2001 From: James Gzowski Date: Tue, 5 Dec 2023 09:21:14 +0000 Subject: [PATCH 47/75] Update keyboards/proteus67/info.json Co-authored-by: Drashna Jaelre --- keyboards/proteus67/info.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/proteus67/info.json b/keyboards/proteus67/info.json index ced6dec25ca8..ee60d9a546e8 100644 --- a/keyboards/proteus67/info.json +++ b/keyboards/proteus67/info.json @@ -47,7 +47,7 @@ }, "ws2812": { "pin": "GP0", - "driver": "vendor" + "driver": "vendor" }, "layouts": { "LAYOUT_ortho_5x14": { From 0e06f164c3e5d2cf8381e1eb2339edee6fb90b22 Mon Sep 17 00:00:00 2001 From: James Gzowski Date: Tue, 5 Dec 2023 09:21:20 +0000 Subject: [PATCH 48/75] Update keyboards/proteus67/keymaps/via/keymap.c Co-authored-by: Drashna Jaelre --- keyboards/proteus67/keymaps/via/keymap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/proteus67/keymaps/via/keymap.c b/keyboards/proteus67/keymaps/via/keymap.c index 05348b60a0d4..91f3dd3eb195 100644 --- a/keyboards/proteus67/keymaps/via/keymap.c +++ b/keyboards/proteus67/keymaps/via/keymap.c @@ -11,8 +11,8 @@ enum custom_layer { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_QWERTY] = LAYOUT_ortho_5x14( KC_ESC , KC_1 ,KC_2 ,KC_3 , KC_4 , KC_5 , KC_MINUS , KC_EQL , KC_6 , KC_7 , KC_8 , KC_9 , KC_0 , KC_GRV , - KC_TAB , KC_Q ,KC_W ,KC_E , KC_R , KC_T , KC_END , KC_HOME , KC_Y , KC_U , KC_I , KC_O , KC_P ,KC_MINUS, - KC_LCTL, KC_A ,KC_S ,KC_D , KC_F , KC_G , KC_PGDN , KC_PGUP , KC_H , KC_J , KC_K , KC_L , KC_SCLN,KC_QUOT , + KC_TAB , KC_Q ,KC_W ,KC_E , KC_R , KC_T , KC_END , KC_HOME , KC_Y , KC_U , KC_I , KC_O , KC_P ,KC_MINUS, + KC_LCTL, KC_A ,KC_S ,KC_D , KC_F , KC_G , KC_PGDN , KC_PGUP , KC_H , KC_J , KC_K , KC_L , KC_SCLN,KC_QUOT , KC_LSFT, KC_Z ,KC_X ,KC_C , KC_V , KC_B , KC_LBRC, KC_RBRC, KC_N , KC_M , KC_COMM , KC_DOT , KC_SLSH, KC_RSFT, KC_NO , MO(_ADJUST) ,KC_LGUI,KC_LALT, KC_SPC , KC_MUTE, KC_ENT , KC_BSPC , MO(_RAISE) , KC_INS , KC_DEL ), From d44494be6b516b9823e8b78be5343fcf08c498d9 Mon Sep 17 00:00:00 2001 From: James Gzowski Date: Tue, 5 Dec 2023 09:38:16 +0000 Subject: [PATCH 49/75] Add files via upload --- keyboards/proteus67/keymaps/colmak/config.h | 7 ++ keyboards/proteus67/keymaps/colmak/keymap.c | 75 +++++++++++++++++++++ keyboards/proteus67/keymaps/colmak/rules.mk | 2 + 3 files changed, 84 insertions(+) create mode 100644 keyboards/proteus67/keymaps/colmak/config.h create mode 100644 keyboards/proteus67/keymaps/colmak/keymap.c create mode 100644 keyboards/proteus67/keymaps/colmak/rules.mk diff --git a/keyboards/proteus67/keymaps/colmak/config.h b/keyboards/proteus67/keymaps/colmak/config.h new file mode 100644 index 000000000000..becdb2dc05cb --- /dev/null +++ b/keyboards/proteus67/keymaps/colmak/config.h @@ -0,0 +1,7 @@ +// Copyright 2023 QMK +// SPDX-License-Identifier: GPL-2.0-or-later +#pragma once + +#define RGBLIGHT_LAYERS +#define RGBLIGHT_MAX_LAYERS 3 +#define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF diff --git a/keyboards/proteus67/keymaps/colmak/keymap.c b/keyboards/proteus67/keymaps/colmak/keymap.c new file mode 100644 index 000000000000..983f835928e8 --- /dev/null +++ b/keyboards/proteus67/keymaps/colmak/keymap.c @@ -0,0 +1,75 @@ +// Copyright 2023 James Gzowski +// SPDX-License-Identifier: GPL-2.0-or-later +#include QMK_KEYBOARD_H + +enum custom_layer { + _COLMAK, + _ADJUST, + _RAISE, +}; + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [_COLMAK] = LAYOUT_ortho_5x14( + KC_ESC , KC_1 ,KC_2 ,KC_3 , KC_4 , KC_5 , KC_PSCR , KC_EQL , KC_6 , KC_7 , KC_8 , KC_9 , KC_0 , KC_GRV , + KC_TAB , KC_Q ,KC_W ,KC_F , KC_P , KC_G , KC_END , KC_HOME , KC_J , KC_L , KC_U , KC_Y , KC_SCLN ,KC_MINUS, + KC_LCTL, KC_A ,KC_R ,KC_S , KC_T , KC_D , KC_PGDN , KC_PGUP , KC_H , KC_N , KC_E , KC_I , KC_Y ,KC_QUOT , + KC_LSFT, KC_Z ,KC_X ,KC_C , KC_V , KC_B , KC_LBRC, KC_RBRC, KC_K , KC_M , KC_COMM , KC_DOT , KC_SLSH, KC_RSFT, + KC_NO , MO(_ADJUST) ,KC_LGUI,KC_LALT, KC_SPC , KC_MUTE, KC_ENT , KC_BSPC , MO(_RAISE) , KC_INS , KC_DEL +), + [_ADJUST] = LAYOUT_ortho_5x14( + RGB_TOG , RGB_HUD ,RGB_HUI ,RGB_SAD , RGB_SAI , RGB_VAD , RGB_VAI , RGB_M_P , RGB_M_B , RGB_M_R , RGB_M_SW , RGB_M_K , RGB_M_TW , RGB_M_G , + KC_TRNS , KC_TRNS, KC_TRNS ,KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_BTN1 , KC_MS_U , KC_BTN2 , KC_TRNS ,KC_TRNS, + KC_TRNS, KC_TRNS ,KC_TRNS ,KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_MS_L , KC_MS_D , KC_MS_R , KC_SCLN,KC_QUOT , + 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_NUBS, KC_TRNS, + KC_TRNS , KC_TRNS ,KC_TRNS,KC_TRNS, KC_TRNS , RGB_RMOD, KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS +), + [_RAISE] = LAYOUT_ortho_5x14( + KC_TRNS , KC_F1 ,KC_F2 ,KC_F3 , KC_F4 , KC_F5 , KC_TRNS , KC_TRNS , KC_F6 , KC_F7 , KC_F8 , KC_F9 , KC_F10 , KC_GRV , + 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_LEFT , KC_DOWN , KC_UP , KC_RIGHT , KC_SCLN,KC_QUOT , + 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_NUBS, KC_TRNS, + KC_TRNS , KC_TRNS ,KC_TRNS,KC_TRNS, KC_TRNS , RGB_MOD, 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] = { + [_COLMAK] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, + [_ADJUST] = { ENCODER_CCW_CW(RGB_HUD, RGB_HUI)}, + [_RAISE] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI)} +}; +#endif + +// MO(_ADJUST) +const rgblight_segment_t PROGMEM backlight_layer_adjust[] = RGBLIGHT_LAYER_SEGMENTS( + {0, 4, HSV_GOLD} +); +// MO(_RAISE) +const rgblight_segment_t PROGMEM backlight_layer_raise[] = RGBLIGHT_LAYER_SEGMENTS( + {0, 4, HSV_CYAN} +); +const rgblight_segment_t PROGMEM backlight_layer_qwerty[] = RGBLIGHT_LAYER_SEGMENTS( + {0, 4, HSV_BLACK} +); + +const rgblight_segment_t* const PROGMEM set_backlight_mode[] = RGBLIGHT_LAYERS_LIST( + backlight_layer_adjust, + backlight_layer_raise, + backlight_layer_qwerty +); + +layer_state_t default_layer_state_set_user(layer_state_t state) { +return state; +} + +layer_state_t layer_state_set_user(layer_state_t state) { + rgblight_set_layer_state(0, layer_state_cmp(state, _ADJUST)); + rgblight_set_layer_state(1, layer_state_cmp(state, _RAISE)); + rgblight_set_layer_state(2, layer_state_cmp(state, _COLMAK)); + return state; +} +void keyboard_post_init_user(void) { + rgblight_set_effect_range(4, 17); + rgblight_sethsv_range(HSV_BLACK, 0, 4); + rgblight_layers = set_backlight_mode; +} diff --git a/keyboards/proteus67/keymaps/colmak/rules.mk b/keyboards/proteus67/keymaps/colmak/rules.mk new file mode 100644 index 000000000000..f1adcab005e8 --- /dev/null +++ b/keyboards/proteus67/keymaps/colmak/rules.mk @@ -0,0 +1,2 @@ +VIA_ENABLE = yes +ENCODER_MAP_ENABLE = yes From 363b6b54fd16a6be564ea8601729e213093b6532 Mon Sep 17 00:00:00 2001 From: James Gzowski Date: Wed, 13 Dec 2023 17:57:05 +0000 Subject: [PATCH 50/75] Create proteus67.c --- keyboards/proteus67/proteus67.c | 38 +++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 keyboards/proteus67/proteus67.c diff --git a/keyboards/proteus67/proteus67.c b/keyboards/proteus67/proteus67.c new file mode 100644 index 000000000000..ffa3cc8bb87e --- /dev/null +++ b/keyboards/proteus67/proteus67.c @@ -0,0 +1,38 @@ +// Copyright 2023 James Gzowski +// SPDX-License-Identifier: GPL-2.0-or-later +#include QMK_KEYBOARD_H + +enum custom_layer { + _LAYERA, + _LAYERB, + _LAYERC, +}; + +// MO(_LAYERB) +const rgblight_segment_t PROGMEM backlight_layer_layerb[] = RGBLIGHT_LAYER_SEGMENTS( + {0, 4, HSV_GOLD} +); +// MO(_LAYERC) +const rgblight_segment_t PROGMEM backlight_layer_layerc[] = RGBLIGHT_LAYER_SEGMENTS( + {0, 4, HSV_CYAN} +); +const rgblight_segment_t PROGMEM backlight_layer_layera[] = RGBLIGHT_LAYER_SEGMENTS( + {0, 4, HSV_BLACK} +); +const rgblight_segment_t* const PROGMEM set_backlight_mode[] = RGBLIGHT_LAYERS_LIST( + backlight_layer_layerb, + backlight_layer_layerc, + backlight_layer_layera +); + +layer_state_t layer_state_set_user(layer_state_t state) { + rgblight_set_layer_state(0, layer_state_cmp(state, _LAYERB)); + rgblight_set_layer_state(1, layer_state_cmp(state, _LAYERC)); + rgblight_set_layer_state(2, layer_state_cmp(state, _LAYERA)); + return state; +} +void keyboard_post_init_user(void) { + rgblight_set_effect_range(4, 17); + rgblight_sethsv_range(HSV_BLACK, 0, 4); + rgblight_layers = set_backlight_mode; +} From 289e0b3477e7eeda5feecd8ae714da89420a135f Mon Sep 17 00:00:00 2001 From: James Gzowski Date: Wed, 13 Dec 2023 17:59:13 +0000 Subject: [PATCH 51/75] Update keymap.c --- keyboards/proteus67/keymaps/colmak/keymap.c | 55 +++++---------------- 1 file changed, 11 insertions(+), 44 deletions(-) diff --git a/keyboards/proteus67/keymaps/colmak/keymap.c b/keyboards/proteus67/keymaps/colmak/keymap.c index 983f835928e8..7e0d5c882430 100644 --- a/keyboards/proteus67/keymaps/colmak/keymap.c +++ b/keyboards/proteus67/keymaps/colmak/keymap.c @@ -3,30 +3,30 @@ #include QMK_KEYBOARD_H enum custom_layer { - _COLMAK, - _ADJUST, - _RAISE, + _LAYERA, + _LAYERB, + _LAYERC, }; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [_COLMAK] = LAYOUT_ortho_5x14( + [_LAYERA] = LAYOUT_ortho_5x14( KC_ESC , KC_1 ,KC_2 ,KC_3 , KC_4 , KC_5 , KC_PSCR , KC_EQL , KC_6 , KC_7 , KC_8 , KC_9 , KC_0 , KC_GRV , KC_TAB , KC_Q ,KC_W ,KC_F , KC_P , KC_G , KC_END , KC_HOME , KC_J , KC_L , KC_U , KC_Y , KC_SCLN ,KC_MINUS, - KC_LCTL, KC_A ,KC_R ,KC_S , KC_T , KC_D , KC_PGDN , KC_PGUP , KC_H , KC_N , KC_E , KC_I , KC_Y ,KC_QUOT , + KC_LCTL, KC_A ,KC_R ,KC_S , KC_T , KC_D , KC_PGDN , KC_PGUP , KC_H , KC_N , KC_E , KC_I , KC_O ,KC_QUOT , KC_LSFT, KC_Z ,KC_X ,KC_C , KC_V , KC_B , KC_LBRC, KC_RBRC, KC_K , KC_M , KC_COMM , KC_DOT , KC_SLSH, KC_RSFT, KC_NO , MO(_ADJUST) ,KC_LGUI,KC_LALT, KC_SPC , KC_MUTE, KC_ENT , KC_BSPC , MO(_RAISE) , KC_INS , KC_DEL ), - [_ADJUST] = LAYOUT_ortho_5x14( + [_LAYERB] = LAYOUT_ortho_5x14( RGB_TOG , RGB_HUD ,RGB_HUI ,RGB_SAD , RGB_SAI , RGB_VAD , RGB_VAI , RGB_M_P , RGB_M_B , RGB_M_R , RGB_M_SW , RGB_M_K , RGB_M_TW , RGB_M_G , KC_TRNS , KC_TRNS, KC_TRNS ,KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_BTN1 , KC_MS_U , KC_BTN2 , KC_TRNS ,KC_TRNS, KC_TRNS, KC_TRNS ,KC_TRNS ,KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_MS_L , KC_MS_D , KC_MS_R , KC_SCLN,KC_QUOT , 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_NUBS, KC_TRNS, KC_TRNS , KC_TRNS ,KC_TRNS,KC_TRNS, KC_TRNS , RGB_RMOD, KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS ), - [_RAISE] = LAYOUT_ortho_5x14( + [_LAYERC] = LAYOUT_ortho_5x14( KC_TRNS , KC_F1 ,KC_F2 ,KC_F3 , KC_F4 , KC_F5 , KC_TRNS , KC_TRNS , KC_F6 , KC_F7 , KC_F8 , KC_F9 , KC_F10 , KC_GRV , 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_LEFT , KC_DOWN , KC_UP , KC_RIGHT , KC_SCLN,KC_QUOT , + KC_TRNS, KC_TRNS ,KC_TRNS ,KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_LEFT , KC_DOWN , KC_UP , KC_RIGHT,KC_QUOT , 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_NUBS, KC_TRNS, KC_TRNS , KC_TRNS ,KC_TRNS,KC_TRNS, KC_TRNS , RGB_MOD, KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS ) @@ -34,42 +34,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { #if defined(ENCODER_MAP_ENABLE) const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { - [_COLMAK] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, - [_ADJUST] = { ENCODER_CCW_CW(RGB_HUD, RGB_HUI)}, - [_RAISE] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI)} + [_LAYERA] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, + [_LAYERB] = { ENCODER_CCW_CW(RGB_HUD, RGB_HUI)}, + [_LAYERC] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI)} }; #endif -// MO(_ADJUST) -const rgblight_segment_t PROGMEM backlight_layer_adjust[] = RGBLIGHT_LAYER_SEGMENTS( - {0, 4, HSV_GOLD} -); -// MO(_RAISE) -const rgblight_segment_t PROGMEM backlight_layer_raise[] = RGBLIGHT_LAYER_SEGMENTS( - {0, 4, HSV_CYAN} -); -const rgblight_segment_t PROGMEM backlight_layer_qwerty[] = RGBLIGHT_LAYER_SEGMENTS( - {0, 4, HSV_BLACK} -); - -const rgblight_segment_t* const PROGMEM set_backlight_mode[] = RGBLIGHT_LAYERS_LIST( - backlight_layer_adjust, - backlight_layer_raise, - backlight_layer_qwerty -); - -layer_state_t default_layer_state_set_user(layer_state_t state) { -return state; -} - -layer_state_t layer_state_set_user(layer_state_t state) { - rgblight_set_layer_state(0, layer_state_cmp(state, _ADJUST)); - rgblight_set_layer_state(1, layer_state_cmp(state, _RAISE)); - rgblight_set_layer_state(2, layer_state_cmp(state, _COLMAK)); - return state; -} -void keyboard_post_init_user(void) { - rgblight_set_effect_range(4, 17); - rgblight_sethsv_range(HSV_BLACK, 0, 4); - rgblight_layers = set_backlight_mode; -} From bbb5a05aa3de6dd9c65059379834879da0bbe83a Mon Sep 17 00:00:00 2001 From: James Gzowski Date: Wed, 13 Dec 2023 18:00:25 +0000 Subject: [PATCH 52/75] Update keymap.c --- keyboards/proteus67/keymaps/default/keymap.c | 52 ++++---------------- 1 file changed, 9 insertions(+), 43 deletions(-) diff --git a/keyboards/proteus67/keymaps/default/keymap.c b/keyboards/proteus67/keymaps/default/keymap.c index 24831087d652..62e8dbba4c1e 100644 --- a/keyboards/proteus67/keymaps/default/keymap.c +++ b/keyboards/proteus67/keymaps/default/keymap.c @@ -3,27 +3,27 @@ #include QMK_KEYBOARD_H enum custom_layer { - _QWERTY, - _ADJUST, - _RAISE, + _LAYERA, + _LAYERB, + _LAYERC, }; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [_QWERTY] = LAYOUT_ortho_5x14( + [_LAYERA] = LAYOUT_ortho_5x14( KC_ESC , KC_1 ,KC_2 ,KC_3 , KC_4 , KC_5 , KC_MINUS , KC_EQL , KC_6 , KC_7 , KC_8 , KC_9 , KC_0 , KC_GRV , KC_TAB , KC_Q ,KC_W ,KC_E , KC_R , KC_T , KC_END , KC_HOME , KC_Y , KC_U , KC_I , KC_O , KC_P ,KC_MINUS, KC_LCTL, KC_A ,KC_S ,KC_D , KC_F , KC_G , KC_PGDN , KC_PGUP , KC_H , KC_J , KC_K , KC_L , KC_SCLN,KC_QUOT , KC_LSFT, KC_Z ,KC_X ,KC_C , KC_V , KC_B , KC_LBRC, KC_RBRC, KC_N , KC_M , KC_COMM , KC_DOT , KC_SLSH, KC_RSFT, KC_NO , MO(_ADJUST) ,KC_LGUI,KC_LALT, KC_SPC , KC_MUTE, KC_ENT , KC_BSPC , MO(_RAISE) , KC_INS , KC_DEL ), - [_ADJUST] = LAYOUT_ortho_5x14( + [_LAYERB] = LAYOUT_ortho_5x14( RGB_TOG , RGB_HUI ,RGB_HUD ,RGB_SAI , RGB_SAD , RGB_VAI , RGB_VAD , RGB_M_P , RGB_M_B , RGB_M_R , RGB_M_SW , RGB_M_K , RGB_M_X , RGB_M_G , KC_TRNS , KC_TRNS, KC_TRNS ,KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_BTN1 , KC_MS_U , KC_BTN2 , KC_TRNS ,KC_TRNS, KC_TRNS, KC_TRNS ,KC_TRNS ,KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_MS_L , KC_MS_D , KC_MS_R , KC_SCLN,KC_QUOT , 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_NUBS, KC_TRNS, KC_TRNS , KC_TRNS ,KC_TRNS,KC_TRNS, KC_TRNS , RGB_RMOD, KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS ), - [_RAISE] = LAYOUT_ortho_5x14( + [_LAYERC] = LAYOUT_ortho_5x14( KC_TRNS , KC_F1 ,KC_F2 ,KC_F3 , KC_F4 , KC_F5 , KC_TRNS , KC_TRNS , KC_F6 , KC_F7 , KC_F8 , KC_F9 , KC_F10 , KC_GRV , KC_TRNS , KC_TRNS, KC_TRNS ,KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_UP , 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_LEFT , KC_DOWN , KC_RIGHT , KC_SCLN,KC_QUOT , @@ -34,42 +34,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { #if defined(ENCODER_MAP_ENABLE) const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { - [_QWERTY] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, - [_ADJUST] = { ENCODER_CCW_CW(RGB_HUD, RGB_HUI)}, - [_RAISE] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI)} + [_LAYERA] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, + [_LAYERB] = { ENCODER_CCW_CW(RGB_HUD, RGB_HUI)}, + [_LAYERC] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI)} }; #endif - -const uint8_t RGBLED_RAINBOW_MOOD_INTERVALS[] PROGMEM = {50, 20, 10}; - -// MO(_ADJUST) -const rgblight_segment_t PROGMEM backlight_layer_adjust[] = RGBLIGHT_LAYER_SEGMENTS( - {0, 4, HSV_RED} -); -// MO(_RAISE) -const rgblight_segment_t PROGMEM backlight_layer_raise[] = RGBLIGHT_LAYER_SEGMENTS( - {0, 4, HSV_BLUE} -); - -const rgblight_segment_t* const PROGMEM set_backlight_mode[] = RGBLIGHT_LAYERS_LIST( - backlight_layer_adjust, - backlight_layer_raise -); - -layer_state_t default_layer_state_set_user(layer_state_t state) { - rgblight_sethsv_noeeprom(HSV_GREEN); - -return state; -} -layer_state_t layer_state_set_user(layer_state_t state) { - rgblight_set_layer_state(0, layer_state_cmp(state, _ADJUST)); - rgblight_set_layer_state(1, layer_state_cmp(state, _RAISE)); - return state; -} - -void keyboard_post_init_user(void) { - rgblight_enable_noeeprom(); - rgblight_sethsv(HSV_GREEN); - rgblight_layers = set_backlight_mode; -} -; From 033e1bc286515969ad96f834da76dec3a237462b Mon Sep 17 00:00:00 2001 From: James Gzowski Date: Wed, 13 Dec 2023 18:01:32 +0000 Subject: [PATCH 53/75] Update keymap.c --- keyboards/proteus67/keymaps/via/keymap.c | 52 ++++-------------------- 1 file changed, 9 insertions(+), 43 deletions(-) diff --git a/keyboards/proteus67/keymaps/via/keymap.c b/keyboards/proteus67/keymaps/via/keymap.c index 91f3dd3eb195..201081e2a378 100644 --- a/keyboards/proteus67/keymaps/via/keymap.c +++ b/keyboards/proteus67/keymaps/via/keymap.c @@ -3,27 +3,27 @@ #include QMK_KEYBOARD_H enum custom_layer { - _QWERTY, - _ADJUST, - _RAISE, + _LAYERA, + _LAYERB, + _LAYERC, }; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [_QWERTY] = LAYOUT_ortho_5x14( + [_LAYERA] = LAYOUT_ortho_5x14( KC_ESC , KC_1 ,KC_2 ,KC_3 , KC_4 , KC_5 , KC_MINUS , KC_EQL , KC_6 , KC_7 , KC_8 , KC_9 , KC_0 , KC_GRV , KC_TAB , KC_Q ,KC_W ,KC_E , KC_R , KC_T , KC_END , KC_HOME , KC_Y , KC_U , KC_I , KC_O , KC_P ,KC_MINUS, KC_LCTL, KC_A ,KC_S ,KC_D , KC_F , KC_G , KC_PGDN , KC_PGUP , KC_H , KC_J , KC_K , KC_L , KC_SCLN,KC_QUOT , KC_LSFT, KC_Z ,KC_X ,KC_C , KC_V , KC_B , KC_LBRC, KC_RBRC, KC_N , KC_M , KC_COMM , KC_DOT , KC_SLSH, KC_RSFT, KC_NO , MO(_ADJUST) ,KC_LGUI,KC_LALT, KC_SPC , KC_MUTE, KC_ENT , KC_BSPC , MO(_RAISE) , KC_INS , KC_DEL ), - [_ADJUST] = LAYOUT_ortho_5x14( + [_LAYERB] = LAYOUT_ortho_5x14( RGB_TOG , RGB_HUD ,RGB_HUI ,RGB_SAD , RGB_SAI , RGB_VAD , RGB_VAI , RGB_M_P , RGB_M_B , RGB_M_R , RGB_M_SW , RGB_M_K , RGB_M_TW , RGB_M_G , KC_TRNS , KC_TRNS, KC_TRNS ,KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_BTN1 , KC_MS_U , KC_BTN2 , KC_TRNS ,KC_TRNS, KC_TRNS, KC_TRNS ,KC_TRNS ,KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_MS_L , KC_MS_D , KC_MS_R , KC_SCLN,KC_QUOT , 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_NUBS, KC_TRNS, KC_TRNS , KC_TRNS ,KC_TRNS,KC_TRNS, KC_TRNS , RGB_RMOD, KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS ), - [_RAISE] = LAYOUT_ortho_5x14( + [_LAYERC] = LAYOUT_ortho_5x14( KC_TRNS , KC_F1 ,KC_F2 ,KC_F3 , KC_F4 , KC_F5 , KC_TRNS , KC_TRNS , KC_F6 , KC_F7 , KC_F8 , KC_F9 , KC_F10 , KC_GRV , KC_TRNS , KC_TRNS, KC_TRNS ,KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_UP , 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_LEFT , KC_DOWN , KC_RIGHT , KC_SCLN,KC_QUOT , @@ -34,42 +34,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { #if defined(ENCODER_MAP_ENABLE) const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { - [_QWERTY] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, - [_ADJUST] = { ENCODER_CCW_CW(RGB_HUD, RGB_HUI)}, - [_RAISE] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI)} + [_LAYERA] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, + [_LAYERB] = { ENCODER_CCW_CW(RGB_HUD, RGB_HUI)}, + [_LAYERC] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI)} }; #endif - -// MO(_ADJUST) -const rgblight_segment_t PROGMEM backlight_layer_adjust[] = RGBLIGHT_LAYER_SEGMENTS( - {0, 4, HSV_GOLD} -); -// MO(_RAISE) -const rgblight_segment_t PROGMEM backlight_layer_raise[] = RGBLIGHT_LAYER_SEGMENTS( - {0, 4, HSV_CYAN} -); -const rgblight_segment_t PROGMEM backlight_layer_qwerty[] = RGBLIGHT_LAYER_SEGMENTS( - {0, 4, HSV_BLACK} -); - -const rgblight_segment_t* const PROGMEM set_backlight_mode[] = RGBLIGHT_LAYERS_LIST( - backlight_layer_adjust, - backlight_layer_raise, - backlight_layer_qwerty -); - -layer_state_t default_layer_state_set_user(layer_state_t state) { -return state; -} - -layer_state_t layer_state_set_user(layer_state_t state) { - rgblight_set_layer_state(0, layer_state_cmp(state, _ADJUST)); - rgblight_set_layer_state(1, layer_state_cmp(state, _RAISE)); - rgblight_set_layer_state(2, layer_state_cmp(state, _QWERTY)); - return state; -} -void keyboard_post_init_user(void) { - rgblight_set_effect_range(4, 17); - rgblight_sethsv_range(HSV_BLACK, 0, 4); - rgblight_layers = set_backlight_mode; -} From 5aadec2207e6ed62dc9f26aefbc218b6f14fd5f1 Mon Sep 17 00:00:00 2001 From: James Gzowski Date: Wed, 13 Dec 2023 18:07:14 +0000 Subject: [PATCH 54/75] Update keymap.c --- keyboards/proteus67/keymaps/colmak/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/proteus67/keymaps/colmak/keymap.c b/keyboards/proteus67/keymaps/colmak/keymap.c index 7e0d5c882430..df572f0bc015 100644 --- a/keyboards/proteus67/keymaps/colmak/keymap.c +++ b/keyboards/proteus67/keymaps/colmak/keymap.c @@ -14,7 +14,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TAB , KC_Q ,KC_W ,KC_F , KC_P , KC_G , KC_END , KC_HOME , KC_J , KC_L , KC_U , KC_Y , KC_SCLN ,KC_MINUS, KC_LCTL, KC_A ,KC_R ,KC_S , KC_T , KC_D , KC_PGDN , KC_PGUP , KC_H , KC_N , KC_E , KC_I , KC_O ,KC_QUOT , KC_LSFT, KC_Z ,KC_X ,KC_C , KC_V , KC_B , KC_LBRC, KC_RBRC, KC_K , KC_M , KC_COMM , KC_DOT , KC_SLSH, KC_RSFT, - KC_NO , MO(_ADJUST) ,KC_LGUI,KC_LALT, KC_SPC , KC_MUTE, KC_ENT , KC_BSPC , MO(_RAISE) , KC_INS , KC_DEL + KC_NO , MO(_LAYERB) ,KC_LGUI,KC_LALT, KC_SPC , KC_MUTE, KC_ENT , KC_BSPC , MO(_LAYERC) , KC_INS , KC_DEL ), [_LAYERB] = LAYOUT_ortho_5x14( RGB_TOG , RGB_HUD ,RGB_HUI ,RGB_SAD , RGB_SAI , RGB_VAD , RGB_VAI , RGB_M_P , RGB_M_B , RGB_M_R , RGB_M_SW , RGB_M_K , RGB_M_TW , RGB_M_G , From 8735050eca5eb8a7bc6befabc84cbfcc3003f15a Mon Sep 17 00:00:00 2001 From: James Gzowski Date: Wed, 13 Dec 2023 18:07:38 +0000 Subject: [PATCH 55/75] Update keymap.c --- keyboards/proteus67/keymaps/via/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/proteus67/keymaps/via/keymap.c b/keyboards/proteus67/keymaps/via/keymap.c index 201081e2a378..c79ac61e9e62 100644 --- a/keyboards/proteus67/keymaps/via/keymap.c +++ b/keyboards/proteus67/keymaps/via/keymap.c @@ -14,7 +14,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TAB , KC_Q ,KC_W ,KC_E , KC_R , KC_T , KC_END , KC_HOME , KC_Y , KC_U , KC_I , KC_O , KC_P ,KC_MINUS, KC_LCTL, KC_A ,KC_S ,KC_D , KC_F , KC_G , KC_PGDN , KC_PGUP , KC_H , KC_J , KC_K , KC_L , KC_SCLN,KC_QUOT , KC_LSFT, KC_Z ,KC_X ,KC_C , KC_V , KC_B , KC_LBRC, KC_RBRC, KC_N , KC_M , KC_COMM , KC_DOT , KC_SLSH, KC_RSFT, - KC_NO , MO(_ADJUST) ,KC_LGUI,KC_LALT, KC_SPC , KC_MUTE, KC_ENT , KC_BSPC , MO(_RAISE) , KC_INS , KC_DEL + KC_NO , MO(_LAYERB) ,KC_LGUI,KC_LALT, KC_SPC , KC_MUTE, KC_ENT , KC_BSPC , MO(_LAYERC) , KC_INS , KC_DEL ), [_LAYERB] = LAYOUT_ortho_5x14( RGB_TOG , RGB_HUD ,RGB_HUI ,RGB_SAD , RGB_SAI , RGB_VAD , RGB_VAI , RGB_M_P , RGB_M_B , RGB_M_R , RGB_M_SW , RGB_M_K , RGB_M_TW , RGB_M_G , From f7d46a093686b84ac1a25dde86b6764668a98663 Mon Sep 17 00:00:00 2001 From: James Gzowski Date: Wed, 13 Dec 2023 18:08:04 +0000 Subject: [PATCH 56/75] Update keymap.c --- keyboards/proteus67/keymaps/default/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/proteus67/keymaps/default/keymap.c b/keyboards/proteus67/keymaps/default/keymap.c index 62e8dbba4c1e..bef2a5d1c5b6 100644 --- a/keyboards/proteus67/keymaps/default/keymap.c +++ b/keyboards/proteus67/keymaps/default/keymap.c @@ -14,7 +14,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TAB , KC_Q ,KC_W ,KC_E , KC_R , KC_T , KC_END , KC_HOME , KC_Y , KC_U , KC_I , KC_O , KC_P ,KC_MINUS, KC_LCTL, KC_A ,KC_S ,KC_D , KC_F , KC_G , KC_PGDN , KC_PGUP , KC_H , KC_J , KC_K , KC_L , KC_SCLN,KC_QUOT , KC_LSFT, KC_Z ,KC_X ,KC_C , KC_V , KC_B , KC_LBRC, KC_RBRC, KC_N , KC_M , KC_COMM , KC_DOT , KC_SLSH, KC_RSFT, - KC_NO , MO(_ADJUST) ,KC_LGUI,KC_LALT, KC_SPC , KC_MUTE, KC_ENT , KC_BSPC , MO(_RAISE) , KC_INS , KC_DEL + KC_NO , MO(_LAYERB) ,KC_LGUI,KC_LALT, KC_SPC , KC_MUTE, KC_ENT , KC_BSPC , MO(_LAYERC) , KC_INS , KC_DEL ), [_LAYERB] = LAYOUT_ortho_5x14( RGB_TOG , RGB_HUI ,RGB_HUD ,RGB_SAI , RGB_SAD , RGB_VAI , RGB_VAD , RGB_M_P , RGB_M_B , RGB_M_R , RGB_M_SW , RGB_M_K , RGB_M_X , RGB_M_G , From b8c1250bfeeaf81ad3fea2581ba9cafd3ba09f26 Mon Sep 17 00:00:00 2001 From: James Gzowski Date: Wed, 13 Dec 2023 21:55:04 +0000 Subject: [PATCH 57/75] Rename config.h to config.h --- keyboards/proteus67/keymaps/{colmak => colemak}/config.h | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename keyboards/proteus67/keymaps/{colmak => colemak}/config.h (100%) diff --git a/keyboards/proteus67/keymaps/colmak/config.h b/keyboards/proteus67/keymaps/colemak/config.h similarity index 100% rename from keyboards/proteus67/keymaps/colmak/config.h rename to keyboards/proteus67/keymaps/colemak/config.h From 5a1080cafef446f629b40f77978dfb9ec6b72e6f Mon Sep 17 00:00:00 2001 From: James Gzowski Date: Wed, 13 Dec 2023 21:55:25 +0000 Subject: [PATCH 58/75] Rename keymap.c to keymap.c --- keyboards/proteus67/keymaps/{colmak => colemak}/keymap.c | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename keyboards/proteus67/keymaps/{colmak => colemak}/keymap.c (100%) diff --git a/keyboards/proteus67/keymaps/colmak/keymap.c b/keyboards/proteus67/keymaps/colemak/keymap.c similarity index 100% rename from keyboards/proteus67/keymaps/colmak/keymap.c rename to keyboards/proteus67/keymaps/colemak/keymap.c From fa86fa0f97a43fe7bc35d97710a9453af8c07be8 Mon Sep 17 00:00:00 2001 From: James Gzowski Date: Wed, 13 Dec 2023 21:55:45 +0000 Subject: [PATCH 59/75] Rename rules.mk to rules.mk --- keyboards/proteus67/keymaps/{colmak => colemak}/rules.mk | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename keyboards/proteus67/keymaps/{colmak => colemak}/rules.mk (100%) diff --git a/keyboards/proteus67/keymaps/colmak/rules.mk b/keyboards/proteus67/keymaps/colemak/rules.mk similarity index 100% rename from keyboards/proteus67/keymaps/colmak/rules.mk rename to keyboards/proteus67/keymaps/colemak/rules.mk From 833a2b8d41a14e93d328f182d411c2111157f4cd Mon Sep 17 00:00:00 2001 From: James Gzowski Date: Wed, 13 Dec 2023 21:58:20 +0000 Subject: [PATCH 60/75] Update keyboards/proteus67/proteus67.c Co-authored-by: Joel Challis --- keyboards/proteus67/proteus67.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/keyboards/proteus67/proteus67.c b/keyboards/proteus67/proteus67.c index ffa3cc8bb87e..4b41e4c0a29e 100644 --- a/keyboards/proteus67/proteus67.c +++ b/keyboards/proteus67/proteus67.c @@ -31,8 +31,11 @@ layer_state_t layer_state_set_user(layer_state_t state) { rgblight_set_layer_state(2, layer_state_cmp(state, _LAYERA)); return state; } -void keyboard_post_init_user(void) { + +void keyboard_post_init_kb(void) { rgblight_set_effect_range(4, 17); rgblight_sethsv_range(HSV_BLACK, 0, 4); rgblight_layers = set_backlight_mode; + + keyboard_post_init_user(); } From 5cec002f2c51a527ac7a12ea671d0ebb5f9549d2 Mon Sep 17 00:00:00 2001 From: James Gzowski Date: Wed, 13 Dec 2023 21:58:39 +0000 Subject: [PATCH 61/75] Update keyboards/proteus67/proteus67.c Co-authored-by: Joel Challis --- keyboards/proteus67/proteus67.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/keyboards/proteus67/proteus67.c b/keyboards/proteus67/proteus67.c index 4b41e4c0a29e..4073ac87d3e6 100644 --- a/keyboards/proteus67/proteus67.c +++ b/keyboards/proteus67/proteus67.c @@ -25,11 +25,12 @@ const rgblight_segment_t* const PROGMEM set_backlight_mode[] = RGBLIGHT_LAYERS_L backlight_layer_layera ); -layer_state_t layer_state_set_user(layer_state_t state) { +layer_state_t layer_state_set_kb(layer_state_t state) { rgblight_set_layer_state(0, layer_state_cmp(state, _LAYERB)); rgblight_set_layer_state(1, layer_state_cmp(state, _LAYERC)); rgblight_set_layer_state(2, layer_state_cmp(state, _LAYERA)); - return state; + + return layer_state_set_user(state); } void keyboard_post_init_kb(void) { From 1a8adfb8f0334e215eb0e3a4eda987d78b0cc2d5 Mon Sep 17 00:00:00 2001 From: James Gzowski Date: Wed, 13 Dec 2023 23:46:23 +0000 Subject: [PATCH 62/75] Update config.h --- keyboards/proteus67/config.h | 1 + 1 file changed, 1 insertion(+) diff --git a/keyboards/proteus67/config.h b/keyboards/proteus67/config.h index 344ff3270691..8f7d363f5c8d 100644 --- a/keyboards/proteus67/config.h +++ b/keyboards/proteus67/config.h @@ -2,5 +2,6 @@ // SPDX-License-Identifier: GPL-2.0-or-later #pragma once +#define RGBLIGHT_LAYERS #define ENCODER_MAP_KEY_DELAY 10 #define ENCODER_DEFAULT_POS 0x3 From 6d9edf7f2124935531dbf08b5cd20f16bfd6885e Mon Sep 17 00:00:00 2001 From: James Gzowski Date: Wed, 13 Dec 2023 23:46:40 +0000 Subject: [PATCH 63/75] Update config.h --- keyboards/proteus67/keymaps/colemak/config.h | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/proteus67/keymaps/colemak/config.h b/keyboards/proteus67/keymaps/colemak/config.h index becdb2dc05cb..636abefe4402 100644 --- a/keyboards/proteus67/keymaps/colemak/config.h +++ b/keyboards/proteus67/keymaps/colemak/config.h @@ -2,6 +2,5 @@ // SPDX-License-Identifier: GPL-2.0-or-later #pragma once -#define RGBLIGHT_LAYERS #define RGBLIGHT_MAX_LAYERS 3 #define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF From d83ab88b009ed9bc9217d0d4d0fdb5b98b02ee47 Mon Sep 17 00:00:00 2001 From: James Gzowski Date: Wed, 13 Dec 2023 23:46:58 +0000 Subject: [PATCH 64/75] Update config.h --- keyboards/proteus67/keymaps/default/config.h | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/proteus67/keymaps/default/config.h b/keyboards/proteus67/keymaps/default/config.h index becdb2dc05cb..636abefe4402 100644 --- a/keyboards/proteus67/keymaps/default/config.h +++ b/keyboards/proteus67/keymaps/default/config.h @@ -2,6 +2,5 @@ // SPDX-License-Identifier: GPL-2.0-or-later #pragma once -#define RGBLIGHT_LAYERS #define RGBLIGHT_MAX_LAYERS 3 #define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF From 8db2b3b573cd47bac03ddd50e61c35383b87930c Mon Sep 17 00:00:00 2001 From: James Gzowski Date: Wed, 13 Dec 2023 23:47:13 +0000 Subject: [PATCH 65/75] Update config.h --- keyboards/proteus67/keymaps/via/config.h | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/proteus67/keymaps/via/config.h b/keyboards/proteus67/keymaps/via/config.h index becdb2dc05cb..636abefe4402 100644 --- a/keyboards/proteus67/keymaps/via/config.h +++ b/keyboards/proteus67/keymaps/via/config.h @@ -2,6 +2,5 @@ // SPDX-License-Identifier: GPL-2.0-or-later #pragma once -#define RGBLIGHT_LAYERS #define RGBLIGHT_MAX_LAYERS 3 #define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF From c176ffb2599257a275972c881f83338033d0b2a2 Mon Sep 17 00:00:00 2001 From: James Gzowski Date: Wed, 13 Dec 2023 23:51:58 +0000 Subject: [PATCH 66/75] Update config.h --- keyboards/proteus67/config.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/keyboards/proteus67/config.h b/keyboards/proteus67/config.h index 8f7d363f5c8d..0cd67cfa0d47 100644 --- a/keyboards/proteus67/config.h +++ b/keyboards/proteus67/config.h @@ -3,5 +3,7 @@ #pragma once #define RGBLIGHT_LAYERS +#define RGBLIGHT_MAX_LAYERS 3 +#define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF #define ENCODER_MAP_KEY_DELAY 10 #define ENCODER_DEFAULT_POS 0x3 From 03d1201f61eb9efcd73628da6b099563bbc36d03 Mon Sep 17 00:00:00 2001 From: James Gzowski Date: Wed, 13 Dec 2023 23:52:18 +0000 Subject: [PATCH 67/75] Update config.h --- keyboards/proteus67/keymaps/colemak/config.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/keyboards/proteus67/keymaps/colemak/config.h b/keyboards/proteus67/keymaps/colemak/config.h index 636abefe4402..17160404f04b 100644 --- a/keyboards/proteus67/keymaps/colemak/config.h +++ b/keyboards/proteus67/keymaps/colemak/config.h @@ -1,6 +1,3 @@ // Copyright 2023 QMK // SPDX-License-Identifier: GPL-2.0-or-later #pragma once - -#define RGBLIGHT_MAX_LAYERS 3 -#define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF From 88fba3a2e2496e4700e5d1d042cc403d1d31d2e1 Mon Sep 17 00:00:00 2001 From: James Gzowski Date: Wed, 13 Dec 2023 23:52:45 +0000 Subject: [PATCH 68/75] Update config.h --- keyboards/proteus67/keymaps/default/config.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/keyboards/proteus67/keymaps/default/config.h b/keyboards/proteus67/keymaps/default/config.h index 636abefe4402..17160404f04b 100644 --- a/keyboards/proteus67/keymaps/default/config.h +++ b/keyboards/proteus67/keymaps/default/config.h @@ -1,6 +1,3 @@ // Copyright 2023 QMK // SPDX-License-Identifier: GPL-2.0-or-later #pragma once - -#define RGBLIGHT_MAX_LAYERS 3 -#define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF From b9b4fb581f422d57c4662b1fa1f7b6d45fd3350f Mon Sep 17 00:00:00 2001 From: James Gzowski Date: Wed, 13 Dec 2023 23:53:02 +0000 Subject: [PATCH 69/75] Update config.h --- keyboards/proteus67/keymaps/via/config.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/keyboards/proteus67/keymaps/via/config.h b/keyboards/proteus67/keymaps/via/config.h index 636abefe4402..17160404f04b 100644 --- a/keyboards/proteus67/keymaps/via/config.h +++ b/keyboards/proteus67/keymaps/via/config.h @@ -1,6 +1,3 @@ // Copyright 2023 QMK // SPDX-License-Identifier: GPL-2.0-or-later #pragma once - -#define RGBLIGHT_MAX_LAYERS 3 -#define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF From e90b86778be3ccc524529bdebd017f7d2d1dbb54 Mon Sep 17 00:00:00 2001 From: James Gzowski Date: Fri, 15 Dec 2023 14:28:41 +0000 Subject: [PATCH 70/75] Delete keyboards/proteus67/keymaps/colemak/config.h --- keyboards/proteus67/keymaps/colemak/config.h | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 keyboards/proteus67/keymaps/colemak/config.h diff --git a/keyboards/proteus67/keymaps/colemak/config.h b/keyboards/proteus67/keymaps/colemak/config.h deleted file mode 100644 index 17160404f04b..000000000000 --- a/keyboards/proteus67/keymaps/colemak/config.h +++ /dev/null @@ -1,3 +0,0 @@ -// Copyright 2023 QMK -// SPDX-License-Identifier: GPL-2.0-or-later -#pragma once From 9592f2cc51f35781cd85bc3c94d12b06373c8a62 Mon Sep 17 00:00:00 2001 From: James Gzowski Date: Fri, 15 Dec 2023 14:28:56 +0000 Subject: [PATCH 71/75] Delete keyboards/proteus67/keymaps/default/config.h --- keyboards/proteus67/keymaps/default/config.h | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 keyboards/proteus67/keymaps/default/config.h diff --git a/keyboards/proteus67/keymaps/default/config.h b/keyboards/proteus67/keymaps/default/config.h deleted file mode 100644 index 17160404f04b..000000000000 --- a/keyboards/proteus67/keymaps/default/config.h +++ /dev/null @@ -1,3 +0,0 @@ -// Copyright 2023 QMK -// SPDX-License-Identifier: GPL-2.0-or-later -#pragma once From 2e46eddf3001afd62c873e97fd98f63a24e90422 Mon Sep 17 00:00:00 2001 From: James Gzowski Date: Fri, 15 Dec 2023 14:29:08 +0000 Subject: [PATCH 72/75] Delete keyboards/proteus67/keymaps/via/config.h --- keyboards/proteus67/keymaps/via/config.h | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 keyboards/proteus67/keymaps/via/config.h diff --git a/keyboards/proteus67/keymaps/via/config.h b/keyboards/proteus67/keymaps/via/config.h deleted file mode 100644 index 17160404f04b..000000000000 --- a/keyboards/proteus67/keymaps/via/config.h +++ /dev/null @@ -1,3 +0,0 @@ -// Copyright 2023 QMK -// SPDX-License-Identifier: GPL-2.0-or-later -#pragma once From 5b617dbaca3d87846f3219fcd272a152c26639f6 Mon Sep 17 00:00:00 2001 From: James Gzowski Date: Fri, 15 Dec 2023 14:29:36 +0000 Subject: [PATCH 73/75] Update keyboards/proteus67/info.json Co-authored-by: jack <0x6a73@protonmail.com> --- keyboards/proteus67/info.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/keyboards/proteus67/info.json b/keyboards/proteus67/info.json index ee60d9a546e8..0ab7117ef27d 100644 --- a/keyboards/proteus67/info.json +++ b/keyboards/proteus67/info.json @@ -37,7 +37,11 @@ "brightness_steps": 5, "led_count": 21, "saturation_steps": 5, - "sleep": true + "sleep": true, + "layers": { + "enabled": true, + "override_rgb": false + } }, "url": "https://github.com/gzowski", "usb": { From 95205421be37ec347162679c46ccccf33a48e22e Mon Sep 17 00:00:00 2001 From: James Gzowski Date: Fri, 15 Dec 2023 14:31:55 +0000 Subject: [PATCH 74/75] Update keyboards/proteus67/config.h Co-authored-by: jack <0x6a73@protonmail.com> --- keyboards/proteus67/config.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/keyboards/proteus67/config.h b/keyboards/proteus67/config.h index 0cd67cfa0d47..66faa7a2981c 100644 --- a/keyboards/proteus67/config.h +++ b/keyboards/proteus67/config.h @@ -2,8 +2,6 @@ // SPDX-License-Identifier: GPL-2.0-or-later #pragma once -#define RGBLIGHT_LAYERS #define RGBLIGHT_MAX_LAYERS 3 -#define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF #define ENCODER_MAP_KEY_DELAY 10 #define ENCODER_DEFAULT_POS 0x3 From fd7717590b2b8f719d14083513bc60e722d954e1 Mon Sep 17 00:00:00 2001 From: James Gzowski Date: Mon, 25 Dec 2023 16:39:16 +0000 Subject: [PATCH 75/75] Update readme.md --- keyboards/proteus67/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/proteus67/readme.md b/keyboards/proteus67/readme.md index da4ca942ecb7..b1422b804217 100644 --- a/keyboards/proteus67/readme.md +++ b/keyboards/proteus67/readme.md @@ -2,7 +2,7 @@ ![proteus67](https://i.imgur.com/mYhl7Jah.png) -*67 key ortholinear layout with rotary encoder* +67 key ortholinear layout with rotary encoder. * Keyboard Maintainer: [James Gzowski](https://github.com/gzowski) * Hardware Supported: Elite-Pi or equivilent RP2040 controller with additional I/O along bottom.