mirror of
https://github.com/zsa/qmk_firmware.git
synced 2026-02-17 01:32:17 +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>
626 lines
20 KiB
C
626 lines
20 KiB
C
/* Copyright 2016-2020 Jack Humbert
|
|
* Copyright 2020 JohSchneider
|
|
|
|
* 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/>.
|
|
*/
|
|
#include "audio.h"
|
|
#include "eeconfig.h"
|
|
#include "timer.h"
|
|
#include "debug.h"
|
|
#include "wait.h"
|
|
#include "util.h"
|
|
#include "gpio.h"
|
|
|
|
/* audio system:
|
|
*
|
|
* audio.[ch] takes care of all overall state, tracking the actively playing
|
|
* notes/tones; the notes a SONG consists of;
|
|
* ...
|
|
* = everything audio-related that is platform agnostic
|
|
*
|
|
* driver_[avr|chibios]_[dac|pwm] take care of the lower hardware dependent parts,
|
|
* specific to each platform and the used subsystem/driver to drive
|
|
* the output pins/channels with the calculated frequencies for each
|
|
* active tone
|
|
* as part of this, the driver has to trigger regular state updates by
|
|
* calling 'audio_update_state' through some sort of timer - be it a
|
|
* dedicated one or piggybacking on for example the timer used to
|
|
* generate a pwm signal/clock.
|
|
*
|
|
*
|
|
* A Note on terminology:
|
|
* tone, pitch and frequency are used somewhat interchangeably, in a strict Wikipedia-sense:
|
|
* "(Musical) tone, a sound characterized by its duration, pitch (=frequency),
|
|
* intensity (=volume), and timbre"
|
|
* - intensity/volume is currently not handled at all, although the 'dac_additive' driver could do so
|
|
* - timbre is handled globally (TODO: only used with the pwm drivers at the moment)
|
|
*
|
|
* in musical_note.h a 'note' is the combination of a pitch and a duration
|
|
* these are used to create SONG arrays; during playback their frequencies
|
|
* are handled as single successive tones, while the durations are
|
|
* kept track of in 'audio_update_state'
|
|
*
|
|
* 'voice' as it is used here, equates to a sort of instrument with its own
|
|
* characteristics sound and effects
|
|
* the audio system as-is deals only with (possibly multiple) tones of one
|
|
* instrument/voice at a time (think: chords). since the number of tones that
|
|
* can be reproduced depends on the hardware/driver in use: pwm can only
|
|
* reproduce one tone per output/speaker; DACs can reproduce/mix multiple
|
|
* when doing additive synthesis.
|
|
*
|
|
* 'duration' can either be in the beats-per-minute related unit found in
|
|
* musical_notes.h, OR in ms; keyboards create SONGs with the former, while
|
|
* the internal state of the audio system does its calculations with the later - ms
|
|
*/
|
|
|
|
#ifndef AUDIO_DEFAULT_ON
|
|
# define AUDIO_DEFAULT_ON true
|
|
#endif
|
|
#ifndef AUDIO_DEFAULT_CLICKY_ON
|
|
# define AUDIO_DEFAULT_CLICKY_ON true
|
|
#endif
|
|
|
|
#ifndef AUDIO_TONE_STACKSIZE
|
|
# define AUDIO_TONE_STACKSIZE 8
|
|
#endif
|
|
uint8_t active_tones = 0; // number of tones pushed onto the stack by audio_play_tone - might be more than the hardware is able to reproduce at any single time
|
|
musical_tone_t tones[AUDIO_TONE_STACKSIZE]; // stack of currently active tones
|
|
|
|
bool playing_melody = false; // playing a SONG?
|
|
bool playing_note = false; // or (possibly multiple simultaneous) tones
|
|
bool state_changed = false; // global flag, which is set if anything changes with the active_tones
|
|
|
|
// melody/SONG related state variables
|
|
float (*notes_pointer)[][2]; // SONG, an array of MUSICAL_NOTEs
|
|
uint16_t notes_count; // length of the notes_pointer array
|
|
bool notes_repeat; // PLAY_SONG or PLAY_LOOP?
|
|
uint16_t melody_current_note_duration = 0; // duration of the currently playing note from the active melody, in ms
|
|
uint8_t note_tempo = TEMPO_DEFAULT; // beats-per-minute
|
|
uint16_t current_note = 0; // index into the array at notes_pointer
|
|
bool note_resting = false; // if a short pause was introduced between two notes with the same frequency while playing a melody
|
|
uint16_t last_timestamp = 0;
|
|
|
|
#ifdef AUDIO_ENABLE_TONE_MULTIPLEXING
|
|
# ifndef AUDIO_MAX_SIMULTANEOUS_TONES
|
|
# define AUDIO_MAX_SIMULTANEOUS_TONES 3
|
|
# endif
|
|
uint16_t tone_multiplexing_rate = AUDIO_TONE_MULTIPLEXING_RATE_DEFAULT;
|
|
uint8_t tone_multiplexing_index_shift = 0; // offset used on active-tone array access
|
|
#endif
|
|
|
|
// provided and used by voices.c
|
|
extern uint8_t note_timbre;
|
|
extern bool glissando;
|
|
extern bool vibrato;
|
|
extern uint16_t voices_timer;
|
|
|
|
#ifndef STARTUP_SONG
|
|
# define STARTUP_SONG SONG(STARTUP_SOUND)
|
|
#endif
|
|
#ifndef AUDIO_ON_SONG
|
|
# define AUDIO_ON_SONG SONG(AUDIO_ON_SOUND)
|
|
#endif
|
|
#ifndef AUDIO_OFF_SONG
|
|
# define AUDIO_OFF_SONG SONG(AUDIO_OFF_SOUND)
|
|
#endif
|
|
float startup_song[][2] = STARTUP_SONG;
|
|
float audio_on_song[][2] = AUDIO_ON_SONG;
|
|
float audio_off_song[][2] = AUDIO_OFF_SONG;
|
|
|
|
static bool audio_initialized = false;
|
|
static bool audio_driver_stopped = true;
|
|
audio_config_t audio_config;
|
|
|
|
#ifndef AUDIO_POWER_CONTROL_PIN_ON_STATE
|
|
# define AUDIO_POWER_CONTROL_PIN_ON_STATE 1
|
|
#endif
|
|
|
|
void audio_driver_initialize(void) {
|
|
#ifdef AUDIO_POWER_CONTROL_PIN
|
|
gpio_set_pin_output_push_pull(AUDIO_POWER_CONTROL_PIN);
|
|
gpio_write_pin(AUDIO_POWER_CONTROL_PIN, !AUDIO_POWER_CONTROL_PIN_ON_STATE);
|
|
#endif
|
|
audio_driver_initialize_impl();
|
|
}
|
|
|
|
void audio_driver_stop(void) {
|
|
audio_driver_stop_impl();
|
|
#ifdef AUDIO_POWER_CONTROL_PIN
|
|
gpio_write_pin(AUDIO_POWER_CONTROL_PIN, !AUDIO_POWER_CONTROL_PIN_ON_STATE);
|
|
#endif
|
|
}
|
|
|
|
void audio_driver_start(void) {
|
|
#ifdef AUDIO_POWER_CONTROL_PIN
|
|
gpio_write_pin(AUDIO_POWER_CONTROL_PIN, AUDIO_POWER_CONTROL_PIN_ON_STATE);
|
|
#endif
|
|
audio_driver_start_impl();
|
|
}
|
|
|
|
void eeconfig_update_audio_current(void) {
|
|
eeconfig_update_audio(&audio_config);
|
|
}
|
|
|
|
void eeconfig_update_audio_default(void) {
|
|
audio_config.valid = true;
|
|
audio_config.enable = AUDIO_DEFAULT_ON;
|
|
audio_config.clicky_enable = AUDIO_DEFAULT_CLICKY_ON;
|
|
eeconfig_update_audio(&audio_config);
|
|
}
|
|
|
|
void audio_init(void) {
|
|
if (audio_initialized) {
|
|
return;
|
|
}
|
|
|
|
eeconfig_read_audio(&audio_config);
|
|
if (!audio_config.valid) {
|
|
dprintf("audio_init audio_config.valid = 0. Write default values to EEPROM.\n");
|
|
eeconfig_update_audio_default();
|
|
}
|
|
|
|
for (uint8_t i = 0; i < AUDIO_TONE_STACKSIZE; i++) {
|
|
tones[i] = (musical_tone_t){.time_started = 0, .pitch = -1.0f, .duration = 0};
|
|
}
|
|
|
|
audio_driver_initialize();
|
|
audio_initialized = true;
|
|
|
|
stop_all_notes();
|
|
#ifndef AUDIO_INIT_DELAY
|
|
audio_startup();
|
|
#endif
|
|
}
|
|
|
|
void audio_startup(void) {
|
|
if (audio_config.enable) {
|
|
PLAY_SONG(startup_song);
|
|
}
|
|
|
|
last_timestamp = timer_read();
|
|
}
|
|
|
|
void audio_toggle(void) {
|
|
if (audio_config.enable) {
|
|
stop_all_notes();
|
|
}
|
|
audio_config.enable ^= 1;
|
|
eeconfig_update_audio(&audio_config);
|
|
if (audio_config.enable) {
|
|
audio_on_user();
|
|
} else {
|
|
audio_off_user();
|
|
}
|
|
}
|
|
|
|
void audio_on(void) {
|
|
audio_config.enable = 1;
|
|
eeconfig_update_audio(&audio_config);
|
|
audio_on_user();
|
|
PLAY_SONG(audio_on_song);
|
|
}
|
|
|
|
void audio_off(void) {
|
|
PLAY_SONG(audio_off_song);
|
|
audio_off_user();
|
|
wait_ms(100);
|
|
audio_stop_all();
|
|
audio_config.enable = 0;
|
|
eeconfig_update_audio(&audio_config);
|
|
}
|
|
|
|
bool audio_is_on(void) {
|
|
return (audio_config.enable != 0);
|
|
}
|
|
|
|
void audio_stop_all(void) {
|
|
if (audio_driver_stopped) {
|
|
return;
|
|
}
|
|
|
|
active_tones = 0;
|
|
|
|
audio_driver_stop();
|
|
|
|
playing_melody = false;
|
|
playing_note = false;
|
|
|
|
melody_current_note_duration = 0;
|
|
|
|
for (uint8_t i = 0; i < AUDIO_TONE_STACKSIZE; i++) {
|
|
tones[i] = (musical_tone_t){.time_started = 0, .pitch = -1.0f, .duration = 0};
|
|
}
|
|
|
|
audio_driver_stopped = true;
|
|
}
|
|
|
|
void audio_stop_tone(float pitch) {
|
|
if (pitch < 0.0f) {
|
|
pitch = -1 * pitch;
|
|
}
|
|
|
|
if (playing_note) {
|
|
if (!audio_initialized) {
|
|
audio_init();
|
|
}
|
|
bool found = false;
|
|
for (int i = AUDIO_TONE_STACKSIZE - 1; i >= 0; i--) {
|
|
found = (tones[i].pitch == pitch);
|
|
if (found) {
|
|
for (int j = i; (j < AUDIO_TONE_STACKSIZE - 1); j++) {
|
|
tones[j] = tones[j + 1];
|
|
}
|
|
tones[AUDIO_TONE_STACKSIZE - 1] = (musical_tone_t){.time_started = 0, .pitch = -1.0f, .duration = 0};
|
|
break;
|
|
}
|
|
}
|
|
if (!found) {
|
|
return;
|
|
}
|
|
|
|
state_changed = true;
|
|
active_tones--;
|
|
if (active_tones < 0) active_tones = 0;
|
|
#ifdef AUDIO_ENABLE_TONE_MULTIPLEXING
|
|
if (tone_multiplexing_index_shift >= active_tones) {
|
|
tone_multiplexing_index_shift = 0;
|
|
}
|
|
#endif
|
|
if (active_tones == 0) {
|
|
audio_driver_stop();
|
|
audio_driver_stopped = true;
|
|
playing_note = false;
|
|
}
|
|
}
|
|
}
|
|
|
|
void audio_play_note(float pitch, uint16_t duration) {
|
|
if (!audio_config.enable) {
|
|
return;
|
|
}
|
|
|
|
if (!audio_initialized) {
|
|
audio_init();
|
|
}
|
|
|
|
if (pitch < 0.0f) {
|
|
pitch = -1 * pitch;
|
|
}
|
|
|
|
// round-robin: shifting out old tones, keeping only unique ones
|
|
// if the new frequency is already amongst the active tones, shift it to the top of the stack
|
|
bool found = false;
|
|
for (int i = active_tones - 1; i >= 0; i--) {
|
|
found = (tones[i].pitch == pitch);
|
|
if (found) {
|
|
for (int j = i; (j < active_tones - 1); j++) {
|
|
tones[j] = tones[j + 1];
|
|
tones[j + 1] = (musical_tone_t){.time_started = timer_read(), .pitch = pitch, .duration = duration};
|
|
}
|
|
return; // since this frequency played already, the hardware was already started
|
|
}
|
|
}
|
|
|
|
// frequency/tone is actually new, so we put it on the top of the stack
|
|
active_tones++;
|
|
if (active_tones > AUDIO_TONE_STACKSIZE) {
|
|
active_tones = AUDIO_TONE_STACKSIZE;
|
|
// shift out the oldest tone to make room
|
|
for (int i = 0; i < active_tones - 1; i++) {
|
|
tones[i] = tones[i + 1];
|
|
}
|
|
}
|
|
state_changed = true;
|
|
playing_note = true;
|
|
tones[active_tones - 1] = (musical_tone_t){.time_started = timer_read(), .pitch = pitch, .duration = duration};
|
|
|
|
// TODO: needs to be handled per note/tone -> use its timestamp instead?
|
|
voices_timer = timer_read(); // reset to zero, for the effects added by voices.c
|
|
|
|
if (audio_driver_stopped) {
|
|
audio_driver_start();
|
|
audio_driver_stopped = false;
|
|
}
|
|
}
|
|
|
|
void audio_play_tone(float pitch) {
|
|
audio_play_note(pitch, 0xffff);
|
|
}
|
|
|
|
void audio_play_melody(float (*np)[][2], uint16_t n_count, bool n_repeat) {
|
|
if (!audio_config.enable) {
|
|
audio_stop_all();
|
|
return;
|
|
}
|
|
|
|
if (n_count == 0) {
|
|
return;
|
|
}
|
|
|
|
if (!audio_initialized) {
|
|
audio_init();
|
|
}
|
|
|
|
// Cancel note if a note is playing
|
|
if (playing_note) audio_stop_all();
|
|
|
|
playing_melody = true;
|
|
note_resting = false;
|
|
|
|
notes_pointer = np;
|
|
notes_count = n_count;
|
|
notes_repeat = n_repeat;
|
|
|
|
current_note = 0; // note in the melody-array/list at note_pointer
|
|
|
|
// start first note manually, which also starts the audio_driver
|
|
// all following/remaining notes are played by 'audio_update_state'
|
|
audio_play_note((*notes_pointer)[current_note][0], audio_duration_to_ms((*notes_pointer)[current_note][1]));
|
|
last_timestamp = timer_read();
|
|
melody_current_note_duration = audio_duration_to_ms((*notes_pointer)[current_note][1]);
|
|
}
|
|
|
|
float click[2][2];
|
|
void audio_play_click(uint16_t delay, float pitch, uint16_t duration) {
|
|
uint16_t duration_tone = audio_ms_to_duration(duration);
|
|
uint16_t duration_delay = audio_ms_to_duration(delay);
|
|
|
|
if (delay <= 0.0f) {
|
|
click[0][0] = pitch;
|
|
click[0][1] = duration_tone;
|
|
click[1][0] = 0.0f;
|
|
click[1][1] = 0.0f;
|
|
audio_play_melody(&click, 1, false);
|
|
} else {
|
|
// first note is a rest/pause
|
|
click[0][0] = 0.0f;
|
|
click[0][1] = duration_delay;
|
|
// second note is the actual click
|
|
click[1][0] = pitch;
|
|
click[1][1] = duration_tone;
|
|
audio_play_melody(&click, 2, false);
|
|
}
|
|
}
|
|
|
|
bool audio_is_playing_note(void) {
|
|
return playing_note;
|
|
}
|
|
|
|
bool audio_is_playing_melody(void) {
|
|
return playing_melody;
|
|
}
|
|
|
|
uint8_t audio_get_number_of_active_tones(void) {
|
|
return active_tones;
|
|
}
|
|
|
|
float audio_get_frequency(uint8_t tone_index) {
|
|
if (tone_index >= active_tones) {
|
|
return 0.0f;
|
|
}
|
|
return tones[active_tones - tone_index - 1].pitch;
|
|
}
|
|
|
|
float audio_get_processed_frequency(uint8_t tone_index) {
|
|
if (tone_index >= active_tones) {
|
|
return 0.0f;
|
|
}
|
|
|
|
int8_t index = active_tones - tone_index - 1;
|
|
// new tones are stacked on top (= appended at the end), so the most recent/current is MAX-1
|
|
|
|
#ifdef AUDIO_ENABLE_TONE_MULTIPLEXING
|
|
index = index - tone_multiplexing_index_shift;
|
|
if (index < 0) // wrap around
|
|
index += active_tones;
|
|
#endif
|
|
|
|
if (tones[index].pitch <= 0.0f) {
|
|
return 0.0f;
|
|
}
|
|
|
|
return voice_envelope(tones[index].pitch);
|
|
}
|
|
|
|
bool audio_update_state(void) {
|
|
if (!playing_note && !playing_melody) {
|
|
return false;
|
|
}
|
|
|
|
bool goto_next_note = false;
|
|
uint16_t current_time = timer_read();
|
|
|
|
if (playing_melody) {
|
|
goto_next_note = timer_elapsed(last_timestamp) >= melody_current_note_duration;
|
|
if (goto_next_note) {
|
|
uint16_t delta = timer_elapsed(last_timestamp) - melody_current_note_duration;
|
|
last_timestamp = current_time;
|
|
uint16_t previous_note = current_note;
|
|
current_note++;
|
|
voices_timer = timer_read(); // reset to zero, for the effects added by voices.c
|
|
|
|
if (current_note >= notes_count) {
|
|
if (notes_repeat) {
|
|
current_note = 0;
|
|
} else {
|
|
audio_stop_all();
|
|
return false;
|
|
}
|
|
}
|
|
|
|
if (!note_resting && (*notes_pointer)[previous_note][0] == (*notes_pointer)[current_note][0]) {
|
|
note_resting = true;
|
|
|
|
// special handling for successive notes of the same frequency:
|
|
// insert a short pause to separate them audibly
|
|
audio_play_note(0.0f, audio_duration_to_ms(2));
|
|
current_note = previous_note;
|
|
melody_current_note_duration = audio_duration_to_ms(2);
|
|
|
|
} else {
|
|
note_resting = false;
|
|
|
|
// TODO: handle glissando here (or remember previous and current tone)
|
|
/* there would need to be a freq(here we are) -> freq(next note)
|
|
* and do slide/glissando in between problem here is to know which
|
|
* frequency on the stack relates to what other? e.g. a melody starts
|
|
* tones in a sequence, and stops expiring one, so the most recently
|
|
* stopped is the starting point for a glissando to the most recently started?
|
|
* how to detect and preserve this relation?
|
|
* and what about user input, chords, ...?
|
|
*/
|
|
|
|
// '- delta': Skip forward in the next note's length if we've over shot
|
|
// the last, so the overall length of the song is the same
|
|
uint16_t duration = audio_duration_to_ms((*notes_pointer)[current_note][1]);
|
|
|
|
// Skip forward past any completely missed notes
|
|
while (delta > duration && current_note < notes_count - 1) {
|
|
delta -= duration;
|
|
current_note++;
|
|
duration = audio_duration_to_ms((*notes_pointer)[current_note][1]);
|
|
}
|
|
|
|
if (delta < duration) {
|
|
duration -= delta;
|
|
} else {
|
|
// Only way to get here is if it is the last note and
|
|
// we have completely missed it. Play it for 1ms...
|
|
duration = 1;
|
|
}
|
|
|
|
audio_play_note((*notes_pointer)[current_note][0], duration);
|
|
melody_current_note_duration = duration;
|
|
}
|
|
}
|
|
}
|
|
|
|
if (playing_note) {
|
|
#ifdef AUDIO_ENABLE_TONE_MULTIPLEXING
|
|
tone_multiplexing_index_shift = (int)(current_time / tone_multiplexing_rate) % MIN(AUDIO_MAX_SIMULTANEOUS_TONES, active_tones);
|
|
goto_next_note = true;
|
|
#endif
|
|
if (vibrato || glissando) {
|
|
// force update on each cycle, since vibrato shifts the frequency slightly
|
|
goto_next_note = true;
|
|
}
|
|
|
|
// housekeeping: stop notes that have no playtime left
|
|
for (int i = 0; i < active_tones; i++) {
|
|
if ((tones[i].duration != 0xffff) // indefinitely playing notes, started by 'audio_play_tone'
|
|
&& (tones[i].duration != 0) // 'uninitialized'
|
|
) {
|
|
if (timer_elapsed(tones[i].time_started) >= tones[i].duration) {
|
|
audio_stop_tone(tones[i].pitch); // also sets 'state_changed=true'
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
// state-changes have a higher priority, always triggering the hardware to update
|
|
if (state_changed) {
|
|
state_changed = false;
|
|
return true;
|
|
}
|
|
|
|
return goto_next_note;
|
|
}
|
|
|
|
// Tone-multiplexing functions
|
|
#ifdef AUDIO_ENABLE_TONE_MULTIPLEXING
|
|
void audio_set_tone_multiplexing_rate(uint16_t rate) {
|
|
tone_multiplexing_rate = rate;
|
|
}
|
|
void audio_enable_tone_multiplexing(void) {
|
|
tone_multiplexing_rate = AUDIO_TONE_MULTIPLEXING_RATE_DEFAULT;
|
|
}
|
|
void audio_disable_tone_multiplexing(void) {
|
|
tone_multiplexing_rate = 0;
|
|
}
|
|
void audio_increase_tone_multiplexing_rate(uint16_t change) {
|
|
if ((0xffff - change) > tone_multiplexing_rate) {
|
|
tone_multiplexing_rate += change;
|
|
}
|
|
}
|
|
void audio_decrease_tone_multiplexing_rate(uint16_t change) {
|
|
if (change <= tone_multiplexing_rate) {
|
|
tone_multiplexing_rate -= change;
|
|
}
|
|
}
|
|
#endif
|
|
|
|
// Tempo functions
|
|
|
|
void audio_set_tempo(uint8_t tempo) {
|
|
if (tempo < 10) note_tempo = 10;
|
|
// else if (tempo > 250)
|
|
// note_tempo = 250;
|
|
else
|
|
note_tempo = tempo;
|
|
}
|
|
|
|
void audio_increase_tempo(uint8_t tempo_change) {
|
|
if (tempo_change > 255 - note_tempo)
|
|
note_tempo = 255;
|
|
else
|
|
note_tempo += tempo_change;
|
|
}
|
|
|
|
void audio_decrease_tempo(uint8_t tempo_change) {
|
|
if (tempo_change >= note_tempo - 10)
|
|
note_tempo = 10;
|
|
else
|
|
note_tempo -= tempo_change;
|
|
}
|
|
|
|
/**
|
|
* Converts from units of 1/64ths of a beat to milliseconds.
|
|
*
|
|
* Round-off error is at most 1 millisecond.
|
|
*
|
|
* Conversion will never overflow for duration_bpm <= 699, provided that
|
|
* note_tempo is at least 10. This is quite a long duration, over ten beats.
|
|
*
|
|
* Beware that for duration_bpm > 699, the result may overflow uint16_t range
|
|
* when duration_bpm is large compared to note_tempo:
|
|
*
|
|
* duration_bpm * 60 * 1000 / (64 * note_tempo) > UINT16_MAX
|
|
*
|
|
* duration_bpm > (2 * 65535 / 1875) * note_tempo
|
|
* = 69.904 * note_tempo.
|
|
*/
|
|
uint16_t audio_duration_to_ms(uint16_t duration_bpm) {
|
|
return ((uint32_t)duration_bpm * 1875) / ((uint_fast16_t)note_tempo * 2);
|
|
}
|
|
|
|
/**
|
|
* Converts from units of milliseconds to 1/64ths of a beat.
|
|
*
|
|
* Round-off error is at most 1/64th of a beat.
|
|
*
|
|
* This conversion never overflows: since duration_ms <= UINT16_MAX = 65535
|
|
* and note_tempo <= 255, the result is always in uint16_t range:
|
|
*
|
|
* duration_ms * 64 * note_tempo / 60 / 1000
|
|
* <= 65535 * 2 * 255 / 1875
|
|
* = 17825.52
|
|
* <= UINT16_MAX.
|
|
*/
|
|
uint16_t audio_ms_to_duration(uint16_t duration_ms) {
|
|
return ((uint32_t)duration_ms * 2 * note_tempo) / 1875;
|
|
}
|
|
|
|
__attribute__((weak)) void audio_on_user(void) {}
|
|
__attribute__((weak)) void audio_off_user(void) {}
|