Agar: Add an option to be able to disable the RGB Underglow

yangdigi · Jan 18, 2025 · f9cd686 · f9cd686
1 parent 3938389
commit f9cd686
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 7 deletions.
diff --git a/keyboards/ydkb/unicore_f1/config.h b/keyboards/ydkb/unicore_f1/config.h
@@ -3,7 +3,7 @@
 #include "config_common.h"
 
 /* USB Device descriptor parameter */
-#define FW_VER_DATE     DOBP
+#define FW_VER_DATE     DP1H
 #define CONTACT(x,y)    x##y
 #define CONTACT2(x,y)   CONTACT(x,y)
 #define FW_VER          CONTACT2(VIAL_, FW_VER_DATE)
@@ -42,6 +42,7 @@
 #define RGBLIGHT_SLEEP
 #define RGB_DI_PIN B15
 #define RGBLED_NUM must_redefine
+//#define RGBLIGHT_DEFAULT_ON FALSE
 
 //#define SUSPEND_ACTION
 

diff --git a/keyboards/ydkb/unicore_f1/keymaps/agar_vial/config.h b/keyboards/ydkb/unicore_f1/keymaps/agar_vial/config.h
@@ -4,7 +4,7 @@
 #define PRODUCT_ID    0x240B
 #undef  PRODUCT
 #define PRODUCT     Agar Keyboard (FW_VER)
-#define DYNAMIC_KEYMAP_LAYER_COUNT    6
+#define DYNAMIC_KEYMAP_LAYER_COUNT    8
 #define FLASH_KEYMAP_COUNT    2
 #define VIAL_KEYBOARD_UID    {0x2E, 0xE6, 0x0E, 0x23, 0x34, 0xEF, 0x99, 0x37}
 
@@ -15,3 +15,4 @@
 #define PHY_INDICATOR_NUM    1
 #define INDICATOR_FUNCT    {(1<<USB_LED_CAPS_LOCK)}
 //#define INDICATOR_0_INSTRIP 0
+#define RGB_EXTRA_PROCESS_ENABLE
diff --git a/keyboards/ydkb/unicore_f1/keymaps/agar_vial/keymap.c b/keyboards/ydkb/unicore_f1/keymaps/agar_vial/keymap.c
@@ -19,11 +19,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   },
   {
     {KC_GRAVE, KC_CAPSLOCK, KC_TRNS, KC_UP, KC_1, KC_2, KC_3, KC_TRNS},
-    {KC_TRNS, KC_TRNS, KC_VOLU, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_TRNS},
-    {KC_4, KC_TRNS, KC_5, KC_TRNS, KC_6, KC_7, KC_TRNS, KC_TRNS},
-    {KC_TRNS, KC_TRNS, KC_TRNS, KC_CALC, KC_TRNS, KC_TRNS, KC_TRNS, KC_MUTE},
+    {KC_TRNS, KC_TRNS, KC_VOLU, KC_TRNS, KC_NO, KC_TRNS, KC_VOLD, KC_TRNS},
+    {KC_4, RGB_TOG, KC_5, RGB_MOD, KC_6, KC_7, KC_TRNS, KC_TRNS},
+    {KC_TRNS, RGB_SAI, KC_TRNS, KC_CALC, KC_TRNS, KC_TRNS, RGB_HUI, KC_MUTE},
     {KC_8, KC_PSCREEN, KC_9, KC_0, KC_MINUS, KC_SCROLLLOCK, KC_PAUSE, KC_UP},
-    {KC_HOME, KC_END, KC_TRNS, KC_TRNS, KC_TRNS, KC_KP_SLASH, KC_TRNS, KC_TRNS},
+    {KC_HOME, KC_END, KC_TRNS, KC_TRNS, KC_TRNS, KC_KP_SLASH, KC_TRNS, RGB_VAI},
     {KC_EQUAL, KC_INSERT, KC_DELETE, KC_PAUSE, KC_TRNS, KC_TRNS, KC_TRNS, KC_NO},
     {KC_TRNS, KC_NO, KC_TRNS, KC_TRNS, KC_DOWN, KC_PGDOWN, KC_RIGHT, KC_PGUP},
     {KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO},
@@ -34,3 +34,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     {KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO}
   },
 };
+
+#include "led.h"
+#include "rgblight.h"
+
+extern uint8_t indicator_color_config[];
+void rgb_extra_process(LED_TYPE *rgbled) {
+    if ((indicator_color_config[1] & 1) == 1) { //disable Bottom RGB, set them to 0
+        memset(&rgbled[PHY_INDICATOR_NUM], 0, RGBLED_NUM*3);
+    }
+}
diff --git a/keyboards/ydkb/unicore_f1/keymaps/agar_vial/rules.mk b/keyboards/ydkb/unicore_f1/keymaps/agar_vial/rules.mk
@@ -3,3 +3,4 @@ VIAL_ENABLE = yes
 VIAL_INSECURE = yes
 QMK_SETTINGS = yes
 TAP_DANCE_ENABLE = yes
+KEY_OVERRIDE_ENABLE = yes
diff --git a/keyboards/ydkb/unicore_f1/keymaps/agar_vial/vial.json b/keyboards/ydkb/unicore_f1/keymaps/agar_vial/vial.json
@@ -10,10 +10,11 @@
   "layouts": {
     "labels":[
         "2U Backspace",
+        ["RGB Underglow", "Enable", "Disable"],
         ["CapsLock Color", "Red", "Orange", "Yellow", "Green", "Cyan", "Blue", "Violet", "White"]
     ], 
     "keymap": [
-        [{"x":2.5,"c":"#777777"},"0,0",{"x":-1,"c":"#cccccc","h":0.75,"d":true},"0,0\n\n\n1,0","0,4","0,5","0,6","2,0","2,2","2,4","2,5","4,0","4,2","4,3","4,4","6,0","6,1\n\n\n0,0",{"c":"#aaaaaa"},"6,2\n\n\n0,0",{"x":0.25,"w":2},"6,1\n\n\n0,1"],
+        [{"x":2.5,"c":"#777777"},"0,0",{"x":-1,"c":"#cccccc","h":0.75,"d":true},"0,0\n\n\n1,0",{"d":true},"0,4\n\n\n2,0",{"x":-1},"0,4","0,5","0,6","2,0","2,2","2,4","2,5","4,0","4,2","4,3","4,4","6,0","6,1\n\n\n0,0",{"c":"#aaaaaa"},"6,2\n\n\n0,0",{"x":0.25,"w":2},"6,1\n\n\n0,1"],
         [{"x":2.5,"w":1.5},"0,1",{"c":"#cccccc"},"0,2","0,3","0,7","2,1","2,3","2,6","2,7","4,1","4,5","4,6","4,7","6,3",{"c":"#aaaaaa","w":1.5},"6,4"],
         [{"x":2.5,"w":1.75},"1,7",{"c":"#cccccc"},"1,6","1,2","3,7","3,6","3,1","5,7","5,6","5,5","5,0","7,7","7,6",{"c":"#777777","w":2.25},"6,5"],
         [{"x":2.5,"c":"#aaaaaa","w":2.25},"1,5",{"c":"#cccccc"},"1,0","3,5","3,3","3,2","3,0","5,4","5,2","5,1","7,5","7,4",{"c":"#aaaaaa","w":1.75},"6,6","7,0"],