summaryrefslogtreecommitdiffstats
path: root/keyboards/lily58/rev1/config.h
diff options
context:
space:
mode:
authorAlex Ong <the.onga@gmail.com>2019-01-26 02:13:19 +0100
committerAlex Ong <the.onga@gmail.com>2019-01-26 02:13:19 +0100
commitc9ba618654417ec115809a031d315f8327c79ad4 (patch)
treecd5b907af5bebde7062897ff847e473232ed1214 /keyboards/lily58/rev1/config.h
parent2bb2977c133646c4e056960e72029270d77cc1eb (diff)
parentd977daa8dc9136746425f9e1414e1f93cb161877 (diff)
downloadqmk_firmware-c9ba618654417ec115809a031d315f8327c79ad4.tar.gz
qmk_firmware-c9ba618654417ec115809a031d315f8327c79ad4.tar.xz
DO NOT USE Merge branch 'master' into debounce_refactor
Merged, however now there are two debounce.h and debounce.c to mess around with and coalesce. # Conflicts: # quantum/matrix.c
Diffstat (limited to 'keyboards/lily58/rev1/config.h')
-rw-r--r--keyboards/lily58/rev1/config.h14
1 files changed, 5 insertions, 9 deletions
diff --git a/keyboards/lily58/rev1/config.h b/keyboards/lily58/rev1/config.h
index a991e8832..0dee6a694 100644
--- a/keyboards/lily58/rev1/config.h
+++ b/keyboards/lily58/rev1/config.h
@@ -19,12 +19,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-//#include QMK_KEYBOARD_CONFIG_H
-#include "config_common.h"
-
/* USB Device descriptor parameter */
#define VENDOR_ID 0xFC51
-#define PRODUCT_ID 0x0058
+#define PRODUCT_ID 0x0058
#define DEVICE_VER 0x0100
#define MANUFACTURER F_YUUCHI
#define PRODUCT Lily58
@@ -51,9 +48,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define DEBOUNCING_DELAY 5
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
+//#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
+//#define LOCKING_RESYNC_ENABLE
/* key combination for command */
#define IS_COMMAND() ( \
@@ -62,8 +59,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* ws2812 RGB LED */
#define RGB_DI_PIN D3
-
-#define RGBLED_NUM 14 // Number of LEDs
+#define RGBLED_NUM 12 // Number of LEDs
/*
* Feature disable options
@@ -81,4 +77,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
//#define NO_ACTION_TAPPING
//#define NO_ACTION_ONESHOT
//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
+//#define NO_ACTION_FUNCTION \ No newline at end of file