From a9f7d4dccc9cd0351658e64d5fbc809c93ac9b46 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Fri, 18 Dec 2020 17:28:29 +0000 Subject: Various compilation fixes for avr-gcc 10 (#9269) --- keyboards/gergo/matrix.c | 54 ++++++++++++++++++++++++------------------------ 1 file changed, 27 insertions(+), 27 deletions(-) (limited to 'keyboards/gergo/matrix.c') diff --git a/keyboards/gergo/matrix.c b/keyboards/gergo/matrix.c index f659ed52c2..080eaea40f 100644 --- a/keyboards/gergo/matrix.c +++ b/keyboards/gergo/matrix.c @@ -38,37 +38,37 @@ along with this program. If not, see . #endif // MCP Pin Defs -#define RROW1 (1<<3) -#define RROW2 (1<<2) -#define RROW3 (1<<1) -#define RROW4 (1<<0) -#define COL0 (1<<0) -#define COL1 (1<<1) -#define COL2 (1<<2) -#define COL3 (1<<3) -#define COL4 (1<<4) -#define COL5 (1<<5) -#define COL6 (1<<6) +#define RROW1 (1u<<3) +#define RROW2 (1u<<2) +#define RROW3 (1u<<1) +#define RROW4 (1u<<0) +#define COL0 (1u<<0) +#define COL1 (1u<<1) +#define COL2 (1u<<2) +#define COL3 (1u<<3) +#define COL4 (1u<<4) +#define COL5 (1u<<5) +#define COL6 (1u<<6) // ATmega pin defs -#define ROW1 (1<<6) -#define ROW2 (1<<5) -#define ROW3 (1<<4) -#define ROW4 (1<<1) -#define COL7 (1<<0) -#define COL8 (1<<1) -#define COL9 (1<<2) -#define COL10 (1<<3) -#define COL11 (1<<2) -#define COL12 (1<<3) -#define COL13 (1<<6) +#define ROW1 (1u<<6) +#define ROW2 (1u<<5) +#define ROW3 (1u<<4) +#define ROW4 (1u<<1) +#define COL7 (1u<<0) +#define COL8 (1u<<1) +#define COL9 (1u<<2) +#define COL10 (1u<<3) +#define COL11 (1u<<2) +#define COL12 (1u<<3) +#define COL13 (1u<<6) //Trackball pin defs -#define TRKUP (1<<4) -#define TRKDN (1<<5) -#define TRKLT (1<<6) -#define TRKRT (1<<7) -#define TRKBTN (1<<6) +#define TRKUP (1u<<4) +#define TRKDN (1u<<5) +#define TRKLT (1u<<6) +#define TRKRT (1u<<7) +#define TRKBTN (1u<<6) // Multiple for mouse moves -- cgit v1.2.3