diff options
| author | Nick Brassel <nick@tzarc.org> | 2021-08-29 08:20:25 +1000 |
|---|---|---|
| committer | Nick Brassel <nick@tzarc.org> | 2021-08-29 08:20:25 +1000 |
| commit | f061ca497464fe85284906fb163a33eaee7a91ef (patch) | |
| tree | 33ef1bfb529aed382e8526c607c4e18717f92571 /keyboards/pistachio_pro | |
| parent | ff65185dec6f97be1eb49f17cea526a0d0bbf3d6 (diff) | |
| parent | 4bad375d7c09d949a9dcdd4feba147c9c7a67ec6 (diff) | |
Breaking changes develop merge to master, 2021Q3 edition. (#14196)
Diffstat (limited to 'keyboards/pistachio_pro')
| -rw-r--r-- | keyboards/pistachio_pro/config.h | 2 | ||||
| -rw-r--r-- | keyboards/pistachio_pro/rules.mk | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/keyboards/pistachio_pro/config.h b/keyboards/pistachio_pro/config.h index 6c95e0f808..c3cb584962 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/>. #define MATRIX_COLS 18 #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 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ #define DEBOUNCE 5 diff --git a/keyboards/pistachio_pro/rules.mk b/keyboards/pistachio_pro/rules.mk index 48e745a631..b27df64bd8 100644 --- a/keyboards/pistachio_pro/rules.mk +++ b/keyboards/pistachio_pro/rules.mk @@ -20,9 +20,10 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow BLUETOOTH_ENABLE = no # Enable Bluetooth AUDIO_ENABLE = no # Audio output -OLED_DRIVER_ENABLE = yes +OLED_ENABLE = yes +OLED_DRIVER = SSD1306 ENCODER_ENABLE = yes CUSTOM_MATRIX = lite SRC += matrix.c -SRC += ./lib/bme280.c
\ No newline at end of file +SRC += ./lib/bme280.c |