mirror of
https://github.com/zsa/qmk_firmware.git
synced 2026-01-18 03:19:45 +00:00
* 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>
665 lines
20 KiB
C++
665 lines
20 KiB
C++
#include "bluefruit_le.h"
|
|
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <alloca.h>
|
|
#include "debug.h"
|
|
#include "timer.h"
|
|
#include "gpio.h"
|
|
#include "ringbuffer.hpp"
|
|
#include <string.h>
|
|
#include "spi_master.h"
|
|
#include "wait.h"
|
|
#include "analog.h"
|
|
#include "progmem.h"
|
|
|
|
// These are the pin assignments for the 32u4 boards.
|
|
// You may define them to something else in your config.h
|
|
// if yours is wired up differently.
|
|
#ifndef BLUEFRUIT_LE_RST_PIN
|
|
# define BLUEFRUIT_LE_RST_PIN D4
|
|
#endif
|
|
|
|
#ifndef BLUEFRUIT_LE_CS_PIN
|
|
# define BLUEFRUIT_LE_CS_PIN B4
|
|
#endif
|
|
|
|
#ifndef BLUEFRUIT_LE_IRQ_PIN
|
|
# define BLUEFRUIT_LE_IRQ_PIN E6
|
|
#endif
|
|
|
|
#ifndef BLUEFRUIT_LE_SCK_DIVISOR
|
|
# define BLUEFRUIT_LE_SCK_DIVISOR 2 // 4MHz SCK/8MHz CPU, calculated for Feather 32U4 BLE
|
|
#endif
|
|
|
|
#define ConnectionUpdateInterval 1000 /* milliseconds */
|
|
|
|
static struct {
|
|
bool is_connected;
|
|
bool initialized;
|
|
bool configured;
|
|
|
|
#define ProbedEvents 1
|
|
#define UsingEvents 2
|
|
bool event_flags;
|
|
|
|
uint16_t last_connection_update;
|
|
} state;
|
|
|
|
// Commands are encoded using SDEP and sent via SPI
|
|
// https://github.com/adafruit/Adafruit_BluefruitLE_nRF51/blob/master/SDEP.md
|
|
|
|
#define SdepMaxPayload 16
|
|
struct sdep_msg {
|
|
uint8_t type;
|
|
uint8_t cmd_low;
|
|
uint8_t cmd_high;
|
|
struct __attribute__((packed)) {
|
|
uint8_t len : 7;
|
|
uint8_t more : 1;
|
|
};
|
|
uint8_t payload[SdepMaxPayload];
|
|
} __attribute__((packed));
|
|
|
|
// The recv latency is relatively high, so when we're hammering keys quickly,
|
|
// we want to avoid waiting for the responses in the matrix loop. We maintain
|
|
// a short queue for that. Since there is quite a lot of space overhead for
|
|
// the AT command representation wrapped up in SDEP, we queue the minimal
|
|
// information here.
|
|
|
|
enum queue_type {
|
|
QTKeyReport, // 1-byte modifier + 6-byte key report
|
|
QTConsumer, // 16-bit key code
|
|
QTMouseMove, // 4-byte mouse report
|
|
};
|
|
|
|
struct queue_item {
|
|
enum queue_type queue_type;
|
|
uint16_t added;
|
|
union __attribute__((packed)) {
|
|
struct __attribute__((packed)) {
|
|
uint8_t modifier;
|
|
uint8_t keys[6];
|
|
} key;
|
|
|
|
uint16_t consumer;
|
|
struct __attribute__((packed)) {
|
|
int8_t x, y, scroll, pan;
|
|
uint8_t buttons;
|
|
} mousemove;
|
|
};
|
|
};
|
|
|
|
// Items that we wish to send
|
|
static RingBuffer<queue_item, 40> send_buf;
|
|
// Pending response; while pending, we can't send any more requests.
|
|
// This records the time at which we sent the command for which we
|
|
// are expecting a response.
|
|
static RingBuffer<uint16_t, 2> resp_buf;
|
|
|
|
static bool process_queue_item(struct queue_item *item, uint16_t timeout);
|
|
|
|
enum sdep_type {
|
|
SdepCommand = 0x10,
|
|
SdepResponse = 0x20,
|
|
SdepAlert = 0x40,
|
|
SdepError = 0x80,
|
|
SdepSlaveNotReady = 0xFE, // Try again later
|
|
SdepSlaveOverflow = 0xFF, // You read more data than is available
|
|
};
|
|
|
|
enum ble_cmd {
|
|
BleInitialize = 0xBEEF,
|
|
BleAtWrapper = 0x0A00,
|
|
BleUartTx = 0x0A01,
|
|
BleUartRx = 0x0A02,
|
|
};
|
|
|
|
enum ble_system_event_bits {
|
|
BleSystemConnected = 0,
|
|
BleSystemDisconnected = 1,
|
|
BleSystemUartRx = 8,
|
|
BleSystemMidiRx = 10,
|
|
};
|
|
|
|
#define SdepTimeout 150 /* milliseconds */
|
|
#define SdepShortTimeout 10 /* milliseconds */
|
|
#define SdepBackOff 25 /* microseconds */
|
|
#define BatteryUpdateInterval 10000 /* milliseconds */
|
|
|
|
static bool at_command(const char *cmd, char *resp, uint16_t resplen, bool verbose, uint16_t timeout = SdepTimeout);
|
|
static bool at_command_P(const char *cmd, char *resp, uint16_t resplen, bool verbose = false);
|
|
|
|
// Send a single SDEP packet
|
|
static bool sdep_send_pkt(const struct sdep_msg *msg, uint16_t timeout) {
|
|
spi_start(BLUEFRUIT_LE_CS_PIN, false, 0, BLUEFRUIT_LE_SCK_DIVISOR);
|
|
uint16_t timerStart = timer_read();
|
|
bool success = false;
|
|
bool ready = false;
|
|
|
|
do {
|
|
ready = spi_write(msg->type) != SdepSlaveNotReady;
|
|
if (ready) {
|
|
break;
|
|
}
|
|
|
|
// Release it and let it initialize
|
|
spi_stop();
|
|
wait_us(SdepBackOff);
|
|
spi_start(BLUEFRUIT_LE_CS_PIN, false, 0, BLUEFRUIT_LE_SCK_DIVISOR);
|
|
} while (timer_elapsed(timerStart) < timeout);
|
|
|
|
if (ready) {
|
|
// Slave is ready; send the rest of the packet
|
|
spi_transmit(&msg->cmd_low, sizeof(*msg) - (1 + sizeof(msg->payload)) + msg->len);
|
|
success = true;
|
|
}
|
|
|
|
spi_stop();
|
|
|
|
return success;
|
|
}
|
|
|
|
static inline void sdep_build_pkt(struct sdep_msg *msg, uint16_t command, const uint8_t *payload, uint8_t len, bool moredata) {
|
|
msg->type = SdepCommand;
|
|
msg->cmd_low = command & 0xFF;
|
|
msg->cmd_high = command >> 8;
|
|
msg->len = len;
|
|
msg->more = (moredata && len == SdepMaxPayload) ? 1 : 0;
|
|
|
|
static_assert(sizeof(*msg) == 20, "msg is correctly packed");
|
|
|
|
memcpy(msg->payload, payload, len);
|
|
}
|
|
|
|
// Read a single SDEP packet
|
|
static bool sdep_recv_pkt(struct sdep_msg *msg, uint16_t timeout) {
|
|
bool success = false;
|
|
uint16_t timerStart = timer_read();
|
|
bool ready = false;
|
|
|
|
do {
|
|
ready = gpio_read_pin(BLUEFRUIT_LE_IRQ_PIN);
|
|
if (ready) {
|
|
break;
|
|
}
|
|
wait_us(1);
|
|
} while (timer_elapsed(timerStart) < timeout);
|
|
|
|
if (ready) {
|
|
spi_start(BLUEFRUIT_LE_CS_PIN, false, 0, BLUEFRUIT_LE_SCK_DIVISOR);
|
|
|
|
do {
|
|
// Read the command type, waiting for the data to be ready
|
|
msg->type = spi_read();
|
|
if (msg->type == SdepSlaveNotReady || msg->type == SdepSlaveOverflow) {
|
|
// Release it and let it initialize
|
|
spi_stop();
|
|
wait_us(SdepBackOff);
|
|
spi_start(BLUEFRUIT_LE_CS_PIN, false, 0, BLUEFRUIT_LE_SCK_DIVISOR);
|
|
continue;
|
|
}
|
|
|
|
// Read the rest of the header
|
|
spi_receive(&msg->cmd_low, sizeof(*msg) - (1 + sizeof(msg->payload)));
|
|
|
|
// and get the payload if there is any
|
|
if (msg->len <= SdepMaxPayload) {
|
|
spi_receive(msg->payload, msg->len);
|
|
}
|
|
success = true;
|
|
break;
|
|
} while (timer_elapsed(timerStart) < timeout);
|
|
|
|
spi_stop();
|
|
}
|
|
return success;
|
|
}
|
|
|
|
static void resp_buf_read_one(bool greedy) {
|
|
uint16_t last_send;
|
|
if (!resp_buf.peek(last_send)) {
|
|
return;
|
|
}
|
|
|
|
if (gpio_read_pin(BLUEFRUIT_LE_IRQ_PIN)) {
|
|
struct sdep_msg msg;
|
|
|
|
again:
|
|
if (sdep_recv_pkt(&msg, SdepTimeout)) {
|
|
if (!msg.more) {
|
|
// We got it; consume this entry
|
|
resp_buf.get(last_send);
|
|
dprintf("recv latency %dms\n", TIMER_DIFF_16(timer_read(), last_send));
|
|
}
|
|
|
|
if (greedy && resp_buf.peek(last_send) && gpio_read_pin(BLUEFRUIT_LE_IRQ_PIN)) {
|
|
goto again;
|
|
}
|
|
}
|
|
|
|
} else if (timer_elapsed(last_send) > SdepTimeout * 2) {
|
|
dprintf("waiting_for_result: timeout, resp_buf size %d\n", (int)resp_buf.size());
|
|
|
|
// Timed out: consume this entry
|
|
resp_buf.get(last_send);
|
|
}
|
|
}
|
|
|
|
static void send_buf_send_one(uint16_t timeout = SdepTimeout) {
|
|
struct queue_item item;
|
|
|
|
// Don't send anything more until we get an ACK
|
|
if (!resp_buf.empty()) {
|
|
return;
|
|
}
|
|
|
|
if (!send_buf.peek(item)) {
|
|
return;
|
|
}
|
|
if (process_queue_item(&item, timeout)) {
|
|
// commit that peek
|
|
send_buf.get(item);
|
|
dprintf("send_buf_send_one: have %d remaining\n", (int)send_buf.size());
|
|
} else {
|
|
dprint("failed to send, will retry\n");
|
|
wait_ms(SdepTimeout);
|
|
resp_buf_read_one(true);
|
|
}
|
|
}
|
|
|
|
static void resp_buf_wait(const char *cmd) {
|
|
bool didPrint = false;
|
|
while (!resp_buf.empty()) {
|
|
if (!didPrint) {
|
|
dprintf("wait on buf for %s\n", cmd);
|
|
didPrint = true;
|
|
}
|
|
resp_buf_read_one(true);
|
|
}
|
|
}
|
|
|
|
void bluefruit_le_init(void) {
|
|
state.initialized = false;
|
|
state.configured = false;
|
|
state.is_connected = false;
|
|
|
|
gpio_set_pin_input(BLUEFRUIT_LE_IRQ_PIN);
|
|
|
|
spi_init();
|
|
|
|
// Perform a hardware reset
|
|
gpio_set_pin_output(BLUEFRUIT_LE_RST_PIN);
|
|
gpio_write_pin_high(BLUEFRUIT_LE_RST_PIN);
|
|
gpio_write_pin_low(BLUEFRUIT_LE_RST_PIN);
|
|
wait_ms(10);
|
|
gpio_write_pin_high(BLUEFRUIT_LE_RST_PIN);
|
|
|
|
wait_ms(1000); // Give it a second to initialize
|
|
|
|
state.initialized = true;
|
|
}
|
|
|
|
static inline uint8_t min(uint8_t a, uint8_t b) {
|
|
return a < b ? a : b;
|
|
}
|
|
|
|
static bool read_response(char *resp, uint16_t resplen, bool verbose) {
|
|
char *dest = resp;
|
|
char *end = dest + resplen;
|
|
|
|
while (true) {
|
|
struct sdep_msg msg;
|
|
|
|
if (!sdep_recv_pkt(&msg, 2 * SdepTimeout)) {
|
|
dprint("sdep_recv_pkt failed\n");
|
|
return false;
|
|
}
|
|
|
|
if (msg.type != SdepResponse) {
|
|
*resp = 0;
|
|
return false;
|
|
}
|
|
|
|
uint8_t len = min(msg.len, end - dest);
|
|
if (len > 0) {
|
|
memcpy(dest, msg.payload, len);
|
|
dest += len;
|
|
}
|
|
|
|
if (!msg.more) {
|
|
// No more data is expected!
|
|
break;
|
|
}
|
|
}
|
|
|
|
// Ensure the response is NUL terminated
|
|
*dest = 0;
|
|
|
|
// "Parse" the result text; we want to snip off the trailing OK or ERROR line
|
|
// Rewind past the possible trailing CRLF so that we can strip it
|
|
--dest;
|
|
while (dest > resp && (dest[0] == '\n' || dest[0] == '\r')) {
|
|
*dest = 0;
|
|
--dest;
|
|
}
|
|
|
|
// Look back for start of preceeding line
|
|
char *last_line = strrchr(resp, '\n');
|
|
if (last_line) {
|
|
++last_line;
|
|
} else {
|
|
last_line = resp;
|
|
}
|
|
|
|
bool success = false;
|
|
static const char kOK[] PROGMEM = "OK";
|
|
|
|
success = !strcmp_P(last_line, kOK);
|
|
|
|
if (verbose || !success) {
|
|
dprintf("result: %s\n", resp);
|
|
}
|
|
return success;
|
|
}
|
|
|
|
static bool at_command(const char *cmd, char *resp, uint16_t resplen, bool verbose, uint16_t timeout) {
|
|
const char * end = cmd + strlen(cmd);
|
|
struct sdep_msg msg;
|
|
|
|
if (verbose) {
|
|
dprintf("ble send: %s\n", cmd);
|
|
}
|
|
|
|
if (resp) {
|
|
// They want to decode the response, so we need to flush and wait
|
|
// for all pending I/O to finish before we start this one, so
|
|
// that we don't confuse the results
|
|
resp_buf_wait(cmd);
|
|
*resp = 0;
|
|
}
|
|
|
|
// Fragment the command into a series of SDEP packets
|
|
while (end - cmd > SdepMaxPayload) {
|
|
sdep_build_pkt(&msg, BleAtWrapper, (uint8_t *)cmd, SdepMaxPayload, true);
|
|
if (!sdep_send_pkt(&msg, timeout)) {
|
|
return false;
|
|
}
|
|
cmd += SdepMaxPayload;
|
|
}
|
|
|
|
sdep_build_pkt(&msg, BleAtWrapper, (uint8_t *)cmd, end - cmd, false);
|
|
if (!sdep_send_pkt(&msg, timeout)) {
|
|
return false;
|
|
}
|
|
|
|
if (resp == NULL) {
|
|
uint16_t now = timer_read();
|
|
while (!resp_buf.enqueue(now)) {
|
|
resp_buf_read_one(false);
|
|
}
|
|
uint16_t later = timer_read();
|
|
if (TIMER_DIFF_16(later, now) > 0) {
|
|
dprintf("waited %dms for resp_buf\n", TIMER_DIFF_16(later, now));
|
|
}
|
|
return true;
|
|
}
|
|
|
|
return read_response(resp, resplen, verbose);
|
|
}
|
|
|
|
bool at_command_P(const char *cmd, char *resp, uint16_t resplen, bool verbose) {
|
|
char *cmdbuf = (char *)alloca(strlen_P(cmd) + 1);
|
|
strcpy_P(cmdbuf, cmd);
|
|
return at_command(cmdbuf, resp, resplen, verbose);
|
|
}
|
|
|
|
bool bluefruit_le_is_connected(void) {
|
|
return state.is_connected;
|
|
}
|
|
|
|
bool bluefruit_le_enable_keyboard(void) {
|
|
char resbuf[128];
|
|
|
|
if (!state.initialized) {
|
|
return false;
|
|
}
|
|
|
|
state.configured = false;
|
|
|
|
// Disable command echo
|
|
static const char kEcho[] PROGMEM = "ATE=0";
|
|
// Make the advertised name match the keyboard
|
|
static const char kGapDevName[] PROGMEM = "AT+GAPDEVNAME=" PRODUCT;
|
|
// Turn on keyboard support
|
|
static const char kHidEnOn[] PROGMEM = "AT+BLEHIDEN=1";
|
|
|
|
// Adjust intervals to improve latency. This causes the "central"
|
|
// system (computer/tablet) to poll us every 10-30 ms. We can't
|
|
// set a smaller value than 10ms, and 30ms seems to be the natural
|
|
// processing time on my macbook. Keeping it constrained to that
|
|
// feels reasonable to type to.
|
|
static const char kGapIntervals[] PROGMEM = "AT+GAPINTERVALS=10,30,,";
|
|
|
|
// Reset the device so that it picks up the above changes
|
|
static const char kATZ[] PROGMEM = "ATZ";
|
|
|
|
// Turn down the power level a bit
|
|
static const char kPower[] PROGMEM = "AT+BLEPOWERLEVEL=-12";
|
|
static PGM_P const configure_commands[] PROGMEM = {
|
|
kEcho, kGapIntervals, kGapDevName, kHidEnOn, kPower, kATZ,
|
|
};
|
|
|
|
uint8_t i;
|
|
for (i = 0; i < sizeof(configure_commands) / sizeof(configure_commands[0]); ++i) {
|
|
PGM_P cmd;
|
|
memcpy_P(&cmd, configure_commands + i, sizeof(cmd));
|
|
|
|
if (!at_command_P(cmd, resbuf, sizeof(resbuf))) {
|
|
dprintf("failed BLE command: %S: %s\n", cmd, resbuf);
|
|
goto fail;
|
|
}
|
|
}
|
|
|
|
state.configured = true;
|
|
|
|
// Check connection status in a little while; allow the ATZ time
|
|
// to kick in.
|
|
state.last_connection_update = timer_read();
|
|
fail:
|
|
return state.configured;
|
|
}
|
|
|
|
static void set_connected(bool connected) {
|
|
if (connected != state.is_connected) {
|
|
if (connected) {
|
|
dprint("BLE connected\n");
|
|
} else {
|
|
dprint("BLE disconnected\n");
|
|
}
|
|
state.is_connected = connected;
|
|
|
|
// TODO: if modifiers are down on the USB interface and
|
|
// we cut over to BLE or vice versa, they will remain stuck.
|
|
// This feels like a good point to do something like clearing
|
|
// the keyboard and/or generating a fake all keys up message.
|
|
// However, I've noticed that it takes a couple of seconds
|
|
// for macOS to to start recognizing key presses after BLE
|
|
// is in the connected state, so I worry that doing that
|
|
// here may not be good enough.
|
|
}
|
|
}
|
|
|
|
void bluefruit_le_task(void) {
|
|
char resbuf[48];
|
|
|
|
if (!state.configured && !bluefruit_le_enable_keyboard()) {
|
|
return;
|
|
}
|
|
resp_buf_read_one(true);
|
|
send_buf_send_one(SdepShortTimeout);
|
|
|
|
if (resp_buf.empty() && (state.event_flags & UsingEvents) && gpio_read_pin(BLUEFRUIT_LE_IRQ_PIN)) {
|
|
// Must be an event update
|
|
if (at_command_P(PSTR("AT+EVENTSTATUS"), resbuf, sizeof(resbuf))) {
|
|
uint32_t mask = strtoul(resbuf, NULL, 16);
|
|
|
|
if (mask & BleSystemConnected) {
|
|
set_connected(true);
|
|
} else if (mask & BleSystemDisconnected) {
|
|
set_connected(false);
|
|
}
|
|
}
|
|
}
|
|
|
|
if (timer_elapsed(state.last_connection_update) > ConnectionUpdateInterval) {
|
|
bool shouldPoll = true;
|
|
if (!(state.event_flags & ProbedEvents)) {
|
|
// Request notifications about connection status changes.
|
|
// This only works in SPIFRIEND firmware > 0.6.7, which is why
|
|
// we check for this conditionally here.
|
|
// Note that at the time of writing, HID reports only work correctly
|
|
// with Apple products on firmware version 0.6.7!
|
|
// https://forums.adafruit.com/viewtopic.php?f=8&t=104052
|
|
if (at_command_P(PSTR("AT+EVENTENABLE=0x1"), resbuf, sizeof(resbuf))) {
|
|
at_command_P(PSTR("AT+EVENTENABLE=0x2"), resbuf, sizeof(resbuf));
|
|
state.event_flags |= UsingEvents;
|
|
}
|
|
state.event_flags |= ProbedEvents;
|
|
|
|
// leave shouldPoll == true so that we check at least once
|
|
// before relying solely on events
|
|
} else {
|
|
shouldPoll = false;
|
|
}
|
|
|
|
static const char kGetConn[] PROGMEM = "AT+GAPGETCONN";
|
|
state.last_connection_update = timer_read();
|
|
|
|
if (at_command_P(kGetConn, resbuf, sizeof(resbuf))) {
|
|
set_connected(atoi(resbuf));
|
|
}
|
|
}
|
|
}
|
|
|
|
static bool process_queue_item(struct queue_item *item, uint16_t timeout) {
|
|
char cmdbuf[48];
|
|
char fmtbuf[64];
|
|
|
|
// Arrange to re-check connection after keys have settled
|
|
state.last_connection_update = timer_read();
|
|
|
|
#if 1
|
|
if (TIMER_DIFF_16(state.last_connection_update, item->added) > 0) {
|
|
dprintf("send latency %dms\n", TIMER_DIFF_16(state.last_connection_update, item->added));
|
|
}
|
|
#endif
|
|
|
|
switch (item->queue_type) {
|
|
case QTKeyReport:
|
|
strcpy_P(fmtbuf, PSTR("AT+BLEKEYBOARDCODE=%02x-00-%02x-%02x-%02x-%02x-%02x-%02x"));
|
|
snprintf(cmdbuf, sizeof(cmdbuf), fmtbuf, item->key.modifier, item->key.keys[0], item->key.keys[1], item->key.keys[2], item->key.keys[3], item->key.keys[4], item->key.keys[5]);
|
|
return at_command(cmdbuf, NULL, 0, true, timeout);
|
|
|
|
#ifdef EXTRAKEY_ENABLE
|
|
case QTConsumer:
|
|
strcpy_P(fmtbuf, PSTR("AT+BLEHIDCONTROLKEY=0x%04x"));
|
|
snprintf(cmdbuf, sizeof(cmdbuf), fmtbuf, item->consumer);
|
|
return at_command(cmdbuf, NULL, 0, true, timeout);
|
|
#endif
|
|
|
|
#ifdef MOUSE_ENABLE
|
|
case QTMouseMove:
|
|
strcpy_P(fmtbuf, PSTR("AT+BLEHIDMOUSEMOVE=%d,%d,%d,%d"));
|
|
snprintf(cmdbuf, sizeof(cmdbuf), fmtbuf, item->mousemove.x, item->mousemove.y, item->mousemove.scroll, item->mousemove.pan);
|
|
if (!at_command(cmdbuf, NULL, 0, true, timeout)) {
|
|
return false;
|
|
}
|
|
strcpy_P(cmdbuf, PSTR("AT+BLEHIDMOUSEBUTTON="));
|
|
if (item->mousemove.buttons & MOUSE_BTN1) {
|
|
strcat(cmdbuf, "L");
|
|
}
|
|
if (item->mousemove.buttons & MOUSE_BTN2) {
|
|
strcat(cmdbuf, "R");
|
|
}
|
|
if (item->mousemove.buttons & MOUSE_BTN3) {
|
|
strcat(cmdbuf, "M");
|
|
}
|
|
if (item->mousemove.buttons == 0) {
|
|
strcat(cmdbuf, "0");
|
|
}
|
|
return at_command(cmdbuf, NULL, 0, true, timeout);
|
|
#endif
|
|
default:
|
|
return true;
|
|
}
|
|
}
|
|
|
|
void bluefruit_le_send_keyboard(report_keyboard_t *report) {
|
|
struct queue_item item;
|
|
|
|
item.queue_type = QTKeyReport;
|
|
item.key.modifier = report->mods;
|
|
item.key.keys[0] = report->keys[0];
|
|
item.key.keys[1] = report->keys[1];
|
|
item.key.keys[2] = report->keys[2];
|
|
item.key.keys[3] = report->keys[3];
|
|
item.key.keys[4] = report->keys[4];
|
|
item.key.keys[5] = report->keys[5];
|
|
|
|
while (!send_buf.enqueue(item)) {
|
|
send_buf_send_one();
|
|
}
|
|
}
|
|
|
|
void bluefruit_le_send_consumer(uint16_t usage) {
|
|
struct queue_item item;
|
|
|
|
item.queue_type = QTConsumer;
|
|
item.consumer = usage;
|
|
|
|
while (!send_buf.enqueue(item)) {
|
|
send_buf_send_one();
|
|
}
|
|
}
|
|
|
|
void bluefruit_le_send_mouse(report_mouse_t *report) {
|
|
struct queue_item item;
|
|
|
|
item.queue_type = QTMouseMove;
|
|
item.mousemove.x = report->x;
|
|
item.mousemove.y = report->y;
|
|
item.mousemove.scroll = report->v;
|
|
item.mousemove.pan = report->h;
|
|
item.mousemove.buttons = report->buttons;
|
|
|
|
while (!send_buf.enqueue(item)) {
|
|
send_buf_send_one();
|
|
}
|
|
}
|
|
|
|
bool bluefruit_le_set_mode_leds(bool on) {
|
|
if (!state.configured) {
|
|
return false;
|
|
}
|
|
|
|
// The "mode" led is the red blinky one
|
|
at_command_P(on ? PSTR("AT+HWMODELED=1") : PSTR("AT+HWMODELED=0"), NULL, 0);
|
|
|
|
// Pin 19 is the blue "connected" LED; turn that off too.
|
|
// When turning LEDs back on, don't turn that LED on if we're
|
|
// not connected, as that would be confusing.
|
|
at_command_P(on && state.is_connected ? PSTR("AT+HWGPIO=19,1") : PSTR("AT+HWGPIO=19,0"), NULL, 0);
|
|
return true;
|
|
}
|
|
|
|
// https://learn.adafruit.com/adafruit-feather-32u4-bluefruit-le/ble-generic#at-plus-blepowerlevel
|
|
bool bluefruit_le_set_power_level(int8_t level) {
|
|
char cmd[46];
|
|
if (!state.configured) {
|
|
return false;
|
|
}
|
|
snprintf(cmd, sizeof(cmd), "AT+BLEPOWERLEVEL=%d", level);
|
|
return at_command(cmd, NULL, 0, false);
|
|
}
|