Merge remote-tracking branch 'origin/master' into develop

2 files changed, 24 insertions, 55 deletions

diff --git a/keyboards/rgbkb/zen/rev2/config.h b/keyboards/rgbkb/zen/rev2/config.h
index e37bd7a168..93c1b3f200 100644
--- a/keyboards/rgbkb/zen/rev2/config.h
+++ b/keyboards/rgbkb/zen/rev2/config.h
@@ -17,6 +17,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
+#include "config_common.h"
+
 /* USB Device descriptor parameter */
 #define VENDOR_ID       0xFEED
 #define PRODUCT_ID      0x3061
@@ -28,13 +30,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // Rows are doubled-up
 
 // wiring of each half
-#ifdef CONVERT_TO_PROTON_C
-  #define MATRIX_ROWS 5
-  #define MATRIX_COLS 7
-#else
-  #define MATRIX_ROWS 10
-  #define MATRIX_COLS 7
-#endif
+#define MATRIX_ROWS 10
+#define MATRIX_COLS 7
 
 // Proton-C does pin conversion
 #define MATRIX_ROW_PINS { C6, E6, B5, D7, B4 }
diff --git a/keyboards/rgbkb/zen/rev2/rev2.h b/keyboards/rgbkb/zen/rev2/rev2.h
index c545710abb..c7a06d1767 100644
--- a/keyboards/rgbkb/zen/rev2/rev2.h
+++ b/keyboards/rgbkb/zen/rev2/rev2.h
@@ -1,52 +1,24 @@
 #pragma once
 
-#include "zen.h"
-
 #include "quantum.h"
 
-#ifdef USE_I2C
-#include <stddef.h>
-#ifdef __AVR__
-    #include <avr/io.h>
-    #include <avr/interrupt.h>
-#endif
-#endif
-
-#ifdef CONVERT_TO_PROTON_C
-  #define LAYOUT( \
-      k00, k01, k02, k03, k04, k05,             k55, k54, k53, k52, k51, k50, \
-      k10, k11, k12, k13, k14, k15,             k65, k64, k63, k62, k61, k60, \
-      k20, k21, k22, k23, k24, k25,             k75, k74, k73, k72, k71, k70, \
-      k30, k31, k32, k33, k34, k35, k16,   k66, k85, k84, k83, k82, k81, k80, \
-      k40, k41, k42, k43, k44, k36, k26,   k76, k86, k94, k93, k92, k91, k90, \
-                               k45, k46,   k96, k95 \
-      ) \
-      { \
-          { k00, k01, k02, k03, k04, k05, KC_NO }, \
-          { k10, k11, k12, k13, k14, k15, k16 }, \
-          { k20, k21, k22, k23, k24, k25, k26 }, \
-          { k30, k31, k32, k33, k34, k35, k36 }, \
-          { k40, k41, k42, k43, k44, k45, k46 } \
-      }
-#else
-  #define LAYOUT( \
-      k00, k01, k02, k03, k04, k05,             k55, k54, k53, k52, k51, k50, \
-      k10, k11, k12, k13, k14, k15,             k65, k64, k63, k62, k61, k60, \
-      k20, k21, k22, k23, k24, k25,             k75, k74, k73, k72, k71, k70, \
-      k30, k31, k32, k33, k34, k35, k16,   k66, k85, k84, k83, k82, k81, k80, \
-      k40, k41, k42, k43, k44, k36, k26,   k76, k86, k94, k93, k92, k91, k90, \
-                               k45, k46,   k96, k95 \
-      ) \
-      { \
-          { k00, k01, k02, k03, k04, k05, KC_NO }, \
-          { k10, k11, k12, k13, k14, k15, k16 }, \
-          { k20, k21, k22, k23, k24, k25, k26 }, \
-          { k30, k31, k32, k33, k34, k35, k36 }, \
-          { k40, k41, k42, k43, k44, k45, k46 }, \
-          { k50, k51, k52, k53, k54, k55, KC_NO }, \
-          { k60, k61, k62, k63, k64, k65, k66 }, \
-          { k70, k71, k72, k73, k74, k75, k76 }, \
-          { k80, k81, k82, k83, k84, k85, k86 }, \
-          { k90, k91, k92, k93, k94, k95, k96 } \
-      }
-#endif
+#define LAYOUT( \
+    k00, k01, k02, k03, k04, k05,             k55, k54, k53, k52, k51, k50, \
+    k10, k11, k12, k13, k14, k15,             k65, k64, k63, k62, k61, k60, \
+    k20, k21, k22, k23, k24, k25,             k75, k74, k73, k72, k71, k70, \
+    k30, k31, k32, k33, k34, k35, k16,   k66, k85, k84, k83, k82, k81, k80, \
+    k40, k41, k42, k43, k44, k36, k26,   k76, k86, k94, k93, k92, k91, k90, \
+                             k45, k46,   k96, k95 \
+    ) \
+    { \
+        { k00, k01, k02, k03, k04, k05, KC_NO }, \
+        { k10, k11, k12, k13, k14, k15, k16 }, \
+        { k20, k21, k22, k23, k24, k25, k26 }, \
+        { k30, k31, k32, k33, k34, k35, k36 }, \
+        { k40, k41, k42, k43, k44, k45, k46 }, \
+        { k50, k51, k52, k53, k54, k55, KC_NO }, \
+        { k60, k61, k62, k63, k64, k65, k66 }, \
+        { k70, k71, k72, k73, k74, k75, k76 }, \
+        { k80, k81, k82, k83, k84, k85, k86 }, \
+        { k90, k91, k92, k93, k94, k95, k96 } \
+    }