micro_ros_setup icon indicating copy to clipboard operation
micro_ros_setup copied to clipboard

Openocd: added script to reset device (backport #399)

Open mergify[bot] opened this issue 3 years ago • 1 comments

This is an automatic backport of pull request #399 done by Mergify. Cherry-pick of 7a2aeaf2cf8fa497949ac5450d007bad2f73d9e0 has failed:

On branch mergify/bp/galactic/pr-399
Your branch is up to date with 'origin/galactic'.

You are currently cherry-picking commit 7a2aeaf.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   CMakeLists.txt
	new file:   config/freertos/nucleo_f446re/reset.sh
	new file:   config/freertos/nucleo_f446ze/reset.sh
	new file:   config/freertos/nucleo_f746zg/reset.sh
	new file:   config/freertos/nucleo_f767zi/reset.sh
	new file:   config/freertos/olimex-stm32-e407/reset.sh
	new file:   config/host/generic/reset.sh
	modified:   config/raspbian/generic/flash.sh
	new file:   config/zephyr/generic/reset.sh
	new file:   scripts/reset_firmware.sh

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	added by them:   config/android/generic/reset.sh

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.io/

mergify[bot] avatar Oct 19 '21 05:10 mergify[bot]

@Acuadros95 Is this ready for merging?

pablogs9 avatar Oct 27 '21 08:10 pablogs9