diff options
| author | James Young <18669334+noroadsleft@users.noreply.github.com> | 2020-11-28 12:02:18 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-28 12:02:18 -0800 |
| commit | c66df1664497546f32662409778731143e45a552 (patch) | |
| tree | da73a2d532a27685a31d932b3a44a707d4a3af81 /drivers/oled/oled_driver.c | |
| parent | 15385d4113414d42bd062c60c9de5df797d3157f (diff) | |
| download | qmk_firmware-c66df1664497546f32662409778731143e45a552.tar.gz qmk_firmware-c66df1664497546f32662409778731143e45a552.zip | |
2020 November 28 Breaking Changes Update (#11053)
* Branch point for 2020 November 28 Breaking Change
* Remove matrix_col_t to allow MATRIX_ROWS > 32 (#10183)
* Add support for soft serial to ATmega32U2 (#10204)
* Change MIDI velocity implementation to allow direct control of velocity value (#9940)
* Add ability to build a subset of all keyboards based on platform.
* Actually use eeprom_driver_init().
* Make bootloader_jump weak for ChibiOS. (#10417)
* Joystick 16-bit support (#10439)
* Per-encoder resolutions (#10259)
* Share button state from mousekey to pointing_device (#10179)
* Add hotfix for chibios keyboards not wake (#10088)
* Add advanced/efficient RGB Matrix Indicators (#8564)
* Naming change.
* Support for STM32 GPIOF,G,H,I,J,K (#10206)
* Add milc as a dependency and remove the installed milc (#10563)
* ChibiOS upgrade: early init conversions (#10214)
* ChibiOS upgrade: configuration file migrator (#9952)
* Haptic and solenoid cleanup (#9700)
* XD75 cleanup (#10524)
* OLED display update interval support (#10388)
* Add definition based on currently-selected serial driver. (#10716)
* New feature: Retro Tapping per key (#10622)
* Allow for modification of output RGB values when using rgblight/rgb_matrix. (#10638)
* Add housekeeping task callbacks so that keyboards/keymaps are capable of executing code for each main loop iteration. (#10530)
* Rescale both ChibiOS and AVR backlighting.
* Reduce Helix keyboard build variation (#8669)
* Minor change to behavior allowing display updates to continue between task ticks (#10750)
* Some GPIO manipulations in matrix.c change to atomic. (#10491)
* qmk cformat (#10767)
* [Keyboard] Update the Speedo firmware for v3.0 (#10657)
* Maartenwut/Maarten namechange to evyd13/Evy (#10274)
* [quantum] combine repeated lines of code (#10837)
* Add step sequencer feature (#9703)
* aeboards/ext65 refactor (#10820)
* Refactor xelus/dawn60 for Rev2 later (#10584)
* add DEBUG_MATRIX_SCAN_RATE_ENABLE to common_features.mk (#10824)
* [Core] Added `add_oneshot_mods` & `del_oneshot_mods` (#10549)
* update chibios os usb for the otg driver (#8893)
* Remove HD44780 References, Part 4 (#10735)
* [Keyboard] Add Valor FRL TKL (+refactor) (#10512)
* Fix cursor position bug in oled_write_raw functions (#10800)
* Fixup version.h writing when using SKIP_VERSION=yes (#10972)
* Allow for certain code in the codebase assuming length of string. (#10974)
* Add AT90USB support for serial.c (#10706)
* Auto shift: support repeats and early registration (#9826)
* Rename ledmatrix.h to match .c file (#7949)
* Split RGB_MATRIX_ENABLE into _ENABLE and _DRIVER (#10231)
* Split LED_MATRIX_ENABLE into _ENABLE and _DRIVER (#10840)
* Merge point for 2020 Nov 28 Breaking Change
Diffstat (limited to 'drivers/oled/oled_driver.c')
| -rw-r--r-- | drivers/oled/oled_driver.c | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/drivers/oled/oled_driver.c b/drivers/oled/oled_driver.c index ba11db1d2..53bb8ca3f 100644 --- a/drivers/oled/oled_driver.c +++ b/drivers/oled/oled_driver.c | |||
| @@ -119,6 +119,9 @@ uint32_t oled_timeout; | |||
| 119 | #if OLED_SCROLL_TIMEOUT > 0 | 119 | #if OLED_SCROLL_TIMEOUT > 0 |
| 120 | uint32_t oled_scroll_timeout; | 120 | uint32_t oled_scroll_timeout; |
| 121 | #endif | 121 | #endif |
| 122 | #if OLED_UPDATE_INTERVAL > 0 | ||
| 123 | uint16_t oled_update_timeout; | ||
| 124 | #endif | ||
| 122 | 125 | ||
| 123 | // Internal variables to reduce math instructions | 126 | // Internal variables to reduce math instructions |
| 124 | 127 | ||
| @@ -468,8 +471,9 @@ void oled_write_raw_byte(const char data, uint16_t index) { | |||
| 468 | } | 471 | } |
| 469 | 472 | ||
| 470 | void oled_write_raw(const char *data, uint16_t size) { | 473 | void oled_write_raw(const char *data, uint16_t size) { |
| 471 | if (size > OLED_MATRIX_SIZE) size = OLED_MATRIX_SIZE; | 474 | uint16_t cursor_start_index = oled_cursor - &oled_buffer[0]; |
| 472 | for (uint16_t i = 0; i < size; i++) { | 475 | if ((size + cursor_start_index) > OLED_MATRIX_SIZE) size = OLED_MATRIX_SIZE - cursor_start_index; |
| 476 | for (uint16_t i = cursor_start_index; i < cursor_start_index + size; i++) { | ||
| 473 | if (oled_buffer[i] == data[i]) continue; | 477 | if (oled_buffer[i] == data[i]) continue; |
| 474 | oled_buffer[i] = data[i]; | 478 | oled_buffer[i] = data[i]; |
| 475 | oled_dirty |= ((OLED_BLOCK_TYPE)1 << (i / OLED_BLOCK_SIZE)); | 479 | oled_dirty |= ((OLED_BLOCK_TYPE)1 << (i / OLED_BLOCK_SIZE)); |
| @@ -511,8 +515,9 @@ void oled_write_ln_P(const char *data, bool invert) { | |||
| 511 | } | 515 | } |
| 512 | 516 | ||
| 513 | void oled_write_raw_P(const char *data, uint16_t size) { | 517 | void oled_write_raw_P(const char *data, uint16_t size) { |
| 514 | if (size > OLED_MATRIX_SIZE) size = OLED_MATRIX_SIZE; | 518 | uint16_t cursor_start_index = oled_cursor - &oled_buffer[0]; |
| 515 | for (uint16_t i = 0; i < size; i++) { | 519 | if ((size + cursor_start_index) > OLED_MATRIX_SIZE) size = OLED_MATRIX_SIZE - cursor_start_index; |
| 520 | for (uint16_t i = cursor_start_index; i < cursor_start_index + size; i++) { | ||
| 516 | uint8_t c = pgm_read_byte(data++); | 521 | uint8_t c = pgm_read_byte(data++); |
| 517 | if (oled_buffer[i] == c) continue; | 522 | if (oled_buffer[i] == c) continue; |
| 518 | oled_buffer[i] = c; | 523 | oled_buffer[i] = c; |
| @@ -650,9 +655,16 @@ void oled_task(void) { | |||
| 650 | return; | 655 | return; |
| 651 | } | 656 | } |
| 652 | 657 | ||
| 658 | #if OLED_UPDATE_INTERVAL > 0 | ||
| 659 | if (timer_elapsed(oled_update_timeout) >= OLED_UPDATE_INTERVAL) { | ||
| 660 | oled_update_timeout = timer_read(); | ||
| 661 | oled_set_cursor(0, 0); | ||
| 662 | oled_task_user(); | ||
| 663 | } | ||
| 664 | #else | ||
| 653 | oled_set_cursor(0, 0); | 665 | oled_set_cursor(0, 0); |
| 654 | |||
| 655 | oled_task_user(); | 666 | oled_task_user(); |
| 667 | #endif | ||
| 656 | 668 | ||
| 657 | #if OLED_SCROLL_TIMEOUT > 0 | 669 | #if OLED_SCROLL_TIMEOUT > 0 |
| 658 | if (oled_dirty && oled_scrolling) { | 670 | if (oled_dirty && oled_scrolling) { |
