Merge remote-tracking branch 'origin/master' into develop
2 files changed, 3 insertions(+), 3 deletions(-) M keyboards/keychron/c2_pro/config.h M keyboards/keychron/c2_pro/matrix.c
M keyboards/keychron/c2_pro/config.h => keyboards/keychron/c2_pro/config.h +1 -1
@@ 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
M keyboards/keychron/c2_pro/matrix.c => keyboards/keychron/c2_pro/matrix.c +2 -2
@@ 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