Przeglądaj źródła

[Keyboard] Adjust ColorLice to work with QMK configurator (#7572)

* [Keyboard] Add new keyboard Symmetry60

* Add new keyboard Symmetry60

* Fix Typo

* Update keyboards/handwired/symmetry60/config.h

* Update keyboards/handwired/symmetry60/readme.md

* Update keyboards/handwired/symmetry60/readme.md

* Update keyboards/handwired/symmetry60/readme.md

* Update keyboards/handwired/symmetry60/rules.mk

* Update keyboards/handwired/symmetry60/symmetry60.h

* Update keyboards/handwired/symmetry60/symmetry60.h

* Update keyboards/handwired/symmetry60/symmetry60.h

* Update readme.md

* Update keymap.c

* Update keymap.c

* Update keymap.c

* Update rules.mk

* Update symmetry60.c

* Update keyboards/handwired/symmetry60/rules.mk

* Add ColorLice

* Update ColorLice

- Adjust info.json to support Configurator
- Adjust layout name to fit with info.json
- Seperate 2 feature: RGB Switch and RGB Underglow

* Update new way of control lock leds

* Remove #ifndef COLORLICE_H

* Update make example

* Revert Helix

* Revert Helix

* Revert Helix

* Revert Helix

* Update keyboards/handwired/colorlice/colorlice.h

* Update keyboards/handwired/colorlice/colorlice.h

* Update default keymap

* Revert Helix

* Update keyboards/handwired/colorlice/readme.md

* Update keyboards/handwired/colorlice/rules.mk

* Update keyboards/handwired/colorlice/colorlice.c

* Update keyboards/handwired/colorlice/colorlice.c

* Remove unnecessary function

* Update keyboards/handwired/colorlice/colorlice.c

* Adjust rules option for working with Configurator

- Move RGB_MATRIX_ENABLE and RGBLIGHT_ENABLE to keyboard rule.
- Add RGB_DI_PIN in keyboard config

* Update keyboards/helix/rev2/keymaps/default/keymap.c

* Update keyboards/handwired/colorlice/readme.md

* Update keymap for Colorlice

* Adjust rules.mk to use space indent

* Update ColorLice to work with QMK online configurator

- Delete rgb_underglow keymap
- Move config from keymap layer to keyboard layer
- Tweak a little layout so it can appear default layout on QMK config

* Update keyboards/handwired/colorlice/rules.mk

* Update keyboards/handwired/colorlice/rules.mk
marhalloweenvt 5 lat temu
rodzic
commit
5acb7e3707

+ 5 - 5
keyboards/handwired/colorlice/colorlice.h

@@ -33,10 +33,10 @@
     k30, k31, k32, k33, k34, k35,      k37, k38, k39, k3a, k3b, k3c, k3d, k3e,      \
     k40,      k42, k43, k44,           k47,           k4a,                k4e       \
 ) { \
-    { k00,  k01,   k02,   k03,  k04,  k05,   k06,  k07,   k08,  k09,   k0a,  k0b,  k0c,   k0d,  k0e,  k0f   }, \
-    { k10,  k11,   k12,   k13,  k14,  k15,   k16,  k17,   k18,  k19,   k1a,  k1b,  k1c,   k1d,  k1e, KC_NO  }, \
-    { k20,  k21,   k22,   k23,  k24,  k25,   k26,  k27,   k28,  k29,   k2a,  k2b,  k2c, KC_NO,  K2e, KC_NO  }, \
-    { k30,  k31,   k32,   k33,  k34,  k35, KC_NO,  k37,   k38,  k39,   k3a,  k3b,  k3c, k3d,    k3e, KC_NO  }, \
-    { k40,  KC_NO, k42,   k43,  k44,  KC_NO, KC_NO,k47, KC_NO,  KC_NO, k4a,  KC_NO,KC_NO,KC_NO, k4e, KC_NO  }, \
+    { k00,  k01,   k02,   k03,  k04,  k05,   k06,   k07,   k08,  k09,   k0a,  k0b,  k0c,    k0d,    k0e, k0f    }, \
+    { k10,  k11,   k12,   k13,  k14,  k15,   k16,   k17,   k18,  k19,   k1a,  k1b,  k1c,    k1d,    k1e, KC_NO  }, \
+    { k20,  k21,   k22,   k23,  k24,  k25,   k26,   k27,   k28,  k29,   k2a,  k2b,  k2c,    KC_NO,  K2e, KC_NO  }, \
+    { k30,  k31,   k32,   k33,  k34,  k35,   KC_NO, k37,   k38,  k39,   k3a,  k3b,  k3c,    k3d,    k3e, KC_NO  }, \
+    { k40,  KC_NO, k42,   k43,  k44,  KC_NO, KC_NO, k47, KC_NO,  KC_NO, k4a,  KC_NO,KC_NO,  KC_NO,  k4e, KC_NO  }, \
 }
 

