Merge tag 'LUFA-210130' into ProMicro
authorPeter Henn <Peter.Henn@web.de>
Wed, 29 Dec 2021 12:10:53 +0000 (12:10 +0000)
committerPeter Henn <Peter.Henn@web.de>
Sun, 2 Jan 2022 00:00:59 +0000 (00:00 +0000)
commit7ea8f0d1efaceedee06a975d10af85975bbe3141
treeb2a8921d3fec00649eebf38f4e8871464b44f5b5
parent8e881ef48f0f49ed6176404597afea1fc7343165
parentfa2cc3e1c3abab7c971506bd86ca4e28ecc7d288
Merge tag 'LUFA-210130' into ProMicro

- use merge strategy "theirs", means in principle rebase ProMicro branch
  to LUFA-210130
- Still remove FUSE_BOOTRST check in Application_Jump_Check, although it
  is in meantime fixed, but ProMicro would now no longer enter bootloader
  once a application is flashed.
Bootloaders/DFU/BootloaderDFU.c
Bootloaders/DFU/BootloaderDFU.h
Bootloaders/DFU/makefile