summaryrefslogtreecommitdiffstats
path: root/users/jonavin
diff options
context:
space:
mode:
authorNick Brassel <nick@tzarc.org>2022-11-28 07:54:00 +1100
committerNick Brassel <nick@tzarc.org>2022-11-28 07:54:00 +1100
commit4020674163fc80914059c4c9c3be5c0ae00bd150 (patch)
tree6f4187d72b04d03572adf507502afbda9726d696 /users/jonavin
parent8f9b49dc5b05fd3421e47aa76822a5b2199dfca6 (diff)
parent9e78e65a566487b2f4fe7b663971a01deb6ddad2 (diff)
Merge remote-tracking branch 'upstream/develop'
Diffstat (limited to 'users/jonavin')
-rw-r--r--users/jonavin/config.h6
-rw-r--r--users/jonavin/jonavin.c2
-rw-r--r--users/jonavin/jonavin.h1
3 files changed, 4 insertions, 5 deletions
diff --git a/users/jonavin/config.h b/users/jonavin/config.h
index d694bc5371..8c5451075c 100644
--- a/users/jonavin/config.h
+++ b/users/jonavin/config.h
@@ -26,9 +26,9 @@
#define TAPPING_TERM_PER_KEY
#ifdef RGB_MATRIX_ENABLE
- #ifdef RGB_MATRIX_STARTUP_MODE
- #undef RGB_MATRIX_STARTUP_MODE
+ #ifdef RGB_MATRIX_DEFAULT_MODE
+ #undef RGB_MATRIX_DEFAULT_MODE
#endif
- #define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_SOLID_COLOR
+ #define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_COLOR
#define RGB_DISABLE_WHEN_USB_SUSPENDED
#endif
diff --git a/users/jonavin/jonavin.c b/users/jonavin/jonavin.c
index b66b444f36..f203bd77df 100644
--- a/users/jonavin/jonavin.c
+++ b/users/jonavin/jonavin.c
@@ -213,7 +213,7 @@ uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *record) {
// Turn on/off NUM LOCK if current state is different
void activate_numlock(bool turn_on) {
if (IS_HOST_LED_ON(USB_LED_NUM_LOCK) != turn_on) {
- tap_code(KC_NUMLOCK);
+ tap_code(KC_NUM_LOCK);
}
}
diff --git a/users/jonavin/jonavin.h b/users/jonavin/jonavin.h
index 3ebd3fe9f2..97f72c1248 100644
--- a/users/jonavin/jonavin.h
+++ b/users/jonavin/jonavin.h
@@ -22,7 +22,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define ARRAYSIZE(arr) sizeof(arr)/sizeof(arr[0])
#endif // !ARRAYSIZE
-
// LAYERS
enum custom_user_layers {
_BASE,