Apply suggestions from code review

Co-authored-by: Ryan <fauxpark@gmail.com>
qmk · Mar 12, 2023 · 39a2f32 · 39a2f32
1 parent 8001b8f
commit 39a2f32
Show file tree

Hide file tree

Showing 11 changed files with 368 additions and 371 deletions.
diff --git a/keyboards/nullbitsco/snap/config.h b/keyboards/nullbitsco/snap/config.h
@@ -16,14 +16,18 @@
 // clang-format off
 #pragma once
 
-#include "config_common.h"
-
 /* Used to set host for remote KB if VUSB detect doesn't work. */
 // #define KEYBOARD_HOST // Force host mode
 // #define KEYBOARD_REMOTE // Force remote mode
 
 // Workarounds for sleep/wake issues
 #define USB_SUSPEND_WAKEUP_DELAY 250
+
+// NOTE: There is a bug in AVR deep sleep, which
+// causes the MCU to stop responding in some cases.
+// Disabling the watchdog prevents the MCU from entering 
+// power down, while still turning off LEDs, audio, etc.
+// See qmk_firmware/issues/20087 for background
 #undef WDT_vect
 
 /* split config */
@@ -38,9 +42,6 @@
 #define MATRIX_COLS 9
 #define MATRIX_MUX_COLS 3
 
-/* Set 0 if debouncing isn't needed */
-#define DEBOUNCE 10
-
 /*
  * Keyboard Matrix Assignments
  * The snap uses a demultiplexer for the cols.

diff --git a/keyboards/nullbitsco/snap/info.json b/keyboards/nullbitsco/snap/info.json
@@ -7,6 +7,7 @@
         "pid": "0x6063",
         "device_version": "0.0.1"
     },
+    "debounce": 10,
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {

diff --git a/keyboards/nullbitsco/snap/keymaps/bongo_reactive/config.h b/keyboards/nullbitsco/snap/keymaps/bongo_reactive/config.h
@@ -18,9 +18,8 @@
 
 /* space savers */
 #define DYNAMIC_KEYMAP_LAYER_COUNT 3
-// #define NO_ACTION_TAPPING // Waiting on QMK #11528
+#define NO_ACTION_TAPPING
 #define NO_ACTION_ONESHOT
-#define IGNORE_MOD_TAP_INTERRUPT
 #define TAPPING_FORCE_HOLD
 
 #define OLED_BRIGHTNESS 128
@@ -29,13 +28,6 @@
 // Selectively undefine to save space
 // VIA support won't fit otherwise
 #ifdef RGBLIGHT_ENABLE
-#undef RGBLIGHT_LED_MAP
-#undef RGBLIGHT_EFFECT_SNAKE
-#undef RGBLIGHT_EFFECT_KNIGHT
-#undef RGBLIGHT_EFFECT_CHRISTMAS
-#undef RGBLIGHT_EFFECT_STATIC_GRADIENT
-#undef RGBLIGHT_EFFECT_RGB_TEST
-#undef RGBLIGHT_EFFECT_ALTERNATING
 #undef RGBLIGHT_EFFECT_TWINKLE
 #endif //RGB LIGHT_ENABLE
 

diff --git a/keyboards/nullbitsco/snap/keymaps/bongo_reactive_single_oled/config.h b/keyboards/nullbitsco/snap/keymaps/bongo_reactive_single_oled/config.h
@@ -21,18 +21,9 @@
 
 /* space savers */
 #define DYNAMIC_KEYMAP_LAYER_COUNT 3
-// #define NO_ACTION_TAPPING // Waiting on QMK #11528
+#define NO_ACTION_TAPPING
 #define NO_ACTION_ONESHOT
-#define IGNORE_MOD_TAP_INTERRUPT
 #define TAPPING_FORCE_HOLD
 
