8000 Waveform: int/uint8_t inconsistency and implied stop PWM by dok-net · Pull Request #8008 · esp8266/Arduino · GitHub
[go: up one dir, main page]
Skip to content

Waveform: int/uint8_t inconsistency and implied stop PWM #8008

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

Open
wants to merge 12 commits into
base: master
Choose a base branch
from
Open

Waveform: int/uint8_t inconsistency and implied stop PWM #8008

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
b89932c
Pin has uint8_t, not int type.
dok-net Apr 29, 2021
2776d16
Can't image stopWaveform is called but PWM shall not stop.
dok-net Apr 29, 2021
98537bd
let analogWrite coexist with open-drain mode
dok-net May 2, 2021
36b2bd3
Don't force timer on PWM update as this is pulled by ISR, but only im…
dok-net May 2, 2021
ff0782c
Correct shutdown sequence for phase-sync waveform generator in analog…
dok-net May 2, 2021
293f767
Correction to IRQ latency and ISR delta logic.
dok-net May 3, 2021
50ded37
Early firing the ISR causes interruption to other waveforms, let it p…
dok-net May 3, 2021
f17ba7f
Stopping of the same pin always wins over starting.
dok-net May 3, 2021
5de25bd
Clean code.
dok-net May 19, 2021
6dbd371
Prevent initial bad clock drift calculation on timer init.
dok-net May 31, 2021
d8893b0
stopWaveform in _setPWM caused unconditional _stopPWM.
dok-net Jun 6, 2021
9c612a9
Prevent inlining of `initTimer()`
dok-net Dec 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
let analogWrite coexist with open-drain mode
  • Loading branch information
@dok-net
dok-net committed Dec 23, 2022
commit 98537bd150194d88c2140fb2dd51086810d4a11b
2 changes: 1 addition & 1 deletion cores/esp8266/core_esp8266_wiring_digital.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ extern void __pinMode(uint8_t pin, uint8_t mode) {
}

extern void IRAM_ATTR __digitalWrite(uint8_t pin, uint8_t val) {
stopWaveform(pin); // Disable any Tone or startWaveform on this pin
stopWaveform(pin); // Disable any Tone, startWaveform, or analogWrite on this pin
if(pin < 16){
if(val) GPOS = (1 << pin);
else GPOC = (1 << pin);
Expand Down
26 changes: 16 additions & 10 deletions cores/esp8266/core_esp8266_wiring_pwm.cpp
View file 10000
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,14 @@ extern void __analogWriteFreq(uint32_t freq) {
}

extern void __analogWrite(uint8_t pin, int val) {
analogWriteMode(pin, val, false);
if (pin > 16) {
return;
}
bool openDrain = false;
if (analogMap & 1UL << pin) {
openDrain = GPC(pin) & (1 << GPCD);
}
analogWriteMode(pin, val, openDrain);
}

extern void __analogWriteMode(uint8_t pin, int val, bool openDrain) {
Expand All @@ -59,23 +66,22 @@ extern void __analogWriteMode(uint8_t pin, int val, bool openDrain) {
}

if (analogMap & 1UL << pin) {
// Per the Arduino docs at https://www.arduino.cc/reference/en/language/functions/analog-io/analogwrite/
// val: the duty cycle: between 0 (always off) and 255 (always on).
// So if val = 0 we have digitalWrite(LOW), if we have val==range we have digitalWrite(HIGH)

analogMap &= ~(1 << pin);
const bool isOpenDrain = GPC(pin) & (1 << GPCD);
if (isOpenDrain != openDrain) {
GPC(pin) ^= (1 << GPCD);
}
}
else {
if(openDrain) {
pinMode(pin, OUTPUT_OPEN_DRAIN);
} else {
pinMode(pin, OUTPUT);
}
pinMode(pin, openDrain ? OUTPUT_OPEN_DRAIN : OUTPUT);
}
uint32_t high = (analogPeriod * val) / analogScale;
uint32_t low = analogPeriod - high;
// Find the first GPIO being generated by checking GCC's find-first-set (returns 1 + the bit of the first 1 in an int32_t)
int phaseReference = __builtin_ffs(analogMap) - 1;
// Per the Arduino docs at https://www.arduino.cc/reference/en/language/functions/analog-io/analogwrite/
// val: the duty cycle: between 0 (always off) and 255 (always on).
// So if val = 0 we have digitalWrite(LOW), if we have val==range we have digitalWrite(HIGH)
if (_setPWM(pin, val, analogScale)) {
analogMap |= (1 << pin);
} else if (startWaveformClockCycles(pin, high, low, 0, phaseReference, 0, true)) {
Expand Down
3 changes: 1 addition & 2 deletions libraries/Servo/src/Servo.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,8 +116,7 @@ void Servo::writeMicroseconds(int value)
_servoMap &= ~(1 << _pin);
// Find the first GPIO being generated by checking GCC's find-first-set (returns 1 + the bit of the first 1 in an int32_t)
int phaseReference = __builtin_ffs(_servoMap) - 1;
if (startWaveform(_pin, _valueUs, REFRESH_INTERVAL - _valueUs, 0, phaseReference))
{
if (startWaveform(_pin, _valueUs, REFRESH_INTERVAL - _valueUs, 0, phaseReference)) {
_servoMap |= (1 << _pin);
}
}
Expand Down
0