2019-04-15 22:32:57 -05:00
|
|
|
/*
|
|
|
|
|
Copyright 2019 Ryan Caltabiano <https://github.com/XScorpion2>
|
|
|
|
|
|
|
|
|
|
This program is free software: you can redistribute it and/or modify
|
|
|
|
|
it under the terms of the GNU General Public License as published by
|
|
|
|
|
the Free Software Foundation, either version 2 of the License, or
|
|
|
|
|
(at your option) any later version.
|
|
|
|
|
|
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
|
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
|
GNU General Public License for more details.
|
|
|
|
|
|
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
|
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
|
*/
|
2023-05-10 14:04:53 -07:00
|
|
|
|
|
|
|
|
#if defined(OLED_TRANSPORT_SPI)
|
|
|
|
|
# include "spi_master.h"
|
|
|
|
|
#elif defined(OLED_TRANSPORT_I2C)
|
|
|
|
|
# include "i2c_master.h"
|
2023-09-25 04:24:57 +02:00
|
|
|
# if defined(USE_I2C) && defined(SPLIT_KEYBOARD)
|
|
|
|
|
# include "keyboard.h"
|
|
|
|
|
# endif
|
2023-05-10 14:04:53 -07:00
|
|
|
#endif
|
Additional updates for firmware25 (#411)
* add 75_(ansi|iso) Community Layouts to mechlovin/olly/octagon (#22459)
* expand mechlovin/olly/octagon
* Update info.json
* Rename info.json to keyboard.json
* correct matrix position for key
* remove VIA
* [Core] get_keycode_string(): function to format keycodes as strings, for more readable debug logging. (#24787)
* keycode_string(): Format keycodes as strings.
This adds the `keycode_string()` function described in
https://getreuer.info/posts/keyboards/keycode-string/index.html
as a core feature.
* Fix formatting.
* keycode_string review revisions.
* Rename keycode_string() -> get_keycode_string() for consistency with
existing string utils like get_u8_str().
* Revise custom keycode names with separate _user and _kb tables.
* Correct indent in builddefs/generic_features.mk.
Co-authored-by: Ryan <fauxpark@gmail.com>
* Add KC_NUHS, KC_NUBS, and KC_CAPS.
* Fix linking error with custom names.
* Attempt at simplifying interface.
* Formatting fix.
* Several fixes and revisions.
* Don't use PSTR in KEYCODE_STRING_NAME, since this fails to build on
AVR. Store custom names in RAM.
* Revise the internal table of common keycode names to use its own
storage representation, still in PROGMEM, and now more efficiently
stored flat in 8 bytes per entry.
* Support Swap Hands keycodes and a few other keycodes.
* Revert "Formatting fix."
This reverts commit 2a2771068c7ee545ffac4103aa07e847a9ec3816.
* Revert "Attempt at simplifying interface."
This reverts commit 8eaf67de76e75bc92d106a8b0decc893fbc65fa5.
* Simplify custom names API by sigprof's suggestion.
* Support more keycodes.
* Add QK_LOCK keycode.
* Add Secure keycodes.
* Add Joystick keycodes.
* Add Programmable Button keycodes.
* Add macro MC_ keycodes.
* For remaining keys in known code ranges, stringify them as
"QK_<feature>+<number>". For instance, "QK_MIDI+7".
* Bug fix and a few improvements.
* Fix missing right-hand bit when displaying 5-bit mods numerically.
* Support KC_HYPR, KC_MEH, HYPR_T(kc), MEH_T(kc).
* Exclude one-shot keycodes when NO_ACTION_ONESHOT is defined.
---------
Co-authored-by: Ryan <fauxpark@gmail.com>
* Align to latest CLI dependencies (#24553)
* Align to latest CLI dependencies
* Update docs
* Add Community Layout support to daskeyboard4 (#23884)
add ansi CL
* Add the plywrks ply8x hotswap variant. (#23558)
* Add hotswap variant
* Update RGB matrix
* Move files around to target develop
* Revert rules.mk for keyboards/jaykeeb/joker/rules.mk
* Update keyboards/plywrks/ply8x/hotswap/keyboard.json
Co-authored-by: Drashna Jaelre <drashna@live.com>
* Apply suggestions from code review
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
* Add missing community layouts
* Delete keyboards/plywrks/ply8x/rules.mk
* Update missing keys in RGB matrix
* Add missing key in RGB matrix for hotswap ver
* Remove via keymaps
* Add keyboard alias for plywrks/ply8x to plywrks/ply8x/solder
* Fix typo
* Fix another typo
---------
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
* [Core] use `keycode_string` in unit tests (#25042)
* tests: use keycode_string feature
With a proper keycode to string implementation in qmk there is no need
to use the unit tests only implementation anymore.
Signed-off-by: Stefan Kerkmann <karlk90@pm.me>
* tests: remove keycode_util feature
This feature is no longer used as we switched the tests to the
keycode string implementation.
Signed-off-by: Stefan Kerkmann <karlk90@pm.me>
* Non-volatile memory data repository pattern (#24356)
* First batch of eeconfig conversions.
* Offset and length for datablocks.
* `via`, `dynamic_keymap`.
* Fix filename.
* Commentary.
* wilba leds
* satisfaction75
* satisfaction75
* more keyboard whack-a-mole
* satisfaction75
* omnikeyish
* more whack-a-mole
* `generic_features.mk` to automatically pick up nvm repositories
* thievery
* deferred variable resolve
* whitespace
* convert api to structs/unions
* convert api to structs/unions
* convert api to structs/unions
* fixups
* code-side docs
* code size fix
* rollback
* nvm_xxxxx_erase
* Updated location of eeconfig magic numbers so non-EEPROM nvm drivers can use them too.
* Fixup build.
* Fixup compilation error with encoders.
* Build fixes.
* Add `via_ci` keymap to onekey to exercise VIA bindings (and thus dynamic keymap et.al.), fixup compilation errors based on preprocessor+sizeof.
* Build failure rectification.
* Migrate remaining `split.soft_serial_pin` to `split.serial.pin` (#25046)
* Migrate keyboards/bastardkb
* Migrate keyboards/handwired
* Migrate keyboards/helix
* Fix duplicate serial key
* Fix outdated GPIO control function usage (#25060)
* [Modules] Provide access to current path in `rules.mk`. (#25061)
* Update keymap for keycult 1800 (#25070)
Update keymap
Co-authored-by: yiancar <yiancar@gmail.com>
* Add handwired/erikpeyronson/erkbd (#25030)
Co-authored-by: Erik Peyronson <erik.peyronson@gmail.com>
Co-authored-by: jack <jack@pngu.org>
Co-authored-by: Drashna Jaelre <drashna@live.com>
* Add support for Starry FRL (#24626)
Co-authored-by: jack <jack@pngu.org>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
* Add "Large Lad" keyboard (#24727)
Co-authored-by: jack <jack@pngu.org>
* Bump vite from 5.4.12 to 5.4.15 in /builddefs/docsgen (#25065)
Bumps [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite) from 5.4.12 to 5.4.15.
- [Release notes](https://github.com/vitejs/vite/releases)
- [Changelog](https://github.com/vitejs/vite/blob/v5.4.15/packages/vite/CHANGELOG.md)
- [Commits](https://github.com/vitejs/vite/commits/v5.4.15/packages/vite)
---
updated-dependencies:
- dependency-name: vite
dependency-type: direct:development
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Allow AnnePro2 to reboot (#24886)
Without this, the QK_REBOOT key did nothing.
* Fix path typo related RP2040 (#25069)
Fix path typo
* Update onekey example for nucleo f446re (#25067)
* use accessible pins for nucleo f446re onekey example
* remove pin collision with matrix in keyboard.json
* use accessible pins for LED
* remove pin collision with matrix
* Update readme.md to reflect pin changes
* Module documentation typo correction (#25073)
* Fix lockups on AVR with `qmk/hello_world` module (#25074)
Fix lockups on AVR.
* At101ish (#25072)
* Dell AT101 replacement pcb support
* Update keyboards/at101ish/readme.md
Co-Authored-By: fauxpark <fauxpark@gmail.com>
* remove empty src clause in makefile
* feature: Update at101ish to qmk v0.28
* feature: Add osdetecting keymap variant.
* refactor: Move at101ish keyboard to handwired folder.
* fix: Adjust at101ish readme-
* fix: review changes.
* chore: Remove unneeded feature.
---------
Co-authored-by: fauxpark <fauxpark@gmail.com>
* Add "license" field to Community Module JSON schema. (#25085)
Add "license" field to community module schema.
* Add kt60HS-T v2 PCB (#25080)
* Add kt60HS-Tv2
* Update keyboards/keyten/kt60hs_t/readme.md
Co-authored-by: Sergey Vlasov <sigprof@gmail.com>
* Update keyboards/keyten/kt60hs_t/v1/readme.md
Co-authored-by: Sergey Vlasov <sigprof@gmail.com>
* Update keyboards/keyten/kt60hs_t/v2/keyboard.json
Co-authored-by: Sergey Vlasov <sigprof@gmail.com>
* Update keyboards/keyten/kt60hs_t/v2/readme.md
Co-authored-by: Sergey Vlasov <sigprof@gmail.com>
* Update keyboards/keyten/kt60hs_t/info.json
Co-authored-by: Sergey Vlasov <sigprof@gmail.com>
* Change of structure
* Moving the keyboard
* Update data/mappings/keyboard_aliases.hjson
Co-authored-by: Sergey Vlasov <sigprof@gmail.com>
* Update keyboards/keyten/kt60hs_t/v1/keyboard.json
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
* Update keyboards/keyten/kt60hs_t/v2/keyboard.json
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
---------
Co-authored-by: Sergey Vlasov <sigprof@gmail.com>
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
* Make sure that unit tests run on all release versions
* [ErgoDox EZ] Fix complication issues due to updates
* [ErgoDox EZ] Fix compilication errors and warnings
We want all green!
* Fix 'qmk lint -kb' argument handling (#25093)
* Refactor Deemen17 Works DE60 (#25088)
* Add Coban Pad 12A (#25039)
Co-authored-by: jack <jack@pngu.org>
* [Keyboard] Add PHDesign PH60/Multi Keyboard PCB (#25086)
* Add PH60/Multi Support
* Add PCB PIcture for README
* Remove MO(_FN2)
* README Typo Fix
* Layout and README Adjustment
* Add README for PHDesign Main Folder
* Keymap Improvement
* Update README.md
* [Keyboard] Add Ortho Slayer (#25099)
* Add Ortho Slayer
* Update keyboards/keyten/ortho_slayer/keymaps/default/keymap.c
Co-authored-by: jack <jack@pngu.org>
* Update keyboards/keyten/ortho_slayer/readme.md
Co-authored-by: jack <jack@pngu.org>
---------
Co-authored-by: jack <jack@pngu.org>
* Fix coban pad9a wrong layout in keyboard.json (#25100)
* Remove `CTPC`/`CONVERT_TO_PROTON_C` options (#25111)
* Remove direct docs.qmk.fm links from docs (#25113)
* Add warning when deprecated 'promicro_rp2040' is used (#25112)
* Add Vida to QMK (#24225)
Co-authored-by: jack <jack@pngu.org>
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
* More Windows->Unix style path fixes. (#25119)
* Include `math.h` where necessary. (#25122)
* Cater for use of `__errno_r()` in ChibiOS syscalls.c with newer picolibc revisions (#25121)
* chore: Allow disabling underglow on Work Louder devices (#25123) (#25120)
* Allow disabling Underglow on Work Louder devices
Allows disabling Underglow on Work Louder devices by using `RGBLIGHT_ENABLE = no` on rules.mk
* Update keyboards/work_louder/rgb_functions.c
Suggested by @zvecr on review.
Co-authored-by: Joel Challis <git@zvecr.com>
---------
Co-authored-by: Joel Challis <git@zvecr.com>
* Exclude external userspace from lint checking (#24680)
* fix: Fix startup sound for Preonic (#25132) (#25133)
Add `AUDIO_INIT_DELAY ` to config.h to resolve
* New standard layout for Savage65 (65_ansi_blocker_tsangan_split_bs) (#24690)
* Added a default firmware and layout for the WindStudio Wind X R1
keyboard.
* Wind X R1: cleaned-up the folders to make clear that this firmware is
for the release 1 of this keyboard.
* Delete keyboards/windstudio/wind_x/R1 directory
Removing the uppercase R1 folder
* feat(cannonkeys/savage65): Added layout to keyboard.json
- Added the layout LAYOUT_65_ansi_blocker_tsangan_split_bs to the
community layouts.
* kradoindustries_promenade: add LAYOUT_1x2u (#25090)
* Update shuguet/shu89 (#24780)
* Update keyboard.json
Update mod keys location in RGB layout.
* Update keyboard.json
* Update keyboards/shuguet/shu89/keyboard.json
Co-authored-by: Ryan <fauxpark@gmail.com>
---------
Co-authored-by: Ryan <fauxpark@gmail.com>
* [Keyboard] Add suika83opti (#24991)
* [chore]: move and rename mouse/scroll min/max defines (#25141)
* protocol: move {XY/HV}_REPORT_{MIN,MAX} into report.h
..to allow easier re-use in other code implementations.
* protocol: rename {XY/HV}_REPORT_{MIN/MAX} to MOUSE_REPORT_{XY/HV}_{MIN/MAX}
..to avoid naming collisions.
* [Core] Flow Tap tap-hold option to disable HRMs during fast typing (#25125)
aka Global Quick Tap, Require Prior Idle
* Add Link keyboard (#25058)
Co-authored-by: jack <jack@pngu.org>
Co-authored-by: Drashna Jaelre <drashna@live.com>
* Remove Sofle `rgb_default` keymap & tidy readme's (#25010)
* Added Keyboard LumPy27 (#24967)
Co-authored-by: jack <jack@pngu.org>
Co-authored-by: Drashna Jaelre <drashna@live.com>
* [Keyboard] Kobold r1 (#25161)
* Kobold r1
* Apply suggestions from code review
Co-authored-by: jack <jack@pngu.org>
* `board_init` => `early_hardware_init_post`.
---------
Co-authored-by: jack <jack@pngu.org>
* [Docs] Unify lighting step descriptions (#25167)
unify lighting step descriptions and defaults across docs
* [Keyboard] Add voidhhkb-hotswap (#25007)
* Added files for voidhhkb-hotswap
* Updated keyboard name to resolve build errors
* Implement suggestions from PR. Use 60_hhkb community layout.
* Update keyboards/void/voidhhkb_hotswap/readme.md
Co-authored-by: Ryan <fauxpark@gmail.com>
* Apply suggestions from code review
Co-authored-by: jack <jack@pngu.org>
---------
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: jack <jack@pngu.org>
* Remove duplication of RGB Matrix defaults (#25146)
* Remove duplication of RGB Matrix defaults
* Remove more duplication of defaults
* fix
* Fix missing and extra commas in JSON schema (#25057)
* Remove duplication of RGBLight defaults (#25169)
* Ignore the Layer Lock key in Repeat Key and Caps Word. (#25171)
* Allow for disabling EEPROM subsystem entirely. (#25173)
* [keyboard] ymdk/id75/rp2040 (#25157)
Co-authored-by: tao heihei <>
* Remove `bluefruit_le_read_battery_voltage` function (#25129)
* Fix 'Would you like to clone the submodules?' prompt under msys (#24958)
* Fixup eeconfig lighting reset. (#25166)
* DOCS: `qmk-hid` missing in bootloaders list? (#25177)
* Fix for `.clangd`. (#25180)
* Update develop branch to Pico SDK 1.5.1 (#25178)
* Add lint warning for empty url (#25182)
* Implement connection keycode logic (#25176)
* Add handwired/footy (#25151)
Co-authored-by: jack <jack@pngu.org>
* Decrease firmware size for `anavi/macropad8`. (#25185)
Preparation for bootstrapper.
* Align ChibiOS `USB_WAIT_FOR_ENUMERATION` implementation (#25184)
* [Bug][Core] Fix for Flow Tap: fix handling of distinct taps and timer updates. (#25175)
* Flow Tap bug fix.
As reported by @amarz45 and @mwpardue, there is a bug where if two
tap-hold keys are pressed in distinct taps back to back, then Flow Tap
is not applied on the second tap-hold key, but it should be.
In a related bug reported by @NikGovorov, if a tap-hold key is held
followed by a tap of a tap-hold key, then Flow Tap updates its timer on
the release of the held tap-hold key, but it should be ignored.
The problem common to both these bugs is that I incorrectly assumed
`tapping_key` is cleared to noevent once it is released, when actually
`tapping_key` is still maintained for `TAPPING_TERM` ms after release
(for Quick Tap). This commit fixes that. Thanks to @amarz45, @mwpardue,
and @NikGovorov for reporting!
Details:
* Logic for converting the current tap-hold event to a tap is extracted
to `flow_tap_key_if_within_term()`, which is now invoked also in the
post-release "interfered with other tap key" case. This fixes the
distinct taps bug.
* The Flow Tap timer is now updated at the beginning of each call to
`process_record()`, provided that there is no unsettled tap-hold key
at that time and that the record is not for a mod or layer switch key.
By moving this update logic to `process_record()`, it is conceptually
simpler and more robust.
* Unit tests extended to cover the reported scenarios.
* Fix formatting.
* Revision to fix @NikGovorov's scenario.
The issue is that when another key is pressed while a layer-tap hasn't
been settled yet, the `prev_keycode` remembers the keycode from before
the layer switched. This can then enable Flow Tap for the following key
when it shouldn't, or vice versa.
Thanks to @NikGovorov for reporting!
This commit revises Flow Tap in the following ways:
* The previous key and timer are both updated from `process_record()`.
This is slightly later in the sequence of processing than before, and
by this point, a just-settled layer-tap should have taken effect so
that the keycode from the correct layer is remembered.
* The Flow Tap previous key and timer are updated now also on key
release events, except for releases of modifiers and held layer
switches.
* The Flow Tap previous key and timer are now updated together, for
simplicity. This makes the logic easier to think about.
* A few additional unit tests, including @NikGovorov's scenario as
"layer_tap_ignored_with_disabled_key_complex."
* Remove empty `url` fields (#25181)
* Prompt for converter when creating new keymap (#25116)
* High resolution scrolling (without feature report parsing) (#24423)
* hires scrolling without feature report parsing
* fix valid range for exponent
* fix incorrect minimum exponent value documentation
* Avoid duplication in generated community modules `rules.mk` (#25135)
* Bump rlespinasse/github-slug-action from 3 to 5 (#25021)
* Remove `"console":false` from keyboards (#25190)
* Update 'qmk generate-api' to only publish pure DD keymaps (#24782)
* Remove more duplication of defaults (#25189)
* Align `new-keyboard` template to current standards (#25191)
* Bump vite from 5.4.15 to 5.4.18 in /builddefs/docsgen (#25192)
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Fix `boardsource/beiwagon` RGB Matrix coordinates (#25018)
* Remove `"command":false` from keyboards (#25193)
* Extend lint checks to reject duplication of defaults (#25149)
* modelh: add prerequisites for via support (#24932)
* First TypeK support (#22876)
* Add Lemokey X0 keyboard (#24994)
* keyboards/annepro2/ld: Add per-variant linker scripts (#24999)
C18 has an MCU with 16K SRAM, up from C15's 8K.
Split the linker script into C15 and C18 variants to make use of the
larger RAM capacity of C18.
* Add new keyboard MirageiX (#25054)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: jack <0x6a73@protonmail.com>
* [Keymap] Sofle RGB - fixed stuck on numpad layer and layout comments (#24942)
* Add handwired 4x14 LuMaWing keyboard (#24885)
* Add jcpm2 (JC Pro Macro 2) (#24816)
Co-authored-by: jack <jack@pngu.org>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Joel Challis <git@zvecr.com>
* [Keyboard] Add splitkb.com's Halcyon Elora rev2 (#24790)
Co-authored-by: Drashna Jaelre <drashna@live.com>
* [Keyboard] mzmkb/slimdash/rev1 (#24804)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: jack <jack@pngu.org>
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
* Added new keyboard epssp75 (#24756)
Co-authored-by: Drashna Jaelre <drashna@live.com>
* Addition of OK-1 (#24646)
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
* Add Umbra keyboard (#24569)
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
* Amptrics 0420 keyboard addition (#24744)
Co-authored-by: jack <jack@pngu.org>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
* [Core] Enhance Flow Tap to work better for rolls over multiple tap-hold keys. (#25200)
* Flow Tap revision for rolling press.
* Remove debugging cruft.
* Formatting fix.
* amptrics/0422 - Prevent OOB in `update_leds_for_layer` (#25209)
* [Keyboard] Add Gravity-45(#25206)
* add gravity-45
* readme.md
* fix readme
* Update keyboards/green_keys/gravity_45/keyboard.json
Co-authored-by: jack <0x6a73@protonmail.com>
* run qmk format-json -i keyboards/green_keys/gravity_45/keyboard.json
* add url
* Update keyboards/green_keys/gravity_45/keyboard.json
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
* Update keyboard.json
* Update keyboard.json
* Update keyboards/green_keys/gravity_45/keyboard.json
Co-authored-by: Drashna Jaelre <drashna@live.com>
---------
Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
* Remove redundant keyboard headers (#25208)
* Fix Spleeb compile when pointing device is enabled (#25016)
* [Bug] Minimise force-included files (#25194)
* Add additional hooks for Community modules (#25050)
* Workaround for resolving keyboard alias for config file values (#25228)
* Generate versions to keycode headers (#25219)
* Resolve alias for `qmk new-keymap` keyboard prompts (#25210)
* [Keyboard] Add Binepad KN01 (#25224)
* Add Binepad NeoKnob KN01
* post @waffle87 recommendations
* Add battery changed callbacks (#25207)
* Ensure `qmk_userspace_paths` maintains detected order (#25204)
* Bind Bluetooth driver to `host_driver_t` (#25199)
* Deprecate `qmk generate-compilation-database`. (#25237)
* Remove force disable of NKRO when Bluetooth enabled (#25201)
* Keycult 60 (#25213)
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
Co-authored-by: jack <jack@pngu.org>
* [Keyboard] Add Binepad KnobX1 (#25222)
Co-authored-by: Drashna Jaelre <drashna@live.com>
* [Keyboard] Update Tractyl Manuform and add F405 (weact) variant (#24764)
* Layout corrections: Zed60 (#25003)
* Fixed print statement after enabling 32-bit layers (#25027)
* Fix Aurora sweep default keymap configuration (#25148)
* Docs update for installing qmk with uv (#24995)
* CXT Studio 12E3: Fix encoder resolutions not applying (#25242)
* add resolution to encoders so they apply
* Tweak default keymap
* replace KC_UNDO with C(KC_Z) as well
* Add debounce to duplicated defaults check (#25246)
* [Docs] Fix typos introduced by PR #25050 (#25250)
It isn't a drashna PR if there aren't some typos in it somewhere.
* Allow LVGL onekey keymap to be able compile for other board (#25005)
* [Keyboard] Add Jason Hazel’s Bad Wings v2 (#25252)
Co-authored-by: Florent Allard <florent.allard@savoirfairelinux.com>
* Add raw_hid support to host driver (#25255)
* Fix Wear Leveling compilation (#25254)
* [New Feature/Core] New RGB Matrix Animation "Starlight Smooth" (#25203)
* Enable community modules to define LED matrix and RGB matrix effects. (#25187)
Co-authored-by: Joel Challis <git@zvecr.com>
* Fix OS_DETECTION_KEYBOARD_RESET (#25015)
Co-authored-by: Nick Brassel <nick@tzarc.org>
* Fixes the numlock indicator for Magic Force MF17 numpad (#25260)
* Add Harite v2 keyboard (#24975)
* dlip/haritev2 - Post merge fixes (#25264)
* Remove more USB only branches from NKRO handling (#25263)
* Deprecate `usb.force_nkro`/`FORCE_NKRO` (#25262)
* Add BDN9 Rev. 3 (#25261)
* Remove duplicate of SPI default config from keyboards (#25266)
* Resolve miscellaneous keyboard lint warnings (#25268)
* Add Zeropad (#24737)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Joel Challis <git@zvecr.com>
* Add Waveshare RP2040-Keyboard-3 support (#25269)
* Update PR checklist notes on custom matrix (#25240)
* Chew folders (#24785)
* gcc15 AVR compilation fixes (#25238)
* [Core] STM32G0x1 support (#24301)
* Use relative paths for schemas, instead of $id. Enables VScode validation. (#25251)
* add doio/kb03 (#24815)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Joel Challis <git@zvecr.com>
* Move rookiebwoy to ivndbt (#25142)
* [Chore] use {rgblight,rgb_matrix}_hsv_to_rgb overrides (#25271)
* Remove outdated `nix` support due to bit-rot. (#25280)
* Add `compiler_support.h` (#25274)
* Configure boards to use development_board - 0-9 (#25287)
* [Fix] lib8tion: enable fixed scale8 and blend functions (#25272)
lib8tion: enable fixed scale8 and blend functions
These FastLED derived lib8tion functions have been fixed and enabled by
default in FastLED. QMK just never set these defines, there is no reason
to keep the buggy implementation. It is assumed that nobody relied on
the buggy behavior.
* Configure boards to use development_board - UVWXYZ (#25288)
* [Docs] Fix tap_hold code blocks (#25298)
* salicylic_acid3/getta25 - Fix oled keymap (#25295)
* Configure boards to use development_board - S (#25293)
* Configure boards to use development_board - T (#25294)
* 2025 Q2 changelog (#25297)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Nick Brassel <nick@tzarc.org>
* Update Oryx module for newer code
* Soft reset matrix
* Use improved i2c reset for voyager and moonlander matrix
* Fix formatting
* Remove labeler action (unneeded)
* Fix module API version for Oryx module
* Use i2cStop instead of trying to work around
---------
Signed-off-by: Stefan Kerkmann <karlk90@pm.me>
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
Co-authored-by: QMK Bot <hello@qmk.fm>
Co-authored-by: Pascal Getreuer <50221757+getreuer@users.noreply.github.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ramon Imbao <ramonimbao@gmail.com>
Co-authored-by: Stefan Kerkmann <karlk90@pm.me>
Co-authored-by: Nick Brassel <nick@tzarc.org>
Co-authored-by: jack <jack@pngu.org>
Co-authored-by: yiancar <yiangosyiangou@cytanet.com.cy>
Co-authored-by: yiancar <yiancar@gmail.com>
Co-authored-by: Erik Peyronson <erikpeyronson@gmail.com>
Co-authored-by: Erik Peyronson <erik.peyronson@gmail.com>
Co-authored-by: Sắn <59417802+MaiTheSan@users.noreply.github.com>
Co-authored-by: Hyphen-ated <Hyphen-ated@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Geoffrey Frogeye <s+github@frogeye.fr>
Co-authored-by: lsh4711 <120231876+lsh4711@users.noreply.github.com>
Co-authored-by: Ben Green <bengreen.uk@gmail.com>
Co-authored-by: フィルターペーパー <76888457+filterpaper@users.noreply.github.com>
Co-authored-by: henrikosorensen <henrik.sorensen@gmail.com>
Co-authored-by: Ivan Gromov <38141348+key10iq@users.noreply.github.com>
Co-authored-by: Sergey Vlasov <sigprof@gmail.com>
Co-authored-by: Pham Duc Minh <95753855+Deemen17@users.noreply.github.com>
Co-authored-by: Dam Vu Duy <RyanDam@users.noreply.github.com>
Co-authored-by: nonameCCC <79012391+nonameCCC@users.noreply.github.com>
Co-authored-by: sudo pacman -Syu <hauvipapro@gmail.com>
Co-authored-by: Andrew Kannan <andrew.kannan@gmail.com>
Co-authored-by: Luis Garcia <luis@bitjester.com>
Co-authored-by: Christian C. Berclaz <christian.berclaz@mac.com>
Co-authored-by: Olivier Mehani <shtrom-github@ssji.net>
Co-authored-by: Sylvain Huguet <sylvain@huguet.me>
Co-authored-by: suikagiken <115451678+suikagiken@users.noreply.github.com>
Co-authored-by: Daniel Reisch <danieljreisch@gmail.com>
Co-authored-by: ClownFish <177758267+clownfish-og@users.noreply.github.com>
Co-authored-by: JamesWilson1996 <47866504+JamesWilson1996@users.noreply.github.com>
Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com>
Co-authored-by: Jan Bláha <blaha.j502@gmail.com>
Co-authored-by: Eric Molitor <534583+emolitor@users.noreply.github.com>
Co-authored-by: CJ Pais <cj@cjpais.com>
Co-authored-by: eynsai <47629346+eynsai@users.noreply.github.com>
Co-authored-by: Joel Beckmeyer <joel@beckmeyer.us>
Co-authored-by: Álvaro A. Volpato <alvaro.augusto.volpato@gmail.com>
Co-authored-by: Aidan Gauland <aidalgol@users.noreply.github.com>
Co-authored-by: Michał Kopeć <michal@nozomi.space>
Co-authored-by: takashicompany <t@kashi.company>
Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Matheus Marques <matheusmbar@gmail.com>
Co-authored-by: LucasMateijsen <l.mateijsen@outlook.com>
Co-authored-by: Jeremy Cook <jscook55@gmail.com>
Co-authored-by: VeyPatch <126267034+VeyPatch@users.noreply.github.com>
Co-authored-by: mizma <omoikane@path-works.net>
Co-authored-by: hen-des <141591967+hen-des@users.noreply.github.com>
Co-authored-by: Cipulot <40441626+Cipulot@users.noreply.github.com>
Co-authored-by: josephawilliamsiv <31166673+josephawilliamsiv@users.noreply.github.com>
Co-authored-by: vchowl <vchowl@outlook.com>
Co-authored-by: Christopher Hoage <iam@chrishoage.com>
Co-authored-by: Silvino R. <366673+silvinor@users.noreply.github.com>
Co-authored-by: dabstractor <dustindschultz@gmail.com>
Co-authored-by: Nathan Cain <13713501+nathanscain@users.noreply.github.com>
Co-authored-by: muge <221161+muge@users.noreply.github.com>
Co-authored-by: HorrorTroll <sonicvipduc@gmail.com>
Co-authored-by: cyxae <cyxae@amphitryon.nrst.fr>
Co-authored-by: Florent Allard <florent.allard@savoirfairelinux.com>
Co-authored-by: art-was-here <mail@buckles.email>
Co-authored-by: Matti Hiljanen <170205+qvr@users.noreply.github.com>
Co-authored-by: Wasteland Fluttershy <ingvardm@gmail.com>
Co-authored-by: Dane Lipscombe <danelipscombe@gmail.com>
Co-authored-by: Danny <nooges@users.noreply.github.com>
Co-authored-by: Infos <136488157+diffrentGuesser@users.noreply.github.com>
Co-authored-by: Florent Linguenheld <f@linguenheld.fr>
Co-authored-by: ivan <81021475+ivndbt@users.noreply.github.com>
Co-authored-by: Pablo Martínez <58857054+elpekenin@users.noreply.github.com>
2025-06-04 01:26:21 -07:00
|
|
|
|
|
|
|
|
#include "compiler_support.h"
|
2019-04-15 22:32:57 -05:00
|
|
|
#include "oled_driver.h"
|
|
|
|
|
#include OLED_FONT_H
|
|
|
|
|
#include "timer.h"
|
|
|
|
|
#include "print.h"
|
|
|
|
|
#include <string.h>
|
2020-03-01 17:56:50 +11:00
|
|
|
#include "progmem.h"
|
2023-05-10 14:04:53 -07:00
|
|
|
#include "wait.h"
|
2021 May 29 Breaking Changes Update (#13034)
* Add Per Key functionality for AutoShift (#11536)
* LED Matrix: Reactive effect buffers & advanced indicators (#12588)
* [Keyboard] kint36: switch to sym_eager_pk debouncing (#12626)
* [Keyboard] kint2pp: reduce input latency by ≈10ms (#12625)
* LED Matrix: Split (#12633)
* [CI] Format code according to conventions (#12650)
* feat: infinite timeout for leader key (#6580)
* feat: implement leader_no_timeout logic
* docs(leader_key): infinite leader timeout docs
* Format code according to conventions (#12680)
* Update ADC driver for STM32F1xx, STM32F3xx, STM32F4xx (#12403)
* Fix default ADC_RESOLUTION for ADCv3 (and ADCv4)
Recent ChibiOS update removed ADC_CFGR1_RES_10BIT from the ADCv3 headers
(that macro should not have been there, because ADCv3 has CFGR instead of
CFGR1). Fix the default value for ADC_RESOLUTION to use ADC_CFGR_RES_10BITS
if it is defined (that name is used for ADCv3 and ADCv4).
* Update ADC docs to match the actually used resolution
ADC driver for ChibiOS actually uses the 10-bit resolution by default
(probably to match AVR); fix the documentation accordingly. Also add
both ADC_CFGR_RES_10BITS and ADC_CFGR1_RES_10BIT constants (these names
differ according to the ADC implementation in the particular MCU).
* Fix pinToMux() for B12 and B13 on STM32F3xx
Testing on STM32F303CCT6 revealed that the ADC mux values for B12 and
B13 pins were wrong.
* Add support for all possible analog pins on STM32F1xx
Added ADC mux values for pins A0...A7, B0, B1, C0...C5 on STM32F1xx
(they are the same at least for STM32F103x8 and larger F103 devices, and
also F102, F105, F107 families). Actually tested on STM32F103C8T6
(therefore pins C0...C5 were not tested).
Pins F6...F10, which are present on STM32F103x[C-G] in 144-pin packages,
cannot be supported at the moment, because those pins are connected only
to ADC3, but the ChibiOS ADC driver for STM32F1xx supports only ADC1.
* Add support for all possible analog pins on STM32F4xx
Added ADC mux values for pins A0...A7, B0, B1, C0...C5 and optionally
F3...F10 (if STM32_ADC_USE_ADC3 is enabled). These mux values are
apparently the same for all F4xx devices, except some smaller devices may
not have ADC3.
Actually tested on STM32F401CCU6, STM32F401CEU6, STM32F411CEU6 (using
various WeAct “Blackpill” boards); only pins A0...A7, B0, B1 were tested.
Pins F3...F10 are inside `#if STM32_ADC_USE_ADC3` because some devices
which don't have ADC3 also don't have the GPIOF port, therefore the code
which refers to Fx pins does not compile.
* Fix STM32F3xx ADC mux table in documentation
The ADC driver documentation had some errors in the mux table for STM32F3xx.
Fix this table to match the datasheet and the actual code (mux settings for
B12 and B13 were also tested on a real STM32F303CCT6 chip).
* Add STM32F1xx ADC pins to the documentation
* Add STM32F4xx ADC pins to the documentation
* Add initial support for tinyuf2 bootloader (when hosted on F411 blackpill) (#12600)
* Add support for jumping to tinyuf2 bootloader. Adds blackpill UF2 example.
* Update flashing.md
* Update chconf.h
* Update config.h
* Update halconf.h
* Update mcuconf.h
* eeprom driver: Refactor where eeprom driver initialisation (and EEPROM emulation initialisation) occurs to make it non-target-specific. (#12671)
* Add support for MCU = STM32F446 (#12619)
* Add support for MCU = STM32F446
* Update platforms/chibios/GENERIC_STM32_F446XE/configs/config.h
* Restore mcuconf.h to the one used by RT-STM32F446RE-NUCLEO64
* stm32f446: update mcuconf.h and board.h for 16MHz operation, with USB enabled, and other peripherals disabled.
* Format code according to conventions (#12682)
* Format code according to conventions (#12687)
* Add STM32L433 and L443 support (#12063)
* initial L433 commit
* change to XC
* fix L433
* disable all peripherals
* update system and peripheral clocks
* 433 change
* use its own board files
* revert its own board files
* l433 specific change
* fix stm32l432xx define
* remove duplicate #define
* fix bootloader jump
* move to L443xx and add i2c2, spi2, usart3 to mcuconf.h
* move to L443
* move to L443
* fix sdmmc in mcuconf.h
* include STM32L443
* add L443
* Include L443 in compatible microcontrollers
* Include L443 in compatible microcontrollers
* Update config bootloader jump description
* Update ChibiOS define reasoning
* Update quantum/mcu_selection.mk
* fix git conflict
* Updated Function96 with V2 files and removed chconf.h and halconf.h (#12613)
* Fix bad PR merge for #6580. (#12721)
* Change RGB/LED Matrix to use a simple define for USB suspend (#12697)
* [CI] Format code according to conventions (#12731)
* Fixing transport's led/rgb matrix suspend state logic (#12770)
* [CI] Format code according to conventions (#12772)
* Fix comment parsing (#12750)
* Added OLED fade out support (#12086)
* fix some references to bin/qmk that slipped in (#12832)
* Resolve a number of warnings in `qmk generate-api` (#12833)
* New command: qmk console (#12828)
* stash poc
* stash
* tidy up implementation
* Tidy up slightly for review
* Tidy up slightly for review
* Bodge environment to make tests pass
* Refactor away from asyncio due to windows issues
* Filter devices
* align vid/pid printing
* Add hidapi to the installers
* start preparing for multiple hid_listeners
* udev rules for hid_listen
* refactor to move closer to end state
* very basic implementation of the threaded model
* refactor how vid/pid/index are supplied and parsed
* windows improvements
* read the report directly when usage page isn't available
* add per-device colors, the choice to show names or numbers, and refactor
* add timestamps
* Add support for showing bootloaders
* tweak the color for bootloaders
* Align bootloader disconnect with connect color
* add support for showing all bootloaders
* fix the pyusb check
* tweaks
* fix exception
* hide a stack trace behind -v
* add --no-bootloaders option
* add documentation for qmk console
* Apply suggestions from code review
* pyformat
* clean up and flesh out KNOWN_BOOTLOADERS
* Remove pointless SERIAL_LINK_ENABLE rules (#12846)
* Make Swap Hands use PROGMEM (#12284)
This converts the array that the Swap Hands feature uses to use PROGMEM,
and to read from that array, as such. Since this array never changes at
runtime, there is no reason to keep it in memory. Especially for AVR
boards, as memory is a precious resource.
* Fix another bin/qmk reference (#12856)
* [Keymap] Turn OLED off on suspend in soundmonster keymap (#10419)
* Fixup build errors on `develop` branch. (#12723)
* LED Matrix: Effects! (#12651)
* Fix syntax error when compiling for ARM (#12866)
* Remove KEYMAP and LAYOUT_kc (#12160)
* alias KEYMAP to LAYOUT
* remove KEYMAP and LAYOUT_kc
* Add setup, clone, and env to the list of commands we allow even with broken modules (#12868)
* Rename `point_t` -> `led_point_t` (#12864)
* [Keyboard] updated a vendor name / fixed minor keymap issues (#12881)
* Add missing LED Matrix suspend code to suspend.c (#12878)
* LED Matrix: Documentation (#12685)
* Deprecate `send_unicode_hex_string()` (#12602)
* Fix spelling mistake regarding LED Matrix in split_common. (#12888)
* [Keymap] Fix QWERTY/DVORAK status output for kzar keymap (#12895)
* Use milc.subcommand.config instead of qmk.cli.config (#12915)
* Use milc.subcommand.config instead
* pyformat
* remove the config test
* Add function to allow repeated blinking of one layer (#12237)
* Implement function rgblight_blink_layer_repeat to allow repeated blinking of one layer at a time
* Update doc
* Rework rgblight blinking according to requested change
* optimize storage
* Fixup housekeeping from being invoked twice per loop. (#12933)
* matrix: wait for row signal to go HIGH for every row (#12945)
I noticed this discrepancy (last row of the matrix treated differently than the
others) when optimizing the input latency of my keyboard controller, see also
https://michael.stapelberg.ch/posts/2021-05-08-keyboard-input-latency-qmk-kinesis/
Before this commit, when tuning the delays I noticed ghost key presses when
pressing the F2 key, which is on the last row of the keyboard matrix: the
dead_grave key, which is on the first row of the keyboard matrix, would be
incorrectly detected as pressed.
After this commit, all keyboard matrix rows are interpreted correctly.
I suspect that my setup is more susceptible to this nuance than others because I
use GPIO_INPUT_PIN_DELAY=0 and hence don’t have another delay that might mask
the problem.
* ensure we do not conflict with existing keymap aliases (#12976)
* Add support for up to 4 IS31FL3733 drivers (#12342)
* Convert Encoder callbacks to be boolean functions (#12805)
* [Keyboard] Fix Terrazzo build failure (#12977)
* Do not hard set config in CPTC files (#11864)
* [Keyboard] Corne - Remove legacy revision support (#12226)
* [Keymap] Update to Drashna keymap and user code (based on develop) (#12936)
* Add Full-duplex serial driver for ARM boards (#9842)
* Document LED_MATRIX_FRAMEBUFFER_EFFECTS (#12987)
* Backlight: add defines for default level and breathing state (#12560)
* Add dire message about LUFA mass storage bootloader (#13014)
* [Keyboard] Remove redundant legacy and common headers for crkbd (#13023)
Was causing compiler errors on some systems.
* Fix keyboards/keymaps for boolean encoder callback changes (#12985)
* `backlight.c`: include `eeprom.h` (#13024)
* Add changelog for 2021-05-29 Breaking Changes merge (#12939)
* Add ChangeLog for 2021-05-29 Breaking Changes Merge: initial version
* Add recent develop changes
* Sort recent develop changes
* Remove sections for ChibiOS changes per tzarc
No ChibiOS changes this round.
* Add and sort recent develop changes
* add notes about keyboard moves/deletions
* import changelog for PR 12172
Documents the change to BOOTMAGIC_ENABLE.
* update section headings
* re-sort changelog
* add additional note regarding Bootmagic changes
* remove changelog timestamp
* update dates in main Breaking Changes docs
* fix broken section anchors in previous changelogs
* add link to backlight/eeprom patch to changelog
* highlight some more changes
* link PRs from section headers
* Restore standard readme
* run: qmk cformat --core-only
2021-05-29 14:38:50 -07:00
|
|
|
|
2019-04-15 22:32:57 -05:00
|
|
|
// Used commands from spec sheet: https://cdn-shop.adafruit.com/datasheets/SSD1306.pdf
|
2019-06-11 15:27:17 -07:00
|
|
|
// for SH1106: https://www.velleman.eu/downloads/29/infosheets/sh1106_datasheet.pdf
|
2023-05-10 14:04:53 -07:00
|
|
|
// for SH1107: https://www.displayfuture.com/Display/datasheet/controller/SH1107.pdf
|
2019-06-11 15:27:17 -07:00
|
|
|
|
2019-04-15 22:32:57 -05:00
|
|
|
// Fundamental Commands
|
2019-08-30 11:19:03 -07:00
|
|
|
#define CONTRAST 0x81
|
|
|
|
|
#define DISPLAY_ALL_ON 0xA5
|
|
|
|
|
#define DISPLAY_ALL_ON_RESUME 0xA4
|
|
|
|
|
#define NORMAL_DISPLAY 0xA6
|
2021-06-18 17:08:22 +02:00
|
|
|
#define INVERT_DISPLAY 0xA7
|
2019-08-30 11:19:03 -07:00
|
|
|
#define DISPLAY_ON 0xAF
|
|
|
|
|
#define DISPLAY_OFF 0xAE
|
|
|
|
|
#define NOP 0xE3
|
2019-04-15 22:32:57 -05:00
|
|
|
|
|
|
|
|
// Scrolling Commands
|
2019-08-30 11:19:03 -07:00
|
|
|
#define ACTIVATE_SCROLL 0x2F
|
|
|
|
|
#define DEACTIVATE_SCROLL 0x2E
|
|
|
|
|
#define SCROLL_RIGHT 0x26
|
|
|
|
|
#define SCROLL_LEFT 0x27
|
|
|
|
|
#define SCROLL_RIGHT_UP 0x29
|
|
|
|
|
#define SCROLL_LEFT_UP 0x2A
|
2019-04-15 22:32:57 -05:00
|
|
|
|
|
|
|
|
// Addressing Setting Commands
|
2019-08-30 11:19:03 -07:00
|
|
|
#define MEMORY_MODE 0x20
|
|
|
|
|
#define COLUMN_ADDR 0x21
|
|
|
|
|
#define PAGE_ADDR 0x22
|
|
|
|
|
#define PAM_SETCOLUMN_LSB 0x00
|
|
|
|
|
#define PAM_SETCOLUMN_MSB 0x10
|
2022-02-12 10:29:31 -08:00
|
|
|
#define PAM_PAGE_ADDR 0xB0 // 0xb0 -- 0xb7
|
2019-04-15 22:32:57 -05:00
|
|
|
|
|
|
|
|
// Hardware Configuration Commands
|
2019-08-30 11:19:03 -07:00
|
|
|
#define DISPLAY_START_LINE 0x40
|
|
|
|
|
#define SEGMENT_REMAP 0xA0
|
|
|
|
|
#define SEGMENT_REMAP_INV 0xA1
|
|
|
|
|
#define MULTIPLEX_RATIO 0xA8
|
|
|
|
|
#define COM_SCAN_INC 0xC0
|
|
|
|
|
#define COM_SCAN_DEC 0xC8
|
|
|
|
|
#define DISPLAY_OFFSET 0xD3
|
|
|
|
|
#define COM_PINS 0xDA
|
|
|
|
|
#define COM_PINS_SEQ 0x02
|
|
|
|
|
#define COM_PINS_ALT 0x12
|
|
|
|
|
#define COM_PINS_SEQ_LR 0x22
|
|
|
|
|
#define COM_PINS_ALT_LR 0x32
|
2019-04-15 22:32:57 -05:00
|
|
|
|
|
|
|
|
// Timing & Driving Commands
|
2019-08-30 11:19:03 -07:00
|
|
|
#define DISPLAY_CLOCK 0xD5
|
|
|
|
|
#define PRE_CHARGE_PERIOD 0xD9
|
|
|
|
|
#define VCOM_DETECT 0xDB
|
2019-04-15 22:32:57 -05:00
|
|
|
|
2021 May 29 Breaking Changes Update (#13034)
* Add Per Key functionality for AutoShift (#11536)
* LED Matrix: Reactive effect buffers & advanced indicators (#12588)
* [Keyboard] kint36: switch to sym_eager_pk debouncing (#12626)
* [Keyboard] kint2pp: reduce input latency by ≈10ms (#12625)
* LED Matrix: Split (#12633)
* [CI] Format code according to conventions (#12650)
* feat: infinite timeout for leader key (#6580)
* feat: implement leader_no_timeout logic
* docs(leader_key): infinite leader timeout docs
* Format code according to conventions (#12680)
* Update ADC driver for STM32F1xx, STM32F3xx, STM32F4xx (#12403)
* Fix default ADC_RESOLUTION for ADCv3 (and ADCv4)
Recent ChibiOS update removed ADC_CFGR1_RES_10BIT from the ADCv3 headers
(that macro should not have been there, because ADCv3 has CFGR instead of
CFGR1). Fix the default value for ADC_RESOLUTION to use ADC_CFGR_RES_10BITS
if it is defined (that name is used for ADCv3 and ADCv4).
* Update ADC docs to match the actually used resolution
ADC driver for ChibiOS actually uses the 10-bit resolution by default
(probably to match AVR); fix the documentation accordingly. Also add
both ADC_CFGR_RES_10BITS and ADC_CFGR1_RES_10BIT constants (these names
differ according to the ADC implementation in the particular MCU).
* Fix pinToMux() for B12 and B13 on STM32F3xx
Testing on STM32F303CCT6 revealed that the ADC mux values for B12 and
B13 pins were wrong.
* Add support for all possible analog pins on STM32F1xx
Added ADC mux values for pins A0...A7, B0, B1, C0...C5 on STM32F1xx
(they are the same at least for STM32F103x8 and larger F103 devices, and
also F102, F105, F107 families). Actually tested on STM32F103C8T6
(therefore pins C0...C5 were not tested).
Pins F6...F10, which are present on STM32F103x[C-G] in 144-pin packages,
cannot be supported at the moment, because those pins are connected only
to ADC3, but the ChibiOS ADC driver for STM32F1xx supports only ADC1.
* Add support for all possible analog pins on STM32F4xx
Added ADC mux values for pins A0...A7, B0, B1, C0...C5 and optionally
F3...F10 (if STM32_ADC_USE_ADC3 is enabled). These mux values are
apparently the same for all F4xx devices, except some smaller devices may
not have ADC3.
Actually tested on STM32F401CCU6, STM32F401CEU6, STM32F411CEU6 (using
various WeAct “Blackpill” boards); only pins A0...A7, B0, B1 were tested.
Pins F3...F10 are inside `#if STM32_ADC_USE_ADC3` because some devices
which don't have ADC3 also don't have the GPIOF port, therefore the code
which refers to Fx pins does not compile.
* Fix STM32F3xx ADC mux table in documentation
The ADC driver documentation had some errors in the mux table for STM32F3xx.
Fix this table to match the datasheet and the actual code (mux settings for
B12 and B13 were also tested on a real STM32F303CCT6 chip).
* Add STM32F1xx ADC pins to the documentation
* Add STM32F4xx ADC pins to the documentation
* Add initial support for tinyuf2 bootloader (when hosted on F411 blackpill) (#12600)
* Add support for jumping to tinyuf2 bootloader. Adds blackpill UF2 example.
* Update flashing.md
* Update chconf.h
* Update config.h
* Update halconf.h
* Update mcuconf.h
* eeprom driver: Refactor where eeprom driver initialisation (and EEPROM emulation initialisation) occurs to make it non-target-specific. (#12671)
* Add support for MCU = STM32F446 (#12619)
* Add support for MCU = STM32F446
* Update platforms/chibios/GENERIC_STM32_F446XE/configs/config.h
* Restore mcuconf.h to the one used by RT-STM32F446RE-NUCLEO64
* stm32f446: update mcuconf.h and board.h for 16MHz operation, with USB enabled, and other peripherals disabled.
* Format code according to conventions (#12682)
* Format code according to conventions (#12687)
* Add STM32L433 and L443 support (#12063)
* initial L433 commit
* change to XC
* fix L433
* disable all peripherals
* update system and peripheral clocks
* 433 change
* use its own board files
* revert its own board files
* l433 specific change
* fix stm32l432xx define
* remove duplicate #define
* fix bootloader jump
* move to L443xx and add i2c2, spi2, usart3 to mcuconf.h
* move to L443
* move to L443
* fix sdmmc in mcuconf.h
* include STM32L443
* add L443
* Include L443 in compatible microcontrollers
* Include L443 in compatible microcontrollers
* Update config bootloader jump description
* Update ChibiOS define reasoning
* Update quantum/mcu_selection.mk
* fix git conflict
* Updated Function96 with V2 files and removed chconf.h and halconf.h (#12613)
* Fix bad PR merge for #6580. (#12721)
* Change RGB/LED Matrix to use a simple define for USB suspend (#12697)
* [CI] Format code according to conventions (#12731)
* Fixing transport's led/rgb matrix suspend state logic (#12770)
* [CI] Format code according to conventions (#12772)
* Fix comment parsing (#12750)
* Added OLED fade out support (#12086)
* fix some references to bin/qmk that slipped in (#12832)
* Resolve a number of warnings in `qmk generate-api` (#12833)
* New command: qmk console (#12828)
* stash poc
* stash
* tidy up implementation
* Tidy up slightly for review
* Tidy up slightly for review
* Bodge environment to make tests pass
* Refactor away from asyncio due to windows issues
* Filter devices
* align vid/pid printing
* Add hidapi to the installers
* start preparing for multiple hid_listeners
* udev rules for hid_listen
* refactor to move closer to end state
* very basic implementation of the threaded model
* refactor how vid/pid/index are supplied and parsed
* windows improvements
* read the report directly when usage page isn't available
* add per-device colors, the choice to show names or numbers, and refactor
* add timestamps
* Add support for showing bootloaders
* tweak the color for bootloaders
* Align bootloader disconnect with connect color
* add support for showing all bootloaders
* fix the pyusb check
* tweaks
* fix exception
* hide a stack trace behind -v
* add --no-bootloaders option
* add documentation for qmk console
* Apply suggestions from code review
* pyformat
* clean up and flesh out KNOWN_BOOTLOADERS
* Remove pointless SERIAL_LINK_ENABLE rules (#12846)
* Make Swap Hands use PROGMEM (#12284)
This converts the array that the Swap Hands feature uses to use PROGMEM,
and to read from that array, as such. Since this array never changes at
runtime, there is no reason to keep it in memory. Especially for AVR
boards, as memory is a precious resource.
* Fix another bin/qmk reference (#12856)
* [Keymap] Turn OLED off on suspend in soundmonster keymap (#10419)
* Fixup build errors on `develop` branch. (#12723)
* LED Matrix: Effects! (#12651)
* Fix syntax error when compiling for ARM (#12866)
* Remove KEYMAP and LAYOUT_kc (#12160)
* alias KEYMAP to LAYOUT
* remove KEYMAP and LAYOUT_kc
* Add setup, clone, and env to the list of commands we allow even with broken modules (#12868)
* Rename `point_t` -> `led_point_t` (#12864)
* [Keyboard] updated a vendor name / fixed minor keymap issues (#12881)
* Add missing LED Matrix suspend code to suspend.c (#12878)
* LED Matrix: Documentation (#12685)
* Deprecate `send_unicode_hex_string()` (#12602)
* Fix spelling mistake regarding LED Matrix in split_common. (#12888)
* [Keymap] Fix QWERTY/DVORAK status output for kzar keymap (#12895)
* Use milc.subcommand.config instead of qmk.cli.config (#12915)
* Use milc.subcommand.config instead
* pyformat
* remove the config test
* Add function to allow repeated blinking of one layer (#12237)
* Implement function rgblight_blink_layer_repeat to allow repeated blinking of one layer at a time
* Update doc
* Rework rgblight blinking according to requested change
* optimize storage
* Fixup housekeeping from being invoked twice per loop. (#12933)
* matrix: wait for row signal to go HIGH for every row (#12945)
I noticed this discrepancy (last row of the matrix treated differently than the
others) when optimizing the input latency of my keyboard controller, see also
https://michael.stapelberg.ch/posts/2021-05-08-keyboard-input-latency-qmk-kinesis/
Before this commit, when tuning the delays I noticed ghost key presses when
pressing the F2 key, which is on the last row of the keyboard matrix: the
dead_grave key, which is on the first row of the keyboard matrix, would be
incorrectly detected as pressed.
After this commit, all keyboard matrix rows are interpreted correctly.
I suspect that my setup is more susceptible to this nuance than others because I
use GPIO_INPUT_PIN_DELAY=0 and hence don’t have another delay that might mask
the problem.
* ensure we do not conflict with existing keymap aliases (#12976)
* Add support for up to 4 IS31FL3733 drivers (#12342)
* Convert Encoder callbacks to be boolean functions (#12805)
* [Keyboard] Fix Terrazzo build failure (#12977)
* Do not hard set config in CPTC files (#11864)
* [Keyboard] Corne - Remove legacy revision support (#12226)
* [Keymap] Update to Drashna keymap and user code (based on develop) (#12936)
* Add Full-duplex serial driver for ARM boards (#9842)
* Document LED_MATRIX_FRAMEBUFFER_EFFECTS (#12987)
* Backlight: add defines for default level and breathing state (#12560)
* Add dire message about LUFA mass storage bootloader (#13014)
* [Keyboard] Remove redundant legacy and common headers for crkbd (#13023)
Was causing compiler errors on some systems.
* Fix keyboards/keymaps for boolean encoder callback changes (#12985)
* `backlight.c`: include `eeprom.h` (#13024)
* Add changelog for 2021-05-29 Breaking Changes merge (#12939)
* Add ChangeLog for 2021-05-29 Breaking Changes Merge: initial version
* Add recent develop changes
* Sort recent develop changes
* Remove sections for ChibiOS changes per tzarc
No ChibiOS changes this round.
* Add and sort recent develop changes
* add notes about keyboard moves/deletions
* import changelog for PR 12172
Documents the change to BOOTMAGIC_ENABLE.
* update section headings
* re-sort changelog
* add additional note regarding Bootmagic changes
* remove changelog timestamp
* update dates in main Breaking Changes docs
* fix broken section anchors in previous changelogs
* add link to backlight/eeprom patch to changelog
* highlight some more changes
* link PRs from section headers
* Restore standard readme
* run: qmk cformat --core-only
2021-05-29 14:38:50 -07:00
|
|
|
// Advance Graphic Commands
|
|
|
|
|
#define FADE_BLINK 0x23
|
|
|
|
|
#define ENABLE_FADE 0x20
|
|
|
|
|
#define ENABLE_BLINK 0x30
|
|
|
|
|
|
2019-04-15 22:32:57 -05:00
|
|
|
// Charge Pump Commands
|
2019-08-30 11:19:03 -07:00
|
|
|
#define CHARGE_PUMP 0x8D
|
2019-04-15 22:32:57 -05:00
|
|
|
|
2023-05-10 14:04:53 -07:00
|
|
|
// Commands specific to the SH1107 chip
|
|
|
|
|
#define SH1107_DISPLAY_START_LINE 0xDC
|
|
|
|
|
#define SH1107_MEMORY_MODE_PAGE 0x20
|
|
|
|
|
#define SH1107_MEMORY_MODE_VERTICAL 0x21
|
|
|
|
|
|
2019-04-15 22:32:57 -05:00
|
|
|
// Misc defines
|
OLED driver fixes (#10377)
* Fix dirtying in oled_write_pixel()
Set the dirty bit for the block only if oled_write_pixel() actually
changed the buffer state. Without this check oled_write_pixel() could
not be used inside the oled_task_user() code using the “redraw always”
style, because the blocks touched by oled_write_pixel() would always
appear dirty, and oled_render() would not proceed beyond the first such
dirty block.
* Fix oled_write_pixel() with 90/270 degree rotation
Use oled_rotation_width instead of OLED_DISPLAY_WIDTH, so that a rotated
display would be handled correctly.
* Fix compilation with custom OLED_BLOCK_COUNT and OLED_BLOCK_SIZE
Some OLED sizes (e.g., 64×48) may require a nonstandard value of
OLED_BLOCK_COUNT. The documentation says that this value may be
redefined in config.h, but actually trying to redefine it caused a
compile error, because the macro was redefined in oled_driver.c.
Make the OLED_BLOCK_COUNT definition in oled_driver.c respect any
user override, and do the same for OLED_BLOCK_SIZE just in case.
* Fix handling of out-of-range bits in oled_dirty
If a custom OLED_BLOCK_COUNT value is specified, some bits in oled_dirty
may not correspond to existing blocks; however, if those bits are set
somewhere (e.g., by code with sets oled_dirty to ~0 or even -1),
oled_render() would try to handle them and could access memory beyond
oled_buffer and perform hardware operations with out of range values.
Prevent this by masking off unused bits in oled_render(), and also avoid
setting those bits in other functions.
* Fix potentially wrong dirtying in oled_write_char()
oled_write_char() tried to mark the position just beyond the written
character as dirty; use (OLED_FONT_WIDTH - 1) to dirty the last position
still belonging to the character instead.
* Fix `#define OLED_BLOCK_TYPE uint32_t` on AVR
Using uint32_t as OLED_BLOCK_TYPE did not work properly on AVR, because
some bit shifts were performed using 16-bit int. Add explicit casts to
OLED_BLOCK_TYPE to those shifts.
2020-10-03 21:44:19 +03:00
|
|
|
#ifndef OLED_BLOCK_COUNT
|
|
|
|
|
# define OLED_BLOCK_COUNT (sizeof(OLED_BLOCK_TYPE) * 8)
|
|
|
|
|
#endif
|
|
|
|
|
#ifndef OLED_BLOCK_SIZE
|
|
|
|
|
# define OLED_BLOCK_SIZE (OLED_MATRIX_SIZE / OLED_BLOCK_COUNT)
|
|
|
|
|
#endif
|
2023-05-10 14:04:53 -07:00
|
|
|
// Default display clock
|
|
|
|
|
#if !defined(OLED_DISPLAY_CLOCK)
|
|
|
|
|
# define OLED_DISPLAY_CLOCK 0x80
|
|
|
|
|
#endif
|
|
|
|
|
// Default VCOMH deselect value
|
|
|
|
|
#if !defined(OLED_VCOM_DETECT)
|
|
|
|
|
# define OLED_VCOM_DETECT 0x20
|
|
|
|
|
#endif
|
|
|
|
|
#if !defined(OLED_PRE_CHARGE_PERIOD)
|
|
|
|
|
# define OLED_PRE_CHARGE_PERIOD 0xF1
|
|
|
|
|
#endif
|
|
|
|
|
|
OLED driver fixes (#10377)
* Fix dirtying in oled_write_pixel()
Set the dirty bit for the block only if oled_write_pixel() actually
changed the buffer state. Without this check oled_write_pixel() could
not be used inside the oled_task_user() code using the “redraw always”
style, because the blocks touched by oled_write_pixel() would always
appear dirty, and oled_render() would not proceed beyond the first such
dirty block.
* Fix oled_write_pixel() with 90/270 degree rotation
Use oled_rotation_width instead of OLED_DISPLAY_WIDTH, so that a rotated
display would be handled correctly.
* Fix compilation with custom OLED_BLOCK_COUNT and OLED_BLOCK_SIZE
Some OLED sizes (e.g., 64×48) may require a nonstandard value of
OLED_BLOCK_COUNT. The documentation says that this value may be
redefined in config.h, but actually trying to redefine it caused a
compile error, because the macro was redefined in oled_driver.c.
Make the OLED_BLOCK_COUNT definition in oled_driver.c respect any
user override, and do the same for OLED_BLOCK_SIZE just in case.
* Fix handling of out-of-range bits in oled_dirty
If a custom OLED_BLOCK_COUNT value is specified, some bits in oled_dirty
may not correspond to existing blocks; however, if those bits are set
somewhere (e.g., by code with sets oled_dirty to ~0 or even -1),
oled_render() would try to handle them and could access memory beyond
oled_buffer and perform hardware operations with out of range values.
Prevent this by masking off unused bits in oled_render(), and also avoid
setting those bits in other functions.
* Fix potentially wrong dirtying in oled_write_char()
oled_write_char() tried to mark the position just beyond the written
character as dirty; use (OLED_FONT_WIDTH - 1) to dirty the last position
still belonging to the character instead.
* Fix `#define OLED_BLOCK_TYPE uint32_t` on AVR
Using uint32_t as OLED_BLOCK_TYPE did not work properly on AVR, because
some bit shifts were performed using 16-bit int. Add explicit casts to
OLED_BLOCK_TYPE to those shifts.
2020-10-03 21:44:19 +03:00
|
|
|
#define OLED_ALL_BLOCKS_MASK (((((OLED_BLOCK_TYPE)1 << (OLED_BLOCK_COUNT - 1)) - 1) << 1) | 1)
|
2019-04-15 22:32:57 -05:00
|
|
|
|
2023-05-10 14:04:53 -07:00
|
|
|
#define OLED_IC_HAS_HORIZONTAL_MODE (OLED_IC == OLED_IC_SSD1306)
|
|
|
|
|
#define OLED_IC_COM_PINS_ARE_COLUMNS (OLED_IC == OLED_IC_SH1107)
|
|
|
|
|
|
|
|
|
|
#ifndef OLED_COM_PIN_COUNT
|
|
|
|
|
# if OLED_IC == OLED_IC_SSD1306
|
|
|
|
|
# define OLED_COM_PIN_COUNT 64
|
|
|
|
|
# elif OLED_IC == OLED_IC_SH1106
|
|
|
|
|
# define OLED_COM_PIN_COUNT 64
|
|
|
|
|
# elif OLED_IC == OLED_IC_SH1107
|
|
|
|
|
# define OLED_COM_PIN_COUNT 128
|
|
|
|
|
# else
|
|
|
|
|
# error Invalid OLED_IC value
|
|
|
|
|
# endif
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
#ifndef OLED_COM_PIN_OFFSET
|
|
|
|
|
# define OLED_COM_PIN_OFFSET 0
|
|
|
|
|
#endif
|
|
|
|
|
|
2019-04-15 22:32:57 -05:00
|
|
|
// i2c defines
|
|
|
|
|
#define I2C_CMD 0x00
|
|
|
|
|
#define I2C_DATA 0x40
|
|
|
|
|
|
|
|
|
|
#define HAS_FLAGS(bits, flags) ((bits & flags) == flags)
|
|
|
|
|
|
|
|
|
|
// Display buffer's is the same as the OLED memory layout
|
|
|
|
|
// this is so we don't end up with rounding errors with
|
|
|
|
|
// parts of the display unusable or don't get cleared correctly
|
|
|
|
|
// and also allows for drawing & inverting
|
2019-08-30 11:19:03 -07:00
|
|
|
uint8_t oled_buffer[OLED_MATRIX_SIZE];
|
2023-05-10 17:36:15 -04:00
|
|
|
uint8_t * oled_cursor;
|
2019-08-30 11:19:03 -07:00
|
|
|
OLED_BLOCK_TYPE oled_dirty = 0;
|
|
|
|
|
bool oled_initialized = false;
|
|
|
|
|
bool oled_active = false;
|
|
|
|
|
bool oled_scrolling = false;
|
2021-06-18 17:08:22 +02:00
|
|
|
bool oled_inverted = false;
|
2020-10-29 18:12:50 +11:00
|
|
|
uint8_t oled_brightness = OLED_BRIGHTNESS;
|
2021-06-17 17:14:23 +10:00
|
|
|
oled_rotation_t oled_rotation = 0;
|
2019-08-30 11:19:03 -07:00
|
|
|
uint8_t oled_rotation_width = 0;
|
2022-02-12 10:29:31 -08:00
|
|
|
uint8_t oled_scroll_speed = 0; // this holds the speed after being remapped to ssd1306 internal values
|
2020-03-14 14:04:34 -07:00
|
|
|
uint8_t oled_scroll_start = 0;
|
|
|
|
|
uint8_t oled_scroll_end = 7;
|
2019-08-25 14:37:55 -05:00
|
|
|
#if OLED_TIMEOUT > 0
|
2019-08-30 11:19:03 -07:00
|
|
|
uint32_t oled_timeout;
|
2019-08-25 14:37:55 -05:00
|
|
|
#endif
|
|
|
|
|
#if OLED_SCROLL_TIMEOUT > 0
|
2019-08-30 11:19:03 -07:00
|
|
|
uint32_t oled_scroll_timeout;
|
2019-04-15 22:32:57 -05:00
|
|
|
#endif
|
2020-11-28 12:02:18 -08:00
|
|
|
#if OLED_UPDATE_INTERVAL > 0
|
|
|
|
|
uint16_t oled_update_timeout;
|
|
|
|
|
#endif
|
2019-04-15 22:32:57 -05:00
|
|
|
|
2023-05-10 14:04:53 -07:00
|
|
|
#if defined(OLED_TRANSPORT_SPI)
|
|
|
|
|
# ifndef OLED_DC_PIN
|
|
|
|
|
# error "The OLED driver in SPI needs a D/C pin defined"
|
|
|
|
|
# endif
|
|
|
|
|
# ifndef OLED_CS_PIN
|
|
|
|
|
# error "The OLED driver in SPI needs a CS pin defined"
|
|
|
|
|
# endif
|
|
|
|
|
# ifndef OLED_SPI_MODE
|
|
|
|
|
# define OLED_SPI_MODE 3
|
|
|
|
|
# endif
|
|
|
|
|
# ifndef OLED_SPI_DIVISOR
|
|
|
|
|
# define OLED_SPI_DIVISOR 2
|
|
|
|
|
# endif
|
|
|
|
|
#elif defined(OLED_TRANSPORT_I2C)
|
|
|
|
|
# if !defined(OLED_DISPLAY_ADDRESS)
|
|
|
|
|
# define OLED_DISPLAY_ADDRESS 0x3C
|
|
|
|
|
# endif
|
|
|
|
|
#endif
|
2019-04-15 22:32:57 -05:00
|
|
|
|
2023-05-10 14:04:53 -07:00
|
|
|
// Transmit/Write Funcs.
|
|
|
|
|
__attribute__((weak)) bool oled_send_cmd(const uint8_t *data, uint16_t size) {
|
|
|
|
|
#if defined(OLED_TRANSPORT_SPI)
|
|
|
|
|
if (!spi_start(OLED_CS_PIN, false, OLED_SPI_MODE, OLED_SPI_DIVISOR)) {
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
// Command Mode
|
2024-02-18 17:08:27 +11:00
|
|
|
gpio_write_pin_low(OLED_DC_PIN);
|
2023-05-10 14:04:53 -07:00
|
|
|
// Send the commands
|
|
|
|
|
if (spi_transmit(&data[1], size - 1) != SPI_STATUS_SUCCESS) {
|
|
|
|
|
spi_stop();
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
spi_stop();
|
|
|
|
|
return true;
|
|
|
|
|
#elif defined(OLED_TRANSPORT_I2C)
|
|
|
|
|
i2c_status_t status = i2c_transmit((OLED_DISPLAY_ADDRESS << 1), data, size, OLED_I2C_TIMEOUT);
|
|
|
|
|
|
|
|
|
|
return (status == I2C_STATUS_SUCCESS);
|
|
|
|
|
#endif
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
__attribute__((weak)) bool oled_send_cmd_P(const uint8_t *data, uint16_t size) {
|
2019-04-15 22:32:57 -05:00
|
|
|
#if defined(__AVR__)
|
2023-05-10 14:04:53 -07:00
|
|
|
# if defined(OLED_TRANSPORT_SPI)
|
|
|
|
|
if (!spi_start(OLED_CS_PIN, false, OLED_SPI_MODE, OLED_SPI_DIVISOR)) {
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
spi_status_t status = SPI_STATUS_SUCCESS;
|
|
|
|
|
// Command Mode
|
2024-02-18 17:08:27 +11:00
|
|
|
gpio_write_pin_low(OLED_DC_PIN);
|
2023-05-10 14:04:53 -07:00
|
|
|
// Send the commands
|
|
|
|
|
for (uint16_t i = 1; i < size && status >= 0; i++) {
|
|
|
|
|
status = spi_write(pgm_read_byte((const char *)&data[i]));
|
|
|
|
|
}
|
|
|
|
|
spi_stop();
|
|
|
|
|
return (status >= 0);
|
|
|
|
|
# elif defined(OLED_TRANSPORT_I2C)
|
2019-04-15 22:32:57 -05:00
|
|
|
|
2024-01-17 07:05:38 -06:00
|
|
|
i2c_status_t status = i2c_transmit_P((OLED_DISPLAY_ADDRESS << 1), data, size, OLED_I2C_TIMEOUT);
|
2019-04-15 22:32:57 -05:00
|
|
|
|
2023-05-10 14:04:53 -07:00
|
|
|
return (status == I2C_STATUS_SUCCESS);
|
|
|
|
|
# endif
|
|
|
|
|
#else
|
|
|
|
|
return oled_send_cmd(data, size);
|
|
|
|
|
#endif
|
2019-04-15 22:32:57 -05:00
|
|
|
}
|
2023-05-10 14:04:53 -07:00
|
|
|
|
|
|
|
|
__attribute__((weak)) bool oled_send_data(const uint8_t *data, uint16_t size) {
|
|
|
|
|
#if defined(OLED_TRANSPORT_SPI)
|
|
|
|
|
if (!spi_start(OLED_CS_PIN, false, OLED_SPI_MODE, OLED_SPI_DIVISOR)) {
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
// Data Mode
|
2024-02-18 17:08:27 +11:00
|
|
|
gpio_write_pin_high(OLED_DC_PIN);
|
2023-05-10 14:04:53 -07:00
|
|
|
// Send the commands
|
|
|
|
|
if (spi_transmit(data, size) != SPI_STATUS_SUCCESS) {
|
|
|
|
|
spi_stop();
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
spi_stop();
|
|
|
|
|
return true;
|
|
|
|
|
#elif defined(OLED_TRANSPORT_I2C)
|
2024-01-16 13:26:40 +11:00
|
|
|
i2c_status_t status = i2c_write_register((OLED_DISPLAY_ADDRESS << 1), I2C_DATA, data, size, OLED_I2C_TIMEOUT);
|
2023-05-10 14:04:53 -07:00
|
|
|
return (status == I2C_STATUS_SUCCESS);
|
2019-04-15 22:32:57 -05:00
|
|
|
#endif
|
2023-05-10 14:04:53 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
__attribute__((weak)) void oled_driver_init(void) {
|
|
|
|
|
#if defined(OLED_TRANSPORT_SPI)
|
|
|
|
|
spi_init();
|
2024-02-18 17:08:27 +11:00
|
|
|
gpio_set_pin_output(OLED_CS_PIN);
|
|
|
|
|
gpio_write_pin_high(OLED_CS_PIN);
|
2023-05-10 14:04:53 -07:00
|
|
|
|
2024-02-18 17:08:27 +11:00
|
|
|
gpio_set_pin_output(OLED_DC_PIN);
|
|
|
|
|
gpio_write_pin_low(OLED_DC_PIN);
|
2023-05-10 14:04:53 -07:00
|
|
|
# ifdef OLED_RST_PIN
|
|
|
|
|
/* Reset device */
|
2024-02-18 17:08:27 +11:00
|
|
|
gpio_set_pin_output(OLED_RST_PIN);
|
|
|
|
|
gpio_write_pin_low(OLED_RST_PIN);
|
2023-05-10 14:04:53 -07:00
|
|
|
wait_ms(20);
|
2024-02-18 17:08:27 +11:00
|
|
|
gpio_write_pin_high(OLED_RST_PIN);
|
2023-05-10 14:04:53 -07:00
|
|
|
wait_ms(20);
|
|
|
|
|
# endif
|
|
|
|
|
#elif defined(OLED_TRANSPORT_I2C)
|
|
|
|
|
i2c_init();
|
|
|
|
|
#endif
|
|
|
|
|
}
|
2019-04-15 22:32:57 -05:00
|
|
|
|
|
|
|
|
// Flips the rendering bits for a character at the current cursor position
|
2019-08-30 11:19:03 -07:00
|
|
|
static void InvertCharacter(uint8_t *cursor) {
|
|
|
|
|
const uint8_t *end = cursor + OLED_FONT_WIDTH;
|
|
|
|
|
while (cursor < end) {
|
|
|
|
|
*cursor = ~(*cursor);
|
|
|
|
|
cursor++;
|
|
|
|
|
}
|
2019-04-15 22:32:57 -05:00
|
|
|
}
|
|
|
|
|
|
2021-06-17 17:14:23 +10:00
|
|
|
bool oled_init(oled_rotation_t rotation) {
|
2023-05-10 14:04:53 -07:00
|
|
|
#if defined(USE_I2C) && defined(SPLIT_KEYBOARD) && defined(OLED_TRANSPORT_I2C)
|
2021 May 29 Breaking Changes Update (#13034)
* Add Per Key functionality for AutoShift (#11536)
* LED Matrix: Reactive effect buffers & advanced indicators (#12588)
* [Keyboard] kint36: switch to sym_eager_pk debouncing (#12626)
* [Keyboard] kint2pp: reduce input latency by ≈10ms (#12625)
* LED Matrix: Split (#12633)
* [CI] Format code according to conventions (#12650)
* feat: infinite timeout for leader key (#6580)
* feat: implement leader_no_timeout logic
* docs(leader_key): infinite leader timeout docs
* Format code according to conventions (#12680)
* Update ADC driver for STM32F1xx, STM32F3xx, STM32F4xx (#12403)
* Fix default ADC_RESOLUTION for ADCv3 (and ADCv4)
Recent ChibiOS update removed ADC_CFGR1_RES_10BIT from the ADCv3 headers
(that macro should not have been there, because ADCv3 has CFGR instead of
CFGR1). Fix the default value for ADC_RESOLUTION to use ADC_CFGR_RES_10BITS
if it is defined (that name is used for ADCv3 and ADCv4).
* Update ADC docs to match the actually used resolution
ADC driver for ChibiOS actually uses the 10-bit resolution by default
(probably to match AVR); fix the documentation accordingly. Also add
both ADC_CFGR_RES_10BITS and ADC_CFGR1_RES_10BIT constants (these names
differ according to the ADC implementation in the particular MCU).
* Fix pinToMux() for B12 and B13 on STM32F3xx
Testing on STM32F303CCT6 revealed that the ADC mux values for B12 and
B13 pins were wrong.
* Add support for all possible analog pins on STM32F1xx
Added ADC mux values for pins A0...A7, B0, B1, C0...C5 on STM32F1xx
(they are the same at least for STM32F103x8 and larger F103 devices, and
also F102, F105, F107 families). Actually tested on STM32F103C8T6
(therefore pins C0...C5 were not tested).
Pins F6...F10, which are present on STM32F103x[C-G] in 144-pin packages,
cannot be supported at the moment, because those pins are connected only
to ADC3, but the ChibiOS ADC driver for STM32F1xx supports only ADC1.
* Add support for all possible analog pins on STM32F4xx
Added ADC mux values for pins A0...A7, B0, B1, C0...C5 and optionally
F3...F10 (if STM32_ADC_USE_ADC3 is enabled). These mux values are
apparently the same for all F4xx devices, except some smaller devices may
not have ADC3.
Actually tested on STM32F401CCU6, STM32F401CEU6, STM32F411CEU6 (using
various WeAct “Blackpill” boards); only pins A0...A7, B0, B1 were tested.
Pins F3...F10 are inside `#if STM32_ADC_USE_ADC3` because some devices
which don't have ADC3 also don't have the GPIOF port, therefore the code
which refers to Fx pins does not compile.
* Fix STM32F3xx ADC mux table in documentation
The ADC driver documentation had some errors in the mux table for STM32F3xx.
Fix this table to match the datasheet and the actual code (mux settings for
B12 and B13 were also tested on a real STM32F303CCT6 chip).
* Add STM32F1xx ADC pins to the documentation
* Add STM32F4xx ADC pins to the documentation
* Add initial support for tinyuf2 bootloader (when hosted on F411 blackpill) (#12600)
* Add support for jumping to tinyuf2 bootloader. Adds blackpill UF2 example.
* Update flashing.md
* Update chconf.h
* Update config.h
* Update halconf.h
* Update mcuconf.h
* eeprom driver: Refactor where eeprom driver initialisation (and EEPROM emulation initialisation) occurs to make it non-target-specific. (#12671)
* Add support for MCU = STM32F446 (#12619)
* Add support for MCU = STM32F446
* Update platforms/chibios/GENERIC_STM32_F446XE/configs/config.h
* Restore mcuconf.h to the one used by RT-STM32F446RE-NUCLEO64
* stm32f446: update mcuconf.h and board.h for 16MHz operation, with USB enabled, and other peripherals disabled.
* Format code according to conventions (#12682)
* Format code according to conventions (#12687)
* Add STM32L433 and L443 support (#12063)
* initial L433 commit
* change to XC
* fix L433
* disable all peripherals
* update system and peripheral clocks
* 433 change
* use its own board files
* revert its own board files
* l433 specific change
* fix stm32l432xx define
* remove duplicate #define
* fix bootloader jump
* move to L443xx and add i2c2, spi2, usart3 to mcuconf.h
* move to L443
* move to L443
* fix sdmmc in mcuconf.h
* include STM32L443
* add L443
* Include L443 in compatible microcontrollers
* Include L443 in compatible microcontrollers
* Update config bootloader jump description
* Update ChibiOS define reasoning
* Update quantum/mcu_selection.mk
* fix git conflict
* Updated Function96 with V2 files and removed chconf.h and halconf.h (#12613)
* Fix bad PR merge for #6580. (#12721)
* Change RGB/LED Matrix to use a simple define for USB suspend (#12697)
* [CI] Format code according to conventions (#12731)
* Fixing transport's led/rgb matrix suspend state logic (#12770)
* [CI] Format code according to conventions (#12772)
* Fix comment parsing (#12750)
* Added OLED fade out support (#12086)
* fix some references to bin/qmk that slipped in (#12832)
* Resolve a number of warnings in `qmk generate-api` (#12833)
* New command: qmk console (#12828)
* stash poc
* stash
* tidy up implementation
* Tidy up slightly for review
* Tidy up slightly for review
* Bodge environment to make tests pass
* Refactor away from asyncio due to windows issues
* Filter devices
* align vid/pid printing
* Add hidapi to the installers
* start preparing for multiple hid_listeners
* udev rules for hid_listen
* refactor to move closer to end state
* very basic implementation of the threaded model
* refactor how vid/pid/index are supplied and parsed
* windows improvements
* read the report directly when usage page isn't available
* add per-device colors, the choice to show names or numbers, and refactor
* add timestamps
* Add support for showing bootloaders
* tweak the color for bootloaders
* Align bootloader disconnect with connect color
* add support for showing all bootloaders
* fix the pyusb check
* tweaks
* fix exception
* hide a stack trace behind -v
* add --no-bootloaders option
* add documentation for qmk console
* Apply suggestions from code review
* pyformat
* clean up and flesh out KNOWN_BOOTLOADERS
* Remove pointless SERIAL_LINK_ENABLE rules (#12846)
* Make Swap Hands use PROGMEM (#12284)
This converts the array that the Swap Hands feature uses to use PROGMEM,
and to read from that array, as such. Since this array never changes at
runtime, there is no reason to keep it in memory. Especially for AVR
boards, as memory is a precious resource.
* Fix another bin/qmk reference (#12856)
* [Keymap] Turn OLED off on suspend in soundmonster keymap (#10419)
* Fixup build errors on `develop` branch. (#12723)
* LED Matrix: Effects! (#12651)
* Fix syntax error when compiling for ARM (#12866)
* Remove KEYMAP and LAYOUT_kc (#12160)
* alias KEYMAP to LAYOUT
* remove KEYMAP and LAYOUT_kc
* Add setup, clone, and env to the list of commands we allow even with broken modules (#12868)
* Rename `point_t` -> `led_point_t` (#12864)
* [Keyboard] updated a vendor name / fixed minor keymap issues (#12881)
* Add missing LED Matrix suspend code to suspend.c (#12878)
* LED Matrix: Documentation (#12685)
* Deprecate `send_unicode_hex_string()` (#12602)
* Fix spelling mistake regarding LED Matrix in split_common. (#12888)
* [Keymap] Fix QWERTY/DVORAK status output for kzar keymap (#12895)
* Use milc.subcommand.config instead of qmk.cli.config (#12915)
* Use milc.subcommand.config instead
* pyformat
* remove the config test
* Add function to allow repeated blinking of one layer (#12237)
* Implement function rgblight_blink_layer_repeat to allow repeated blinking of one layer at a time
* Update doc
* Rework rgblight blinking according to requested change
* optimize storage
* Fixup housekeeping from being invoked twice per loop. (#12933)
* matrix: wait for row signal to go HIGH for every row (#12945)
I noticed this discrepancy (last row of the matrix treated differently than the
others) when optimizing the input latency of my keyboard controller, see also
https://michael.stapelberg.ch/posts/2021-05-08-keyboard-input-latency-qmk-kinesis/
Before this commit, when tuning the delays I noticed ghost key presses when
pressing the F2 key, which is on the last row of the keyboard matrix: the
dead_grave key, which is on the first row of the keyboard matrix, would be
incorrectly detected as pressed.
After this commit, all keyboard matrix rows are interpreted correctly.
I suspect that my setup is more susceptible to this nuance than others because I
use GPIO_INPUT_PIN_DELAY=0 and hence don’t have another delay that might mask
the problem.
* ensure we do not conflict with existing keymap aliases (#12976)
* Add support for up to 4 IS31FL3733 drivers (#12342)
* Convert Encoder callbacks to be boolean functions (#12805)
* [Keyboard] Fix Terrazzo build failure (#12977)
* Do not hard set config in CPTC files (#11864)
* [Keyboard] Corne - Remove legacy revision support (#12226)
* [Keymap] Update to Drashna keymap and user code (based on develop) (#12936)
* Add Full-duplex serial driver for ARM boards (#9842)
* Document LED_MATRIX_FRAMEBUFFER_EFFECTS (#12987)
* Backlight: add defines for default level and breathing state (#12560)
* Add dire message about LUFA mass storage bootloader (#13014)
* [Keyboard] Remove redundant legacy and common headers for crkbd (#13023)
Was causing compiler errors on some systems.
* Fix keyboards/keymaps for boolean encoder callback changes (#12985)
* `backlight.c`: include `eeprom.h` (#13024)
* Add changelog for 2021-05-29 Breaking Changes merge (#12939)
* Add ChangeLog for 2021-05-29 Breaking Changes Merge: initial version
* Add recent develop changes
* Sort recent develop changes
* Remove sections for ChibiOS changes per tzarc
No ChibiOS changes this round.
* Add and sort recent develop changes
* add notes about keyboard moves/deletions
* import changelog for PR 12172
Documents the change to BOOTMAGIC_ENABLE.
* update section headings
* re-sort changelog
* add additional note regarding Bootmagic changes
* remove changelog timestamp
* update dates in main Breaking Changes docs
* fix broken section anchors in previous changelogs
* add link to backlight/eeprom patch to changelog
* highlight some more changes
* link PRs from section headers
* Restore standard readme
* run: qmk cformat --core-only
2021-05-29 14:38:50 -07:00
|
|
|
if (!is_keyboard_master()) {
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
|
2021-11-01 15:42:50 -07:00
|
|
|
oled_rotation = oled_init_user(oled_init_kb(rotation));
|
2019-08-30 11:19:03 -07:00
|
|
|
if (!HAS_FLAGS(oled_rotation, OLED_ROTATION_90)) {
|
|
|
|
|
oled_rotation_width = OLED_DISPLAY_WIDTH;
|
|
|
|
|
} else {
|
|
|
|
|
oled_rotation_width = OLED_DISPLAY_HEIGHT;
|
|
|
|
|
}
|
2023-05-10 14:04:53 -07:00
|
|
|
oled_driver_init();
|
2019-08-30 11:19:03 -07:00
|
|
|
|
|
|
|
|
static const uint8_t PROGMEM display_setup1[] = {
|
|
|
|
|
I2C_CMD,
|
|
|
|
|
DISPLAY_OFF,
|
|
|
|
|
DISPLAY_CLOCK,
|
2023-05-10 14:04:53 -07:00
|
|
|
OLED_DISPLAY_CLOCK,
|
2019-08-30 11:19:03 -07:00
|
|
|
MULTIPLEX_RATIO,
|
2023-05-10 14:04:53 -07:00
|
|
|
#if OLED_IC_COM_PINS_ARE_COLUMNS
|
|
|
|
|
OLED_DISPLAY_WIDTH - 1,
|
|
|
|
|
#else
|
2019-08-30 11:19:03 -07:00
|
|
|
OLED_DISPLAY_HEIGHT - 1,
|
2023-05-10 14:04:53 -07:00
|
|
|
#endif
|
|
|
|
|
#if OLED_IC == OLED_IC_SH1107
|
|
|
|
|
SH1107_DISPLAY_START_LINE,
|
2019-08-30 11:19:03 -07:00
|
|
|
0x00,
|
2023-05-10 14:04:53 -07:00
|
|
|
#else
|
2019-08-30 11:19:03 -07:00
|
|
|
DISPLAY_START_LINE | 0x00,
|
2023-05-10 14:04:53 -07:00
|
|
|
#endif
|
2019-08-30 11:19:03 -07:00
|
|
|
CHARGE_PUMP,
|
|
|
|
|
0x14,
|
2023-05-10 14:04:53 -07:00
|
|
|
#if OLED_IC_HAS_HORIZONTAL_MODE
|
2019-08-30 11:19:03 -07:00
|
|
|
// MEMORY_MODE is unsupported on SH1106 (Page Addressing only)
|
|
|
|
|
MEMORY_MODE,
|
2022-02-12 10:29:31 -08:00
|
|
|
0x00, // Horizontal addressing mode
|
2023-05-10 14:04:53 -07:00
|
|
|
#elif OLED_IC == OLED_IC_SH1107
|
|
|
|
|
// Page addressing mode
|
|
|
|
|
SH1107_MEMORY_MODE_PAGE,
|
2019-06-11 15:27:17 -07:00
|
|
|
#endif
|
2019-08-30 11:19:03 -07:00
|
|
|
};
|
2023-05-10 14:04:53 -07:00
|
|
|
if (!oled_send_cmd_P(display_setup1, ARRAY_SIZE(display_setup1))) {
|
2019-08-30 11:19:03 -07:00
|
|
|
print("oled_init cmd set 1 failed\n");
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!HAS_FLAGS(oled_rotation, OLED_ROTATION_180)) {
|
2023-05-10 14:04:53 -07:00
|
|
|
static const uint8_t PROGMEM display_normal[] = {
|
|
|
|
|
I2C_CMD, SEGMENT_REMAP_INV, COM_SCAN_DEC, DISPLAY_OFFSET, OLED_COM_PIN_OFFSET,
|
|
|
|
|
};
|
|
|
|
|
if (!oled_send_cmd_P(display_normal, ARRAY_SIZE(display_normal))) {
|
2019-08-30 11:19:03 -07:00
|
|
|
print("oled_init cmd normal rotation failed\n");
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
} else {
|
2023-05-10 14:04:53 -07:00
|
|
|
static const uint8_t PROGMEM display_flipped[] = {
|
|
|
|
|
I2C_CMD, SEGMENT_REMAP, COM_SCAN_INC, DISPLAY_OFFSET, (OLED_COM_PIN_COUNT - OLED_COM_PIN_OFFSET) % OLED_COM_PIN_COUNT,
|
|
|
|
|
};
|
|
|
|
|
if (!oled_send_cmd_P(display_flipped, ARRAY_SIZE(display_flipped))) {
|
2019-08-30 11:19:03 -07:00
|
|
|
print("display_flipped failed\n");
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2023-05-10 14:04:53 -07:00
|
|
|
static const uint8_t PROGMEM display_setup2[] = {I2C_CMD, COM_PINS, OLED_COM_PINS, CONTRAST, OLED_BRIGHTNESS, PRE_CHARGE_PERIOD, OLED_PRE_CHARGE_PERIOD, VCOM_DETECT, OLED_VCOM_DETECT, DISPLAY_ALL_ON_RESUME, NORMAL_DISPLAY, DEACTIVATE_SCROLL, DISPLAY_ON};
|
|
|
|
|
if (!oled_send_cmd_P(display_setup2, ARRAY_SIZE(display_setup2))) {
|
2019-08-30 11:19:03 -07:00
|
|
|
print("display_setup2 failed\n");
|
|
|
|
|
return false;
|
|
|
|
|
}
|
2019-04-15 22:32:57 -05:00
|
|
|
|
2019-08-25 14:37:55 -05:00
|
|
|
#if OLED_TIMEOUT > 0
|
2019-08-30 11:19:03 -07:00
|
|
|
oled_timeout = timer_read32() + OLED_TIMEOUT;
|
2019-08-25 14:37:55 -05:00
|
|
|
#endif
|
|
|
|
|
#if OLED_SCROLL_TIMEOUT > 0
|
2019-08-30 11:19:03 -07:00
|
|
|
oled_scroll_timeout = timer_read32() + OLED_SCROLL_TIMEOUT;
|
2019-08-25 14:37:55 -05:00
|
|
|
#endif
|
|
|
|
|
|
2019-08-30 11:19:03 -07:00
|
|
|
oled_clear();
|
|
|
|
|
oled_initialized = true;
|
|
|
|
|
oled_active = true;
|
|
|
|
|
oled_scrolling = false;
|
|
|
|
|
return true;
|
2019-04-15 22:32:57 -05:00
|
|
|
}
|
|
|
|
|
|
2022-02-12 10:29:31 -08:00
|
|
|
__attribute__((weak)) oled_rotation_t oled_init_kb(oled_rotation_t rotation) {
|
|
|
|
|
return rotation;
|
|
|
|
|
}
|
|
|
|
|
__attribute__((weak)) oled_rotation_t oled_init_user(oled_rotation_t rotation) {
|
|
|
|
|
return rotation;
|
|
|
|
|
}
|
2019-04-15 22:32:57 -05:00
|
|
|
|
|
|
|
|
void oled_clear(void) {
|
2019-08-30 11:19:03 -07:00
|
|
|
memset(oled_buffer, 0, sizeof(oled_buffer));
|
|
|
|
|
oled_cursor = &oled_buffer[0];
|
OLED driver fixes (#10377)
* Fix dirtying in oled_write_pixel()
Set the dirty bit for the block only if oled_write_pixel() actually
changed the buffer state. Without this check oled_write_pixel() could
not be used inside the oled_task_user() code using the “redraw always”
style, because the blocks touched by oled_write_pixel() would always
appear dirty, and oled_render() would not proceed beyond the first such
dirty block.
* Fix oled_write_pixel() with 90/270 degree rotation
Use oled_rotation_width instead of OLED_DISPLAY_WIDTH, so that a rotated
display would be handled correctly.
* Fix compilation with custom OLED_BLOCK_COUNT and OLED_BLOCK_SIZE
Some OLED sizes (e.g., 64×48) may require a nonstandard value of
OLED_BLOCK_COUNT. The documentation says that this value may be
redefined in config.h, but actually trying to redefine it caused a
compile error, because the macro was redefined in oled_driver.c.
Make the OLED_BLOCK_COUNT definition in oled_driver.c respect any
user override, and do the same for OLED_BLOCK_SIZE just in case.
* Fix handling of out-of-range bits in oled_dirty
If a custom OLED_BLOCK_COUNT value is specified, some bits in oled_dirty
may not correspond to existing blocks; however, if those bits are set
somewhere (e.g., by code with sets oled_dirty to ~0 or even -1),
oled_render() would try to handle them and could access memory beyond
oled_buffer and perform hardware operations with out of range values.
Prevent this by masking off unused bits in oled_render(), and also avoid
setting those bits in other functions.
* Fix potentially wrong dirtying in oled_write_char()
oled_write_char() tried to mark the position just beyond the written
character as dirty; use (OLED_FONT_WIDTH - 1) to dirty the last position
still belonging to the character instead.
* Fix `#define OLED_BLOCK_TYPE uint32_t` on AVR
Using uint32_t as OLED_BLOCK_TYPE did not work properly on AVR, because
some bit shifts were performed using 16-bit int. Add explicit casts to
OLED_BLOCK_TYPE to those shifts.
2020-10-03 21:44:19 +03:00
|
|
|
oled_dirty = OLED_ALL_BLOCKS_MASK;
|
2019-04-15 22:32:57 -05:00
|
|
|
}
|
|
|
|
|
|
2019-08-30 11:19:03 -07:00
|
|
|
static void calc_bounds(uint8_t update_start, uint8_t *cmd_array) {
|
|
|
|
|
// Calculate commands to set memory addressing bounds.
|
|
|
|
|
uint8_t start_page = OLED_BLOCK_SIZE * update_start / OLED_DISPLAY_WIDTH;
|
|
|
|
|
uint8_t start_column = OLED_BLOCK_SIZE * update_start % OLED_DISPLAY_WIDTH;
|
2023-05-10 14:04:53 -07:00
|
|
|
#if !OLED_IC_HAS_HORIZONTAL_MODE
|
2019-08-30 11:19:03 -07:00
|
|
|
// Commands for Page Addressing Mode. Sets starting page and column; has no end bound.
|
|
|
|
|
// Column value must be split into high and low nybble and sent as two commands.
|
|
|
|
|
cmd_array[0] = PAM_PAGE_ADDR | start_page;
|
|
|
|
|
cmd_array[1] = PAM_SETCOLUMN_LSB | ((OLED_COLUMN_OFFSET + start_column) & 0x0f);
|
|
|
|
|
cmd_array[2] = PAM_SETCOLUMN_MSB | ((OLED_COLUMN_OFFSET + start_column) >> 4 & 0x0f);
|
2019-06-11 15:27:17 -07:00
|
|
|
#else
|
2019-08-30 11:19:03 -07:00
|
|
|
// Commands for use in Horizontal Addressing mode.
|
2023-05-10 14:04:53 -07:00
|
|
|
cmd_array[1] = start_column + OLED_COLUMN_OFFSET;
|
2019-08-30 11:19:03 -07:00
|
|
|
cmd_array[4] = start_page;
|
|
|
|
|
cmd_array[2] = (OLED_BLOCK_SIZE + OLED_DISPLAY_WIDTH - 1) % OLED_DISPLAY_WIDTH + cmd_array[1];
|
2023-05-10 14:04:53 -07:00
|
|
|
cmd_array[5] = (OLED_BLOCK_SIZE + OLED_DISPLAY_WIDTH - 1) / OLED_DISPLAY_WIDTH - 1 + cmd_array[4];
|
2019-06-11 15:27:17 -07:00
|
|
|
#endif
|
2019-04-15 22:32:57 -05:00
|
|
|
}
|
|
|
|
|
|
2019-08-30 11:19:03 -07:00
|
|
|
static void calc_bounds_90(uint8_t update_start, uint8_t *cmd_array) {
|
2023-05-10 14:04:53 -07:00
|
|
|
// Block numbering starts from the bottom left corner, going up and then to
|
|
|
|
|
// the right. The controller needs the page and column numbers for the top
|
|
|
|
|
// left and bottom right corners of that block.
|
|
|
|
|
|
|
|
|
|
// Total number of pages across the screen height.
|
|
|
|
|
const uint8_t height_in_pages = OLED_DISPLAY_HEIGHT / 8;
|
|
|
|
|
|
|
|
|
|
// Difference of starting page numbers for adjacent blocks; may be 0 if
|
|
|
|
|
// blocks are large enough to occupy one or more whole 8px columns.
|
|
|
|
|
const uint8_t page_inc_per_block = OLED_BLOCK_SIZE % OLED_DISPLAY_HEIGHT / 8;
|
|
|
|
|
|
|
|
|
|
// Top page number for a block which is at the bottom edge of the screen.
|
|
|
|
|
const uint8_t bottom_block_top_page = (height_in_pages - page_inc_per_block) % height_in_pages;
|
|
|
|
|
|
|
|
|
|
#if !OLED_IC_HAS_HORIZONTAL_MODE
|
|
|
|
|
// Only the Page Addressing Mode is supported
|
|
|
|
|
uint8_t start_page = bottom_block_top_page - (OLED_BLOCK_SIZE * update_start % OLED_DISPLAY_HEIGHT / 8);
|
|
|
|
|
uint8_t start_column = OLED_BLOCK_SIZE * update_start / OLED_DISPLAY_HEIGHT * 8;
|
|
|
|
|
cmd_array[0] = PAM_PAGE_ADDR | start_page;
|
|
|
|
|
cmd_array[1] = PAM_SETCOLUMN_LSB | ((OLED_COLUMN_OFFSET + start_column) & 0x0f);
|
|
|
|
|
cmd_array[2] = PAM_SETCOLUMN_MSB | ((OLED_COLUMN_OFFSET + start_column) >> 4 & 0x0f);
|
|
|
|
|
#else
|
|
|
|
|
cmd_array[1] = OLED_BLOCK_SIZE * update_start / OLED_DISPLAY_HEIGHT * 8 + OLED_COLUMN_OFFSET;
|
|
|
|
|
cmd_array[4] = bottom_block_top_page - (OLED_BLOCK_SIZE * update_start % OLED_DISPLAY_HEIGHT / 8);
|
2019-08-30 11:19:03 -07:00
|
|
|
cmd_array[2] = (OLED_BLOCK_SIZE + OLED_DISPLAY_HEIGHT - 1) / OLED_DISPLAY_HEIGHT * 8 - 1 + cmd_array[1];
|
2023-05-10 14:04:53 -07:00
|
|
|
cmd_array[5] = (OLED_BLOCK_SIZE + OLED_DISPLAY_HEIGHT - 1) % OLED_DISPLAY_HEIGHT / 8 + cmd_array[4];
|
|
|
|
|
#endif
|
2019-04-15 22:32:57 -05:00
|
|
|
}
|
|
|
|
|
|
2019-08-30 11:19:03 -07:00
|
|
|
uint8_t crot(uint8_t a, int8_t n) {
|
|
|
|
|
const uint8_t mask = 0x7;
|
|
|
|
|
n &= mask;
|
|
|
|
|
return a << n | a >> (-n & mask);
|
2019-04-15 22:32:57 -05:00
|
|
|
}
|
|
|
|
|
|
2019-08-30 11:19:03 -07:00
|
|
|
static void rotate_90(const uint8_t *src, uint8_t *dest) {
|
|
|
|
|
for (uint8_t i = 0, shift = 7; i < 8; ++i, --shift) {
|
|
|
|
|
uint8_t selector = (1 << i);
|
|
|
|
|
for (uint8_t j = 0; j < 8; ++j) {
|
|
|
|
|
dest[i] |= crot(src[j] & selector, shift - (int8_t)j);
|
|
|
|
|
}
|
2019-04-15 22:32:57 -05:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2023-09-14 03:20:03 -05:00
|
|
|
void oled_render_dirty(bool all) {
|
2019-08-30 11:19:03 -07:00
|
|
|
// Do we have work to do?
|
OLED driver fixes (#10377)
* Fix dirtying in oled_write_pixel()
Set the dirty bit for the block only if oled_write_pixel() actually
changed the buffer state. Without this check oled_write_pixel() could
not be used inside the oled_task_user() code using the “redraw always”
style, because the blocks touched by oled_write_pixel() would always
appear dirty, and oled_render() would not proceed beyond the first such
dirty block.
* Fix oled_write_pixel() with 90/270 degree rotation
Use oled_rotation_width instead of OLED_DISPLAY_WIDTH, so that a rotated
display would be handled correctly.
* Fix compilation with custom OLED_BLOCK_COUNT and OLED_BLOCK_SIZE
Some OLED sizes (e.g., 64×48) may require a nonstandard value of
OLED_BLOCK_COUNT. The documentation says that this value may be
redefined in config.h, but actually trying to redefine it caused a
compile error, because the macro was redefined in oled_driver.c.
Make the OLED_BLOCK_COUNT definition in oled_driver.c respect any
user override, and do the same for OLED_BLOCK_SIZE just in case.
* Fix handling of out-of-range bits in oled_dirty
If a custom OLED_BLOCK_COUNT value is specified, some bits in oled_dirty
may not correspond to existing blocks; however, if those bits are set
somewhere (e.g., by code with sets oled_dirty to ~0 or even -1),
oled_render() would try to handle them and could access memory beyond
oled_buffer and perform hardware operations with out of range values.
Prevent this by masking off unused bits in oled_render(), and also avoid
setting those bits in other functions.
* Fix potentially wrong dirtying in oled_write_char()
oled_write_char() tried to mark the position just beyond the written
character as dirty; use (OLED_FONT_WIDTH - 1) to dirty the last position
still belonging to the character instead.
* Fix `#define OLED_BLOCK_TYPE uint32_t` on AVR
Using uint32_t as OLED_BLOCK_TYPE did not work properly on AVR, because
some bit shifts were performed using 16-bit int. Add explicit casts to
OLED_BLOCK_TYPE to those shifts.
2020-10-03 21:44:19 +03:00
|
|
|
oled_dirty &= OLED_ALL_BLOCKS_MASK;
|
2022-11-13 10:49:59 -05:00
|
|
|
if (!oled_dirty || !oled_initialized || oled_scrolling) {
|
2019-08-30 11:19:03 -07:00
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
2022-11-13 10:49:59 -05:00
|
|
|
// Turn on display if it is off
|
|
|
|
|
oled_on();
|
2019-08-30 11:19:03 -07:00
|
|
|
|
2022-11-14 01:49:58 +00:00
|
|
|
uint8_t update_start = 0;
|
|
|
|
|
uint8_t num_processed = 0;
|
2023-09-14 03:20:03 -05:00
|
|
|
while (oled_dirty && (num_processed++ < OLED_UPDATE_PROCESS_LIMIT || all)) { // render all dirty blocks (up to the configured limit)
|
2022-11-13 10:49:59 -05:00
|
|
|
// Find next dirty block
|
|
|
|
|
while (!(oled_dirty & ((OLED_BLOCK_TYPE)1 << update_start))) {
|
|
|
|
|
++update_start;
|
2019-08-30 11:19:03 -07:00
|
|
|
}
|
2022-11-13 10:49:59 -05:00
|
|
|
|
|
|
|
|
// Set column & page position
|
2023-05-10 14:04:53 -07:00
|
|
|
#if OLED_IC_HAS_HORIZONTAL_MODE
|
2022-11-13 10:49:59 -05:00
|
|
|
static uint8_t display_start[] = {I2C_CMD, COLUMN_ADDR, 0, OLED_DISPLAY_WIDTH - 1, PAGE_ADDR, 0, OLED_DISPLAY_HEIGHT / 8 - 1};
|
2023-05-10 14:04:53 -07:00
|
|
|
#else
|
|
|
|
|
static uint8_t display_start[] = {I2C_CMD, PAM_PAGE_ADDR, PAM_SETCOLUMN_LSB, PAM_SETCOLUMN_MSB};
|
|
|
|
|
#endif
|
2022-11-13 10:49:59 -05:00
|
|
|
if (!HAS_FLAGS(oled_rotation, OLED_ROTATION_90)) {
|
|
|
|
|
calc_bounds(update_start, &display_start[1]); // Offset from I2C_CMD byte at the start
|
|
|
|
|
} else {
|
|
|
|
|
calc_bounds_90(update_start, &display_start[1]); // Offset from I2C_CMD byte at the start
|
2019-08-30 11:19:03 -07:00
|
|
|
}
|
|
|
|
|
|
2022-11-13 10:49:59 -05:00
|
|
|
// Send column & page position
|
2023-05-10 14:04:53 -07:00
|
|
|
if (!oled_send_cmd(display_start, ARRAY_SIZE(display_start))) {
|
2022-11-13 10:49:59 -05:00
|
|
|
print("oled_render offset command failed\n");
|
2019-08-30 11:19:03 -07:00
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
2022-11-13 10:49:59 -05:00
|
|
|
if (!HAS_FLAGS(oled_rotation, OLED_ROTATION_90)) {
|
|
|
|
|
// Send render data chunk as is
|
2023-05-10 14:04:53 -07:00
|
|
|
if (!oled_send_data(&oled_buffer[OLED_BLOCK_SIZE * update_start], OLED_BLOCK_SIZE)) {
|
2022-11-13 10:49:59 -05:00
|
|
|
print("oled_render data failed\n");
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
// Rotate the render chunks
|
|
|
|
|
const static uint8_t source_map[] = OLED_SOURCE_MAP;
|
|
|
|
|
const static uint8_t target_map[] = OLED_TARGET_MAP;
|
|
|
|
|
|
|
|
|
|
static uint8_t temp_buffer[OLED_BLOCK_SIZE];
|
|
|
|
|
memset(temp_buffer, 0, sizeof(temp_buffer));
|
|
|
|
|
for (uint8_t i = 0; i < sizeof(source_map); ++i) {
|
|
|
|
|
rotate_90(&oled_buffer[OLED_BLOCK_SIZE * update_start + source_map[i]], &temp_buffer[target_map[i]]);
|
|
|
|
|
}
|
|
|
|
|
|
2023-05-10 14:04:53 -07:00
|
|
|
#if OLED_IC_HAS_HORIZONTAL_MODE
|
2022-11-13 10:49:59 -05:00
|
|
|
// Send render data chunk after rotating
|
2023-05-10 14:04:53 -07:00
|
|
|
if (!oled_send_data(&temp_buffer[0], OLED_BLOCK_SIZE)) {
|
2022-11-13 10:49:59 -05:00
|
|
|
print("oled_render90 data failed\n");
|
|
|
|
|
return;
|
|
|
|
|
}
|
2023-05-10 14:04:53 -07:00
|
|
|
#else
|
|
|
|
|
// For SH1106 or SH1107 the data chunk must be split into separate pieces for each page
|
|
|
|
|
const uint8_t columns_in_block = (OLED_BLOCK_SIZE + OLED_DISPLAY_HEIGHT - 1) / OLED_DISPLAY_HEIGHT * 8;
|
|
|
|
|
const uint8_t num_pages = OLED_BLOCK_SIZE / columns_in_block;
|
|
|
|
|
for (uint8_t i = 0; i < num_pages; ++i) {
|
|
|
|
|
// Send column & page position for all pages except the first one
|
|
|
|
|
if (i > 0) {
|
|
|
|
|
display_start[1]++;
|
|
|
|
|
if (!oled_send_cmd(display_start, ARRAY_SIZE(display_start))) {
|
|
|
|
|
print("oled_render offset command failed\n");
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
// Send data for the page
|
|
|
|
|
if (!oled_send_data(&temp_buffer[columns_in_block * i], columns_in_block)) {
|
|
|
|
|
print("oled_render90 data failed\n");
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
#endif
|
2022-11-13 10:49:59 -05:00
|
|
|
}
|
2019-08-30 11:19:03 -07:00
|
|
|
|
2022-11-13 10:49:59 -05:00
|
|
|
// Clear dirty flag of just rendered block
|
|
|
|
|
oled_dirty &= ~((OLED_BLOCK_TYPE)1 << update_start);
|
|
|
|
|
}
|
2019-04-15 22:32:57 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void oled_set_cursor(uint8_t col, uint8_t line) {
|
2019-08-30 11:19:03 -07:00
|
|
|
uint16_t index = line * oled_rotation_width + col * OLED_FONT_WIDTH;
|
2019-04-15 22:32:57 -05:00
|
|
|
|
2019-08-30 11:19:03 -07:00
|
|
|
// Out of bounds?
|
|
|
|
|
if (index >= OLED_MATRIX_SIZE) {
|
|
|
|
|
index = 0;
|
|
|
|
|
}
|
2019-04-15 22:32:57 -05:00
|
|
|
|
2019-08-30 11:19:03 -07:00
|
|
|
oled_cursor = &oled_buffer[index];
|
2019-04-15 22:32:57 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void oled_advance_page(bool clearPageRemainder) {
|
2019-08-30 11:19:03 -07:00
|
|
|
uint16_t index = oled_cursor - &oled_buffer[0];
|
|
|
|
|
uint8_t remaining = oled_rotation_width - (index % oled_rotation_width);
|
|
|
|
|
|
|
|
|
|
if (clearPageRemainder) {
|
|
|
|
|
// Remaining Char count
|
|
|
|
|
remaining = remaining / OLED_FONT_WIDTH;
|
|
|
|
|
|
|
|
|
|
// Write empty character until next line
|
2022-02-12 10:29:31 -08:00
|
|
|
while (remaining--)
|
|
|
|
|
oled_write_char(' ', false);
|
2019-08-30 11:19:03 -07:00
|
|
|
} else {
|
|
|
|
|
// Next page index out of bounds?
|
|
|
|
|
if (index + remaining >= OLED_MATRIX_SIZE) {
|
|
|
|
|
index = 0;
|
|
|
|
|
remaining = 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
oled_cursor = &oled_buffer[index + remaining];
|
2019-04-15 22:32:57 -05:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void oled_advance_char(void) {
|
2019-08-30 11:19:03 -07:00
|
|
|
uint16_t nextIndex = oled_cursor - &oled_buffer[0] + OLED_FONT_WIDTH;
|
|
|
|
|
uint8_t remainingSpace = oled_rotation_width - (nextIndex % oled_rotation_width);
|
2019-04-15 22:32:57 -05:00
|
|
|
|
2019-08-30 11:19:03 -07:00
|
|
|
// Do we have enough space on the current line for the next character
|
|
|
|
|
if (remainingSpace < OLED_FONT_WIDTH) {
|
|
|
|
|
nextIndex += remainingSpace;
|
|
|
|
|
}
|
2019-04-15 22:32:57 -05:00
|
|
|
|
2019-08-30 11:19:03 -07:00
|
|
|
// Did we go out of bounds
|
|
|
|
|
if (nextIndex >= OLED_MATRIX_SIZE) {
|
|
|
|
|
nextIndex = 0;
|
|
|
|
|
}
|
2019-04-15 22:32:57 -05:00
|
|
|
|
2019-08-30 11:19:03 -07:00
|
|
|
// Update cursor position
|
|
|
|
|
oled_cursor = &oled_buffer[nextIndex];
|
2019-04-15 22:32:57 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Main handler that writes character data to the display buffer
|
|
|
|
|
void oled_write_char(const char data, bool invert) {
|
2019-08-30 11:19:03 -07:00
|
|
|
// Advance to the next line if newline
|
|
|
|
|
if (data == '\n') {
|
|
|
|
|
// Old source wrote ' ' until end of line...
|
|
|
|
|
oled_advance_page(true);
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (data == '\r') {
|
|
|
|
|
oled_advance_page(false);
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// copy the current render buffer to check for dirty after
|
|
|
|
|
static uint8_t oled_temp_buffer[OLED_FONT_WIDTH];
|
|
|
|
|
memcpy(&oled_temp_buffer, oled_cursor, OLED_FONT_WIDTH);
|
|
|
|
|
|
Additional updates for firmware25 (#411)
* add 75_(ansi|iso) Community Layouts to mechlovin/olly/octagon (#22459)
* expand mechlovin/olly/octagon
* Update info.json
* Rename info.json to keyboard.json
* correct matrix position for key
* remove VIA
* [Core] get_keycode_string(): function to format keycodes as strings, for more readable debug logging. (#24787)
* keycode_string(): Format keycodes as strings.
This adds the `keycode_string()` function described in
https://getreuer.info/posts/keyboards/keycode-string/index.html
as a core feature.
* Fix formatting.
* keycode_string review revisions.
* Rename keycode_string() -> get_keycode_string() for consistency with
existing string utils like get_u8_str().
* Revise custom keycode names with separate _user and _kb tables.
* Correct indent in builddefs/generic_features.mk.
Co-authored-by: Ryan <fauxpark@gmail.com>
* Add KC_NUHS, KC_NUBS, and KC_CAPS.
* Fix linking error with custom names.
* Attempt at simplifying interface.
* Formatting fix.
* Several fixes and revisions.
* Don't use PSTR in KEYCODE_STRING_NAME, since this fails to build on
AVR. Store custom names in RAM.
* Revise the internal table of common keycode names to use its own
storage representation, still in PROGMEM, and now more efficiently
stored flat in 8 bytes per entry.
* Support Swap Hands keycodes and a few other keycodes.
* Revert "Formatting fix."
This reverts commit 2a2771068c7ee545ffac4103aa07e847a9ec3816.
* Revert "Attempt at simplifying interface."
This reverts commit 8eaf67de76e75bc92d106a8b0decc893fbc65fa5.
* Simplify custom names API by sigprof's suggestion.
* Support more keycodes.
* Add QK_LOCK keycode.
* Add Secure keycodes.
* Add Joystick keycodes.
* Add Programmable Button keycodes.
* Add macro MC_ keycodes.
* For remaining keys in known code ranges, stringify them as
"QK_<feature>+<number>". For instance, "QK_MIDI+7".
* Bug fix and a few improvements.
* Fix missing right-hand bit when displaying 5-bit mods numerically.
* Support KC_HYPR, KC_MEH, HYPR_T(kc), MEH_T(kc).
* Exclude one-shot keycodes when NO_ACTION_ONESHOT is defined.
---------
Co-authored-by: Ryan <fauxpark@gmail.com>
* Align to latest CLI dependencies (#24553)
* Align to latest CLI dependencies
* Update docs
* Add Community Layout support to daskeyboard4 (#23884)
add ansi CL
* Add the plywrks ply8x hotswap variant. (#23558)
* Add hotswap variant
* Update RGB matrix
* Move files around to target develop
* Revert rules.mk for keyboards/jaykeeb/joker/rules.mk
* Update keyboards/plywrks/ply8x/hotswap/keyboard.json
Co-authored-by: Drashna Jaelre <drashna@live.com>
* Apply suggestions from code review
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
* Add missing community layouts
* Delete keyboards/plywrks/ply8x/rules.mk
* Update missing keys in RGB matrix
* Add missing key in RGB matrix for hotswap ver
* Remove via keymaps
* Add keyboard alias for plywrks/ply8x to plywrks/ply8x/solder
* Fix typo
* Fix another typo
---------
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
* [Core] use `keycode_string` in unit tests (#25042)
* tests: use keycode_string feature
With a proper keycode to string implementation in qmk there is no need
to use the unit tests only implementation anymore.
Signed-off-by: Stefan Kerkmann <karlk90@pm.me>
* tests: remove keycode_util feature
This feature is no longer used as we switched the tests to the
keycode string implementation.
Signed-off-by: Stefan Kerkmann <karlk90@pm.me>
* Non-volatile memory data repository pattern (#24356)
* First batch of eeconfig conversions.
* Offset and length for datablocks.
* `via`, `dynamic_keymap`.
* Fix filename.
* Commentary.
* wilba leds
* satisfaction75
* satisfaction75
* more keyboard whack-a-mole
* satisfaction75
* omnikeyish
* more whack-a-mole
* `generic_features.mk` to automatically pick up nvm repositories
* thievery
* deferred variable resolve
* whitespace
* convert api to structs/unions
* convert api to structs/unions
* convert api to structs/unions
* fixups
* code-side docs
* code size fix
* rollback
* nvm_xxxxx_erase
* Updated location of eeconfig magic numbers so non-EEPROM nvm drivers can use them too.
* Fixup build.
* Fixup compilation error with encoders.
* Build fixes.
* Add `via_ci` keymap to onekey to exercise VIA bindings (and thus dynamic keymap et.al.), fixup compilation errors based on preprocessor+sizeof.
* Build failure rectification.
* Migrate remaining `split.soft_serial_pin` to `split.serial.pin` (#25046)
* Migrate keyboards/bastardkb
* Migrate keyboards/handwired
* Migrate keyboards/helix
* Fix duplicate serial key
* Fix outdated GPIO control function usage (#25060)
* [Modules] Provide access to current path in `rules.mk`. (#25061)
* Update keymap for keycult 1800 (#25070)
Update keymap
Co-authored-by: yiancar <yiancar@gmail.com>
* Add handwired/erikpeyronson/erkbd (#25030)
Co-authored-by: Erik Peyronson <erik.peyronson@gmail.com>
Co-authored-by: jack <jack@pngu.org>
Co-authored-by: Drashna Jaelre <drashna@live.com>
* Add support for Starry FRL (#24626)
Co-authored-by: jack <jack@pngu.org>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
* Add "Large Lad" keyboard (#24727)
Co-authored-by: jack <jack@pngu.org>
* Bump vite from 5.4.12 to 5.4.15 in /builddefs/docsgen (#25065)
Bumps [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite) from 5.4.12 to 5.4.15.
- [Release notes](https://github.com/vitejs/vite/releases)
- [Changelog](https://github.com/vitejs/vite/blob/v5.4.15/packages/vite/CHANGELOG.md)
- [Commits](https://github.com/vitejs/vite/commits/v5.4.15/packages/vite)
---
updated-dependencies:
- dependency-name: vite
dependency-type: direct:development
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Allow AnnePro2 to reboot (#24886)
Without this, the QK_REBOOT key did nothing.
* Fix path typo related RP2040 (#25069)
Fix path typo
* Update onekey example for nucleo f446re (#25067)
* use accessible pins for nucleo f446re onekey example
* remove pin collision with matrix in keyboard.json
* use accessible pins for LED
* remove pin collision with matrix
* Update readme.md to reflect pin changes
* Module documentation typo correction (#25073)
* Fix lockups on AVR with `qmk/hello_world` module (#25074)
Fix lockups on AVR.
* At101ish (#25072)
* Dell AT101 replacement pcb support
* Update keyboards/at101ish/readme.md
Co-Authored-By: fauxpark <fauxpark@gmail.com>
* remove empty src clause in makefile
* feature: Update at101ish to qmk v0.28
* feature: Add osdetecting keymap variant.
* refactor: Move at101ish keyboard to handwired folder.
* fix: Adjust at101ish readme-
* fix: review changes.
* chore: Remove unneeded feature.
---------
Co-authored-by: fauxpark <fauxpark@gmail.com>
* Add "license" field to Community Module JSON schema. (#25085)
Add "license" field to community module schema.
* Add kt60HS-T v2 PCB (#25080)
* Add kt60HS-Tv2
* Update keyboards/keyten/kt60hs_t/readme.md
Co-authored-by: Sergey Vlasov <sigprof@gmail.com>
* Update keyboards/keyten/kt60hs_t/v1/readme.md
Co-authored-by: Sergey Vlasov <sigprof@gmail.com>
* Update keyboards/keyten/kt60hs_t/v2/keyboard.json
Co-authored-by: Sergey Vlasov <sigprof@gmail.com>
* Update keyboards/keyten/kt60hs_t/v2/readme.md
Co-authored-by: Sergey Vlasov <sigprof@gmail.com>
* Update keyboards/keyten/kt60hs_t/info.json
Co-authored-by: Sergey Vlasov <sigprof@gmail.com>
* Change of structure
* Moving the keyboard
* Update data/mappings/keyboard_aliases.hjson
Co-authored-by: Sergey Vlasov <sigprof@gmail.com>
* Update keyboards/keyten/kt60hs_t/v1/keyboard.json
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
* Update keyboards/keyten/kt60hs_t/v2/keyboard.json
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
---------
Co-authored-by: Sergey Vlasov <sigprof@gmail.com>
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
* Make sure that unit tests run on all release versions
* [ErgoDox EZ] Fix complication issues due to updates
* [ErgoDox EZ] Fix compilication errors and warnings
We want all green!
* Fix 'qmk lint -kb' argument handling (#25093)
* Refactor Deemen17 Works DE60 (#25088)
* Add Coban Pad 12A (#25039)
Co-authored-by: jack <jack@pngu.org>
* [Keyboard] Add PHDesign PH60/Multi Keyboard PCB (#25086)
* Add PH60/Multi Support
* Add PCB PIcture for README
* Remove MO(_FN2)
* README Typo Fix
* Layout and README Adjustment
* Add README for PHDesign Main Folder
* Keymap Improvement
* Update README.md
* [Keyboard] Add Ortho Slayer (#25099)
* Add Ortho Slayer
* Update keyboards/keyten/ortho_slayer/keymaps/default/keymap.c
Co-authored-by: jack <jack@pngu.org>
* Update keyboards/keyten/ortho_slayer/readme.md
Co-authored-by: jack <jack@pngu.org>
---------
Co-authored-by: jack <jack@pngu.org>
* Fix coban pad9a wrong layout in keyboard.json (#25100)
* Remove `CTPC`/`CONVERT_TO_PROTON_C` options (#25111)
* Remove direct docs.qmk.fm links from docs (#25113)
* Add warning when deprecated 'promicro_rp2040' is used (#25112)
* Add Vida to QMK (#24225)
Co-authored-by: jack <jack@pngu.org>
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
* More Windows->Unix style path fixes. (#25119)
* Include `math.h` where necessary. (#25122)
* Cater for use of `__errno_r()` in ChibiOS syscalls.c with newer picolibc revisions (#25121)
* chore: Allow disabling underglow on Work Louder devices (#25123) (#25120)
* Allow disabling Underglow on Work Louder devices
Allows disabling Underglow on Work Louder devices by using `RGBLIGHT_ENABLE = no` on rules.mk
* Update keyboards/work_louder/rgb_functions.c
Suggested by @zvecr on review.
Co-authored-by: Joel Challis <git@zvecr.com>
---------
Co-authored-by: Joel Challis <git@zvecr.com>
* Exclude external userspace from lint checking (#24680)
* fix: Fix startup sound for Preonic (#25132) (#25133)
Add `AUDIO_INIT_DELAY ` to config.h to resolve
* New standard layout for Savage65 (65_ansi_blocker_tsangan_split_bs) (#24690)
* Added a default firmware and layout for the WindStudio Wind X R1
keyboard.
* Wind X R1: cleaned-up the folders to make clear that this firmware is
for the release 1 of this keyboard.
* Delete keyboards/windstudio/wind_x/R1 directory
Removing the uppercase R1 folder
* feat(cannonkeys/savage65): Added layout to keyboard.json
- Added the layout LAYOUT_65_ansi_blocker_tsangan_split_bs to the
community layouts.
* kradoindustries_promenade: add LAYOUT_1x2u (#25090)
* Update shuguet/shu89 (#24780)
* Update keyboard.json
Update mod keys location in RGB layout.
* Update keyboard.json
* Update keyboards/shuguet/shu89/keyboard.json
Co-authored-by: Ryan <fauxpark@gmail.com>
---------
Co-authored-by: Ryan <fauxpark@gmail.com>
* [Keyboard] Add suika83opti (#24991)
* [chore]: move and rename mouse/scroll min/max defines (#25141)
* protocol: move {XY/HV}_REPORT_{MIN,MAX} into report.h
..to allow easier re-use in other code implementations.
* protocol: rename {XY/HV}_REPORT_{MIN/MAX} to MOUSE_REPORT_{XY/HV}_{MIN/MAX}
..to avoid naming collisions.
* [Core] Flow Tap tap-hold option to disable HRMs during fast typing (#25125)
aka Global Quick Tap, Require Prior Idle
* Add Link keyboard (#25058)
Co-authored-by: jack <jack@pngu.org>
Co-authored-by: Drashna Jaelre <drashna@live.com>
* Remove Sofle `rgb_default` keymap & tidy readme's (#25010)
* Added Keyboard LumPy27 (#24967)
Co-authored-by: jack <jack@pngu.org>
Co-authored-by: Drashna Jaelre <drashna@live.com>
* [Keyboard] Kobold r1 (#25161)
* Kobold r1
* Apply suggestions from code review
Co-authored-by: jack <jack@pngu.org>
* `board_init` => `early_hardware_init_post`.
---------
Co-authored-by: jack <jack@pngu.org>
* [Docs] Unify lighting step descriptions (#25167)
unify lighting step descriptions and defaults across docs
* [Keyboard] Add voidhhkb-hotswap (#25007)
* Added files for voidhhkb-hotswap
* Updated keyboard name to resolve build errors
* Implement suggestions from PR. Use 60_hhkb community layout.
* Update keyboards/void/voidhhkb_hotswap/readme.md
Co-authored-by: Ryan <fauxpark@gmail.com>
* Apply suggestions from code review
Co-authored-by: jack <jack@pngu.org>
---------
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: jack <jack@pngu.org>
* Remove duplication of RGB Matrix defaults (#25146)
* Remove duplication of RGB Matrix defaults
* Remove more duplication of defaults
* fix
* Fix missing and extra commas in JSON schema (#25057)
* Remove duplication of RGBLight defaults (#25169)
* Ignore the Layer Lock key in Repeat Key and Caps Word. (#25171)
* Allow for disabling EEPROM subsystem entirely. (#25173)
* [keyboard] ymdk/id75/rp2040 (#25157)
Co-authored-by: tao heihei <>
* Remove `bluefruit_le_read_battery_voltage` function (#25129)
* Fix 'Would you like to clone the submodules?' prompt under msys (#24958)
* Fixup eeconfig lighting reset. (#25166)
* DOCS: `qmk-hid` missing in bootloaders list? (#25177)
* Fix for `.clangd`. (#25180)
* Update develop branch to Pico SDK 1.5.1 (#25178)
* Add lint warning for empty url (#25182)
* Implement connection keycode logic (#25176)
* Add handwired/footy (#25151)
Co-authored-by: jack <jack@pngu.org>
* Decrease firmware size for `anavi/macropad8`. (#25185)
Preparation for bootstrapper.
* Align ChibiOS `USB_WAIT_FOR_ENUMERATION` implementation (#25184)
* [Bug][Core] Fix for Flow Tap: fix handling of distinct taps and timer updates. (#25175)
* Flow Tap bug fix.
As reported by @amarz45 and @mwpardue, there is a bug where if two
tap-hold keys are pressed in distinct taps back to back, then Flow Tap
is not applied on the second tap-hold key, but it should be.
In a related bug reported by @NikGovorov, if a tap-hold key is held
followed by a tap of a tap-hold key, then Flow Tap updates its timer on
the release of the held tap-hold key, but it should be ignored.
The problem common to both these bugs is that I incorrectly assumed
`tapping_key` is cleared to noevent once it is released, when actually
`tapping_key` is still maintained for `TAPPING_TERM` ms after release
(for Quick Tap). This commit fixes that. Thanks to @amarz45, @mwpardue,
and @NikGovorov for reporting!
Details:
* Logic for converting the current tap-hold event to a tap is extracted
to `flow_tap_key_if_within_term()`, which is now invoked also in the
post-release "interfered with other tap key" case. This fixes the
distinct taps bug.
* The Flow Tap timer is now updated at the beginning of each call to
`process_record()`, provided that there is no unsettled tap-hold key
at that time and that the record is not for a mod or layer switch key.
By moving this update logic to `process_record()`, it is conceptually
simpler and more robust.
* Unit tests extended to cover the reported scenarios.
* Fix formatting.
* Revision to fix @NikGovorov's scenario.
The issue is that when another key is pressed while a layer-tap hasn't
been settled yet, the `prev_keycode` remembers the keycode from before
the layer switched. This can then enable Flow Tap for the following key
when it shouldn't, or vice versa.
Thanks to @NikGovorov for reporting!
This commit revises Flow Tap in the following ways:
* The previous key and timer are both updated from `process_record()`.
This is slightly later in the sequence of processing than before, and
by this point, a just-settled layer-tap should have taken effect so
that the keycode from the correct layer is remembered.
* The Flow Tap previous key and timer are updated now also on key
release events, except for releases of modifiers and held layer
switches.
* The Flow Tap previous key and timer are now updated together, for
simplicity. This makes the logic easier to think about.
* A few additional unit tests, including @NikGovorov's scenario as
"layer_tap_ignored_with_disabled_key_complex."
* Remove empty `url` fields (#25181)
* Prompt for converter when creating new keymap (#25116)
* High resolution scrolling (without feature report parsing) (#24423)
* hires scrolling without feature report parsing
* fix valid range for exponent
* fix incorrect minimum exponent value documentation
* Avoid duplication in generated community modules `rules.mk` (#25135)
* Bump rlespinasse/github-slug-action from 3 to 5 (#25021)
* Remove `"console":false` from keyboards (#25190)
* Update 'qmk generate-api' to only publish pure DD keymaps (#24782)
* Remove more duplication of defaults (#25189)
* Align `new-keyboard` template to current standards (#25191)
* Bump vite from 5.4.15 to 5.4.18 in /builddefs/docsgen (#25192)
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Fix `boardsource/beiwagon` RGB Matrix coordinates (#25018)
* Remove `"command":false` from keyboards (#25193)
* Extend lint checks to reject duplication of defaults (#25149)
* modelh: add prerequisites for via support (#24932)
* First TypeK support (#22876)
* Add Lemokey X0 keyboard (#24994)
* keyboards/annepro2/ld: Add per-variant linker scripts (#24999)
C18 has an MCU with 16K SRAM, up from C15's 8K.
Split the linker script into C15 and C18 variants to make use of the
larger RAM capacity of C18.
* Add new keyboard MirageiX (#25054)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: jack <0x6a73@protonmail.com>
* [Keymap] Sofle RGB - fixed stuck on numpad layer and layout comments (#24942)
* Add handwired 4x14 LuMaWing keyboard (#24885)
* Add jcpm2 (JC Pro Macro 2) (#24816)
Co-authored-by: jack <jack@pngu.org>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Joel Challis <git@zvecr.com>
* [Keyboard] Add splitkb.com's Halcyon Elora rev2 (#24790)
Co-authored-by: Drashna Jaelre <drashna@live.com>
* [Keyboard] mzmkb/slimdash/rev1 (#24804)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: jack <jack@pngu.org>
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
* Added new keyboard epssp75 (#24756)
Co-authored-by: Drashna Jaelre <drashna@live.com>
* Addition of OK-1 (#24646)
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
* Add Umbra keyboard (#24569)
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
* Amptrics 0420 keyboard addition (#24744)
Co-authored-by: jack <jack@pngu.org>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
* [Core] Enhance Flow Tap to work better for rolls over multiple tap-hold keys. (#25200)
* Flow Tap revision for rolling press.
* Remove debugging cruft.
* Formatting fix.
* amptrics/0422 - Prevent OOB in `update_leds_for_layer` (#25209)
* [Keyboard] Add Gravity-45(#25206)
* add gravity-45
* readme.md
* fix readme
* Update keyboards/green_keys/gravity_45/keyboard.json
Co-authored-by: jack <0x6a73@protonmail.com>
* run qmk format-json -i keyboards/green_keys/gravity_45/keyboard.json
* add url
* Update keyboards/green_keys/gravity_45/keyboard.json
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
* Update keyboard.json
* Update keyboard.json
* Update keyboards/green_keys/gravity_45/keyboard.json
Co-authored-by: Drashna Jaelre <drashna@live.com>
---------
Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
* Remove redundant keyboard headers (#25208)
* Fix Spleeb compile when pointing device is enabled (#25016)
* [Bug] Minimise force-included files (#25194)
* Add additional hooks for Community modules (#25050)
* Workaround for resolving keyboard alias for config file values (#25228)
* Generate versions to keycode headers (#25219)
* Resolve alias for `qmk new-keymap` keyboard prompts (#25210)
* [Keyboard] Add Binepad KN01 (#25224)
* Add Binepad NeoKnob KN01
* post @waffle87 recommendations
* Add battery changed callbacks (#25207)
* Ensure `qmk_userspace_paths` maintains detected order (#25204)
* Bind Bluetooth driver to `host_driver_t` (#25199)
* Deprecate `qmk generate-compilation-database`. (#25237)
* Remove force disable of NKRO when Bluetooth enabled (#25201)
* Keycult 60 (#25213)
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
Co-authored-by: jack <jack@pngu.org>
* [Keyboard] Add Binepad KnobX1 (#25222)
Co-authored-by: Drashna Jaelre <drashna@live.com>
* [Keyboard] Update Tractyl Manuform and add F405 (weact) variant (#24764)
* Layout corrections: Zed60 (#25003)
* Fixed print statement after enabling 32-bit layers (#25027)
* Fix Aurora sweep default keymap configuration (#25148)
* Docs update for installing qmk with uv (#24995)
* CXT Studio 12E3: Fix encoder resolutions not applying (#25242)
* add resolution to encoders so they apply
* Tweak default keymap
* replace KC_UNDO with C(KC_Z) as well
* Add debounce to duplicated defaults check (#25246)
* [Docs] Fix typos introduced by PR #25050 (#25250)
It isn't a drashna PR if there aren't some typos in it somewhere.
* Allow LVGL onekey keymap to be able compile for other board (#25005)
* [Keyboard] Add Jason Hazel’s Bad Wings v2 (#25252)
Co-authored-by: Florent Allard <florent.allard@savoirfairelinux.com>
* Add raw_hid support to host driver (#25255)
* Fix Wear Leveling compilation (#25254)
* [New Feature/Core] New RGB Matrix Animation "Starlight Smooth" (#25203)
* Enable community modules to define LED matrix and RGB matrix effects. (#25187)
Co-authored-by: Joel Challis <git@zvecr.com>
* Fix OS_DETECTION_KEYBOARD_RESET (#25015)
Co-authored-by: Nick Brassel <nick@tzarc.org>
* Fixes the numlock indicator for Magic Force MF17 numpad (#25260)
* Add Harite v2 keyboard (#24975)
* dlip/haritev2 - Post merge fixes (#25264)
* Remove more USB only branches from NKRO handling (#25263)
* Deprecate `usb.force_nkro`/`FORCE_NKRO` (#25262)
* Add BDN9 Rev. 3 (#25261)
* Remove duplicate of SPI default config from keyboards (#25266)
* Resolve miscellaneous keyboard lint warnings (#25268)
* Add Zeropad (#24737)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Joel Challis <git@zvecr.com>
* Add Waveshare RP2040-Keyboard-3 support (#25269)
* Update PR checklist notes on custom matrix (#25240)
* Chew folders (#24785)
* gcc15 AVR compilation fixes (#25238)
* [Core] STM32G0x1 support (#24301)
* Use relative paths for schemas, instead of $id. Enables VScode validation. (#25251)
* add doio/kb03 (#24815)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Joel Challis <git@zvecr.com>
* Move rookiebwoy to ivndbt (#25142)
* [Chore] use {rgblight,rgb_matrix}_hsv_to_rgb overrides (#25271)
* Remove outdated `nix` support due to bit-rot. (#25280)
* Add `compiler_support.h` (#25274)
* Configure boards to use development_board - 0-9 (#25287)
* [Fix] lib8tion: enable fixed scale8 and blend functions (#25272)
lib8tion: enable fixed scale8 and blend functions
These FastLED derived lib8tion functions have been fixed and enabled by
default in FastLED. QMK just never set these defines, there is no reason
to keep the buggy implementation. It is assumed that nobody relied on
the buggy behavior.
* Configure boards to use development_board - UVWXYZ (#25288)
* [Docs] Fix tap_hold code blocks (#25298)
* salicylic_acid3/getta25 - Fix oled keymap (#25295)
* Configure boards to use development_board - S (#25293)
* Configure boards to use development_board - T (#25294)
* 2025 Q2 changelog (#25297)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Nick Brassel <nick@tzarc.org>
* Update Oryx module for newer code
* Soft reset matrix
* Use improved i2c reset for voyager and moonlander matrix
* Fix formatting
* Remove labeler action (unneeded)
* Fix module API version for Oryx module
* Use i2cStop instead of trying to work around
---------
Signed-off-by: Stefan Kerkmann <karlk90@pm.me>
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
Co-authored-by: QMK Bot <hello@qmk.fm>
Co-authored-by: Pascal Getreuer <50221757+getreuer@users.noreply.github.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ramon Imbao <ramonimbao@gmail.com>
Co-authored-by: Stefan Kerkmann <karlk90@pm.me>
Co-authored-by: Nick Brassel <nick@tzarc.org>
Co-authored-by: jack <jack@pngu.org>
Co-authored-by: yiancar <yiangosyiangou@cytanet.com.cy>
Co-authored-by: yiancar <yiancar@gmail.com>
Co-authored-by: Erik Peyronson <erikpeyronson@gmail.com>
Co-authored-by: Erik Peyronson <erik.peyronson@gmail.com>
Co-authored-by: Sắn <59417802+MaiTheSan@users.noreply.github.com>
Co-authored-by: Hyphen-ated <Hyphen-ated@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Geoffrey Frogeye <s+github@frogeye.fr>
Co-authored-by: lsh4711 <120231876+lsh4711@users.noreply.github.com>
Co-authored-by: Ben Green <bengreen.uk@gmail.com>
Co-authored-by: フィルターペーパー <76888457+filterpaper@users.noreply.github.com>
Co-authored-by: henrikosorensen <henrik.sorensen@gmail.com>
Co-authored-by: Ivan Gromov <38141348+key10iq@users.noreply.github.com>
Co-authored-by: Sergey Vlasov <sigprof@gmail.com>
Co-authored-by: Pham Duc Minh <95753855+Deemen17@users.noreply.github.com>
Co-authored-by: Dam Vu Duy <RyanDam@users.noreply.github.com>
Co-authored-by: nonameCCC <79012391+nonameCCC@users.noreply.github.com>
Co-authored-by: sudo pacman -Syu <hauvipapro@gmail.com>
Co-authored-by: Andrew Kannan <andrew.kannan@gmail.com>
Co-authored-by: Luis Garcia <luis@bitjester.com>
Co-authored-by: Christian C. Berclaz <christian.berclaz@mac.com>
Co-authored-by: Olivier Mehani <shtrom-github@ssji.net>
Co-authored-by: Sylvain Huguet <sylvain@huguet.me>
Co-authored-by: suikagiken <115451678+suikagiken@users.noreply.github.com>
Co-authored-by: Daniel Reisch <danieljreisch@gmail.com>
Co-authored-by: ClownFish <177758267+clownfish-og@users.noreply.github.com>
Co-authored-by: JamesWilson1996 <47866504+JamesWilson1996@users.noreply.github.com>
Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com>
Co-authored-by: Jan Bláha <blaha.j502@gmail.com>
Co-authored-by: Eric Molitor <534583+emolitor@users.noreply.github.com>
Co-authored-by: CJ Pais <cj@cjpais.com>
Co-authored-by: eynsai <47629346+eynsai@users.noreply.github.com>
Co-authored-by: Joel Beckmeyer <joel@beckmeyer.us>
Co-authored-by: Álvaro A. Volpato <alvaro.augusto.volpato@gmail.com>
Co-authored-by: Aidan Gauland <aidalgol@users.noreply.github.com>
Co-authored-by: Michał Kopeć <michal@nozomi.space>
Co-authored-by: takashicompany <t@kashi.company>
Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Matheus Marques <matheusmbar@gmail.com>
Co-authored-by: LucasMateijsen <l.mateijsen@outlook.com>
Co-authored-by: Jeremy Cook <jscook55@gmail.com>
Co-authored-by: VeyPatch <126267034+VeyPatch@users.noreply.github.com>
Co-authored-by: mizma <omoikane@path-works.net>
Co-authored-by: hen-des <141591967+hen-des@users.noreply.github.com>
Co-authored-by: Cipulot <40441626+Cipulot@users.noreply.github.com>
Co-authored-by: josephawilliamsiv <31166673+josephawilliamsiv@users.noreply.github.com>
Co-authored-by: vchowl <vchowl@outlook.com>
Co-authored-by: Christopher Hoage <iam@chrishoage.com>
Co-authored-by: Silvino R. <366673+silvinor@users.noreply.github.com>
Co-authored-by: dabstractor <dustindschultz@gmail.com>
Co-authored-by: Nathan Cain <13713501+nathanscain@users.noreply.github.com>
Co-authored-by: muge <221161+muge@users.noreply.github.com>
Co-authored-by: HorrorTroll <sonicvipduc@gmail.com>
Co-authored-by: cyxae <cyxae@amphitryon.nrst.fr>
Co-authored-by: Florent Allard <florent.allard@savoirfairelinux.com>
Co-authored-by: art-was-here <mail@buckles.email>
Co-authored-by: Matti Hiljanen <170205+qvr@users.noreply.github.com>
Co-authored-by: Wasteland Fluttershy <ingvardm@gmail.com>
Co-authored-by: Dane Lipscombe <danelipscombe@gmail.com>
Co-authored-by: Danny <nooges@users.noreply.github.com>
Co-authored-by: Infos <136488157+diffrentGuesser@users.noreply.github.com>
Co-authored-by: Florent Linguenheld <f@linguenheld.fr>
Co-authored-by: ivan <81021475+ivndbt@users.noreply.github.com>
Co-authored-by: Pablo Martínez <58857054+elpekenin@users.noreply.github.com>
2025-06-04 01:26:21 -07:00
|
|
|
STATIC_ASSERT(sizeof(font) >= ((OLED_FONT_END + 1 - OLED_FONT_START) * OLED_FONT_WIDTH), "OLED_FONT_END references outside array");
|
2020-02-11 16:38:20 -05:00
|
|
|
|
2019-08-30 11:19:03 -07:00
|
|
|
// set the reder buffer data
|
2022-02-12 10:29:31 -08:00
|
|
|
uint8_t cast_data = (uint8_t)data; // font based on unsigned type for index
|
2019-08-30 11:19:03 -07:00
|
|
|
if (cast_data < OLED_FONT_START || cast_data > OLED_FONT_END) {
|
|
|
|
|
memset(oled_cursor, 0x00, OLED_FONT_WIDTH);
|
|
|
|
|
} else {
|
|
|
|
|
const uint8_t *glyph = &font[(cast_data - OLED_FONT_START) * OLED_FONT_WIDTH];
|
|
|
|
|
memcpy_P(oled_cursor, glyph, OLED_FONT_WIDTH);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Invert if needed
|
|
|
|
|
if (invert) {
|
|
|
|
|
InvertCharacter(oled_cursor);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Dirty check
|
|
|
|
|
if (memcmp(&oled_temp_buffer, oled_cursor, OLED_FONT_WIDTH)) {
|
|
|
|
|
uint16_t index = oled_cursor - &oled_buffer[0];
|
OLED driver fixes (#10377)
* Fix dirtying in oled_write_pixel()
Set the dirty bit for the block only if oled_write_pixel() actually
changed the buffer state. Without this check oled_write_pixel() could
not be used inside the oled_task_user() code using the “redraw always”
style, because the blocks touched by oled_write_pixel() would always
appear dirty, and oled_render() would not proceed beyond the first such
dirty block.
* Fix oled_write_pixel() with 90/270 degree rotation
Use oled_rotation_width instead of OLED_DISPLAY_WIDTH, so that a rotated
display would be handled correctly.
* Fix compilation with custom OLED_BLOCK_COUNT and OLED_BLOCK_SIZE
Some OLED sizes (e.g., 64×48) may require a nonstandard value of
OLED_BLOCK_COUNT. The documentation says that this value may be
redefined in config.h, but actually trying to redefine it caused a
compile error, because the macro was redefined in oled_driver.c.
Make the OLED_BLOCK_COUNT definition in oled_driver.c respect any
user override, and do the same for OLED_BLOCK_SIZE just in case.
* Fix handling of out-of-range bits in oled_dirty
If a custom OLED_BLOCK_COUNT value is specified, some bits in oled_dirty
may not correspond to existing blocks; however, if those bits are set
somewhere (e.g., by code with sets oled_dirty to ~0 or even -1),
oled_render() would try to handle them and could access memory beyond
oled_buffer and perform hardware operations with out of range values.
Prevent this by masking off unused bits in oled_render(), and also avoid
setting those bits in other functions.
* Fix potentially wrong dirtying in oled_write_char()
oled_write_char() tried to mark the position just beyond the written
character as dirty; use (OLED_FONT_WIDTH - 1) to dirty the last position
still belonging to the character instead.
* Fix `#define OLED_BLOCK_TYPE uint32_t` on AVR
Using uint32_t as OLED_BLOCK_TYPE did not work properly on AVR, because
some bit shifts were performed using 16-bit int. Add explicit casts to
OLED_BLOCK_TYPE to those shifts.
2020-10-03 21:44:19 +03:00
|
|
|
oled_dirty |= ((OLED_BLOCK_TYPE)1 << (index / OLED_BLOCK_SIZE));
|
2019-08-30 11:19:03 -07:00
|
|
|
// Edgecase check if the written data spans the 2 chunks
|
OLED driver fixes (#10377)
* Fix dirtying in oled_write_pixel()
Set the dirty bit for the block only if oled_write_pixel() actually
changed the buffer state. Without this check oled_write_pixel() could
not be used inside the oled_task_user() code using the “redraw always”
style, because the blocks touched by oled_write_pixel() would always
appear dirty, and oled_render() would not proceed beyond the first such
dirty block.
* Fix oled_write_pixel() with 90/270 degree rotation
Use oled_rotation_width instead of OLED_DISPLAY_WIDTH, so that a rotated
display would be handled correctly.
* Fix compilation with custom OLED_BLOCK_COUNT and OLED_BLOCK_SIZE
Some OLED sizes (e.g., 64×48) may require a nonstandard value of
OLED_BLOCK_COUNT. The documentation says that this value may be
redefined in config.h, but actually trying to redefine it caused a
compile error, because the macro was redefined in oled_driver.c.
Make the OLED_BLOCK_COUNT definition in oled_driver.c respect any
user override, and do the same for OLED_BLOCK_SIZE just in case.
* Fix handling of out-of-range bits in oled_dirty
If a custom OLED_BLOCK_COUNT value is specified, some bits in oled_dirty
may not correspond to existing blocks; however, if those bits are set
somewhere (e.g., by code with sets oled_dirty to ~0 or even -1),
oled_render() would try to handle them and could access memory beyond
oled_buffer and perform hardware operations with out of range values.
Prevent this by masking off unused bits in oled_render(), and also avoid
setting those bits in other functions.
* Fix potentially wrong dirtying in oled_write_char()
oled_write_char() tried to mark the position just beyond the written
character as dirty; use (OLED_FONT_WIDTH - 1) to dirty the last position
still belonging to the character instead.
* Fix `#define OLED_BLOCK_TYPE uint32_t` on AVR
Using uint32_t as OLED_BLOCK_TYPE did not work properly on AVR, because
some bit shifts were performed using 16-bit int. Add explicit casts to
OLED_BLOCK_TYPE to those shifts.
2020-10-03 21:44:19 +03:00
|
|
|
oled_dirty |= ((OLED_BLOCK_TYPE)1 << ((index + OLED_FONT_WIDTH - 1) / OLED_BLOCK_SIZE));
|
2019-08-30 11:19:03 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Finally move to the next char
|
|
|
|
|
oled_advance_char();
|
2019-04-15 22:32:57 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void oled_write(const char *data, bool invert) {
|
2019-08-30 11:19:03 -07:00
|
|
|
const char *end = data + strlen(data);
|
|
|
|
|
while (data < end) {
|
|
|
|
|
oled_write_char(*data, invert);
|
|
|
|
|
data++;
|
|
|
|
|
}
|
2019-04-15 22:32:57 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void oled_write_ln(const char *data, bool invert) {
|
2019-08-30 11:19:03 -07:00
|
|
|
oled_write(data, invert);
|
|
|
|
|
oled_advance_page(true);
|
2019-04-15 22:32:57 -05:00
|
|
|
}
|
|
|
|
|
|
2020-03-06 16:52:39 -08:00
|
|
|
void oled_pan(bool left) {
|
|
|
|
|
uint16_t i = 0;
|
2020-03-07 01:24:47 +00:00
|
|
|
for (uint16_t y = 0; y < OLED_DISPLAY_HEIGHT / 8; y++) {
|
|
|
|
|
if (left) {
|
2020-03-06 16:52:39 -08:00
|
|
|
for (uint16_t x = 0; x < OLED_DISPLAY_WIDTH - 1; x++) {
|
2020-03-07 01:24:47 +00:00
|
|
|
i = y * OLED_DISPLAY_WIDTH + x;
|
|
|
|
|
oled_buffer[i] = oled_buffer[i + 1];
|
2020-03-06 16:52:39 -08:00
|
|
|
}
|
|
|
|
|
} else {
|
2020-03-07 01:24:47 +00:00
|
|
|
for (uint16_t x = OLED_DISPLAY_WIDTH - 1; x > 0; x--) {
|
|
|
|
|
i = y * OLED_DISPLAY_WIDTH + x;
|
|
|
|
|
oled_buffer[i] = oled_buffer[i - 1];
|
2020-03-06 16:52:39 -08:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
OLED driver fixes (#10377)
* Fix dirtying in oled_write_pixel()
Set the dirty bit for the block only if oled_write_pixel() actually
changed the buffer state. Without this check oled_write_pixel() could
not be used inside the oled_task_user() code using the “redraw always”
style, because the blocks touched by oled_write_pixel() would always
appear dirty, and oled_render() would not proceed beyond the first such
dirty block.
* Fix oled_write_pixel() with 90/270 degree rotation
Use oled_rotation_width instead of OLED_DISPLAY_WIDTH, so that a rotated
display would be handled correctly.
* Fix compilation with custom OLED_BLOCK_COUNT and OLED_BLOCK_SIZE
Some OLED sizes (e.g., 64×48) may require a nonstandard value of
OLED_BLOCK_COUNT. The documentation says that this value may be
redefined in config.h, but actually trying to redefine it caused a
compile error, because the macro was redefined in oled_driver.c.
Make the OLED_BLOCK_COUNT definition in oled_driver.c respect any
user override, and do the same for OLED_BLOCK_SIZE just in case.
* Fix handling of out-of-range bits in oled_dirty
If a custom OLED_BLOCK_COUNT value is specified, some bits in oled_dirty
may not correspond to existing blocks; however, if those bits are set
somewhere (e.g., by code with sets oled_dirty to ~0 or even -1),
oled_render() would try to handle them and could access memory beyond
oled_buffer and perform hardware operations with out of range values.
Prevent this by masking off unused bits in oled_render(), and also avoid
setting those bits in other functions.
* Fix potentially wrong dirtying in oled_write_char()
oled_write_char() tried to mark the position just beyond the written
character as dirty; use (OLED_FONT_WIDTH - 1) to dirty the last position
still belonging to the character instead.
* Fix `#define OLED_BLOCK_TYPE uint32_t` on AVR
Using uint32_t as OLED_BLOCK_TYPE did not work properly on AVR, because
some bit shifts were performed using 16-bit int. Add explicit casts to
OLED_BLOCK_TYPE to those shifts.
2020-10-03 21:44:19 +03:00
|
|
|
oled_dirty = OLED_ALL_BLOCKS_MASK;
|
2020-03-06 16:52:39 -08:00
|
|
|
}
|
|
|
|
|
|
2020-08-24 07:40:45 -07:00
|
|
|
oled_buffer_reader_t oled_read_raw(uint16_t start_index) {
|
|
|
|
|
if (start_index > OLED_MATRIX_SIZE) start_index = OLED_MATRIX_SIZE;
|
|
|
|
|
oled_buffer_reader_t ret_reader;
|
2020-08-29 22:57:48 +00:00
|
|
|
ret_reader.current_element = &oled_buffer[start_index];
|
2020-08-24 07:40:45 -07:00
|
|
|
ret_reader.remaining_element_count = OLED_MATRIX_SIZE - start_index;
|
|
|
|
|
return ret_reader;
|
|
|
|
|
}
|
|
|
|
|
|
2020-03-06 16:52:39 -08:00
|
|
|
void oled_write_raw_byte(const char data, uint16_t index) {
|
|
|
|
|
if (index > OLED_MATRIX_SIZE) index = OLED_MATRIX_SIZE;
|
|
|
|
|
if (oled_buffer[index] == data) return;
|
|
|
|
|
oled_buffer[index] = data;
|
OLED driver fixes (#10377)
* Fix dirtying in oled_write_pixel()
Set the dirty bit for the block only if oled_write_pixel() actually
changed the buffer state. Without this check oled_write_pixel() could
not be used inside the oled_task_user() code using the “redraw always”
style, because the blocks touched by oled_write_pixel() would always
appear dirty, and oled_render() would not proceed beyond the first such
dirty block.
* Fix oled_write_pixel() with 90/270 degree rotation
Use oled_rotation_width instead of OLED_DISPLAY_WIDTH, so that a rotated
display would be handled correctly.
* Fix compilation with custom OLED_BLOCK_COUNT and OLED_BLOCK_SIZE
Some OLED sizes (e.g., 64×48) may require a nonstandard value of
OLED_BLOCK_COUNT. The documentation says that this value may be
redefined in config.h, but actually trying to redefine it caused a
compile error, because the macro was redefined in oled_driver.c.
Make the OLED_BLOCK_COUNT definition in oled_driver.c respect any
user override, and do the same for OLED_BLOCK_SIZE just in case.
* Fix handling of out-of-range bits in oled_dirty
If a custom OLED_BLOCK_COUNT value is specified, some bits in oled_dirty
may not correspond to existing blocks; however, if those bits are set
somewhere (e.g., by code with sets oled_dirty to ~0 or even -1),
oled_render() would try to handle them and could access memory beyond
oled_buffer and perform hardware operations with out of range values.
Prevent this by masking off unused bits in oled_render(), and also avoid
setting those bits in other functions.
* Fix potentially wrong dirtying in oled_write_char()
oled_write_char() tried to mark the position just beyond the written
character as dirty; use (OLED_FONT_WIDTH - 1) to dirty the last position
still belonging to the character instead.
* Fix `#define OLED_BLOCK_TYPE uint32_t` on AVR
Using uint32_t as OLED_BLOCK_TYPE did not work properly on AVR, because
some bit shifts were performed using 16-bit int. Add explicit casts to
OLED_BLOCK_TYPE to those shifts.
2020-10-03 21:44:19 +03:00
|
|
|
oled_dirty |= ((OLED_BLOCK_TYPE)1 << (index / OLED_BLOCK_SIZE));
|
2020-03-06 16:52:39 -08:00
|
|
|
}
|
|
|
|
|
|
2019-11-03 23:34:47 +01:00
|
|
|
void oled_write_raw(const char *data, uint16_t size) {
|
2020-11-28 12:02:18 -08:00
|
|
|
uint16_t cursor_start_index = oled_cursor - &oled_buffer[0];
|
|
|
|
|
if ((size + cursor_start_index) > OLED_MATRIX_SIZE) size = OLED_MATRIX_SIZE - cursor_start_index;
|
|
|
|
|
for (uint16_t i = cursor_start_index; i < cursor_start_index + size; i++) {
|
2021-06-16 00:30:37 -05:00
|
|
|
uint8_t c = *data++;
|
|
|
|
|
if (oled_buffer[i] == c) continue;
|
|
|
|
|
oled_buffer[i] = c;
|
OLED driver fixes (#10377)
* Fix dirtying in oled_write_pixel()
Set the dirty bit for the block only if oled_write_pixel() actually
changed the buffer state. Without this check oled_write_pixel() could
not be used inside the oled_task_user() code using the “redraw always”
style, because the blocks touched by oled_write_pixel() would always
appear dirty, and oled_render() would not proceed beyond the first such
dirty block.
* Fix oled_write_pixel() with 90/270 degree rotation
Use oled_rotation_width instead of OLED_DISPLAY_WIDTH, so that a rotated
display would be handled correctly.
* Fix compilation with custom OLED_BLOCK_COUNT and OLED_BLOCK_SIZE
Some OLED sizes (e.g., 64×48) may require a nonstandard value of
OLED_BLOCK_COUNT. The documentation says that this value may be
redefined in config.h, but actually trying to redefine it caused a
compile error, because the macro was redefined in oled_driver.c.
Make the OLED_BLOCK_COUNT definition in oled_driver.c respect any
user override, and do the same for OLED_BLOCK_SIZE just in case.
* Fix handling of out-of-range bits in oled_dirty
If a custom OLED_BLOCK_COUNT value is specified, some bits in oled_dirty
may not correspond to existing blocks; however, if those bits are set
somewhere (e.g., by code with sets oled_dirty to ~0 or even -1),
oled_render() would try to handle them and could access memory beyond
oled_buffer and perform hardware operations with out of range values.
Prevent this by masking off unused bits in oled_render(), and also avoid
setting those bits in other functions.
* Fix potentially wrong dirtying in oled_write_char()
oled_write_char() tried to mark the position just beyond the written
character as dirty; use (OLED_FONT_WIDTH - 1) to dirty the last position
still belonging to the character instead.
* Fix `#define OLED_BLOCK_TYPE uint32_t` on AVR
Using uint32_t as OLED_BLOCK_TYPE did not work properly on AVR, because
some bit shifts were performed using 16-bit int. Add explicit casts to
OLED_BLOCK_TYPE to those shifts.
2020-10-03 21:44:19 +03:00
|
|
|
oled_dirty |= ((OLED_BLOCK_TYPE)1 << (i / OLED_BLOCK_SIZE));
|
2019-11-03 23:34:47 +01:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2020-07-15 22:48:04 -07:00
|
|
|
void oled_write_pixel(uint8_t x, uint8_t y, bool on) {
|
OLED driver fixes (#10377)
* Fix dirtying in oled_write_pixel()
Set the dirty bit for the block only if oled_write_pixel() actually
changed the buffer state. Without this check oled_write_pixel() could
not be used inside the oled_task_user() code using the “redraw always”
style, because the blocks touched by oled_write_pixel() would always
appear dirty, and oled_render() would not proceed beyond the first such
dirty block.
* Fix oled_write_pixel() with 90/270 degree rotation
Use oled_rotation_width instead of OLED_DISPLAY_WIDTH, so that a rotated
display would be handled correctly.
* Fix compilation with custom OLED_BLOCK_COUNT and OLED_BLOCK_SIZE
Some OLED sizes (e.g., 64×48) may require a nonstandard value of
OLED_BLOCK_COUNT. The documentation says that this value may be
redefined in config.h, but actually trying to redefine it caused a
compile error, because the macro was redefined in oled_driver.c.
Make the OLED_BLOCK_COUNT definition in oled_driver.c respect any
user override, and do the same for OLED_BLOCK_SIZE just in case.
* Fix handling of out-of-range bits in oled_dirty
If a custom OLED_BLOCK_COUNT value is specified, some bits in oled_dirty
may not correspond to existing blocks; however, if those bits are set
somewhere (e.g., by code with sets oled_dirty to ~0 or even -1),
oled_render() would try to handle them and could access memory beyond
oled_buffer and perform hardware operations with out of range values.
Prevent this by masking off unused bits in oled_render(), and also avoid
setting those bits in other functions.
* Fix potentially wrong dirtying in oled_write_char()
oled_write_char() tried to mark the position just beyond the written
character as dirty; use (OLED_FONT_WIDTH - 1) to dirty the last position
still belonging to the character instead.
* Fix `#define OLED_BLOCK_TYPE uint32_t` on AVR
Using uint32_t as OLED_BLOCK_TYPE did not work properly on AVR, because
some bit shifts were performed using 16-bit int. Add explicit casts to
OLED_BLOCK_TYPE to those shifts.
2020-10-03 21:44:19 +03:00
|
|
|
if (x >= oled_rotation_width) {
|
2020-07-15 22:48:04 -07:00
|
|
|
return;
|
|
|
|
|
}
|
OLED driver fixes (#10377)
* Fix dirtying in oled_write_pixel()
Set the dirty bit for the block only if oled_write_pixel() actually
changed the buffer state. Without this check oled_write_pixel() could
not be used inside the oled_task_user() code using the “redraw always”
style, because the blocks touched by oled_write_pixel() would always
appear dirty, and oled_render() would not proceed beyond the first such
dirty block.
* Fix oled_write_pixel() with 90/270 degree rotation
Use oled_rotation_width instead of OLED_DISPLAY_WIDTH, so that a rotated
display would be handled correctly.
* Fix compilation with custom OLED_BLOCK_COUNT and OLED_BLOCK_SIZE
Some OLED sizes (e.g., 64×48) may require a nonstandard value of
OLED_BLOCK_COUNT. The documentation says that this value may be
redefined in config.h, but actually trying to redefine it caused a
compile error, because the macro was redefined in oled_driver.c.
Make the OLED_BLOCK_COUNT definition in oled_driver.c respect any
user override, and do the same for OLED_BLOCK_SIZE just in case.
* Fix handling of out-of-range bits in oled_dirty
If a custom OLED_BLOCK_COUNT value is specified, some bits in oled_dirty
may not correspond to existing blocks; however, if those bits are set
somewhere (e.g., by code with sets oled_dirty to ~0 or even -1),
oled_render() would try to handle them and could access memory beyond
oled_buffer and perform hardware operations with out of range values.
Prevent this by masking off unused bits in oled_render(), and also avoid
setting those bits in other functions.
* Fix potentially wrong dirtying in oled_write_char()
oled_write_char() tried to mark the position just beyond the written
character as dirty; use (OLED_FONT_WIDTH - 1) to dirty the last position
still belonging to the character instead.
* Fix `#define OLED_BLOCK_TYPE uint32_t` on AVR
Using uint32_t as OLED_BLOCK_TYPE did not work properly on AVR, because
some bit shifts were performed using 16-bit int. Add explicit casts to
OLED_BLOCK_TYPE to those shifts.
2020-10-03 21:44:19 +03:00
|
|
|
uint16_t index = x + (y / 8) * oled_rotation_width;
|
|
|
|
|
if (index >= OLED_MATRIX_SIZE) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
uint8_t data = oled_buffer[index];
|
2020-07-15 22:48:04 -07:00
|
|
|
if (on) {
|
OLED driver fixes (#10377)
* Fix dirtying in oled_write_pixel()
Set the dirty bit for the block only if oled_write_pixel() actually
changed the buffer state. Without this check oled_write_pixel() could
not be used inside the oled_task_user() code using the “redraw always”
style, because the blocks touched by oled_write_pixel() would always
appear dirty, and oled_render() would not proceed beyond the first such
dirty block.
* Fix oled_write_pixel() with 90/270 degree rotation
Use oled_rotation_width instead of OLED_DISPLAY_WIDTH, so that a rotated
display would be handled correctly.
* Fix compilation with custom OLED_BLOCK_COUNT and OLED_BLOCK_SIZE
Some OLED sizes (e.g., 64×48) may require a nonstandard value of
OLED_BLOCK_COUNT. The documentation says that this value may be
redefined in config.h, but actually trying to redefine it caused a
compile error, because the macro was redefined in oled_driver.c.
Make the OLED_BLOCK_COUNT definition in oled_driver.c respect any
user override, and do the same for OLED_BLOCK_SIZE just in case.
* Fix handling of out-of-range bits in oled_dirty
If a custom OLED_BLOCK_COUNT value is specified, some bits in oled_dirty
may not correspond to existing blocks; however, if those bits are set
somewhere (e.g., by code with sets oled_dirty to ~0 or even -1),
oled_render() would try to handle them and could access memory beyond
oled_buffer and perform hardware operations with out of range values.
Prevent this by masking off unused bits in oled_render(), and also avoid
setting those bits in other functions.
* Fix potentially wrong dirtying in oled_write_char()
oled_write_char() tried to mark the position just beyond the written
character as dirty; use (OLED_FONT_WIDTH - 1) to dirty the last position
still belonging to the character instead.
* Fix `#define OLED_BLOCK_TYPE uint32_t` on AVR
Using uint32_t as OLED_BLOCK_TYPE did not work properly on AVR, because
some bit shifts were performed using 16-bit int. Add explicit casts to
OLED_BLOCK_TYPE to those shifts.
2020-10-03 21:44:19 +03:00
|
|
|
data |= (1 << (y % 8));
|
2020-07-15 22:48:04 -07:00
|
|
|
} else {
|
OLED driver fixes (#10377)
* Fix dirtying in oled_write_pixel()
Set the dirty bit for the block only if oled_write_pixel() actually
changed the buffer state. Without this check oled_write_pixel() could
not be used inside the oled_task_user() code using the “redraw always”
style, because the blocks touched by oled_write_pixel() would always
appear dirty, and oled_render() would not proceed beyond the first such
dirty block.
* Fix oled_write_pixel() with 90/270 degree rotation
Use oled_rotation_width instead of OLED_DISPLAY_WIDTH, so that a rotated
display would be handled correctly.
* Fix compilation with custom OLED_BLOCK_COUNT and OLED_BLOCK_SIZE
Some OLED sizes (e.g., 64×48) may require a nonstandard value of
OLED_BLOCK_COUNT. The documentation says that this value may be
redefined in config.h, but actually trying to redefine it caused a
compile error, because the macro was redefined in oled_driver.c.
Make the OLED_BLOCK_COUNT definition in oled_driver.c respect any
user override, and do the same for OLED_BLOCK_SIZE just in case.
* Fix handling of out-of-range bits in oled_dirty
If a custom OLED_BLOCK_COUNT value is specified, some bits in oled_dirty
may not correspond to existing blocks; however, if those bits are set
somewhere (e.g., by code with sets oled_dirty to ~0 or even -1),
oled_render() would try to handle them and could access memory beyond
oled_buffer and perform hardware operations with out of range values.
Prevent this by masking off unused bits in oled_render(), and also avoid
setting those bits in other functions.
* Fix potentially wrong dirtying in oled_write_char()
oled_write_char() tried to mark the position just beyond the written
character as dirty; use (OLED_FONT_WIDTH - 1) to dirty the last position
still belonging to the character instead.
* Fix `#define OLED_BLOCK_TYPE uint32_t` on AVR
Using uint32_t as OLED_BLOCK_TYPE did not work properly on AVR, because
some bit shifts were performed using 16-bit int. Add explicit casts to
OLED_BLOCK_TYPE to those shifts.
2020-10-03 21:44:19 +03:00
|
|
|
data &= ~(1 << (y % 8));
|
|
|
|
|
}
|
|
|
|
|
if (oled_buffer[index] != data) {
|
|
|
|
|
oled_buffer[index] = data;
|
|
|
|
|
oled_dirty |= ((OLED_BLOCK_TYPE)1 << (index / OLED_BLOCK_SIZE));
|
2020-07-15 22:48:04 -07:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2019-04-15 22:32:57 -05:00
|
|
|
#if defined(__AVR__)
|
|
|
|
|
void oled_write_P(const char *data, bool invert) {
|
2019-08-30 11:19:03 -07:00
|
|
|
uint8_t c = pgm_read_byte(data);
|
|
|
|
|
while (c != 0) {
|
|
|
|
|
oled_write_char(c, invert);
|
|
|
|
|
c = pgm_read_byte(++data);
|
|
|
|
|
}
|
2019-04-15 22:32:57 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void oled_write_ln_P(const char *data, bool invert) {
|
2019-08-30 11:19:03 -07:00
|
|
|
oled_write_P(data, invert);
|
|
|
|
|
oled_advance_page(true);
|
2019-04-15 22:32:57 -05:00
|
|
|
}
|
2019-11-03 23:34:47 +01:00
|
|
|
|
|
|
|
|
void oled_write_raw_P(const char *data, uint16_t size) {
|
2020-11-28 12:02:18 -08:00
|
|
|
uint16_t cursor_start_index = oled_cursor - &oled_buffer[0];
|
|
|
|
|
if ((size + cursor_start_index) > OLED_MATRIX_SIZE) size = OLED_MATRIX_SIZE - cursor_start_index;
|
|
|
|
|
for (uint16_t i = cursor_start_index; i < cursor_start_index + size; i++) {
|
2020-05-09 20:14:07 -07:00
|
|
|
uint8_t c = pgm_read_byte(data++);
|
2019-11-03 23:34:47 +01:00
|
|
|
if (oled_buffer[i] == c) continue;
|
|
|
|
|
oled_buffer[i] = c;
|
OLED driver fixes (#10377)
* Fix dirtying in oled_write_pixel()
Set the dirty bit for the block only if oled_write_pixel() actually
changed the buffer state. Without this check oled_write_pixel() could
not be used inside the oled_task_user() code using the “redraw always”
style, because the blocks touched by oled_write_pixel() would always
appear dirty, and oled_render() would not proceed beyond the first such
dirty block.
* Fix oled_write_pixel() with 90/270 degree rotation
Use oled_rotation_width instead of OLED_DISPLAY_WIDTH, so that a rotated
display would be handled correctly.
* Fix compilation with custom OLED_BLOCK_COUNT and OLED_BLOCK_SIZE
Some OLED sizes (e.g., 64×48) may require a nonstandard value of
OLED_BLOCK_COUNT. The documentation says that this value may be
redefined in config.h, but actually trying to redefine it caused a
compile error, because the macro was redefined in oled_driver.c.
Make the OLED_BLOCK_COUNT definition in oled_driver.c respect any
user override, and do the same for OLED_BLOCK_SIZE just in case.
* Fix handling of out-of-range bits in oled_dirty
If a custom OLED_BLOCK_COUNT value is specified, some bits in oled_dirty
may not correspond to existing blocks; however, if those bits are set
somewhere (e.g., by code with sets oled_dirty to ~0 or even -1),
oled_render() would try to handle them and could access memory beyond
oled_buffer and perform hardware operations with out of range values.
Prevent this by masking off unused bits in oled_render(), and also avoid
setting those bits in other functions.
* Fix potentially wrong dirtying in oled_write_char()
oled_write_char() tried to mark the position just beyond the written
character as dirty; use (OLED_FONT_WIDTH - 1) to dirty the last position
still belonging to the character instead.
* Fix `#define OLED_BLOCK_TYPE uint32_t` on AVR
Using uint32_t as OLED_BLOCK_TYPE did not work properly on AVR, because
some bit shifts were performed using 16-bit int. Add explicit casts to
OLED_BLOCK_TYPE to those shifts.
2020-10-03 21:44:19 +03:00
|
|
|
oled_dirty |= ((OLED_BLOCK_TYPE)1 << (i / OLED_BLOCK_SIZE));
|
2019-11-03 23:34:47 +01:00
|
|
|
}
|
|
|
|
|
}
|
2022-02-12 10:29:31 -08:00
|
|
|
#endif // defined(__AVR__)
|
2019-04-15 22:32:57 -05:00
|
|
|
|
|
|
|
|
bool oled_on(void) {
|
2020-12-05 19:53:47 -06:00
|
|
|
if (!oled_initialized) {
|
|
|
|
|
return oled_active;
|
|
|
|
|
}
|
|
|
|
|
|
2019-08-25 14:37:55 -05:00
|
|
|
#if OLED_TIMEOUT > 0
|
2019-08-30 11:19:03 -07:00
|
|
|
oled_timeout = timer_read32() + OLED_TIMEOUT;
|
2019-04-15 22:32:57 -05:00
|
|
|
#endif
|
|
|
|
|
|
2021 May 29 Breaking Changes Update (#13034)
* Add Per Key functionality for AutoShift (#11536)
* LED Matrix: Reactive effect buffers & advanced indicators (#12588)
* [Keyboard] kint36: switch to sym_eager_pk debouncing (#12626)
* [Keyboard] kint2pp: reduce input latency by ≈10ms (#12625)
* LED Matrix: Split (#12633)
* [CI] Format code according to conventions (#12650)
* feat: infinite timeout for leader key (#6580)
* feat: implement leader_no_timeout logic
* docs(leader_key): infinite leader timeout docs
* Format code according to conventions (#12680)
* Update ADC driver for STM32F1xx, STM32F3xx, STM32F4xx (#12403)
* Fix default ADC_RESOLUTION for ADCv3 (and ADCv4)
Recent ChibiOS update removed ADC_CFGR1_RES_10BIT from the ADCv3 headers
(that macro should not have been there, because ADCv3 has CFGR instead of
CFGR1). Fix the default value for ADC_RESOLUTION to use ADC_CFGR_RES_10BITS
if it is defined (that name is used for ADCv3 and ADCv4).
* Update ADC docs to match the actually used resolution
ADC driver for ChibiOS actually uses the 10-bit resolution by default
(probably to match AVR); fix the documentation accordingly. Also add
both ADC_CFGR_RES_10BITS and ADC_CFGR1_RES_10BIT constants (these names
differ according to the ADC implementation in the particular MCU).
* Fix pinToMux() for B12 and B13 on STM32F3xx
Testing on STM32F303CCT6 revealed that the ADC mux values for B12 and
B13 pins were wrong.
* Add support for all possible analog pins on STM32F1xx
Added ADC mux values for pins A0...A7, B0, B1, C0...C5 on STM32F1xx
(they are the same at least for STM32F103x8 and larger F103 devices, and
also F102, F105, F107 families). Actually tested on STM32F103C8T6
(therefore pins C0...C5 were not tested).
Pins F6...F10, which are present on STM32F103x[C-G] in 144-pin packages,
cannot be supported at the moment, because those pins are connected only
to ADC3, but the ChibiOS ADC driver for STM32F1xx supports only ADC1.
* Add support for all possible analog pins on STM32F4xx
Added ADC mux values for pins A0...A7, B0, B1, C0...C5 and optionally
F3...F10 (if STM32_ADC_USE_ADC3 is enabled). These mux values are
apparently the same for all F4xx devices, except some smaller devices may
not have ADC3.
Actually tested on STM32F401CCU6, STM32F401CEU6, STM32F411CEU6 (using
various WeAct “Blackpill” boards); only pins A0...A7, B0, B1 were tested.
Pins F3...F10 are inside `#if STM32_ADC_USE_ADC3` because some devices
which don't have ADC3 also don't have the GPIOF port, therefore the code
which refers to Fx pins does not compile.
* Fix STM32F3xx ADC mux table in documentation
The ADC driver documentation had some errors in the mux table for STM32F3xx.
Fix this table to match the datasheet and the actual code (mux settings for
B12 and B13 were also tested on a real STM32F303CCT6 chip).
* Add STM32F1xx ADC pins to the documentation
* Add STM32F4xx ADC pins to the documentation
* Add initial support for tinyuf2 bootloader (when hosted on F411 blackpill) (#12600)
* Add support for jumping to tinyuf2 bootloader. Adds blackpill UF2 example.
* Update flashing.md
* Update chconf.h
* Update config.h
* Update halconf.h
* Update mcuconf.h
* eeprom driver: Refactor where eeprom driver initialisation (and EEPROM emulation initialisation) occurs to make it non-target-specific. (#12671)
* Add support for MCU = STM32F446 (#12619)
* Add support for MCU = STM32F446
* Update platforms/chibios/GENERIC_STM32_F446XE/configs/config.h
* Restore mcuconf.h to the one used by RT-STM32F446RE-NUCLEO64
* stm32f446: update mcuconf.h and board.h for 16MHz operation, with USB enabled, and other peripherals disabled.
* Format code according to conventions (#12682)
* Format code according to conventions (#12687)
* Add STM32L433 and L443 support (#12063)
* initial L433 commit
* change to XC
* fix L433
* disable all peripherals
* update system and peripheral clocks
* 433 change
* use its own board files
* revert its own board files
* l433 specific change
* fix stm32l432xx define
* remove duplicate #define
* fix bootloader jump
* move to L443xx and add i2c2, spi2, usart3 to mcuconf.h
* move to L443
* move to L443
* fix sdmmc in mcuconf.h
* include STM32L443
* add L443
* Include L443 in compatible microcontrollers
* Include L443 in compatible microcontrollers
* Update config bootloader jump description
* Update ChibiOS define reasoning
* Update quantum/mcu_selection.mk
* fix git conflict
* Updated Function96 with V2 files and removed chconf.h and halconf.h (#12613)
* Fix bad PR merge for #6580. (#12721)
* Change RGB/LED Matrix to use a simple define for USB suspend (#12697)
* [CI] Format code according to conventions (#12731)
* Fixing transport's led/rgb matrix suspend state logic (#12770)
* [CI] Format code according to conventions (#12772)
* Fix comment parsing (#12750)
* Added OLED fade out support (#12086)
* fix some references to bin/qmk that slipped in (#12832)
* Resolve a number of warnings in `qmk generate-api` (#12833)
* New command: qmk console (#12828)
* stash poc
* stash
* tidy up implementation
* Tidy up slightly for review
* Tidy up slightly for review
* Bodge environment to make tests pass
* Refactor away from asyncio due to windows issues
* Filter devices
* align vid/pid printing
* Add hidapi to the installers
* start preparing for multiple hid_listeners
* udev rules for hid_listen
* refactor to move closer to end state
* very basic implementation of the threaded model
* refactor how vid/pid/index are supplied and parsed
* windows improvements
* read the report directly when usage page isn't available
* add per-device colors, the choice to show names or numbers, and refactor
* add timestamps
* Add support for showing bootloaders
* tweak the color for bootloaders
* Align bootloader disconnect with connect color
* add support for showing all bootloaders
* fix the pyusb check
* tweaks
* fix exception
* hide a stack trace behind -v
* add --no-bootloaders option
* add documentation for qmk console
* Apply suggestions from code review
* pyformat
* clean up and flesh out KNOWN_BOOTLOADERS
* Remove pointless SERIAL_LINK_ENABLE rules (#12846)
* Make Swap Hands use PROGMEM (#12284)
This converts the array that the Swap Hands feature uses to use PROGMEM,
and to read from that array, as such. Since this array never changes at
runtime, there is no reason to keep it in memory. Especially for AVR
boards, as memory is a precious resource.
* Fix another bin/qmk reference (#12856)
* [Keymap] Turn OLED off on suspend in soundmonster keymap (#10419)
* Fixup build errors on `develop` branch. (#12723)
* LED Matrix: Effects! (#12651)
* Fix syntax error when compiling for ARM (#12866)
* Remove KEYMAP and LAYOUT_kc (#12160)
* alias KEYMAP to LAYOUT
* remove KEYMAP and LAYOUT_kc
* Add setup, clone, and env to the list of commands we allow even with broken modules (#12868)
* Rename `point_t` -> `led_point_t` (#12864)
* [Keyboard] updated a vendor name / fixed minor keymap issues (#12881)
* Add missing LED Matrix suspend code to suspend.c (#12878)
* LED Matrix: Documentation (#12685)
* Deprecate `send_unicode_hex_string()` (#12602)
* Fix spelling mistake regarding LED Matrix in split_common. (#12888)
* [Keymap] Fix QWERTY/DVORAK status output for kzar keymap (#12895)
* Use milc.subcommand.config instead of qmk.cli.config (#12915)
* Use milc.subcommand.config instead
* pyformat
* remove the config test
* Add function to allow repeated blinking of one layer (#12237)
* Implement function rgblight_blink_layer_repeat to allow repeated blinking of one layer at a time
* Update doc
* Rework rgblight blinking according to requested change
* optimize storage
* Fixup housekeeping from being invoked twice per loop. (#12933)
* matrix: wait for row signal to go HIGH for every row (#12945)
I noticed this discrepancy (last row of the matrix treated differently than the
others) when optimizing the input latency of my keyboard controller, see also
https://michael.stapelberg.ch/posts/2021-05-08-keyboard-input-latency-qmk-kinesis/
Before this commit, when tuning the delays I noticed ghost key presses when
pressing the F2 key, which is on the last row of the keyboard matrix: the
dead_grave key, which is on the first row of the keyboard matrix, would be
incorrectly detected as pressed.
After this commit, all keyboard matrix rows are interpreted correctly.
I suspect that my setup is more susceptible to this nuance than others because I
use GPIO_INPUT_PIN_DELAY=0 and hence don’t have another delay that might mask
the problem.
* ensure we do not conflict with existing keymap aliases (#12976)
* Add support for up to 4 IS31FL3733 drivers (#12342)
* Convert Encoder callbacks to be boolean functions (#12805)
* [Keyboard] Fix Terrazzo build failure (#12977)
* Do not hard set config in CPTC files (#11864)
* [Keyboard] Corne - Remove legacy revision support (#12226)
* [Keymap] Update to Drashna keymap and user code (based on develop) (#12936)
* Add Full-duplex serial driver for ARM boards (#9842)
* Document LED_MATRIX_FRAMEBUFFER_EFFECTS (#12987)
* Backlight: add defines for default level and breathing state (#12560)
* Add dire message about LUFA mass storage bootloader (#13014)
* [Keyboard] Remove redundant legacy and common headers for crkbd (#13023)
Was causing compiler errors on some systems.
* Fix keyboards/keymaps for boolean encoder callback changes (#12985)
* `backlight.c`: include `eeprom.h` (#13024)
* Add changelog for 2021-05-29 Breaking Changes merge (#12939)
* Add ChangeLog for 2021-05-29 Breaking Changes Merge: initial version
* Add recent develop changes
* Sort recent develop changes
* Remove sections for ChibiOS changes per tzarc
No ChibiOS changes this round.
* Add and sort recent develop changes
* add notes about keyboard moves/deletions
* import changelog for PR 12172
Documents the change to BOOTMAGIC_ENABLE.
* update section headings
* re-sort changelog
* add additional note regarding Bootmagic changes
* remove changelog timestamp
* update dates in main Breaking Changes docs
* fix broken section anchors in previous changelogs
* add link to backlight/eeprom patch to changelog
* highlight some more changes
* link PRs from section headers
* Restore standard readme
* run: qmk cformat --core-only
2021-05-29 14:38:50 -07:00
|
|
|
static const uint8_t PROGMEM display_on[] =
|
|
|
|
|
#ifdef OLED_FADE_OUT
|
|
|
|
|
{I2C_CMD, FADE_BLINK, 0x00};
|
|
|
|
|
#else
|
|
|
|
|
{I2C_CMD, DISPLAY_ON};
|
|
|
|
|
#endif
|
|
|
|
|
|
2019-08-30 11:19:03 -07:00
|
|
|
if (!oled_active) {
|
2023-05-10 14:04:53 -07:00
|
|
|
if (!oled_send_cmd_P(display_on, ARRAY_SIZE(display_on))) {
|
2019-08-30 11:19:03 -07:00
|
|
|
print("oled_on cmd failed\n");
|
|
|
|
|
return oled_active;
|
|
|
|
|
}
|
|
|
|
|
oled_active = true;
|
2019-04-15 22:32:57 -05:00
|
|
|
}
|
2019-08-30 11:19:03 -07:00
|
|
|
return oled_active;
|
2019-04-15 22:32:57 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
bool oled_off(void) {
|
2020-12-05 19:53:47 -06:00
|
|
|
if (!oled_initialized) {
|
|
|
|
|
return !oled_active;
|
|
|
|
|
}
|
|
|
|
|
|
2021 May 29 Breaking Changes Update (#13034)
* Add Per Key functionality for AutoShift (#11536)
* LED Matrix: Reactive effect buffers & advanced indicators (#12588)
* [Keyboard] kint36: switch to sym_eager_pk debouncing (#12626)
* [Keyboard] kint2pp: reduce input latency by ≈10ms (#12625)
* LED Matrix: Split (#12633)
* [CI] Format code according to conventions (#12650)
* feat: infinite timeout for leader key (#6580)
* feat: implement leader_no_timeout logic
* docs(leader_key): infinite leader timeout docs
* Format code according to conventions (#12680)
* Update ADC driver for STM32F1xx, STM32F3xx, STM32F4xx (#12403)
* Fix default ADC_RESOLUTION for ADCv3 (and ADCv4)
Recent ChibiOS update removed ADC_CFGR1_RES_10BIT from the ADCv3 headers
(that macro should not have been there, because ADCv3 has CFGR instead of
CFGR1). Fix the default value for ADC_RESOLUTION to use ADC_CFGR_RES_10BITS
if it is defined (that name is used for ADCv3 and ADCv4).
* Update ADC docs to match the actually used resolution
ADC driver for ChibiOS actually uses the 10-bit resolution by default
(probably to match AVR); fix the documentation accordingly. Also add
both ADC_CFGR_RES_10BITS and ADC_CFGR1_RES_10BIT constants (these names
differ according to the ADC implementation in the particular MCU).
* Fix pinToMux() for B12 and B13 on STM32F3xx
Testing on STM32F303CCT6 revealed that the ADC mux values for B12 and
B13 pins were wrong.
* Add support for all possible analog pins on STM32F1xx
Added ADC mux values for pins A0...A7, B0, B1, C0...C5 on STM32F1xx
(they are the same at least for STM32F103x8 and larger F103 devices, and
also F102, F105, F107 families). Actually tested on STM32F103C8T6
(therefore pins C0...C5 were not tested).
Pins F6...F10, which are present on STM32F103x[C-G] in 144-pin packages,
cannot be supported at the moment, because those pins are connected only
to ADC3, but the ChibiOS ADC driver for STM32F1xx supports only ADC1.
* Add support for all possible analog pins on STM32F4xx
Added ADC mux values for pins A0...A7, B0, B1, C0...C5 and optionally
F3...F10 (if STM32_ADC_USE_ADC3 is enabled). These mux values are
apparently the same for all F4xx devices, except some smaller devices may
not have ADC3.
Actually tested on STM32F401CCU6, STM32F401CEU6, STM32F411CEU6 (using
various WeAct “Blackpill” boards); only pins A0...A7, B0, B1 were tested.
Pins F3...F10 are inside `#if STM32_ADC_USE_ADC3` because some devices
which don't have ADC3 also don't have the GPIOF port, therefore the code
which refers to Fx pins does not compile.
* Fix STM32F3xx ADC mux table in documentation
The ADC driver documentation had some errors in the mux table for STM32F3xx.
Fix this table to match the datasheet and the actual code (mux settings for
B12 and B13 were also tested on a real STM32F303CCT6 chip).
* Add STM32F1xx ADC pins to the documentation
* Add STM32F4xx ADC pins to the documentation
* Add initial support for tinyuf2 bootloader (when hosted on F411 blackpill) (#12600)
* Add support for jumping to tinyuf2 bootloader. Adds blackpill UF2 example.
* Update flashing.md
* Update chconf.h
* Update config.h
* Update halconf.h
* Update mcuconf.h
* eeprom driver: Refactor where eeprom driver initialisation (and EEPROM emulation initialisation) occurs to make it non-target-specific. (#12671)
* Add support for MCU = STM32F446 (#12619)
* Add support for MCU = STM32F446
* Update platforms/chibios/GENERIC_STM32_F446XE/configs/config.h
* Restore mcuconf.h to the one used by RT-STM32F446RE-NUCLEO64
* stm32f446: update mcuconf.h and board.h for 16MHz operation, with USB enabled, and other peripherals disabled.
* Format code according to conventions (#12682)
* Format code according to conventions (#12687)
* Add STM32L433 and L443 support (#12063)
* initial L433 commit
* change to XC
* fix L433
* disable all peripherals
* update system and peripheral clocks
* 433 change
* use its own board files
* revert its own board files
* l433 specific change
* fix stm32l432xx define
* remove duplicate #define
* fix bootloader jump
* move to L443xx and add i2c2, spi2, usart3 to mcuconf.h
* move to L443
* move to L443
* fix sdmmc in mcuconf.h
* include STM32L443
* add L443
* Include L443 in compatible microcontrollers
* Include L443 in compatible microcontrollers
* Update config bootloader jump description
* Update ChibiOS define reasoning
* Update quantum/mcu_selection.mk
* fix git conflict
* Updated Function96 with V2 files and removed chconf.h and halconf.h (#12613)
* Fix bad PR merge for #6580. (#12721)
* Change RGB/LED Matrix to use a simple define for USB suspend (#12697)
* [CI] Format code according to conventions (#12731)
* Fixing transport's led/rgb matrix suspend state logic (#12770)
* [CI] Format code according to conventions (#12772)
* Fix comment parsing (#12750)
* Added OLED fade out support (#12086)
* fix some references to bin/qmk that slipped in (#12832)
* Resolve a number of warnings in `qmk generate-api` (#12833)
* New command: qmk console (#12828)
* stash poc
* stash
* tidy up implementation
* Tidy up slightly for review
* Tidy up slightly for review
* Bodge environment to make tests pass
* Refactor away from asyncio due to windows issues
* Filter devices
* align vid/pid printing
* Add hidapi to the installers
* start preparing for multiple hid_listeners
* udev rules for hid_listen
* refactor to move closer to end state
* very basic implementation of the threaded model
* refactor how vid/pid/index are supplied and parsed
* windows improvements
* read the report directly when usage page isn't available
* add per-device colors, the choice to show names or numbers, and refactor
* add timestamps
* Add support for showing bootloaders
* tweak the color for bootloaders
* Align bootloader disconnect with connect color
* add support for showing all bootloaders
* fix the pyusb check
* tweaks
* fix exception
* hide a stack trace behind -v
* add --no-bootloaders option
* add documentation for qmk console
* Apply suggestions from code review
* pyformat
* clean up and flesh out KNOWN_BOOTLOADERS
* Remove pointless SERIAL_LINK_ENABLE rules (#12846)
* Make Swap Hands use PROGMEM (#12284)
This converts the array that the Swap Hands feature uses to use PROGMEM,
and to read from that array, as such. Since this array never changes at
runtime, there is no reason to keep it in memory. Especially for AVR
boards, as memory is a precious resource.
* Fix another bin/qmk reference (#12856)
* [Keymap] Turn OLED off on suspend in soundmonster keymap (#10419)
* Fixup build errors on `develop` branch. (#12723)
* LED Matrix: Effects! (#12651)
* Fix syntax error when compiling for ARM (#12866)
* Remove KEYMAP and LAYOUT_kc (#12160)
* alias KEYMAP to LAYOUT
* remove KEYMAP and LAYOUT_kc
* Add setup, clone, and env to the list of commands we allow even with broken modules (#12868)
* Rename `point_t` -> `led_point_t` (#12864)
* [Keyboard] updated a vendor name / fixed minor keymap issues (#12881)
* Add missing LED Matrix suspend code to suspend.c (#12878)
* LED Matrix: Documentation (#12685)
* Deprecate `send_unicode_hex_string()` (#12602)
* Fix spelling mistake regarding LED Matrix in split_common. (#12888)
* [Keymap] Fix QWERTY/DVORAK status output for kzar keymap (#12895)
* Use milc.subcommand.config instead of qmk.cli.config (#12915)
* Use milc.subcommand.config instead
* pyformat
* remove the config test
* Add function to allow repeated blinking of one layer (#12237)
* Implement function rgblight_blink_layer_repeat to allow repeated blinking of one layer at a time
* Update doc
* Rework rgblight blinking according to requested change
* optimize storage
* Fixup housekeeping from being invoked twice per loop. (#12933)
* matrix: wait for row signal to go HIGH for every row (#12945)
I noticed this discrepancy (last row of the matrix treated differently than the
others) when optimizing the input latency of my keyboard controller, see also
https://michael.stapelberg.ch/posts/2021-05-08-keyboard-input-latency-qmk-kinesis/
Before this commit, when tuning the delays I noticed ghost key presses when
pressing the F2 key, which is on the last row of the keyboard matrix: the
dead_grave key, which is on the first row of the keyboard matrix, would be
incorrectly detected as pressed.
After this commit, all keyboard matrix rows are interpreted correctly.
I suspect that my setup is more susceptible to this nuance than others because I
use GPIO_INPUT_PIN_DELAY=0 and hence don’t have another delay that might mask
the problem.
* ensure we do not conflict with existing keymap aliases (#12976)
* Add support for up to 4 IS31FL3733 drivers (#12342)
* Convert Encoder callbacks to be boolean functions (#12805)
* [Keyboard] Fix Terrazzo build failure (#12977)
* Do not hard set config in CPTC files (#11864)
* [Keyboard] Corne - Remove legacy revision support (#12226)
* [Keymap] Update to Drashna keymap and user code (based on develop) (#12936)
* Add Full-duplex serial driver for ARM boards (#9842)
* Document LED_MATRIX_FRAMEBUFFER_EFFECTS (#12987)
* Backlight: add defines for default level and breathing state (#12560)
* Add dire message about LUFA mass storage bootloader (#13014)
* [Keyboard] Remove redundant legacy and common headers for crkbd (#13023)
Was causing compiler errors on some systems.
* Fix keyboards/keymaps for boolean encoder callback changes (#12985)
* `backlight.c`: include `eeprom.h` (#13024)
* Add changelog for 2021-05-29 Breaking Changes merge (#12939)
* Add ChangeLog for 2021-05-29 Breaking Changes Merge: initial version
* Add recent develop changes
* Sort recent develop changes
* Remove sections for ChibiOS changes per tzarc
No ChibiOS changes this round.
* Add and sort recent develop changes
* add notes about keyboard moves/deletions
* import changelog for PR 12172
Documents the change to BOOTMAGIC_ENABLE.
* update section headings
* re-sort changelog
* add additional note regarding Bootmagic changes
* remove changelog timestamp
* update dates in main Breaking Changes docs
* fix broken section anchors in previous changelogs
* add link to backlight/eeprom patch to changelog
* highlight some more changes
* link PRs from section headers
* Restore standard readme
* run: qmk cformat --core-only
2021-05-29 14:38:50 -07:00
|
|
|
static const uint8_t PROGMEM display_off[] =
|
|
|
|
|
#ifdef OLED_FADE_OUT
|
|
|
|
|
{I2C_CMD, FADE_BLINK, ENABLE_FADE | OLED_FADE_OUT_INTERVAL};
|
|
|
|
|
#else
|
|
|
|
|
{I2C_CMD, DISPLAY_OFF};
|
|
|
|
|
#endif
|
|
|
|
|
|
2019-08-30 11:19:03 -07:00
|
|
|
if (oled_active) {
|
2023-05-10 14:04:53 -07:00
|
|
|
if (!oled_send_cmd_P(display_off, ARRAY_SIZE(display_off))) {
|
2019-08-30 11:19:03 -07:00
|
|
|
print("oled_off cmd failed\n");
|
|
|
|
|
return oled_active;
|
|
|
|
|
}
|
|
|
|
|
oled_active = false;
|
|
|
|
|
}
|
|
|
|
|
return !oled_active;
|
2019-04-15 22:32:57 -05:00
|
|
|
}
|
|
|
|
|
|
2022-02-12 10:29:31 -08:00
|
|
|
bool is_oled_on(void) {
|
|
|
|
|
return oled_active;
|
|
|
|
|
}
|
2020-09-21 18:39:50 -07:00
|
|
|
|
2020-10-29 18:12:50 +11:00
|
|
|
uint8_t oled_set_brightness(uint8_t level) {
|
2020-12-05 19:53:47 -06:00
|
|
|
if (!oled_initialized) {
|
|
|
|
|
return oled_brightness;
|
|
|
|
|
}
|
|
|
|
|
|
2020-10-29 18:12:50 +11:00
|
|
|
uint8_t set_contrast[] = {I2C_CMD, CONTRAST, level};
|
|
|
|
|
if (oled_brightness != level) {
|
2023-05-10 14:04:53 -07:00
|
|
|
if (!oled_send_cmd(set_contrast, ARRAY_SIZE(set_contrast))) {
|
2020-10-29 18:12:50 +11:00
|
|
|
print("set_brightness cmd failed\n");
|
|
|
|
|
return oled_brightness;
|
|
|
|
|
}
|
|
|
|
|
oled_brightness = level;
|
|
|
|
|
}
|
|
|
|
|
return oled_brightness;
|
|
|
|
|
}
|
|
|
|
|
|
2022-02-12 10:29:31 -08:00
|
|
|
uint8_t oled_get_brightness(void) {
|
|
|
|
|
return oled_brightness;
|
|
|
|
|
}
|
2020-10-29 18:12:50 +11:00
|
|
|
|
2020-03-14 14:04:34 -07:00
|
|
|
// Set the specific 8 lines rows of the screen to scroll.
|
|
|
|
|
// 0 is the default for start, and 7 for end, which is the entire
|
|
|
|
|
// height of the screen. For 128x32 screens, rows 4-7 are not used.
|
|
|
|
|
void oled_scroll_set_area(uint8_t start_line, uint8_t end_line) {
|
|
|
|
|
oled_scroll_start = start_line;
|
2020-03-14 21:37:29 +00:00
|
|
|
oled_scroll_end = end_line;
|
2020-03-14 14:04:34 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void oled_scroll_set_speed(uint8_t speed) {
|
|
|
|
|
// Sets the speed for scrolling... does not take effect
|
|
|
|
|
// until scrolling is either started or restarted
|
|
|
|
|
// the ssd1306 supports 8 speeds
|
|
|
|
|
// FrameRate2 speed = 7
|
|
|
|
|
// FrameRate3 speed = 4
|
|
|
|
|
// FrameRate4 speed = 5
|
|
|
|
|
// FrameRate5 speed = 0
|
|
|
|
|
// FrameRate25 speed = 6
|
|
|
|
|
// FrameRate64 speed = 1
|
|
|
|
|
// FrameRate128 speed = 2
|
|
|
|
|
// FrameRate256 speed = 3
|
|
|
|
|
// for ease of use these are remaped here to be in order
|
|
|
|
|
static const uint8_t scroll_remap[8] = {7, 4, 5, 0, 6, 1, 2, 3};
|
2020-03-14 21:37:29 +00:00
|
|
|
oled_scroll_speed = scroll_remap[speed];
|
2020-03-14 14:04:34 -07:00
|
|
|
}
|
|
|
|
|
|
2019-04-15 22:32:57 -05:00
|
|
|
bool oled_scroll_right(void) {
|
2020-12-05 19:53:47 -06:00
|
|
|
if (!oled_initialized) {
|
|
|
|
|
return oled_scrolling;
|
|
|
|
|
}
|
|
|
|
|
|
2019-08-30 11:19:03 -07:00
|
|
|
// Dont enable scrolling if we need to update the display
|
|
|
|
|
// This prevents scrolling of bad data from starting the scroll too early after init
|
|
|
|
|
if (!oled_dirty && !oled_scrolling) {
|
2020-03-14 14:04:34 -07:00
|
|
|
uint8_t display_scroll_right[] = {I2C_CMD, SCROLL_RIGHT, 0x00, oled_scroll_start, oled_scroll_speed, oled_scroll_end, 0x00, 0xFF, ACTIVATE_SCROLL};
|
2023-05-10 14:04:53 -07:00
|
|
|
if (!oled_send_cmd(display_scroll_right, ARRAY_SIZE(display_scroll_right))) {
|
2019-08-30 11:19:03 -07:00
|
|
|
print("oled_scroll_right cmd failed\n");
|
|
|
|
|
return oled_scrolling;
|
|
|
|
|
}
|
|
|
|
|
oled_scrolling = true;
|
|
|
|
|
}
|
|
|
|
|
return oled_scrolling;
|
2019-04-15 22:32:57 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
bool oled_scroll_left(void) {
|
2020-12-05 19:53:47 -06:00
|
|
|
if (!oled_initialized) {
|
|
|
|
|
return oled_scrolling;
|
|
|
|
|
}
|
|
|
|
|
|
2019-08-30 11:19:03 -07:00
|
|
|
// Dont enable scrolling if we need to update the display
|
|
|
|
|
// This prevents scrolling of bad data from starting the scroll too early after init
|
|
|
|
|
if (!oled_dirty && !oled_scrolling) {
|
2020-03-14 14:04:34 -07:00
|
|
|
uint8_t display_scroll_left[] = {I2C_CMD, SCROLL_LEFT, 0x00, oled_scroll_start, oled_scroll_speed, oled_scroll_end, 0x00, 0xFF, ACTIVATE_SCROLL};
|
2023-05-10 14:04:53 -07:00
|
|
|
if (!oled_send_cmd(display_scroll_left, ARRAY_SIZE(display_scroll_left))) {
|
2019-08-30 11:19:03 -07:00
|
|
|
print("oled_scroll_left cmd failed\n");
|
|
|
|
|
return oled_scrolling;
|
|
|
|
|
}
|
|
|
|
|
oled_scrolling = true;
|
|
|
|
|
}
|
|
|
|
|
return oled_scrolling;
|
2019-04-15 22:32:57 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
bool oled_scroll_off(void) {
|
2020-12-05 19:53:47 -06:00
|
|
|
if (!oled_initialized) {
|
|
|
|
|
return !oled_scrolling;
|
|
|
|
|
}
|
|
|
|
|
|
2019-08-30 11:19:03 -07:00
|
|
|
if (oled_scrolling) {
|
|
|
|
|
static const uint8_t PROGMEM display_scroll_off[] = {I2C_CMD, DEACTIVATE_SCROLL};
|
2023-05-10 14:04:53 -07:00
|
|
|
if (!oled_send_cmd_P(display_scroll_off, ARRAY_SIZE(display_scroll_off))) {
|
2019-08-30 11:19:03 -07:00
|
|
|
print("oled_scroll_off cmd failed\n");
|
|
|
|
|
return oled_scrolling;
|
|
|
|
|
}
|
|
|
|
|
oled_scrolling = false;
|
OLED driver fixes (#10377)
* Fix dirtying in oled_write_pixel()
Set the dirty bit for the block only if oled_write_pixel() actually
changed the buffer state. Without this check oled_write_pixel() could
not be used inside the oled_task_user() code using the “redraw always”
style, because the blocks touched by oled_write_pixel() would always
appear dirty, and oled_render() would not proceed beyond the first such
dirty block.
* Fix oled_write_pixel() with 90/270 degree rotation
Use oled_rotation_width instead of OLED_DISPLAY_WIDTH, so that a rotated
display would be handled correctly.
* Fix compilation with custom OLED_BLOCK_COUNT and OLED_BLOCK_SIZE
Some OLED sizes (e.g., 64×48) may require a nonstandard value of
OLED_BLOCK_COUNT. The documentation says that this value may be
redefined in config.h, but actually trying to redefine it caused a
compile error, because the macro was redefined in oled_driver.c.
Make the OLED_BLOCK_COUNT definition in oled_driver.c respect any
user override, and do the same for OLED_BLOCK_SIZE just in case.
* Fix handling of out-of-range bits in oled_dirty
If a custom OLED_BLOCK_COUNT value is specified, some bits in oled_dirty
may not correspond to existing blocks; however, if those bits are set
somewhere (e.g., by code with sets oled_dirty to ~0 or even -1),
oled_render() would try to handle them and could access memory beyond
oled_buffer and perform hardware operations with out of range values.
Prevent this by masking off unused bits in oled_render(), and also avoid
setting those bits in other functions.
* Fix potentially wrong dirtying in oled_write_char()
oled_write_char() tried to mark the position just beyond the written
character as dirty; use (OLED_FONT_WIDTH - 1) to dirty the last position
still belonging to the character instead.
* Fix `#define OLED_BLOCK_TYPE uint32_t` on AVR
Using uint32_t as OLED_BLOCK_TYPE did not work properly on AVR, because
some bit shifts were performed using 16-bit int. Add explicit casts to
OLED_BLOCK_TYPE to those shifts.
2020-10-03 21:44:19 +03:00
|
|
|
oled_dirty = OLED_ALL_BLOCKS_MASK;
|
2019-08-30 11:19:03 -07:00
|
|
|
}
|
|
|
|
|
return !oled_scrolling;
|
2019-04-15 22:32:57 -05:00
|
|
|
}
|
|
|
|
|
|
2022-02-12 10:29:31 -08:00
|
|
|
bool is_oled_scrolling(void) {
|
|
|
|
|
return oled_scrolling;
|
|
|
|
|
}
|
2021-09-05 18:09:20 +02:00
|
|
|
|
2021-06-18 17:08:22 +02:00
|
|
|
bool oled_invert(bool invert) {
|
|
|
|
|
if (!oled_initialized) {
|
|
|
|
|
return oled_inverted;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (invert && !oled_inverted) {
|
|
|
|
|
static const uint8_t PROGMEM display_inverted[] = {I2C_CMD, INVERT_DISPLAY};
|
2023-05-10 14:04:53 -07:00
|
|
|
if (!oled_send_cmd_P(display_inverted, ARRAY_SIZE(display_inverted))) {
|
2021-06-18 17:08:22 +02:00
|
|
|
print("oled_invert cmd failed\n");
|
|
|
|
|
return oled_inverted;
|
|
|
|
|
}
|
|
|
|
|
oled_inverted = true;
|
|
|
|
|
} else if (!invert && oled_inverted) {
|
|
|
|
|
static const uint8_t PROGMEM display_normal[] = {I2C_CMD, NORMAL_DISPLAY};
|
2023-05-10 14:04:53 -07:00
|
|
|
if (!oled_send_cmd_P(display_normal, ARRAY_SIZE(display_normal))) {
|
2021-06-18 17:08:22 +02:00
|
|
|
print("oled_invert cmd failed\n");
|
|
|
|
|
return oled_inverted;
|
|
|
|
|
}
|
|
|
|
|
oled_inverted = false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return oled_inverted;
|
|
|
|
|
}
|
|
|
|
|
|
2019-04-15 22:32:57 -05:00
|
|
|
uint8_t oled_max_chars(void) {
|
2019-08-30 11:19:03 -07:00
|
|
|
if (!HAS_FLAGS(oled_rotation, OLED_ROTATION_90)) {
|
|
|
|
|
return OLED_DISPLAY_WIDTH / OLED_FONT_WIDTH;
|
|
|
|
|
}
|
|
|
|
|
return OLED_DISPLAY_HEIGHT / OLED_FONT_WIDTH;
|
2019-04-15 22:32:57 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
uint8_t oled_max_lines(void) {
|
2019-08-30 11:19:03 -07:00
|
|
|
if (!HAS_FLAGS(oled_rotation, OLED_ROTATION_90)) {
|
|
|
|
|
return OLED_DISPLAY_HEIGHT / OLED_FONT_HEIGHT;
|
|
|
|
|
}
|
|
|
|
|
return OLED_DISPLAY_WIDTH / OLED_FONT_HEIGHT;
|
2019-04-15 22:32:57 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void oled_task(void) {
|
2019-08-30 11:19:03 -07:00
|
|
|
if (!oled_initialized) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
2019-04-15 22:32:57 -05:00
|
|
|
|
2020-11-28 12:02:18 -08:00
|
|
|
#if OLED_UPDATE_INTERVAL > 0
|
|
|
|
|
if (timer_elapsed(oled_update_timeout) >= OLED_UPDATE_INTERVAL) {
|
|
|
|
|
oled_update_timeout = timer_read();
|
|
|
|
|
oled_set_cursor(0, 0);
|
2021-11-01 15:42:50 -07:00
|
|
|
oled_task_kb();
|
2020-11-28 12:02:18 -08:00
|
|
|
}
|
|
|
|
|
#else
|
2019-08-30 11:19:03 -07:00
|
|
|
oled_set_cursor(0, 0);
|
2021-11-01 15:42:50 -07:00
|
|
|
oled_task_kb();
|
2020-11-28 12:02:18 -08:00
|
|
|
#endif
|
2019-04-15 22:32:57 -05:00
|
|
|
|
2019-08-25 14:37:55 -05:00
|
|
|
#if OLED_SCROLL_TIMEOUT > 0
|
2019-08-30 11:19:03 -07:00
|
|
|
if (oled_dirty && oled_scrolling) {
|
|
|
|
|
oled_scroll_timeout = timer_read32() + OLED_SCROLL_TIMEOUT;
|
|
|
|
|
oled_scroll_off();
|
|
|
|
|
}
|
2019-08-25 14:37:55 -05:00
|
|
|
#endif
|
|
|
|
|
|
2019-08-30 11:19:03 -07:00
|
|
|
// Smart render system, no need to check for dirty
|
|
|
|
|
oled_render();
|
2019-04-15 22:32:57 -05:00
|
|
|
|
2019-08-30 11:19:03 -07:00
|
|
|
// Display timeout check
|
2019-08-25 14:37:55 -05:00
|
|
|
#if OLED_TIMEOUT > 0
|
2019-08-30 11:19:03 -07:00
|
|
|
if (oled_active && timer_expired32(timer_read32(), oled_timeout)) {
|
|
|
|
|
oled_off();
|
|
|
|
|
}
|
2019-04-15 22:32:57 -05:00
|
|
|
#endif
|
2019-08-25 14:37:55 -05:00
|
|
|
|
|
|
|
|
#if OLED_SCROLL_TIMEOUT > 0
|
2019-08-30 11:19:03 -07:00
|
|
|
if (!oled_scrolling && timer_expired32(timer_read32(), oled_scroll_timeout)) {
|
|
|
|
|
# ifdef OLED_SCROLL_TIMEOUT_RIGHT
|
|
|
|
|
oled_scroll_right();
|
|
|
|
|
# else
|
|
|
|
|
oled_scroll_left();
|
|
|
|
|
# endif
|
|
|
|
|
}
|
2019-08-25 14:37:55 -05:00
|
|
|
#endif
|
2019-04-15 22:32:57 -05:00
|
|
|
}
|
|
|
|
|
|
2022-02-12 10:29:31 -08:00
|
|
|
__attribute__((weak)) bool oled_task_kb(void) {
|
|
|
|
|
return oled_task_user();
|
|
|
|
|
}
|
|
|
|
|
__attribute__((weak)) bool oled_task_user(void) {
|
|
|
|
|
return true;
|
|
|
|
|
}
|