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

Changes from 1 commit
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
Prev Previous commit
Next Next commit
Stopping of the same pin always wins over starting.
  • Loading branch information
@dok-net
dok-net committed Dec 23, 2022
commit f17ba7fb39ce364c400bca0d4e6f62eac99cf8a3
11 changes: 5 additions & 6 deletions cores/esp8266/core_esp8266_waveform_phase.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ constexpr int32_t DELTAIRQCCYS = ISCPUFREQ160MHZ ?
enum class WaveformMode : uint8_t {INFINITE = 0, EXPIRES = 1, UPDATEEXPIRY = 2, INIT = 3};

// Waveform generator can create tones, PWM, and servos
typedef struct {
struct Waveform {
uint32_t nextPeriodCcy; // ESP clock cycle when a period begins. If WaveformMode::INIT, temporarily holds positive phase offset ccy count
uint32_t endDutyCcy; // ESP clock cycle when going from duty to off
int32_t dutyCcys; // Set next off cycle at low->high to maintain phase
Expand All @@ -88,7 +88,7 @@ typedef struct {
WaveformMode mode;
int8_t alignPhase; // < 0 no phase alignment, otherwise starts waveform in relative phase offset to given pin
bool autoPwm; // perform PWM duty to idle cycle ratio correction under high load at the expense of precise timings
} Waveform;
};

namespace {

Expand Down Expand Up @@ -116,7 +116,6 @@ static IRAM_ATTR void timer1Interrupt();
// Non-speed critical bits
#pragma GCC optimize ("Os")

static void initTimer() __attribute__((noinline));
static void initTimer() {
timer1_disable();
ETS_FRC_TIMER1_INTR_ATTACH(NULL, NULL);
Expand All @@ -126,7 +125,7 @@ static void initTimer() {
timer1_write(IRQLATENCYCCYS); // Cause an interrupt post-haste
}

static void IRAM_ATTR deinitTimer() {
static IRAM_ATTR void deinitTimer() {
ETS_FRC_TIMER1_NMI_INTR_ATTACH(NULL);
timer1_disable();
timer1_isr_init();
Expand Down Expand Up @@ -195,7 +194,7 @@ int startWaveformClockCycles_weak(uint8_t pin, uint32_t highCcys, uint32_t lowCc
if (!waveform.timer1Running) {
initTimer();
}
// The ISR pulls updates on next PWM interval
// The ISR pulls updates on the next waveform interval
}
else {
wave.mode = WaveformMode::INFINITE; // turn off possible expiry to make update atomic from NMI
Expand Down Expand Up @@ -265,7 +264,7 @@ static IRAM_ATTR void timer1Interrupt() {
const bool isCPU2X = CPU2X & 1;
if ((waveform.toSetBits && !(waveform.enabled & waveform.toSetBits)) || waveform.toDisableBits) {
// Handle enable/disable requests from main app.
waveform.enabled = (waveform.enabled & ~waveform.toDisableBits) | waveform.toSetBits; // Set the requested waveforms on/off
waveform.enabled = (waveform.enabled | waveform.toSetBits) & ~waveform.toDisableBits; // Set the requested waveforms on/off
// 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)
waveform.toDisableBits = 0;
}
Expand Down
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy