Skip to content
New issue

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

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

Already on GitHub? # to your account

Bugfix169 analog write #193

Closed
wants to merge 7 commits into from
Closed

Bugfix169 analog write #193

wants to merge 7 commits into from

Conversation

micooke
Copy link
Contributor

@micooke micooke commented Sep 17, 2017

  • Fix bug PWM signal from analogWrite does not stop when pin is set to different mode #169
  • wiring_analog_* : fallback to digitalWrite if no available PWM channel (copied from AVR core)
  • wiring_analog_nRF52.c : convert pwmChannelPins & pwmChannelSequence -> pwmContext to semi-standardise pwm pin allocation and pwm status between nRF51 and nRF52
  • wiring_private.h : Move pwm structures defines out of wiring_analog_* into wiring_private and make the instantiation of these structure externs instead of statics
  • wiring_digital.c : disable the appropriate pwm timer when a digitalWrite is sent to an allocated (from analogWrite) pwm pin, and free up the pwm channel for re-allocation

* wiring_analog_* : fallback to digitalWrite if no available PWM channel (copied from AVR core)
* wiring_analog_nRF52.c : convert pwmChannelPins & pwmChannelSequence -> pwmContext to semi-standardise pwm pin allocation and pwm status between nRF51 and nRF52
* wiring_private.h : Move pwm structures defines out of wiring_analog_* into wiring_private and make the instantiation of these structure externs instead of statics
* wiring_digital.c : disable the appropriate pwm timer when a digitalWrite is sent to an allocated (from analogWrite) pwm pin, and free up the pwm channel for re-allocation
@dlabun
Copy link
Collaborator

dlabun commented Sep 28, 2017

This PR has a bunch of stuff related to adding the BMP... Can remove those commits from this PR so I can merge it? Not a GitHub expert...

Copy link
Collaborator

@dlabun dlabun left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Need to remove BMP related changes

@micooke
Copy link
Contributor Author

micooke commented Sep 28, 2017

Oh sorry about that. I mustn't have rebased it properly - ill try and fix it today.

@micooke
Copy link
Contributor Author

micooke commented Sep 28, 2017

What a mess, this is because i (stupidly) made the BMP changes to my trunk

@dlabun
Copy link
Collaborator

dlabun commented Sep 28, 2017

No worries. If its easier you could always just do a new PR.

@micooke
Copy link
Contributor Author

micooke commented Sep 28, 2017

What do you see on you end post a PR? Do you get all my intermittent garbage logs and changes or just a unified change? If you get all the garbage ill redo both (and try to make it neater next time).
Otherwise ill give it one go and if it doesnt work ill redo them

@dlabun
Copy link
Collaborator

dlabun commented Sep 29, 2017

I can see that there's been 7 commits to this PR with all of the individual changes per commit. I was hoping there was a way to just approve the last commit...either I can't find that button or it doesn't exist.

@jeremypoulter
Copy link

jeremypoulter commented Sep 29, 2017 via email

# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants