Apply code review suggestions

Co-authored-by: sigprof and fauxpark
thewerther · Dec 25, 2021 · e4d54f7 · e4d54f7
1 parent 75a864d
commit e4d54f7
Show file tree

Hide file tree

Showing 7 changed files with 57 additions and 17 deletions.
diff --git a/keyboards/id67/config.h b/keyboards/id67/config.h
@@ -45,10 +45,34 @@
 
 #define DIODE_DIRECTION COL2ROW
 #define RGB_DI_PIN F0
-#define DRIVER_LED_TOTAL 77
-#define DRIVER_LED_UNDERGLOW 10
 
-#if defined(RGB_DI_PIN)
+// RGB Light config
+#if defined(RGBLIGHT_ENABLE)
+    #define RGBLED_NUM 77
+    #define RGBLIGHT_HUE_STEP 8
+    #define RGBLIGHT_SAT_STEP 8
+    #define RGBLIGHT_VAL_STEP 8
+    #define RGBLIGHT_LIMIT_VAL 150 /* The maximum brightness level */
+    #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
+/*== all animations enable ==*/
+    #define RGBLIGHT_ANIMATIONS
+// /*== or choose animations ==*/
+//     #define RGBLIGHT_EFFECT_BREATHING
+//     #define RGBLIGHT_EFFECT_RAINBOW_MOOD
+//     #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+//     #define RGBLIGHT_EFFECT_SNAKE
+//     #define RGBLIGHT_EFFECT_KNIGHT
+//     #define RGBLIGHT_EFFECT_CHRISTMAS
+//     #define RGBLIGHT_EFFECT_STATIC_GRADIENT
+//     #define RGBLIGHT_EFFECT_RGB_TEST
+//     #define RGBLIGHT_EFFECT_ALTERNATING
+#endif
+
+// RGB Matrix config
+#if defined(RGB_MATRIX_ENABLE)
+    #define DRIVER_LED_TOTAL 77
+    #define DRIVER_LED_UNDERGLOW 10
+
     #define RGB_DISABLE_WHEN_USB_SUSPENDED true // turn off effects when suspended
     #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150 // limits maximum brightness of LEDs to 200 out of 255. If not defined maximum brightness is set to 255
 
@@ -93,4 +117,4 @@
     #define ENABLE_RGB_MATRIX_SOLID_SPLASH         // Hue & value pulse away from a single key hit then fades value out
     #define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH    // Hue & value pulse away from multiple key hits then fades value out
 #endif // #if defined(RGB_MATRIX_KEYPRESSES) || defined(RGB_MATRIX_KEYRELEASES)
-#endif // #if defined(RGB_DI_PIN)
+#endif // #if defined(RGB_MATRIX_ENABLE)
diff --git a/keyboards/id67/id67.c b/keyboards/id67/id67.c
@@ -36,11 +36,12 @@ led_config_t g_led_config = { {
     {0, 64}, {56, 64}, {112, 64}, {168, 64}, {224, 64}
 },  {
     // LED Index to Flag
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4,
+    // Indices are reveresed on the physical board, top left is bottom right.
+    4, 4, 4, 1, 1, 4, 1, 1, 1,                      // first row
+    1, 4, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,       // second row
+    1, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,       // third row
+    1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,    // fourth row
+    4, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,    // fifth row
     // underglow leds
     2, 2, 2, 2, 2, 2, 2, 2, 2, 2
 } };
diff --git a/keyboards/id67/keymaps/thewerther/config.h b/keyboards/id67/keymaps/thewerther/config.h
@@ -20,7 +20,14 @@
 
 #if defined(RGB_DI_PIN)
     #define RGB_DISABLE_WHEN_USB_SUSPENDED true // turn off effects when suspended
-    #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150 // limits maximum brightness of LEDs to 200 out of 255. If not defined maximum brightness is set to 255
+    #undef RGB_MATRIX_MAXIMUM_BRIGHTNESS
+    #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 255 // limits maximum brightness of LEDs to 200 out of 255. If not defined maximum brightness is set to 255
+
+    // change saturation and hue step size
+    #undef RGBLIGHT_HUE_STEP
+    #undef RGBLIGHT_SAT_STEP
+    #define RGBLIGHT_SAT_STEP 5
+    #define RGBLIGHT_HUE_STEP 5
 
     #define RGB_MATRIX_KEYPRESSES
 

diff --git a/keyboards/id67/keymaps/thewerther/keymap.c b/keyboards/id67/keymaps/thewerther/keymap.c
@@ -18,7 +18,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_65_ansi_blocker(
-        KC_ESC,  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_BSPC,          KC_TILD,
+        KC_ESC,  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_BSPC,          KC_GRV,
         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_BSLS,      KC_DEL,
         KC_RALT,       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_PGUP,
         KC_LSFT,            KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,          KC_PGDN,

diff --git a/keyboards/id67/keymaps/thewerther/readme.md b/keyboards/id67/keymaps/thewerther/readme.md
@@ -1,15 +1,19 @@
-# IDOBAO ID67
-![id67](https://i.imgur.com/9roQ4Mi.jpeg)
-
+# thewerther configuration
 ## RGB effects
 
 Only enabled a few effects and modified the `RGB_MATRIX_REACTIVE_SIMPLE` effect to always light up the underglow leds to the chosen color.
-See [here](https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects) for more information on all the possible effects.
+The effect can be seen here:
+![](https://media.giphy.com/media/l2gz7n045RtSM1ulxV/giphy-downsized-large.gif).
+
+See [here](https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects) for more information on all the possible effects that can be enabled.
 
-## Layout 
+## Modified Layout
 
 ![ID67 layout](https://i.imgur.com/R0sGkIN.png)
 
+- Added media buttons on second layer.
+- Replaced `Tab` with `RAlt` so I can use us-international-nodeadkeys to be able to type special characters.
+
 ## Compiling and flashing
 
 Make example for this keyboard (after setting up your build environment):

diff --git a/keyboards/id67/readme.md b/keyboards/id67/readme.md
@@ -1,4 +1,5 @@
 # IDOBAO ID67
+
 ![id67](https://i.imgur.com/9roQ4Mi.jpeg)
 
 A 65% hotswap keyboard from IDOBAO.
@@ -10,6 +11,7 @@ A 65% hotswap keyboard from IDOBAO.
 * Hardware Availability: [IDOBAO-website](https://www.idobao.net/products/idobao-id67-65-hot-swappable-mechanical-keyboard-kit-1)
 
 ## Layout 
+
 ![ID67 layout](https://i.imgur.com/Ge6Uxao.png)
 
 

diff --git a/keyboards/id67/rules.mk b/keyboards/id67/rules.mk
@@ -8,11 +8,13 @@ BOOTLOADER = atmel-dfu
 #   change yes to no to disable
 #
 BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse key
+MOUSEKEY_ENABLE = yes       # Mouse keys
 EXTRAKEY_ENABLE = yes       # Audio control and System control
 CONSOLE_ENABLE = no         # Console for debug
 COMMAND_ENABLE = no         # Commands for debug and configuration
 NKRO_ENABLE = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
 RGB_MATRIX_ENABLE = yes     # Enable RGB Matrix feature