Skip to content

Commit

Permalink
Move prototype for enablePhaseLockedWaveform linker magic into header…
Browse files Browse the repository at this point in the history
… that's included by default instead of particular internal core header. (esp8266#7996)
  • Loading branch information
dok-net authored Apr 22, 2021
1 parent cfbbd6f commit 4576921
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 8 deletions.
3 changes: 3 additions & 0 deletions cores/esp8266/core_esp8266_features.h
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,9 @@ 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);

#ifdef __cplusplus
}
Expand Down
5 changes: 0 additions & 5 deletions cores/esp8266/core_esp8266_waveform.h
Original file line number Diff line number Diff line change
Expand Up @@ -72,11 +72,6 @@
extern "C" {
#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);


// Start or change a waveform of the specified high and low times on specific pin.
// If runtimeUS > 0 then automatically stop it after that many usecs, relative to the next
// full period.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
Note that this sketch uses LED_BUILTIN to find the pin with the internal LED
*/

#include <core_esp8266_waveform.h>
#include <PolledTimeout.h>

esp8266::polledTimeout::periodicFastUs stepPeriod(50000);
Expand All @@ -33,8 +32,8 @@ void setup() {
Serial.begin(115200);
Serial.println();

// This next line will call will cause the code to use the Phase-Locked waveform generator
// instead of the default one. Comment it out to try the default version.
// This next line will cause the code to use the Phase-Locked waveform generator
// instead of the default PWM-Locked one. Comment it out to try the default version.
// For more information on choosing between the two options, see the following pull requests:
// Phase-Locked generator: https://github.com/esp8266/Arduino/pull/7022
// PWM-Locked generator: https://github.com/esp8266/Arduino/pull/7231
Expand Down

0 comments on commit 4576921

Please sign in to comment.