From 47db2ea409c8c2222219d5af42389804b0462c2d Mon Sep 17 00:00:00 2001 From: Ciaanh Date: Fri, 28 Apr 2023 01:48:40 +0200 Subject: [PATCH] fix Oled config --- keyboards/ciaanh/kanagawa/config.h | 2 +- keyboards/ciaanh/kanagawa/info.json | 11 ----------- keyboards/ciaanh/kanagawa/mcuconf.h | 3 +++ keyboards/ciaanh/kanagawa/rules.mk | 19 +++++++++++++------ keyboards/ciaanh/kanagawa2040/config.h | 2 +- keyboards/ciaanh/kanagawa2040/info.json | 13 +------------ keyboards/ciaanh/kanagawa2040/mcuconf.h | 3 +++ keyboards/ciaanh/kanagawa2040/rules.mk | 19 +++++++++++++------ 8 files changed, 35 insertions(+), 37 deletions(-) diff --git a/keyboards/ciaanh/kanagawa/config.h b/keyboards/ciaanh/kanagawa/config.h index d35884fb1b4..912da2c1ba0 100644 --- a/keyboards/ciaanh/kanagawa/config.h +++ b/keyboards/ciaanh/kanagawa/config.h @@ -8,7 +8,7 @@ # define OLED_DISPLAY_ADDRESS 0x3C /* I2C Conf */ -# define I2C_DRIVER I2CD1 +# define I2C_DRIVER I2CD0 # define I2C1_SDA_PIN GP0 # define I2C1_SCL_PIN GP1 #endif diff --git a/keyboards/ciaanh/kanagawa/info.json b/keyboards/ciaanh/kanagawa/info.json index 45a70539801..d0da504a473 100644 --- a/keyboards/ciaanh/kanagawa/info.json +++ b/keyboards/ciaanh/kanagawa/info.json @@ -8,17 +8,6 @@ "pid": "0x0010", "device_version": "2.1.0" }, - "features": { - "audio": false, - "backlight": false, - "bootmagic": true, - "command": false, - "console": false, - "extrakey": true, - "mousekey": false, - "nkro": false, - "rgblight": false - }, "bootmagic": { "matrix": [0, 13] }, diff --git a/keyboards/ciaanh/kanagawa/mcuconf.h b/keyboards/ciaanh/kanagawa/mcuconf.h index d3ca0baab50..f6378664da8 100644 --- a/keyboards/ciaanh/kanagawa/mcuconf.h +++ b/keyboards/ciaanh/kanagawa/mcuconf.h @@ -4,3 +4,6 @@ #undef RP_I2C_USE_I2C0 #define RP_I2C_USE_I2C0 TRUE + +#undef RP_I2C_USE_I2C1 +#define RP_I2C_USE_I2C1 FALSE diff --git a/keyboards/ciaanh/kanagawa/rules.mk b/keyboards/ciaanh/kanagawa/rules.mk index 96c6b71a3f5..f1c870e1b2a 100644 --- a/keyboards/ciaanh/kanagawa/rules.mk +++ b/keyboards/ciaanh/kanagawa/rules.mk @@ -1,13 +1,20 @@ -# MCU name -MCU = RP2040 - -# Bootloader selection -BOOTLOADER = rp2040 - # RP2040-specific options ALLOW_WARNINGS = yes PICO_INTRINSICS_ENABLED = no # ATM Unsupported by ChibiOS. +BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite +MOUSEKEY_ENABLE = no # Mouse keys +EXTRAKEY_ENABLE = yes # Audio control and System control +CONSOLE_ENABLE = no # Console for debug +COMMAND_ENABLE = no # Commands for debug and configuration +NKRO_ENABLE = no # Enable N-Key Rollover +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality +RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow +AUDIO_ENABLE = no # Audio output +BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID + +ENCODER_ENABLE = yes + RGB_MATRIX_ENABLE = yes RGB_MATRIX_DRIVER = WS2812 WS2812_DRIVER = vendor diff --git a/keyboards/ciaanh/kanagawa2040/config.h b/keyboards/ciaanh/kanagawa2040/config.h index dc409bf96d8..8600fa9a31e 100644 --- a/keyboards/ciaanh/kanagawa2040/config.h +++ b/keyboards/ciaanh/kanagawa2040/config.h @@ -8,7 +8,7 @@ # define OLED_DISPLAY_ADDRESS 0x3C /* I2C Conf */ -# define I2C_DRIVER I2CD1 +# define I2C_DRIVER I2CD0 # define I2C1_SDA_PIN GP0 # define I2C1_SCL_PIN GP1 #endif diff --git a/keyboards/ciaanh/kanagawa2040/info.json b/keyboards/ciaanh/kanagawa2040/info.json index 7b2011ce7dd..9c124ae684f 100644 --- a/keyboards/ciaanh/kanagawa2040/info.json +++ b/keyboards/ciaanh/kanagawa2040/info.json @@ -8,18 +8,7 @@ "pid": "0x0010", "device_version": "2.1.0" }, - "features": { - "audio": false, - "backlight": false, - "bootmagic": true, - "command": false, - "console": false, - "extrakey": true, - "mousekey": false, - "nkro": false, - "rgblight": false - }, - "bootmagic": { + "bootmagic": { "matrix": [0, 13] }, "encoder": { diff --git a/keyboards/ciaanh/kanagawa2040/mcuconf.h b/keyboards/ciaanh/kanagawa2040/mcuconf.h index d3ca0baab50..f6378664da8 100644 --- a/keyboards/ciaanh/kanagawa2040/mcuconf.h +++ b/keyboards/ciaanh/kanagawa2040/mcuconf.h @@ -4,3 +4,6 @@ #undef RP_I2C_USE_I2C0 #define RP_I2C_USE_I2C0 TRUE + +#undef RP_I2C_USE_I2C1 +#define RP_I2C_USE_I2C1 FALSE diff --git a/keyboards/ciaanh/kanagawa2040/rules.mk b/keyboards/ciaanh/kanagawa2040/rules.mk index 7cbb07d3e3e..20fcc9172ab 100644 --- a/keyboards/ciaanh/kanagawa2040/rules.mk +++ b/keyboards/ciaanh/kanagawa2040/rules.mk @@ -1,13 +1,20 @@ -# MCU name -MCU = RP2040 - -# Bootloader selection -BOOTLOADER = rp2040 - # RP2040-specific options ALLOW_WARNINGS = yes PICO_INTRINSICS_ENABLED = no # ATM Unsupported by ChibiOS. +BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite +MOUSEKEY_ENABLE = no # Mouse keys +EXTRAKEY_ENABLE = yes # Audio control and System control +CONSOLE_ENABLE = no # Console for debug +COMMAND_ENABLE = no # Commands for debug and configuration +NKRO_ENABLE = no # Enable N-Key Rollover +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality +RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow +AUDIO_ENABLE = no # Audio output +BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID + +ENCODER_ENABLE = yes + RGB_MATRIX_ENABLE = yes RGB_MATRIX_DRIVER = WS2812 WS2812_DRIVER = vendor