-// Selectively undefine to save space
-// VIA support won't fit otherwise
-#ifdef RGBLIGHT_ENABLE
-#undef RGBLIGHT_EFFECT_RGB_TEST
-#undef RGBLIGHT_EFFECT_ALTERNATING
-#undef RGBLIGHT_EFFECT_TWINKLE
-#endif //RGB LIGHT_ENABLE
-
 // Split Options
 #define SPLIT_TRANSPORT_MIRROR
diff --git a/keyboards/nullbitsco/snap/keymaps/oled/config.h b/keyboards/nullbitsco/snap/keymaps/oled/config.h
@@ -18,22 +18,10 @@
 
 /* space savers */
 #define DYNAMIC_KEYMAP_LAYER_COUNT 3
-// #define NO_ACTION_TAPPING // Waiting on QMK #11528
+#define NO_ACTION_TAPPING
 #define NO_ACTION_ONESHOT
-#define IGNORE_MOD_TAP_INTERRUPT
 #define TAPPING_FORCE_HOLD
 
 #define OLED_BRIGHTNESS 128
 #define OLED_TIMEOUT 30000
 #define OLED_UPDATE_INTERVAL 250
-
-// Selectively undefine to save space
-// VIA support won't fit otherwise
-#ifdef RGBLIGHT_ENABLE
-#undef RGBLIGHT_EFFECT_SNAKE
-#undef RGBLIGHT_EFFECT_KNIGHT
-#undef RGBLIGHT_EFFECT_CHRISTMAS
-#undef RGBLIGHT_EFFECT_RGB_TEST
-#undef RGBLIGHT_EFFECT_ALTERNATING
-#undef RGBLIGHT_EFFECT_TWINKLE
-#endif //RGB LIGHT_ENABLE
diff --git a/keyboards/nullbitsco/snap/keymaps/typehud/config.h b/keyboards/nullbitsco/snap/keymaps/typehud/config.h
@@ -18,9 +18,8 @@
 
 /* space savers */
 #define DYNAMIC_KEYMAP_LAYER_COUNT 3
-// #define NO_ACTION_TAPPING // Waiting on QMK #11528
+#define NO_ACTION_TAPPING
 #define NO_ACTION_ONESHOT
-#define IGNORE_MOD_TAP_INTERRUPT
 #define TAPPING_FORCE_HOLD
 
 // Old configuration
@@ -31,13 +30,6 @@
 // Selectively undefine to save space
 // VIA support won't fit otherwise
 #ifdef RGBLIGHT_ENABLE
-#undef RGBLIGHT_LED_MAP
-#undef RGBLIGHT_EFFECT_SNAKE
-#undef RGBLIGHT_EFFECT_KNIGHT
-#undef RGBLIGHT_EFFECT_CHRISTMAS
-#undef RGBLIGHT_EFFECT_STATIC_GRADIENT
-#undef RGBLIGHT_EFFECT_RGB_TEST
-#undef RGBLIGHT_EFFECT_ALTERNATING
 #undef RGBLIGHT_EFFECT_TWINKLE
 #endif //RGB LIGHT_ENABLE
 

diff --git a/...nullbitsco/snap/keymaps/typehud/README.md → ...nullbitsco/snap/keymaps/typehud/readme.md b/...nullbitsco/snap/keymaps/typehud/README.md → ...nullbitsco/snap/keymaps/typehud/readme.md
@@ -2,7 +2,7 @@
 
 VIA compatible keymap that displays a live wpm HUD on your OLED.
 
-<https://user-images.githubusercontent.com/2514771/166799498-01af70cd-fee3-40e4-861d-b3646f40051b.mp4>
+<https://nullbits.co/static/file/snap-typehud.webp>
 
 ## Configuration
 

diff --git a/keyboards/nullbitsco/snap/keymaps/typehud/rules.mk b/keyboards/nullbitsco/snap/keymaps/typehud/rules.mk
@@ -3,3 +3,5 @@ OLED_DRIVER = SSD1306
 WPM_ENABLE = yes
 VIA_ENABLE = yes
 ENCODER_MAP_ENABLE = yes
+
+SRC += typehud.c