From 7f6c708da8edf779664ccc80b8932cad3ad37bf3 Mon Sep 17 00:00:00 2001
From: Jesse Leventhal <Jesse@spul-3d.com>
Date: Wed, 29 Apr 2020 12:07:51 -0400
Subject: [PATCH] Requested Changes to all files

---
 .../themadnoodle/ncc1701kbv2/keymaps/default/keymap.c     | 8 ++++----
 lib/chibios                                               | 2 +-
 lib/chibios-contrib                                       | 2 +-
 lib/ugfx                                                  | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/keyboards/themadnoodle/ncc1701kbv2/keymaps/default/keymap.c b/keyboards/themadnoodle/ncc1701kbv2/keymaps/default/keymap.c
index fe6b2c589e3..e67f6e2fc89 100644
--- a/keyboards/themadnoodle/ncc1701kbv2/keymaps/default/keymap.c
+++ b/keyboards/themadnoodle/ncc1701kbv2/keymaps/default/keymap.c
@@ -12,7 +12,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * `-----------------------'
      */
 
-    [0] = LAYOUT(
+    [0] = LAYOUT_ortho_3x3(
       KC_MPRV, LT(2, KC_MUTE), KC_MNXT, 
       KC_MSTP, KC_MPLY, KC_MSEL,
       KC_CALC, KC_MAIL, LT(1, KC_MYCM)
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * `-----------------------'
      */
     
-    [1] = LAYOUT(
+    [1] = LAYOUT_ortho_3x3(
       RGB_MOD, RGB_TOG, RGB_RMOD, 
       RGB_SPI, RGB_SPD, RGB_VAI, 
       RGB_SAI, RGB_SAD, KC_TRNS
@@ -46,7 +46,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * `-----------------------'
      */
     
-    [2] = LAYOUT(
+    [2] = LAYOUT_ortho_3x3(
       KC_TRNS, KC_TRNS, KC_TRNS, 
       KC_TRNS, KC_TRNS, KC_TRNS, 
       KC_TRNS, KC_TRNS, KC_TRNS
@@ -56,7 +56,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 void encoder_update_user(uint8_t index, bool clockwise) {
     
-  switch (biton32(layer_state)) {
+  switch (get_highest_layer(layer_state)) {
       case 1:
           if (clockwise) {
               rgblight_increase_hue();
diff --git a/lib/chibios b/lib/chibios
index 313416b8fda..587968d6cbc 160000
--- a/lib/chibios
+++ b/lib/chibios
@@ -1 +1 @@
-Subproject commit 313416b8fda90d9973a749a0a35970956852c286
+Subproject commit 587968d6cbc2b0e1c7147540872f2a67e59ca18b
diff --git a/lib/chibios-contrib b/lib/chibios-contrib
index e3a3a240477..ede48346eee 160000
--- a/lib/chibios-contrib
+++ b/lib/chibios-contrib
@@ -1 +1 @@
-Subproject commit e3a3a24047717af33b098266e11c2e4e5102206a
+Subproject commit ede48346eee4b8d6847c19bc01420bee76a5e486
diff --git a/lib/ugfx b/lib/ugfx
index 40b48f470ad..3e97b74e03c 160000
--- a/lib/ugfx
+++ b/lib/ugfx
@@ -1 +1 @@
-Subproject commit 40b48f470addad6a4fb1177de1a69a181158739b
+Subproject commit 3e97b74e03c93631cdd3ddb2ce43b963fdce19b2