Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
qmk-bot committed Aug 23, 2023
2 parents 1babb2c + b1fbfaa commit 2b7f1b0
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion keyboards/keychron/c2_pro/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions keyboards/keychron/c2_pro/matrix.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 2b7f1b0

Please sign in to comment.