Merge remote-tracking branch 'origin/feature/DK60'

master
dbroqua 2017-05-30 23:10:14 +02:00
commit c5d3faace5
2 changed files with 1 additions and 3 deletions

View File

@ -1,5 +1,5 @@
/* /*
Copyright 2012 Jun Wako <wakojun@gmail.com> Copyright 2017 Damien Broqua <contact@darkou.fr>
This program is free software: you can redistribute it and/or modify This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
@ -33,7 +33,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define MATRIX_COLS 13 #define MATRIX_COLS 13
// ROWS: Top to bottom, COLS: Left to right // ROWS: Top to bottom, COLS: Left to right
#define MATRIX_ROW_PINS { B6, B4, D7, D6, D4 } #define MATRIX_ROW_PINS { B6, B4, D7, D6, D4 }
#define MATRIX_COL_PINS { B0, B3, B2, B1, D3, D5, B5, B7, C6, C7, D0, D1, D2 } #define MATRIX_COL_PINS { B0, B3, B2, B1, D3, D5, B5, B7, C6, C7, D0, D1, D2 }
#define UNUSED_PINS #define UNUSED_PINS

View File

@ -3,7 +3,6 @@
#include "quantum.h" #include "quantum.h"
#include <util/delay.h> #include <util/delay.h>
// #include "led.h"
inline void dk60_caps_led_on(void) { PORTE |= (1<<6); } inline void dk60_caps_led_on(void) { PORTE |= (1<<6); }
inline void dk60_esc_led_on(void) { PORTF |= (1<<0); } inline void dk60_esc_led_on(void) { PORTF |= (1<<0); }