Skip to content

Pull GPIO initialization into its own 'weak' function. #7044

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

Merged
merged 3 commits into from
Mar 22, 2020
Merged

Pull GPIO initialization into its own 'weak' function. #7044

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ede7e8e
Pull GPIO initialization into its own 'weak' function.
everslick Jan 29, 2020
8ab77a4
Add prototype for resetPins()
everslick Mar 19, 2020
7f59fd2
Merge branch 'master' into patch-4
everslick Mar 19, 2020
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 11 additions & 6 deletions cores/esp8266/core_esp8266_wiring_digital.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,12 +235,7 @@ extern void __attachInterrupt(uint8_t pin, voidFuncPtr userFunc, int mode)
__attachInterruptFunctionalArg(pin, (voidFuncPtrArg)userFunc, 0, mode, false);
}

extern void initPins() {
//Disable UART interrupts
system_set_os_print(0);
U0IE = 0;
U1IE = 0;

extern void __resetPins() {
for (int i = 0; i <= 5; ++i) {
pinMode(i, INPUT);
}
Expand All @@ -250,6 +245,16 @@ extern void initPins() {
}
}

extern void initPins() {
//Disable UART interrupts
system_set_os_print(0);
U0IE = 0;
U1IE = 0;

resetPins();
}

extern void resetPins() __attribute__ ((weak, alias("__resetPins")));
extern void pinMode(uint8_t pin, uint8_t mode) __attribute__ ((weak, alias("__pinMode")));
extern void digitalWrite(uint8_t pin, uint8_t val) __attribute__ ((weak, alias("__digitalWrite")));
extern int digitalRead(uint8_t pin) __attribute__ ((weak, alias("__digitalRead"), nothrow));
Expand Down
1 change: 1 addition & 0 deletions cores/esp8266/wiring_private.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ extern "C" {
typedef void (*voidFuncPtr)(void);

void initPins();
void resetPins();

#ifdef __cplusplus
} // extern "C"
Expand Down