u-blox rearrange ODIN target - Rebase #4467
Closed
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
|
The file targets/TARGET_STM/TARGET_STM32F4/TARGET_UBLOX_EVK_ODIN_W2/device/hal_tick.h shall be removed since we're using this one TARGET_STM32F439xI\device\hal_tick.h after the re-arrangement. |
kegilbert
force-pushed
the
kg-rearrange-odin-target
branch
from
f7ecddf to
06efe99
Compare
|
@andreaslarssonublox rebased the base branch, fixed the merge conflict. Thanks for the info! |
|
@kegilbert restarted jenkins CI to be certain. Please look at the job number 4 to review the failure |
|
Error seems to be: I'd been looking into this one for a bit, this rebase got a bit ugly so there's a good chance I merged something incorrectly. Going back through it again. |
"Moved ODIN target files into STM32F439xI folder to avoid duplicate code"
"Moved ODIN target files into STM32F439xI folder to avoid duplicate code"
kegilbert
force-pushed
the
kg-rearrange-odin-target
branch
from
ef688b3 to
5b83a64
Compare
|
Moving review to: #4510 |
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.
Rebase against master for: #4089
Smaller chunk of the Workshop branch additions: #4412
Feel free to add in however else should be a reviewer @c1728p9