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

freznel10 · Aug 23, 2023 · 2b7f1b0 · 2b7f1b0
2 parents 1babb2c + b1fbfaa
commit 2b7f1b0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/keyboards/keychron/c2_pro/config.h b/keyboards/keychron/c2_pro/config.h
@@ -41,4 +41,4 @@
 #define HC595_SHCP A1
 #define HC595_DS C15
 #define SHIFT_COL_START 11
-#define SHIFT_COL_END 19
+#define SHIFT_COL_END 18
diff --git a/keyboards/keychron/c2_pro/matrix.c b/keyboards/keychron/c2_pro/matrix.c
@@ -24,10 +24,10 @@
 #endif
 
 #if defined(SHIFT_COL_START) && defined(SHIFT_COL_END)
-# if ((SHIFT_COL_END - SHIFT_COL_START) > 16)
+# if ((SHIFT_COL_END - SHIFT_COL_START + 1) > 16)
 # define SIZE_T uint32_t
 # define UNSELECT_ALL_COL 0xFFFFFFFF
-# elif ((SHIFT_COL_END - SHIFT_COL_START) > 8)
+# elif ((SHIFT_COL_END - SHIFT_COL_START + 1) > 8)
 # define SIZE_T uint16_t
 # define UNSELECT_ALL_COL 0xFFFF
 # else