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

Dummy merge for sync master and develop #287

Merged
merged 6 commits into from
Jul 11, 2024
Merged

Dummy merge for sync master and develop #287

merged 6 commits into from
Jul 11, 2024

Conversation

LinjingZhang
Copy link
Collaborator

By creating this pull request you agree to the terms in CONTRIBUTING.md.
https://github.com/Infineon/.github/blob/master/CONTRIBUTING.md
--- DO NOT DELETE ANYTHING ABOVE THIS LINE ---

CONTRIBUTING.md also tells you what to expect in the PR process.

Description
Dummy merge for sync master and develop

Related Issue
NA

Context
Because revert commits/ PR from community, need to sync develop branch in this way...

jaenrig-ifx and others added 6 commits June 4, 2024 15:12
Signed-off-by: enriquezgarc <[email protected]>
* - fix package.json for PlatformIO

* - removed ".input_hysteresis = XMC_GPIO_INPUT_HYSTERESIS_STANDARD" line from a couple .miso_config inits in pins_arduino.h as compiling failed for XMC11000_XMC2GO due to skipping the not necessary output_level element

* Revert "- removed ".input_hysteresis = XMC_GPIO_INPUT_HYSTERESIS_STANDARD" line from a couple .miso_config inits in pins_arduino.h as compiling failed for XMC11000_XMC2GO due to skipping the not necessary output_level element"

This reverts commit 7b91618.
@LinjingZhang LinjingZhang requested a review from jaenrig-ifx July 11, 2024 08:44
@LinjingZhang LinjingZhang merged commit cac637b into develop Jul 11, 2024
jaenrig-ifx pushed a commit to jaenrig-ifx/XMC-for-Arduino that referenced this pull request Jan 17, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants