diff options
| author | Joel Challis <git@zvecr.com> | 2020-12-18 17:28:29 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-18 17:28:29 +0000 |
| commit | a9f7d4dccc9cd0351658e64d5fbc809c93ac9b46 (patch) | |
| tree | bfaaaf23c39f4ab72541309592e6f162b9ba4d06 /keyboards/gergo | |
| parent | 6ea4b06f9fc19825605477cdc27f5bec0f3dc0a9 (diff) | |
| download | qmk_firmware-a9f7d4dccc9cd0351658e64d5fbc809c93ac9b46.tar.gz qmk_firmware-a9f7d4dccc9cd0351658e64d5fbc809c93ac9b46.zip | |
Various compilation fixes for avr-gcc 10 (#9269)
Diffstat (limited to 'keyboards/gergo')
| -rw-r--r-- | keyboards/gergo/matrix.c | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/keyboards/gergo/matrix.c b/keyboards/gergo/matrix.c index f659ed52c..080eaea40 100644 --- a/keyboards/gergo/matrix.c +++ b/keyboards/gergo/matrix.c | |||
| @@ -38,37 +38,37 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 38 | #endif | 38 | #endif |
| 39 | 39 | ||
| 40 | // MCP Pin Defs | 40 | // MCP Pin Defs |
| 41 | #define RROW1 (1<<3) | 41 | #define RROW1 (1u<<3) |
| 42 | #define RROW2 (1<<2) | 42 | #define RROW2 (1u<<2) |
| 43 | #define RROW3 (1<<1) | 43 | #define RROW3 (1u<<1) |
| 44 | #define RROW4 (1<<0) | 44 | #define RROW4 (1u<<0) |
| 45 | #define COL0 (1<<0) | 45 | #define COL0 (1u<<0) |
| 46 | #define COL1 (1<<1) | 46 | #define COL1 (1u<<1) |
| 47 | #define COL2 (1<<2) | 47 | #define COL2 (1u<<2) |
| 48 | #define COL3 (1<<3) | 48 | #define COL3 (1u<<3) |
| 49 | #define COL4 (1<<4) | 49 | #define COL4 (1u<<4) |
| 50 | #define COL5 (1<<5) | 50 | #define COL5 (1u<<5) |
| 51 | #define COL6 (1<<6) | 51 | #define COL6 (1u<<6) |
| 52 | 52 | ||
| 53 | // ATmega pin defs | 53 | // ATmega pin defs |
| 54 | #define ROW1 (1<<6) | 54 | #define ROW1 (1u<<6) |
| 55 | #define ROW2 (1<<5) | 55 | #define ROW2 (1u<<5) |
| 56 | #define ROW3 (1<<4) | 56 | #define ROW3 (1u<<4) |
| 57 | #define ROW4 (1<<1) | 57 | #define ROW4 (1u<<1) |
| 58 | #define COL7 (1<<0) | 58 | #define COL7 (1u<<0) |
| 59 | #define COL8 (1<<1) | 59 | #define COL8 (1u<<1) |
| 60 | #define COL9 (1<<2) | 60 | #define COL9 (1u<<2) |
| 61 | #define COL10 (1<<3) | 61 | #define COL10 (1u<<3) |
| 62 | #define COL11 (1<<2) | 62 | #define COL11 (1u<<2) |
| 63 | #define COL12 (1<<3) | 63 | #define COL12 (1u<<3) |
| 64 | #define COL13 (1<<6) | 64 | #define COL13 (1u<<6) |
| 65 | 65 | ||
| 66 | //Trackball pin defs | 66 | //Trackball pin defs |
| 67 | #define TRKUP (1<<4) | 67 | #define TRKUP (1u<<4) |
| 68 | #define TRKDN (1<<5) | 68 | #define TRKDN (1u<<5) |
| 69 | #define TRKLT (1<<6) | 69 | #define TRKLT (1u<<6) |
| 70 | #define TRKRT (1<<7) | 70 | #define TRKRT (1u<<7) |
| 71 | #define TRKBTN (1<<6) | 71 | #define TRKBTN (1u<<6) |
| 72 | 72 | ||
| 73 | 73 | ||
| 74 | // Multiple for mouse moves | 74 | // Multiple for mouse moves |