+ 7 - 0
keyboards/handwired/colorlice/config.h

@@ -49,3 +49,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* RGB LEDs */
 #define RGB_DI_PIN B1
+#define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
+#define RGB_DISABLE_WHEN_USB_SUSPENDED true // turn off effects when suspended
+#define RGB_MATRIX_KEYPRESSES
+#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
+#define RGB_MATRIX_LED_PROCESS_LIMIT 4
+#define RGB_MATRIX_LED_FLUSH_LIMIT 26
+#define DRIVER_LED_TOTAL 70

+ 0 - 24
keyboards/handwired/colorlice/keymaps/default/config.h

@@ -1,24 +0,0 @@
-/*
-Copyright 2019 Marhalloweenvt
-
-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 <http://www.gnu.org/licenses/>.
-*/
-
-#define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
-#define RGB_DISABLE_WHEN_USB_SUSPENDED true // turn off effects when suspended
-#define RGB_MATRIX_KEYPRESSES
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#define RGB_MATRIX_LED_PROCESS_LIMIT 4
-#define RGB_MATRIX_LED_FLUSH_LIMIT 26
-#define DRIVER_LED_TOTAL 70

+ 0 - 22
keyboards/handwired/colorlice/keymaps/default_rgb_underglow/config.h

@@ -1,22 +0,0 @@
-/*
-Copyright 2019 Marhalloweenvt
-
-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 <http://www.gnu.org/licenses/>.
-*/
-
-#define RGBLIGHT_ANIMATIONS
-#define RGBLED_NUM 16
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8

+ 0 - 33
keyboards/handwired/colorlice/keymaps/default_rgb_underglow/keymap.c

@@ -1,33 +0,0 @@
-/* Copyright 2019 marhalloweenvt
- *
- * 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 <http://www.gnu.org/licenses/>.
- */
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-	[0] = LAYOUT(
-        RGB_TOG,    KC_GESC,    KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,       KC_9,   KC_0,       KC_MINS,    KC_EQL, KC_GRV, KC_BSLS,
-        RGB_MOD,    KC_TAB,     KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,       KC_O,   KC_P,       KC_LBRC,    KC_RBRC,        KC_BSPC,
-		KC_PGDN,    KC_LCTL,    KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,       KC_L,   KC_SCLN,    KC_QUOT,    KC_ENT,
-		KC_LSFT,    KC_Z,       KC_X,   KC_C,   KC_V,   KC_B,   KC_B,   KC_N,   KC_M,   KC_COMM,    KC_DOT, KC_SLSH,    KC_RSFT,    MO(1),
-		KC_LGUI,    KC_LALT,    KC_SPC, KC_LGUI,        KC_SPC,         KC_RALT,        KC_RCTL),
-
-	[1] = LAYOUT(
-        _______,    _______, KC_F1,     KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_DEL,
-        _______,    _______, _______,   KC_UP, _______, _______, _______, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD  , _______, _______,
-        _______,    _______, KC_LEFT,   KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______,          RESET,
-                    _______, _______,   _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLD, KC_VOLU, KC_MUTE, _______,
-                    _______,            _______,          _______, _______,          _______,          _______,                            _______           ),
-};

+ 0 - 2
keyboards/handwired/colorlice/keymaps/default_rgb_underglow/rules.mk

@@ -1,2 +0,0 @@
-RGB_MATRIX_ENABLE = no	# Enable keyboard RGB backlight functionality with ws2812 driver
-RGBLIGHT_ENABLE = yes	# Enable keyboard RGB underglow

+ 2 - 3
keyboards/handwired/colorlice/rules.mk

@@ -17,7 +17,7 @@ BOOTLOADER = atmel-dfu
 BOOTMAGIC_ENABLE = yes      # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes       # Mouse keys
 EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = yes        # Console for debug
+CONSOLE_ENABLE = no         # Console for debug
 COMMAND_ENABLE = no         # Commands for debug and configuration
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
@@ -30,7 +30,6 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 AUDIO_ENABLE = no           # Audio output on port C6
 FAUXCLICKY_ENABLE = no      # Use buzzer to emulate clicky switches
 HD44780_ENABLE = no         # Enable support for HD44780 based LCDs
-LTO_ENABLE = yes            # Use link time optimization
+LTO_ENABLE = no             # Use link time optimization
 RGB_MATRIX_ENABLE = WS2812  # Enable keyboard RGB backlight functionality with ws2812 driver
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-NO_USB_STARTUP_CHECK = no   # Disable initialization only when usb is plugged in