8000 Fix boards.txt.py compatible with python3 by wemos · Pull Request #4995 · esp8266/Arduino · GitHub
[go: up one dir, main page]
Skip to content

Fix boards.txt.py compatible with python3 #4995

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

Closed
wants to merge 11 commits into from
Closed

Fix boards.txt.py compatible with python3 #4995

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
247f727
fix digitalPinToBitMask(), portOutputRegister(), portInputRegister() …
wemos Jul 27, 2018
a5a5db3
Merge branch 'master' into master
earlephilhower Jul 27, 2018
7ad04e0
Merge branch 'master' into master
devyte Jul 27, 2018
0824c0f
fix macros (..) parenthesis lost
wemos Jul 28, 2018
090ae54
surround the entire ternary
wemos Jul 28, 2018
2443aaa
Merge remote-tracking branch 'remotes/upstream/master'
wemos Jul 28, 2018
c6dc637
Merge remote-tracking branch 'remotes/upstream/master'
wemos Jul 30, 2018
cd6a643
change "WeMos" to new brand name "LOLIN"
wemos Jul 30, 2018
6f90669
Merge remote-tracking branch 'remotes/upstream/master'
wemos Aug 1, 2018
b3a0a0e
Compatible with python3
wemos Aug 2, 2018
9bbde70
Merge remote-tracking branch 'remotes/upstream/master' into fix_board…
wemos Aug 2, 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
Prev Previous commit
Next Next commit
fix macros (..) parenthesis lost
  • Loading branch information
@wemos
wemos committed Jul 28, 2018
commit 0824c0f358f38156442245089cdb88e8c7f4d6aa
10 changes: 5 additions & 5 deletions cores/esp8266/Arduino.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,12 +225,12 @@ void yield(void);
void optimistic_yield(uint32_t interval_us);

#define _PORT_GPIO16 1
#define digitalPinToPort(pin) (pin==16)?(_PORT_GPIO16):(0)
#define digitalPinToBitMask(pin) (pin==16)?(1):(1UL << (pin))
#define digitalPinToPort(pin) ((pin)==16)?(_PORT_GPIO16):(0)
#define digitalPinToBitMask(pin) ((pin)==16)?(1):(1UL << (pin))
#define digitalPinToTimer(pin) (0)
#define portOutputRegister(port) (port==_PORT_GPIO16)?((volatile uint32_t*) &GP16O):((volatile uint32_t*) &GPO)
#define portInputRegister(port) (port==_PORT_GPIO16)?((volatile uint32_t*) &GP16I):((volatile uint32_t*) &GPI)
#define portModeRegister(port) (port==_PORT_GPIO16)?((volatile uint32_t*) &GP16E):((volatile uint32_t*) &GPE)
#define portOutputRegister(port) ((port)==_PORT_GPIO16)?((volatile uint32_t*) &GP16O):((volatile uint32_t*) &GPO)
#define portInputRegister(port) ((port)==_PORT_GPIO16)?((volatile uint32_t*) &GP16I):((volatile uint32_t*) &GPI)
#define portModeRegister(port) ((port)==_PORT_GPIO16)?((volatile uint32_t*) &GP16E):((volatile uint32_t*) &GPE)

#define NOT_A_PIN -1
#define NOT_A_PORT -1
Expand Down
0