-
Notifications
You must be signed in to change notification settings - Fork 7.6k
update m5stack boards define #9086
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
Merged
Merged
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
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
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
File renamed without changes.
File renamed without changes.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,60 @@ | ||
| #ifndef Pins_Arduino_h | ||
| #define Pins_Arduino_h | ||
|
|
||
| #include <stdint.h> | ||
| #include "soc/soc_caps.h" | ||
|
|
||
| #define USB_VID 0x303a | ||
| #define USB_PID 0x1001 | ||
|
|
||
| #define EXTERNAL_NUM_INTERRUPTS 23 | ||
| #define NUM_DIGITAL_PINS 46 | ||
| #define NUM_ANALOG_INPUTS 15 | ||
|
|
||
| #define analogInputToDigitalPin(p) \ | ||
| (((p) < 20) ? (analogChannelToDigitalPin(p)) : -1) | ||
| #define digitalPinToInterrupt(p) (((p) < 48) ? (p) : -1) | ||
| #define digitalPinHasPWM(p) (p < 46) | ||
|
|
||
| static const uint8_t TX = 43; | ||
| static const uint8_t RX = 44; | ||
|
|
||
| static const uint8_t TXD2 = 1; | ||
| static const uint8_t RXD2 = 2; | ||
|
|
||
| static const uint8_t SDA = 13; | ||
| static const uint8_t SCL = 15; | ||
|
|
||
| static const uint8_t SS = 11; | ||
| static const uint8_t MOSI = 12; | ||
| static const uint8_t MISO = 39; | ||
| static const uint8_t SCK = 14; | ||
|
|
||
| static const uint8_t G0 = 0; | ||
| static const uint8_t G1 = 1; | ||
| static const uint8_t G2 = 2; | ||
| static const uint8_t G3 = 3; | ||
| static const uint8_t G4 = 4; | ||
| static const uint8_t G5 = 5; | ||
| static const uint8_t G6 = 6; | ||
| static const uint8_t G7 = 7; | ||
| static const uint8_t G8 = 8; | ||
| static const uint8_t G9 = 9; | ||
| static const uint8_t G10 = 10; | ||
| static const uint8_t G11 = 11; | ||
| static const uint8_t G12 = 12; | ||
| static const uint8_t G13 = 13; | ||
| static const uint8_t G14 = 14; | ||
| static const uint8_t G15 = 15; | ||
| static const uint8_t G39 = 39; | ||
| static const uint8_t G40 = 40; | ||
| static const uint8_t G41 = 41; | ||
| static const uint8_t G42 = 42; | ||
| static const uint8_t G43 = 43; | ||
| static const uint8_t G44 = 44; | ||
| static const uint8_t G46 = 46; | ||
|
|
||
| static const uint8_t ADC1 = 7; | ||
| static const uint8_t ADC2 = 8; | ||
|
|
||
| #endif /* Pins_Arduino_h */ |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,62 @@ | ||
| #ifndef Pins_Arduino_h | ||
| #define Pins_Arduino_h | ||
|
|
||
| #include <stdint.h> | ||
| #include "soc/soc_caps.h" | ||
|
|
||
| #define USB_VID 0x303a | ||
| #define USB_PID 0x1001 | ||
|
|
||
| #define EXTERNAL_NUM_INTERRUPTS 23 | ||
| #define NUM_DIGITAL_PINS 46 | ||
| #define NUM_ANALOG_INPUTS 15 | ||
|
|
||
| #define analogInputToDigitalPin(p) \ | ||
| (((p) < 20) ? (analogChannelToDigitalPin(p)) : -1) | ||
| #define digitalPinToInterrupt(p) (((p) < 48) ? (p) : -1) | ||
| #define digitalPinHasPWM(p) (p < 46) | ||
|
|
||
| static const uint8_t TX = 43; | ||
| static const uint8_t RX = 44; | ||
|
|
||
| static const uint8_t TXD2 = 1; | ||
| static const uint8_t RXD2 = 2; | ||
|
|
||
| static const uint8_t SDA = 13; | ||
| static const uint8_t SCL = 15; | ||
|
|
||
| static const uint8_t SS = 12; | ||
| static const uint8_t MOSI = 14; | ||
| static const uint8_t MISO = 39; | ||
| static const uint8_t SCK = 40; | ||
|
|
||
| static const uint8_t G0 = 0; | ||
| static const uint8_t G1 = 1; | ||
| static const uint8_t G2 = 2; | ||
| static const uint8_t G3 = 3; | ||
| static const uint8_t G4 = 4; | ||
| static const uint8_t G5 = 5; | ||
| static const uint8_t G6 = 6; | ||
| static const uint8_t G7 = 7; | ||
| static const uint8_t G8 = 8; | ||
| static const uint8_t G9 = 9; | ||
| static const uint8_t G10 = 10; | ||
| static const uint8_t G11 = 11; | ||
| static const uint8_t G12 = 12; | ||
| static const uint8_t G13 = 13; | ||
| static const uint8_t G14 = 14; | ||
| static const uint8_t G15 = 15; | ||
| static const uint8_t G39 = 39; | ||
| static const uint8_t G40 = 40; | ||
| static const uint8_t G41 = 41; | ||
| static const uint8_t G42 = 42; | ||
| static const uint8_t G43 = 43; | ||
| static const uint8_t G44 = 44; | ||
| static const uint8_t G46 = 46; | ||
|
|
||
| static const uint8_t ADC1 = 7; | ||
| static const uint8_t ADC2 = 8; | ||
|
|
||
|
|
||
|
|
||
| #endif /* Pins_Arduino_h */ |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,56 @@ | ||
| #ifndef Pins_Arduino_h | ||
| #define Pins_Arduino_h | ||
|
|
||
| #include <stdint.h> | ||
|
|
||
| #define EXTERNAL_NUM_INTERRUPTS 16 | ||
| #define NUM_DIGITAL_PINS 40 | ||
| #define NUM_ANALOG_INPUTS 16 | ||
|
|
||
| #define analogInputToDigitalPin(p) (((p)<20)?(esp32_adc2gpio[(p)]):-1) | ||
| #define digitalPinToInterrupt(p) (((p)<40)?(p):-1) | ||
| #define digitalPinHasPWM(p) (p < 34) | ||
|
|
||
| #define TX2 14 | ||
| #define RX2 13 | ||
|
|
||
| static const uint8_t TX = 1; | ||
| static const uint8_t RX = 3; | ||
|
|
||
| static const uint8_t SDA = 25; | ||
| static const uint8_t SCL = 32; | ||
|
|
||
| static const uint8_t SS = 15; | ||
| static const uint8_t MOSI = 12; | ||
| static const uint8_t MISO = 13; | ||
| static const uint8_t SCK = 14; | ||
|
|
||
| static const uint8_t G25 = 25; | ||
| static const uint8_t G32 = 32; | ||
|
|
||
| static const uint8_t G26 = 26; | ||
| static const uint8_t G33 = 33; | ||
|
|
||
| static const uint8_t G18 = 18; | ||
| static const uint8_t G19 = 19; | ||
|
|
||
| static const uint8_t G21 = 21; | ||
| static const uint8_t G22 = 22; | ||
|
|
||
| static const uint8_t G36 = 36; | ||
| static const uint8_t G2 = 2; | ||
| static const uint8_t G4 = 4; | ||
| static const uint8_t G5 = 5; | ||
| static const uint8_t G23 = 23; | ||
|
|
||
| static const uint8_t G37 = 37; | ||
| static const uint8_t G38 = 38; | ||
| static const uint8_t G39 = 39; | ||
|
|
||
| static const uint8_t DAC1 = 25; | ||
| static const uint8_t DAC2 = 26; | ||
|
|
||
| static const uint8_t ADC1 = 35; | ||
| static const uint8_t ADC2 = 36; | ||
|
|
||
| #endif /* Pins_Arduino_h */ |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,56 @@ | ||
| #ifndef Pins_Arduino_h | ||
| #define Pins_Arduino_h | ||
|
|
||
| #include <stdint.h> | ||
|
|
||
| #define EXTERNAL_NUM_INTERRUPTS 16 | ||
| #define NUM_DIGITAL_PINS 40 | ||
| #define NUM_ANALOG_INPUTS 16 | ||
|
|
||
| #define analogInputToDigitalPin(p) (((p)<20)?(esp32_adc2gpio[(p)]):-1) | ||
| #define digitalPinToInterrupt(p) (((p)<40)?(p):-1) | ||
| #define digitalPinHasPWM(p) (p < 34) | ||
|
|
||
| static const uint8_t TX = 1; | ||
| static const uint8_t RX = 3; | ||
|
|
||
| static const uint8_t SDA = 25; | ||
| static const uint8_t SCL = 33; | ||
|
|
||
| // Modified elsewhere | ||
| static const uint8_t SS = -1; | ||
| static const uint8_t MOSI = -1; | ||
| static const uint8_t MISO = -1; | ||
| static const uint8_t SCK = -1; | ||
|
|
||
| static const uint8_t G23 = 23; | ||
| static const uint8_t G25 = 25; | ||
| static const uint8_t G27 = 27; | ||
| static const uint8_t G22 = 22; | ||
| static const uint8_t G26 = 26; | ||
| static const uint8_t G21 = 21; | ||
| static const uint8_t G32 = 32; | ||
| static const uint8_t G35 = 35; | ||
| static const uint8_t G34 = 34; | ||
| static const uint8_t G5 = 5; | ||
| static const uint8_t G39 = 39; | ||
| static const uint8_t G18 = 18; | ||
| static const uint8_t G36 = 36; | ||
| static const uint8_t G19 = 19; | ||
| static const uint8_t G15 = 15; | ||
|
|
||
| static const uint8_t G2 = 2; | ||
| static const uint8_t G33 = 33; | ||
|
|
||
| static const uint8_t G13 = 13; | ||
| static const uint8_t G4 = 4; | ||
|
|
||
| static const uint8_t G0 = 0; | ||
|
|
||
| static const uint8_t DAC1 = 25; | ||
| static const uint8_t DAC2 = 26; | ||
|
|
||
| static const uint8_t ADC1 = 35; | ||
| static const uint8_t ADC2 = 36; | ||
|
|
||
| #endif /* Pins_Arduino_h */ |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@Gitshaoxiang Please remove this part from all pins_arduino.h files of your boards.
These #defines are now defined globally per SoC.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for your reply, new changes have been committed now