Skip to content
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

BREAKING - analogWriteRange 8-bit default #7456

Merged
merged 8 commits into from
Jul 29, 2020
Merged

BREAKING - analogWriteRange 8-bit default #7456

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
13f5dfb
BREAKING - analogWriteRange 8-bit default
earlephilhower Jul 14, 2020
583bed8
Merge branch 'master' into range255
earlephilhower Jul 14, 2020
10f7df8
Merge branch 'master' into range255
d-a-v Jul 17, 2020
c19ae4c
Merge branch 'master' into range255
earlephilhower Jul 26, 2020
f505ec7
Match upstream Arduino interfaces
earlephilhower Jul 26, 2020
601a79f
Merge branch 'master' into range255
earlephilhower Jul 28, 2020
7522ab1
Update documentation for new calls and defaults
earlephilhower Jul 28, 2020
0bbedbb
Merge branch 'master' into range255
earlephilhower Jul 29, 2020
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
3 changes: 1 addition & 2 deletions cores/esp8266/Arduino.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,6 @@ extern "C" {
#define HIGH 0x1
#define LOW 0x0

#define PWMRANGE 1023

//GPIO FUNCTIONS
#define INPUT 0x00
#define INPUT_PULLUP 0x02
Expand Down Expand Up @@ -176,6 +174,7 @@ int analogRead(uint8_t pin);
void analogReference(uint8_t mode);
void analogWrite(uint8_t pin, int val);
void analogWriteFreq(uint32_t freq);
void analogWriteResolution(int res);
void analogWriteRange(uint32_t range);

unsigned long millis(void);
Expand Down
15 changes: 13 additions & 2 deletions cores/esp8266/core_esp8266_wiring_pwm.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,21 @@
extern "C" {

static uint32_t analogMap = 0;
static int32_t analogScale = PWMRANGE;
static int32_t analogScale = 255; // Match upstream default, breaking change from 2.x.x
static uint16_t analogFreq = 1000;

extern void __analogWriteRange(uint32_t range) {
if (range > 0) {
if ((range >= 15) && (range <= 65535)) {
analogScale = range;
}
}

extern void __analogWriteResolution(int res) {
if ((res >= 4) && (res <= 16)) {
analogScale = (1 << res) - 1;
}
}

extern void __analogWriteFreq(uint32_t freq) {
if (freq < 100) {
analogFreq = 100;
Expand All @@ -57,6 +63,10 @@ extern void __analogWrite(uint8_t pin, int val) {
val = analogScale;
}

// 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);
uint32_t high = (analogPeriod * val) / analogScale;
uint32_t low = analogPeriod - high;
Expand All @@ -75,5 +85,6 @@ extern void __analogWrite(uint8_t pin, int val) {
extern void analogWrite(uint8_t pin, int val) __attribute__((weak, alias("__analogWrite")));
extern void analogWriteFreq(uint32_t freq) __attribute__((weak, alias("__analogWriteFreq")));
extern void analogWriteRange(uint32_t range) __attribute__((weak, alias("__analogWriteRange")));
extern void analogWriteResolution(int res) __attribute__((weak, alias("__analogWriteResolution")));

};