diff options
| author | Florian Didron <fdidron@users.noreply.github.com> | 2019-05-20 15:47:50 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-20 15:47:50 +0900 |
| commit | 24d05fee49bd9d86863f896d70eafd25674ec248 (patch) | |
| tree | 9ffb4b051e795adfcc19fdffd7ed78f7933ee4ad /quantum | |
| parent | 3662999df266c68e10d0b898f03fdd44e74dd272 (diff) | |
| parent | a90a78c265aa3e82850c7265a6b391ec719f3c11 (diff) | |
Merge pull request #46 from zsa/fix/oled_driver_for_splits
Fix issuse with OLED Driver and Split Keyboard code
Diffstat (limited to 'quantum')
| -rw-r--r-- | quantum/quantum.c | 16 | ||||
| -rw-r--r-- | quantum/split_common/matrix.c | 2 |
2 files changed, 1 insertions, 17 deletions
diff --git a/quantum/quantum.c b/quantum/quantum.c index 43d7be7b87..426de28d84 100644 --- a/quantum/quantum.c +++ b/quantum/quantum.c @@ -247,12 +247,6 @@ bool process_record_quantum(keyrecord_t *record) { preprocess_tap_dance(keycode, record); #endif - #if defined(OLED_DRIVER_ENABLE) && !defined(OLED_DISABLE_TIMEOUT) - // Wake up oled if user is using those fabulous keys! - if (record->event.pressed) - oled_on(); - #endif - if (!( #if defined(KEY_LOCK_ENABLE) // Must run first to be able to mask key_up events. @@ -976,9 +970,6 @@ void matrix_init_quantum() { #ifdef OUTPUT_AUTO_ENABLE set_output(OUTPUT_AUTO); #endif - #ifdef OLED_DRIVER_ENABLE - oled_init(OLED_ROTATION_0); - #endif matrix_init_kb(); } @@ -1015,10 +1006,6 @@ void matrix_scan_quantum() { haptic_task(); #endif - #ifdef OLED_DRIVER_ENABLE - oled_task(); - #endif - matrix_scan_kb(); } #if defined(BACKLIGHT_ENABLE) && defined(BACKLIGHT_PIN) @@ -1109,9 +1096,7 @@ void backlight_task(void) { #endif #endif -#else // pwm through timer -#define TIMER_TOP 0xFFFFU // See http://jared.geek.nz/2013/feb/linear-led-pwm static uint16_t cie_lightness(uint16_t v) { @@ -1158,7 +1143,6 @@ void backlight_task(void) {} #define BREATHING_NO_HALT 0 #define BREATHING_HALT_OFF 1 -#define BREATHING_HALT_ON 2 #define BREATHING_STEPS 128 static uint8_t breathing_period = BREATHING_PERIOD; diff --git a/quantum/split_common/matrix.c b/quantum/split_common/matrix.c index eb110bd23a..3c3daf3d3b 100644 --- a/quantum/split_common/matrix.c +++ b/quantum/split_common/matrix.c @@ -299,7 +299,7 @@ uint8_t _matrix_scan(void) { debounce(raw_matrix, matrix + thisHand, ROWS_PER_HAND, changed); - return 1; + return (uint8_t)changed; } uint8_t matrix_scan(void) { |