Fix errors that have cropped up in develop (#14005)

* frooastboard: remove duplicate values from config.h

* pistachio_pro: remove unused pin D5
This commit is contained in:
Zach White 2021-08-14 18:02:46 -07:00 committed by GitHub
parent 60a36863bc
commit 8a54127782
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 15 deletions

View File

@ -19,9 +19,6 @@
#include "config_common.h" #include "config_common.h"
/* USB Device descriptor parameter */ /* USB Device descriptor parameter */
#define VENDOR_ID 0x4642 /*F rooast B oards*/
#define PRODUCT_ID 0x6F21 /*osu!*/
#define DEVICE_VER 0x0001
#define MANUFACTURER frooastside #define MANUFACTURER frooastside
#define PRODUCT Frooastboard #define PRODUCT Frooastboard
@ -29,20 +26,9 @@
#define MATRIX_ROWS 2 #define MATRIX_ROWS 2
#define MATRIX_COLS 2 #define MATRIX_COLS 2
/* key matrix pins */
#define MATRIX_ROW_PINS { B0, B1 }
#define MATRIX_COL_PINS { B2, B3 }
#define UNUSED_PINS
#define BOOTMAGIC_LITE_ROW 1 #define BOOTMAGIC_LITE_ROW 1
#define BOOTMAGIC_LITE_COLUMN 1 #define BOOTMAGIC_LITE_COLUMN 1
/* COL2ROW or ROW2COL */
#define DIODE_DIRECTION COL2ROW
/* Set 0 if debouncing isn't needed */
#define DEBOUNCE 5
#define RGB_DI_PIN B4 #define RGB_DI_PIN B4
#define RGBLED_NUM 8 #define RGBLED_NUM 8

View File

@ -34,7 +34,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define MATRIX_COLS 18 #define MATRIX_COLS 18
#define MATRIX_ROW_PINS { D4, C6, D7, B3, B4, B5 } #define MATRIX_ROW_PINS { D4, C6, D7, B3, B4, B5 }
#define MATRIX_COL_PINS { E6, F0, F1, F4, F5, F6, F7, B6, D6, D5,} #define MATRIX_COL_PINS { E6, F0, F1, F4, F5, F6, F7, B6, D6 }
#define UNUSED_PINS #define UNUSED_PINS
/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
#define DEBOUNCE 5 #define DEBOUNCE 5