aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZach White <skullydazed@gmail.com>2021-08-14 18:02:46 -0700
committerGitHub <noreply@github.com>2021-08-15 11:02:46 +1000
commit8a5412778278ec197c58b5bb8baed85e913e3ccd (patch)
tree4c8709a504fae8f37e317d3533972dcefa16ca95
parent60a36863bca9f52cad6984de4e877f8dcd30a88f (diff)
downloadqmk_firmware-8a5412778278ec197c58b5bb8baed85e913e3ccd.tar.gz
qmk_firmware-8a5412778278ec197c58b5bb8baed85e913e3ccd.zip
Fix errors that have cropped up in develop (#14005)
* frooastboard: remove duplicate values from config.h * pistachio_pro: remove unused pin D5
-rw-r--r--keyboards/frooastboard/config.h14
-rw-r--r--keyboards/pistachio_pro/config.h2
2 files changed, 1 insertions, 15 deletions
diff --git a/keyboards/frooastboard/config.h b/keyboards/frooastboard/config.h
index fb5f3e650..ebfc6a75d 100644
--- a/keyboards/frooastboard/config.h
+++ b/keyboards/frooastboard/config.h
@@ -19,9 +19,6 @@
19#include "config_common.h" 19#include "config_common.h"
20 20
21/* USB Device descriptor parameter */ 21/* USB Device descriptor parameter */
22#define VENDOR_ID 0x4642 /*F rooast B oards*/
23#define PRODUCT_ID 0x6F21 /*osu!*/
24#define DEVICE_VER 0x0001
25#define MANUFACTURER frooastside 22#define MANUFACTURER frooastside
26#define PRODUCT Frooastboard 23#define PRODUCT Frooastboard
27 24
@@ -29,20 +26,9 @@
29#define MATRIX_ROWS 2 26#define MATRIX_ROWS 2
30#define MATRIX_COLS 2 27#define MATRIX_COLS 2
31 28
32/* key matrix pins */
33#define MATRIX_ROW_PINS { B0, B1 }
34#define MATRIX_COL_PINS { B2, B3 }
35#define UNUSED_PINS
36
37#define BOOTMAGIC_LITE_ROW 1 29#define BOOTMAGIC_LITE_ROW 1
38#define BOOTMAGIC_LITE_COLUMN 1 30#define BOOTMAGIC_LITE_COLUMN 1
39 31
40/* COL2ROW or ROW2COL */
41#define DIODE_DIRECTION COL2ROW
42
43/* Set 0 if debouncing isn't needed */
44#define DEBOUNCE 5
45
46#define RGB_DI_PIN B4 32#define RGB_DI_PIN B4
47#define RGBLED_NUM 8 33#define RGBLED_NUM 8
48 34
diff --git a/keyboards/pistachio_pro/config.h b/keyboards/pistachio_pro/config.h
index 6c95e0f80..c3cb58496 100644
--- a/keyboards/pistachio_pro/config.h
+++ b/keyboards/pistachio_pro/config.h
@@ -34,7 +34,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
34#define MATRIX_COLS 18 34#define MATRIX_COLS 18
35 35
36#define MATRIX_ROW_PINS { D4, C6, D7, B3, B4, B5 } 36#define MATRIX_ROW_PINS { D4, C6, D7, B3, B4, B5 }
37#define MATRIX_COL_PINS { E6, F0, F1, F4, F5, F6, F7, B6, D6, D5,} 37#define MATRIX_COL_PINS { E6, F0, F1, F4, F5, F6, F7, B6, D6 }
38#define UNUSED_PINS 38#define UNUSED_PINS
39/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ 39/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
40#define DEBOUNCE 5 40#define DEBOUNCE 5