Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
commit
a7810db7ba
3 changed files with 8 additions and 2 deletions
|
@ -62,7 +62,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
#define LED_CAPS_LOCK_PIN B9
|
#define LED_CAPS_LOCK_PIN B9
|
||||||
|
|
||||||
/* RGB settings, uncomment this define to enable RGB */
|
/* RGB settings, uncomment this define to enable RGB */
|
||||||
//#define RGB_DI_PIN A0
|
#define RGB_DI_PIN A0
|
||||||
#ifdef RGB_DI_PIN
|
#ifdef RGB_DI_PIN
|
||||||
# define RGBLED_NUM 10
|
# define RGBLED_NUM 10
|
||||||
# define RGBLIGHT_HUE_STEP 8
|
# define RGBLIGHT_HUE_STEP 8
|
||||||
|
|
|
@ -16,6 +16,12 @@
|
||||||
|
|
||||||
#include "obe.h"
|
#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
|
#ifdef ENCODER_ENABLE
|
||||||
bool encoder_update_kb(uint8_t index, bool clockwise) {
|
bool encoder_update_kb(uint8_t index, bool clockwise) {
|
||||||
if (!encoder_update_user(index, clockwise)) { return false; }
|
if (!encoder_update_user(index, clockwise)) { return false; }
|
||||||
|
|
|
@ -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
|
# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
|
||||||
NKRO_ENABLE = no # USB Nkey Rollover
|
NKRO_ENABLE = no # USB Nkey Rollover
|
||||||
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
|
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
|
AUDIO_ENABLE = no # Audio output
|
||||||
ENCODER_ENABLE = yes # Encoder Enabled
|
ENCODER_ENABLE = yes # Encoder Enabled
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue