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.

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

FunctionalInterrupt/ScheduledFunctions should be in a library, not in core_esp8266_wiring_digital #6038

Closed
wants to merge 24 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
3720f4d
Remove special support for FunctionalInterrupt from core interrupt ha…
dok-net May 2, 2019
e4f6e6c
Add supporting function for interrupt arg memory management, linke wi…
dok-net May 2, 2019
035551d
Bring back FunctionalInterrupt, and ScheduledFunctions, as example code.
dok-net May 2, 2019
bd339ec
Ridiculous port number mistake.
dok-net May 2, 2019
f4acddb
Merge branch 'master' into functional-shouldbe-lib
dok-net May 2, 2019
4f621ea
Apply astyle to example INO.
dok-net May 2, 2019
6002811
Merge branch 'master' into functional-shouldbe-lib
dok-net May 2, 2019
4b045f5
Remove ScheduledFunctions.(h|cpp), per comment https://github.com/esp…
dok-net May 2, 2019
e7013ba
Merge remote-tracking branch 'origin/master' into functional-shouldbe…
dok-net May 2, 2019
9e239ec
Invented void* detachInterruptArg() that returns the argument given i…
dok-net May 3, 2019
f89b22c
Modified example to showcase how general FunctionalInterrupt uses vio…
dok-net May 3, 2019
346d3c3
Direct call or scheduled is either-or.
dok-net May 3, 2019
a844d43
Always apply astyle to examples.
dok-net May 3, 2019
eb6c493
Merge branch 'master' into functional-shouldbe-lib
dok-net May 3, 2019
17e3692
Merge branch 'master' into functional-shouldbe-lib
dok-net May 3, 2019
f5092c6
Merge branch 'master' into functional-shouldbe-lib
dok-net May 4, 2019
e619e4c
Merge branch 'master' into functional-shouldbe-lib
dok-net May 4, 2019
69ac313
Merge branch 'master' into functional-shouldbe-lib
dok-net May 4, 2019
fe56dc6
Merge branch 'master' into functional-shouldbe-lib
dok-net May 4, 2019
db7b1b1
Merge branch 'master' into functional-shouldbe-lib
dok-net May 5, 2019
c8c8bfb
astyle Arduino.h and core_esp8266_wiring_digital.cpp - reduced diff t…
dok-net May 6, 2019
6a33d99
astyle libraries/esp8266/examples/GPIO/FunctionalInterrupt
dok-net May 6, 2019
dd066c9
Merge branch 'master' into functional-shouldbe-lib
dok-net May 9, 2019
6a58725
Merge branch 'master' into functional-shouldbe-lib
dok-net May 12, 2019
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
41 changes: 22 additions & 19 deletions cores/esp8266/Arduino.h
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
/*
Arduino.h - Main include file for the Arduino SDK
Copyright (c) 2005-2013 Arduino Team. All right reserved.
Arduino.h - Main include file for the Arduino SDK
Copyright (c) 2005-2013 Arduino Team. All right reserved.

This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.

This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.

You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/

#ifndef Arduino_h
#define Arduino_h
Expand Down Expand Up @@ -86,10 +86,11 @@ extern "C" {
#define EXTERNAL 0

//timer dividers
enum TIM_DIV_ENUM {
TIM_DIV1 = 0, //80MHz (80 ticks/us - 104857.588 us max)
TIM_DIV16 = 1, //5MHz (5 ticks/us - 1677721.4 us max)
TIM_DIV256 = 3 //312.5Khz (1 tick = 3.2us - 26843542.4 us max)
enum TIM_DIV_ENUM
{
TIM_DIV1 = 0, //80MHz (80 ticks/us - 104857.588 us max)
TIM_DIV16 = 1, //5MHz (5 ticks/us - 1677721.4 us max)
TIM_DIV256 = 3 //312.5Khz (1 tick = 3.2us - 26843542.4 us max)
};


Expand Down Expand Up @@ -218,6 +219,8 @@ uint8_t shiftIn(uint8_t dataPin, uint8_t clockPin, uint8_t bitOrder);

void attachInterrupt(uint8_t pin, void (*)(void), int mode);
void detachInterrupt(uint8_t pin);
void attachInterruptArg(uint8_t pin, void (*)(void*), void* arg, int mode);
void* detachInterruptArg(uint8_t pin);

void preinit(void);
void setup(void);
Expand Down Expand Up @@ -295,7 +298,7 @@ long secureRandom(long, long);
long map(long, long, long, long, long);

extern "C" void configTime(long timezone, int daylightOffset_sec,
const char* server1, const char* server2 = nullptr, const char* server3 = nullptr);
const char* server1, const char* server2 = nullptr, const char* server3 = nullptr);

#endif

Expand Down
71 changes: 0 additions & 71 deletions cores/esp8266/FunctionalInterrupt.cpp

This file was deleted.

37 changes: 0 additions & 37 deletions cores/esp8266/FunctionalInterrupt.h

This file was deleted.

117 changes: 0 additions & 117 deletions cores/esp8266/ScheduledFunctions.cpp

This file was deleted.

51 changes: 0 additions & 51 deletions cores/esp8266/ScheduledFunctions.h

This file was deleted.

Loading