Skip to content

Full consolidation of "phase locking" and "PWM locking" waveform generators #8011

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 16 commits into
base: master
Choose a base branch
from
Open

Full consolidation of "phase locking" and "PWM locking" waveform generators #8011

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 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
a1ffcbd
Merge PWM code and updated generic phase-locking waveform code into u…
dok-net May 3, 2021
e662f2d
Remove enablePhaseLockedWaveform().
dok-net May 1, 2021
8750088
Remove paranoid check.
dok-net May 1, 2021
6bafed4
Carry over a few insights from comparing to original waveform (phase-…
dok-net May 3, 2021
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
5 changes: 0 additions & 5 deletions cores/esp8266/Tone.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,6 @@ static void _startTone(uint8_t _pin, uint32_t high, uint32_t low, uint32_t durat
return;
}

// Stop any analogWrites (PWM) because they are a different generator
_stopPWM(_pin);
// If there's another Tone or startWaveform on this pin
// it will be changed on-the-fly (no need to stop it)

pinMode(_pin, OUTPUT);

high = std::max(high, (uint32_t)microsecondsToClockCycles(25)); // new 20KHz maximum tone frequency,
Expand Down
4 changes: 0 additions & 4 deletions cores/esp8266/core_esp8266_features.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,9 +123,6 @@ inline int esp_get_cpu_freq_mhz()
#endif


// Call this function in your setup() to cause the phase locked version of the generator to
// be linked in automatically. Otherwise, the default PWM locked version will be used.
void enablePhaseLockedWaveform(void);

// Determine when the sketch runs on ESP8285
#if !defined(CORE_MOCK)
Expand All @@ -136,7 +133,6 @@ inline bool esp_is_8285()
return false;
}
#endif

#ifdef __cplusplus
}
#endif
Expand Down
Loading