mBed and nrf-mbed merge #159
Merged
Conversation
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
…s an empty string as a file, this version removes any empty strings in the files to build.
…nt 0 pulse and 100% pulse.
…vice (defined in system_nRF51822).
…ure no conflict with the SD.
…he closest available frequency instead of generating an error. Sleep is now implemented (deepsleep will cause nrf to work in System OFF mode).
- The final image is now generated at "binary" step, which is compatible with the on-line build system structure - The SoftDevice image is appended to the application code, resulting in a single .hex image file - Python is used for merging and generating .hex files using the 'intelhex' module, no more dependencies on external tools
…solves the mbed runtime problems with the SoftDevice enabled.
Generate a concatenated binary image that has both the SoftDevice code and the user code in a single binary file. NOT TESTED.
When timer interrupt priority is at 3, the pwm functionality can be disturbed by an active ble connection.
Unused header files are removed from the cmsis dir. Tab characters replaced by 4 spaces. Brackets and parenthesis formatted. Spi slave functions updated for faster response.
This reverts commit 658b18d.
Licensing headers replaced with mbed Apache. SPI/SPIS pin configuration is done via PIN_CNF
Conflicts: libraries/tests/mbed/portinout/main.cpp libraries/tests/mbed/portout_portin/main.cpp libraries/tests/mbed/sd/main.cpp libraries/tests/mbed/spi_slave/main.cpp workspace_tools/targets.py workspace_tools/toolchains/arm.py workspace_tools/toolchains/gcc.py workspace_tools/toolchains/iar.py
This reverts commit 5038233.
lrusinowicz
pushed a commit
to lrusinowicz/mbed-os
that referenced
this pull request
Feb 5, 2019
Fix link in CONTRIBUTING.md
Jookia
pushed a commit
to Jookia/mbed-os
that referenced
this pull request
May 18, 2023
* Remove all source files exclusive to Arm Compiler and IAR * Also remove 'TOOLCHAIN_ARM' * Remove targets.json entries for ARM and IAR
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
No description provided.