From 9fb7ead990aff757938d2a1a9d71833845dda61a Mon Sep 17 00:00:00 2001 From: sunbeam Date: Mon, 2 Dec 2024 14:11:13 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0CMSIS=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- firmware/src/config/mcal/definitions.h | 4 ++-- firmware/src/config/mcal/harmony-manifest-success.yml | 4 ++-- firmware/src/config/mcal/initialization.c | 4 ++-- .../src/packs/CMSIS/CMSIS/Core/Include/cmsis_version.h | 8 ++++---- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/firmware/src/config/mcal/definitions.h b/firmware/src/config/mcal/definitions.h index 1e47e07..d33246e 100644 --- a/firmware/src/config/mcal/definitions.h +++ b/firmware/src/config/mcal/definitions.h @@ -50,8 +50,8 @@ #include #include "peripheral/nvmctrl/plib_nvmctrl.h" #include "peripheral/sercom/i2c_master/plib_sercom1_i2c_master.h" -#include "peripheral/evsys/plib_evsys.h" #include "peripheral/sercom/spi_master/plib_sercom0_spi_master.h" +#include "peripheral/evsys/plib_evsys.h" #include "peripheral/can/plib_can1.h" #include "peripheral/port/plib_port.h" #include "peripheral/clock/plib_clock.h" @@ -60,9 +60,9 @@ #include "peripheral/wdt/plib_wdt.h" #include "peripheral/cmcc/plib_cmcc.h" #include "peripheral/tc/plib_tc1.h" -#include "touch/touch.h" #include "peripheral/rtc/plib_rtc.h" #include "peripheral/tc/plib_tc0.h" +#include "touch/touch.h" #include "peripheral/tc/plib_tc2.h" #include "peripheral/dac/plib_dac.h" #include "peripheral/tcc/plib_tcc0.h" diff --git a/firmware/src/config/mcal/harmony-manifest-success.yml b/firmware/src/config/mcal/harmony-manifest-success.yml index 5652eb2..81a5ce1 100644 --- a/firmware/src/config/mcal/harmony-manifest-success.yml +++ b/firmware/src/config/mcal/harmony-manifest-success.yml @@ -4,7 +4,7 @@ project: P417_SWTL -creation_date: 2024-08-19T22:45:13.334+08:00[Asia/Shanghai] # ISO 8601 format: https://www.w3.org/TR/NOTE-datetime +creation_date: 2024-12-02T14:05:58.826+08:00[Asia/Shanghai] # ISO 8601 format: https://www.w3.org/TR/NOTE-datetime operating_system: Windows 10 mcc_mode: IDE # [IDE|Standalone|Headless] mcc_version: v5.5.1 @@ -15,7 +15,7 @@ compiler: XC32 4.10 modules: - {name: "csp", version: "v3.18.5"} - - {name: "CMSIS_5", version: "5.8.0"} + - {name: "CMSIS_5", version: "5.9.0"} - {name: "touch", version: "v3.16.0"} packs: diff --git a/firmware/src/config/mcal/initialization.c b/firmware/src/config/mcal/initialization.c index b09d042..7b2ac6b 100644 --- a/firmware/src/config/mcal/initialization.c +++ b/firmware/src/config/mcal/initialization.c @@ -140,10 +140,10 @@ void SYS_Initialize ( void* data ) SERCOM1_I2C_Initialize(); - EVSYS_Initialize(); - SERCOM0_SPI_Initialize(); + EVSYS_Initialize(); + CAN1_Initialize(); SYSTICK_TimerInitialize(); diff --git a/firmware/src/packs/CMSIS/CMSIS/Core/Include/cmsis_version.h b/firmware/src/packs/CMSIS/CMSIS/Core/Include/cmsis_version.h index 2f048e4..8b4765f 100644 --- a/firmware/src/packs/CMSIS/CMSIS/Core/Include/cmsis_version.h +++ b/firmware/src/packs/CMSIS/CMSIS/Core/Include/cmsis_version.h @@ -1,11 +1,11 @@ /**************************************************************************//** * @file cmsis_version.h * @brief CMSIS Core(M) Version definitions - * @version V5.0.4 - * @date 23. July 2019 + * @version V5.0.5 + * @date 02. February 2022 ******************************************************************************/ /* - * Copyright (c) 2009-2019 ARM Limited. All rights reserved. + * Copyright (c) 2009-2022 ARM Limited. All rights reserved. * * SPDX-License-Identifier: Apache-2.0 * @@ -33,7 +33,7 @@ /* CMSIS Version definitions */ #define __CM_CMSIS_VERSION_MAIN ( 5U) /*!< [31:16] CMSIS Core(M) main version */ -#define __CM_CMSIS_VERSION_SUB ( 4U) /*!< [15:0] CMSIS Core(M) sub version */ +#define __CM_CMSIS_VERSION_SUB ( 6U) /*!< [15:0] CMSIS Core(M) sub version */ #define __CM_CMSIS_VERSION ((__CM_CMSIS_VERSION_MAIN << 16U) | \ __CM_CMSIS_VERSION_SUB ) /*!< CMSIS Core(M) version number */ #endif