Skip to content

bump zephyr version to 2.6.0; zephyr-sdk version to 0.12.4#351

Merged
pablogs9 merged 1 commit intomicro-ROS:mainfrom
dayjaby:galactic
Jul 15, 2021
Merged

bump zephyr version to 2.6.0; zephyr-sdk version to 0.12.4#351
pablogs9 merged 1 commit intomicro-ROS:mainfrom
dayjaby:galactic

Conversation

@dayjaby
Copy link
Copy Markdown
Contributor

@dayjaby dayjaby commented Jul 13, 2021

The previous zephyr-sdk version 0.11.2 installed by micro_ros_setup contained no cmake files and it relied to be found via the home directory. That's not necessary with 0.12.4 anymore and the zephyr-sdk downloaded by micro_ros_setup works standalone.

I also bumped zephyrs version to 2.6.0 as it contains some better board dts. In my case I made a full CAN bus app work on the nucleo f446re with microros support.

@pablogs9
Copy link
Copy Markdown
Member

Please modify the used version in the readme table: https://github.com/micro-ROS/micro_ros_setup#supported-platforms

@pablogs9
Copy link
Copy Markdown
Member

pablogs9 commented Jul 13, 2021

Also, I have modified the target branch to main in order to apply this patch to Rolling release. I will backport it to galactic when merged.

Please rebase your changes on top of main

@pablogs9 pablogs9 changed the base branch from galactic to main July 13, 2021 09:13
@pablogs9 pablogs9 requested a review from donRaphaco as a code owner July 13, 2021 09:13
@pablogs9 pablogs9 removed the request for review from donRaphaco July 13, 2021 09:25
@dayjaby
Copy link
Copy Markdown
Contributor Author

dayjaby commented Jul 13, 2021

I did not test it yet on the other boards mentioned there though..I could run the same tests on a Olimex STM32 E407 later today.

@dayjaby
Copy link
Copy Markdown
Contributor Author

dayjaby commented Jul 14, 2021

README versions bumped and rebase done

$ git rebase origin/main
Current branch galactic is up to date.

So pull requests should be done against main?

@pablogs9
Copy link
Copy Markdown
Member

Yes, the procedure is to make PR against main and then we will backport them to the stable versions: foxy and galactic.

Let me know when you finish the rebase, I still see changes in a lot of files.

Thanks for the contribution.

@dayjaby
Copy link
Copy Markdown
Contributor Author

dayjaby commented Jul 15, 2021

Done. Thanks for your patience!

@pablogs9
Copy link
Copy Markdown
Member

Cool, I'm merging when the CI pass. Thanks again!

@pablogs9 pablogs9 merged commit 535e745 into micro-ROS:main Jul 15, 2021
@pablogs9
Copy link
Copy Markdown
Member

@mergify backport foxy galactic

mergify Bot pushed a commit that referenced this pull request Jul 15, 2021
(cherry picked from commit 535e745)

# Conflicts:
#	README.md
mergify Bot pushed a commit that referenced this pull request Jul 15, 2021
(cherry picked from commit 535e745)

# Conflicts:
#	README.md
@mergify
Copy link
Copy Markdown
Contributor

mergify Bot commented Jul 15, 2021

Command backport foxy galactic: success

Backports have been created

Hey, I reacted but my real name is @Mergifyio

pablogs9 pushed a commit that referenced this pull request Jul 15, 2021
…351) (#356)

* bump zephyr version to 2.6.0; zephyr-sdk version to 0.12.4 (#351)

(cherry picked from commit 535e745)

# Conflicts:
#	README.md

* Fix conflicts

Co-authored-by: David Jablonski <dayjaby@gmail.com>
Co-authored-by: Antonio cuadros <acuadros1995@gmail.com>
pablogs9 pushed a commit that referenced this pull request Jul 15, 2021
…351) (#357)

* bump zephyr version to 2.6.0; zephyr-sdk version to 0.12.4 (#351)

(cherry picked from commit 535e745)

# Conflicts:
#	README.md

* Fix merge conflict

Co-authored-by: David Jablonski <dayjaby@gmail.com>
Co-authored-by: Antonio cuadros <acuadros1995@gmail.com>
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.

2 participants