diff options
| author | XScorpion2 <rcalt2vt@gmail.com> | 2019-05-06 17:06:43 -0500 |
|---|---|---|
| committer | Drashna Jaelre <drashna@live.com> | 2019-05-06 15:06:43 -0700 |
| commit | e01b2d518a1a08ce07278ef9a38c7a793c843749 (patch) | |
| tree | bb63e0653e09308286d86df303c8d17a447df46c /quantum/quantum.c | |
| parent | 99500243e10c12c0a5005da49aa1986947b27153 (diff) | |
| download | qmk_firmware-e01b2d518a1a08ce07278ef9a38c7a793c843749.tar.gz qmk_firmware-e01b2d518a1a08ce07278ef9a38c7a793c843749.zip | |
[Keyboard] Sol keyboard conversion to split common (#5773)
* Split common conversion
* Updated serial and encoder pins
* Fixing default folder until r2
* Fixing oled driver on slave split common
* Fixing keymap compile errors
* Fixing oled inactivity timer on slave split common
* Hoisted oled driver task, init, & activity to keyboard.c
* Update keyboards/sol/config.h
Co-Authored-By: XScorpion2 <rcalt2vt@gmail.com>
* Remove TAPPING_FORCE_HOLD
Diffstat (limited to 'quantum/quantum.c')
| -rw-r--r-- | quantum/quantum.c | 23 |
1 files changed, 5 insertions, 18 deletions
diff --git a/quantum/quantum.c b/quantum/quantum.c index fcedf0bc1..d4fa7f2ef 100644 --- a/quantum/quantum.c +++ b/quantum/quantum.c | |||
| @@ -247,12 +247,6 @@ bool process_record_quantum(keyrecord_t *record) { | |||
| 247 | preprocess_tap_dance(keycode, record); | 247 | preprocess_tap_dance(keycode, record); |
| 248 | #endif | 248 | #endif |
| 249 | 249 | ||
| 250 | #if defined(OLED_DRIVER_ENABLE) && !defined(OLED_DISABLE_TIMEOUT) | ||
| 251 | // Wake up oled if user is using those fabulous keys! | ||
| 252 | if (record->event.pressed) | ||
| 253 | oled_on(); | ||
| 254 | #endif | ||
| 255 | |||
| 256 | if (!( | 250 | if (!( |
| 257 | #if defined(KEY_LOCK_ENABLE) | 251 | #if defined(KEY_LOCK_ENABLE) |
| 258 | // Must run first to be able to mask key_up events. | 252 | // Must run first to be able to mask key_up events. |
| @@ -976,9 +970,6 @@ void matrix_init_quantum() { | |||
| 976 | #ifdef OUTPUT_AUTO_ENABLE | 970 | #ifdef OUTPUT_AUTO_ENABLE |
| 977 | set_output(OUTPUT_AUTO); | 971 | set_output(OUTPUT_AUTO); |
| 978 | #endif | 972 | #endif |
| 979 | #ifdef OLED_DRIVER_ENABLE | ||
| 980 | oled_init(OLED_ROTATION_0); | ||
| 981 | #endif | ||
| 982 | matrix_init_kb(); | 973 | matrix_init_kb(); |
| 983 | } | 974 | } |
| 984 | 975 | ||
| @@ -1015,10 +1006,6 @@ void matrix_scan_quantum() { | |||
| 1015 | haptic_task(); | 1006 | haptic_task(); |
| 1016 | #endif | 1007 | #endif |
| 1017 | 1008 | ||
| 1018 | #ifdef OLED_DRIVER_ENABLE | ||
| 1019 | oled_task(); | ||
| 1020 | #endif | ||
| 1021 | |||
| 1022 | matrix_scan_kb(); | 1009 | matrix_scan_kb(); |
| 1023 | } | 1010 | } |
| 1024 | #if defined(BACKLIGHT_ENABLE) && (defined(BACKLIGHT_PIN) || defined(BACKLIGHT_PINS)) | 1011 | #if defined(BACKLIGHT_ENABLE) && (defined(BACKLIGHT_PIN) || defined(BACKLIGHT_PINS)) |
| @@ -1214,10 +1201,10 @@ void backlight_task(void) { | |||
| 1214 | // (which is not possible since the backlight is not wired to PWM pins on the | 1201 | // (which is not possible since the backlight is not wired to PWM pins on the |
| 1215 | // CPU), we do the LED on/off by oursleves. | 1202 | // CPU), we do the LED on/off by oursleves. |
| 1216 | // The timer is setup to count up to 0xFFFF, and we set the Output Compare | 1203 | // The timer is setup to count up to 0xFFFF, and we set the Output Compare |
| 1217 | // register to the current 16bits backlight level (after CIE correction). | 1204 | // register to the current 16bits backlight level (after CIE correction). |
| 1218 | // This means the CPU will trigger a compare match interrupt when the counter | 1205 | // This means the CPU will trigger a compare match interrupt when the counter |
| 1219 | // reaches the backlight level, where we turn off the LEDs, | 1206 | // reaches the backlight level, where we turn off the LEDs, |
| 1220 | // but also an overflow interrupt when the counter rolls back to 0, | 1207 | // but also an overflow interrupt when the counter rolls back to 0, |
| 1221 | // in which we're going to turn on the LEDs. | 1208 | // in which we're going to turn on the LEDs. |
| 1222 | // The LED will then be on for OCRxx/0xFFFF time, adjusted every 244Hz. | 1209 | // The LED will then be on for OCRxx/0xFFFF time, adjusted every 244Hz. |
| 1223 | 1210 | ||
| @@ -1229,7 +1216,7 @@ ISR(TIMERx_COMPA_vect) { | |||
| 1229 | } | 1216 | } |
| 1230 | 1217 | ||
| 1231 | // Triggered when the counter reaches the TOP value | 1218 | // Triggered when the counter reaches the TOP value |
| 1232 | // this one triggers at F_CPU/65536 =~ 244 Hz | 1219 | // this one triggers at F_CPU/65536 =~ 244 Hz |
| 1233 | ISR(TIMERx_OVF_vect) { | 1220 | ISR(TIMERx_OVF_vect) { |
| 1234 | #ifdef BACKLIGHT_BREATHING | 1221 | #ifdef BACKLIGHT_BREATHING |
| 1235 | breathing_task(); | 1222 | breathing_task(); |
