search

microbit-foundation / DAPLink

This DAPLink fork is only for development - everything is submitted upstream - please file issues on https://github.com/ARMmbed/DAPLink
Apache License 2.0
9 stars 2 forks source link

Microbit features develop rebase #7

Open microbit-carlos opened 3 years ago

microbit-carlos commented 3 years ago

Thanks @c1728p9 for rebasing the microbit_features branch and resolve the conflicts.

From the original notes:

The kl27z_microbit_if passed the DAPLink endpoint tests with this PR.

Conflicts during the rebase:

  • fb73881 - Sync latest features including:
    • kidff3 autoresolved changes in DAPLink\source\daplink\cmsis-dap\DAP.c
  • e8480a6 - Update wake from deep sleep handling
    • reset_button_pressed renamed DAPLink\source\daplink\bootloader\main_bootloader.c
  • 258d0b7 - # 54 Bump DAPLink version to 255
    • Version bumped to 257 (was 256 in develop) in DAPLink\records\tools\version.yaml
  • 2482d2a - Formatting and indentation
    • kidff3 autoresolved changes in DAPLink\source\daplink\cmsis-dap\DAP.c
  • Make microbit bootloader optional for kl27z HIC - source/hic_hal/freescale/kl27z/gcc/startup_MKL27Z4.S
    • Use existing .S file and bring over microbit flash locking changes

Fixups after rebasing:

  • a6b95c8 - Add microbit specific features
    • change main.h to main_interface.h in DAPLink\source\board\microbitv2\microbitv2.c
  • 147b1b4 - Set usb_state to disconnected immediately after cable deatch, instead of waiting to the main loop poll to update the status.
    • change main.h to main_interface.h in DAPLink\source\board\microbitv2\power.c
  • 5d3b4e8 - Fix lost serial bytes during flash operations
    • change main.h to main_interface.h in DAPLink\source\hic_hal\freescale\kl27z\i2c.c
  • 38fe9bc - # 64 Assume "PC connected" at the start of USB communication instead of waiting for the whole enumeration process to be finished.
    • change weak to WEAK in DAPLink\source\usb\usb_lib.c
  • f3d9350 - remove arm copyright from newly added files
    • change main.h to main_interface.h in DAPLink\source\board\microbitv2\i2c_commands.c
  • New commit - Fix unterminated comment on kl27z GCC
    • DAPLink\source\hic_hal\freescale\kl27z\gcc\startup_MKL27Z4.S