diff options
author | Nick Brassel <nick@tzarc.org> | 2022-05-29 07:57:11 +1000 |
---|---|---|
committer | Nick Brassel <nick@tzarc.org> | 2022-05-29 07:57:11 +1000 |
commit | b835171008eaeaa992a1b8e390af8bce6f5f0b8f (patch) | |
tree | de22c239cc47556f8be7538f95f48ad75b86d110 /platforms/arm_atsam | |
parent | f5d091a9d58c8349437e9d52de87294258cbd256 (diff) | |
parent | 0c8f78020d01ee5c45481d7d93b9b0d9f7b95103 (diff) | |
download | qmk_firmware-b835171008eaeaa992a1b8e390af8bce6f5f0b8f.tar.gz qmk_firmware-b835171008eaeaa992a1b8e390af8bce6f5f0b8f.zip |
Merge branch 'develop' -- breaking changes 2022-05-28.
Diffstat (limited to 'platforms/arm_atsam')
-rw-r--r-- | platforms/arm_atsam/_pin_defs.h (renamed from platforms/arm_atsam/pin_defs.h) | 0 | ||||
-rw-r--r-- | platforms/arm_atsam/bootloaders/md_boot.c | 4 | ||||
-rw-r--r-- | platforms/arm_atsam/hardware_id.c | 9 |
3 files changed, 13 insertions, 0 deletions
diff --git a/platforms/arm_atsam/pin_defs.h b/platforms/arm_atsam/_pin_defs.h index 5b50b23910..5b50b23910 100644 --- a/platforms/arm_atsam/pin_defs.h +++ b/platforms/arm_atsam/_pin_defs.h diff --git a/platforms/arm_atsam/bootloaders/md_boot.c b/platforms/arm_atsam/bootloaders/md_boot.c index 32cf850448..1cf7aec62c 100644 --- a/platforms/arm_atsam/bootloaders/md_boot.c +++ b/platforms/arm_atsam/bootloaders/md_boot.c @@ -63,3 +63,7 @@ void bootloader_jump(void) { while (1) ; // Wait on timeout } + +__attribute__((weak)) void mcu_reset(void) { + NVIC_SystemReset(); +} diff --git a/platforms/arm_atsam/hardware_id.c b/platforms/arm_atsam/hardware_id.c new file mode 100644 index 0000000000..8b3b35a492 --- /dev/null +++ b/platforms/arm_atsam/hardware_id.c @@ -0,0 +1,9 @@ +// Copyright 2022 QMK +// SPDX-License-Identifier: GPL-2.0-or-later + +#include "hardware_id.h" + +hardware_id_t get_hardware_id(void) { + hardware_id_t id = {0}; + return id; +} |