Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Arm dac+arm pwm #6165

Closed
wants to merge 161 commits into from
Closed

Arm dac+arm pwm #6165

wants to merge 161 commits into from

Conversation

JohSchneider
Copy link
Contributor

@JohSchneider JohSchneider commented Jun 20, 2019 •
edited
Loading

add audio-ARM-PWM feature

Description

These updates do a bit of refactoring (de-duplicating and moving common code around) between the existing AVR (-pwm) code and the new ARM-DAC from this branch #6123 f52faeb
And finally add a new audio-ARM-PWM implementation.

My goal is/was to get audio working on the dirt-cheap STM32F103C8B boards (BluePill) - which sadly do not have a DAC like its newer/larger brethren from the STM32F2xx and STM32F3xx family.

still open TODOs

  • implement/refactor glissando (was in the pre-refactoring implementation)
  • implement/refactor vibrato
  • implement/refactor timbre
  • implement rest/pause between two same notes of a melody
  • code-cleanup (mainly removing all the notes and uneccessary comments, commented out codeblocks/leftovers from refactoring)
  • fix bugs noticed during refactoring

Types of Changes

  • Core
  • Bugfix
  • New feature
  • Enhancement/optimization
  • Keyboard (addition or update)
  • Keymap/layout/userspace (addition or update)
  • Documentation

Issues Fixed or Closed by This PR

  • code-deduplication
  • improved maintainability (?)

Checklist

  • My code follows the code style of this project.
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I have read the CONTRIBUTING document.
  • I have added tests to cover my changes.
  • I have tested the changes and verified that they work and don't break anything (as well as I can manage).

@JohSchneider JohSchneider force-pushed the arm-dac+arm-pwm branch 5 times, most recently from 4dbd794 to 9a71ebd Compare June 22, 2019 02:53
@JohSchneider JohSchneider mentioned this pull request Jun 22, 2019
Closed
5 tasks
@drashna
Copy link
Member

drashna commented Jun 22, 2019

@JohSchneider Should this be targeting the "arm-dac-work" branch? If so, we can redirect the PR.

@JohSchneider
Copy link
Contributor Author

JohSchneider commented Jun 22, 2019 •
edited
Loading

@drashna: yes that was my intention -> please redirect the PR
(must have messed up the git-push somehow :-s)

the "duplicate" tag is probably related to that?

@drashna drashna changed the base branch from master to arm-dac-work June 22, 2019 16:10
@drashna
Copy link
Member

drashna commented Jun 22, 2019

There, that should be what you wanted. :)

And yes, that's why the duplicate tag was added. removing now.

@drashna drashna removed the duplicate label Jun 22, 2019
@JohSchneider
Copy link
Contributor Author

thank you :-D

@drashna
Copy link
Member

drashna commented Jun 22, 2019

You're very welcome!

And most likely, when you opened the PR, you didn't change the target branch, so it defaults to master. Which can be a PITA, some times.

@drashna
Copy link
Member

drashna commented Jul 30, 2019

@jackhumbert any issues with this PR, since it's merging int the arm-dac-work branch that you were/are working on?

Johannes and others added 11 commits October 29, 2020 10:25
audio-refactoring: document tone-multiplexing feature
7da7744
@JohSchneider @noroadsleft
audio-refactoring: Apply suggestions from documentation review
53d6210 
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
@JohSchneider
audio-refactoring: Update docs/audio_driver.md
663375e
@JohSchneider @noroadsleft
audio-refactoring: docs: fix markdown newlines
d641d43 
Terminating a line in Markdown with <space>-<space>-<linebreak> creates an HTML single-line break (<br>).

Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
audio-arm-dac: additive: fix AUDIO_PIN_ALT handling
4968345
@JohSchneider @zvecr
audio-arm-pwm: align define naming with other drivers
ef63526 
Co-authored-by: Joel Challis <git@zvecr.com>
audio-refactoring: set detault tempo to 120
722bce8 
and add documentation for the override
@JohSchneider
audio-refactoring: update backlight define checks to new AUDIO_PIN names
89a9dae
@JohSchneider @zvecr
audio-refactoring: reworking PWM related defines
1059f4d 
to be more consistent with other QMK code

Co-authored-by: Joel Challis <git@zvecr.com>
audio-arm: have the state-update-timer user configurable
c1c1fb7 
defaulting to GPTD6 or GPTD8 for stm32f2+ (=proton-c)
stm32f1 might need to set this to GPTD4, since 6 and 8 are not available
@JohSchneider
audio-refactoring: PLAY_NOTE_ARRAY was already removed in master
bfec6c6
@JohSchneider
Copy link
Contributor Author

again rebased, this time onto 'develop'
the arm variants worked last i checked, but avr has some issues with its timer_read() which currently leads to melodies beeing stuck on one note :-/
... will investigate

@noroadsleft noroadsleft deleted the branch qmk:develop November 28, 2020 20:02
@tzarc tzarc reopened this Nov 28, 2020
@github-actions github-actions bot added cli qmk cli command keyboard via Adds via keymap and/or updates keyboard for via support labels Nov 28, 2020
@skullydazed skullydazed removed cli qmk cli command python labels Dec 12, 2020
@drashna
Copy link
Member

drashna commented Jan 10, 2021

Any updates on this?

@drashna drashna self-requested a review January 23, 2021 03:15
@drashna
Copy link
Member

drashna commented Jan 23, 2021 •
edited
Loading

Since this is too technical for me, I can't really help out here. However I do have a rebased version of this tree, in case that helps either @JohSchneider or anyone else that wants to pick this up.

Edit: you can find that branch, with some additional edits/backports here:
https://github.com/drashna/qmk_firmware/tree/audio_overhaul

Edit 2: @spidey3 was able to find the AVR issue, and can confirm that it's fixed. f7c51105600cce5c3444f0542e45510e9d4dbc12

@tzarc
Copy link
Member

tzarc commented Feb 7, 2021

This will be addressed with a separate PR.

@tzarc tzarc closed this Feb 7, 2021
@drashna drashna mentioned this pull request Feb 7, 2021
Merged
14 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@skullydazed skullydazed Awaiting requested review from skullydazed

@tzarc tzarc Awaiting requested review from tzarc

@noroadsleft noroadsleft Awaiting requested review from noroadsleft

@fauxpark fauxpark Awaiting requested review from fauxpark

@zvecr zvecr Awaiting requested review from zvecr

@drashna drashna Awaiting requested review from drashna

Assignees

@tzarc tzarc

Labels
core documentation enhancement in progress keyboard keymap via Adds via keymap and/or updates keyboard for via support
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.