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

Allow GPIO 9 and 10 for waveform generation #5055

Merged
merged 10 commits into from
Sep 18, 2018
Merged

Allow GPIO 9 and 10 for waveform generation #5055

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
c53a682
Allow GPIO 9 and 10 for waveform generation
earlephilhower Aug 16, 2018
456836e
Merge branch 'master' into add_gpio910_pwm
earlephilhower Aug 21, 2018
67223fc
Merge branch 'master' into add_gpio910_pwm
devyte Aug 31, 2018
f1d063d
Add variant for 8285 to init GPIO 9/10
earlephilhower Sep 9, 2018
ed2c872
Merge branch 'master' into add_gpio910_pwm
earlephilhower Sep 9, 2018
57a3874
Update waveform gen to only allow 9/10 on 8285
earlephilhower Sep 10, 2018
a894dc8
Merge branch 'add_gpio910_pwm' of https://github.com/earlephilhower/A…
earlephilhower Sep 10, 2018
aa683ec
Merge branch 'master' into add_gpio910_pwm
earlephilhower Sep 12, 2018
faa672d
Merge branch 'master' into add_gpio910_pwm
earlephilhower Sep 12, 2018
f8fb8d0
Merge branch 'master' into add_gpio910_pwm
earlephilhower Sep 17, 2018
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
6 changes: 5 additions & 1 deletion cores/esp8266/core_esp8266_waveform.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,11 @@ static Waveform waveform[] = {
{0, 0, 1<<3, 0, 0, 0, 0, 0},
{0, 0, 1<<4, 0, 0, 0, 0, 0},
{0, 0, 1<<5, 0, 0, 0, 0, 0},
// GPIOS 6-11 not allowed, used for flash
// GPIOS 6-8 not allowed, used for flash
// GPIO 9 and 10 only allowed in 2-bit flash mode
{0, 0, 1<<9, 0, 0, 0, 0, 0},
earlephilhower marked this conversation as resolved.
Show resolved Hide resolved
{0, 0, 1<<10, 0, 0, 0, 0, 0},
// GPIO 11 not allowed, used for flash
{0, 0, 1<<12, 0, 0, 0, 0, 0},
{0, 0, 1<<13, 0, 0, 0, 0, 0},
{0, 0, 1<<14, 0, 0, 0, 0, 0},
Expand Down