Merge remote-tracking branch 'origin/master' into develop

master
QMK Bot 2021-10-10 20:30:26 +00:00
commit a7810db7ba
3 changed files with 8 additions and 2 deletions

View File

@ -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

View File

@ -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; }

View File

@ -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