diff options
| author | QMK Bot <hello@qmk.fm> | 2021-10-10 20:30:26 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2021-10-10 20:30:26 +0000 |
| commit | a7810db7ba35c5354708891ad3da317937e953d3 (patch) | |
| tree | 0a625ed1c750d84f0fd53b006399affc1a5412a0 /keyboards | |
| parent | ce151686248e344bb213fea3f3e1eece616eeb27 (diff) | |
| parent | fa1a59e7f843f07b333b573384584e360d1d3c75 (diff) | |
| download | qmk_firmware-a7810db7ba35c5354708891ad3da317937e953d3.tar.gz qmk_firmware-a7810db7ba35c5354708891ad3da317937e953d3.zip | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards')
| -rw-r--r-- | keyboards/mechwild/obe/config.h | 2 | ||||
| -rw-r--r-- | keyboards/mechwild/obe/obe.c | 6 | ||||
| -rw-r--r-- | keyboards/mechwild/obe/rules.mk | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/keyboards/mechwild/obe/config.h b/keyboards/mechwild/obe/config.h index 9cbc012637..03ff968787 100644 --- a/keyboards/mechwild/obe/config.h +++ b/keyboards/mechwild/obe/config.h @@ -62,7 +62,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define LED_CAPS_LOCK_PIN B9 /* RGB settings, uncomment this define to enable RGB */ -//#define RGB_DI_PIN A0 +#define RGB_DI_PIN A0 #ifdef RGB_DI_PIN # define RGBLED_NUM 10 # define RGBLIGHT_HUE_STEP 8 diff --git a/keyboards/mechwild/obe/obe.c b/keyboards/mechwild/obe/obe.c index 195d4a7679..8612764ae5 100644 --- a/keyboards/mechwild/obe/obe.c +++ b/keyboards/mechwild/obe/obe.c @@ -16,6 +16,12 @@ #include "obe.h" +void board_init(void) { + // B9 is configured as I2C1_SDA in the board file; that function must be + // disabled before using B7 as I2C1_SDA. + setPinInputHigh(B9); +} + #ifdef ENCODER_ENABLE bool encoder_update_kb(uint8_t index, bool clockwise) { if (!encoder_update_user(index, clockwise)) { return false; } diff --git a/keyboards/mechwild/obe/rules.mk b/keyboards/mechwild/obe/rules.mk index 8271e9d1d6..fb66887e62 100644 --- a/keyboards/mechwild/obe/rules.mk +++ b/keyboards/mechwild/obe/rules.mk @@ -11,7 +11,7 @@ SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend # if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work NKRO_ENABLE = no # USB Nkey Rollover BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow +RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output ENCODER_ENABLE = yes # Encoder Enabled |