From 02120c67b1e30ccd1fd158d373353c39f3670f2e Mon Sep 17 00:00:00 2001 From: zhaohe Date: Sun, 12 May 2024 11:53:27 +0800 Subject: [PATCH] update --- .settings/language.settings.xml | 4 ++-- Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS/cmsis_os.h | 4 ++-- iflytop_canbus_protocol | 2 +- usrc/base/config_service.cpp | 8 ++++---- usrc/protocol_impl/basic/fn_mgr.hpp | 4 ++-- usrc/protocol_impl/function_impl/afunction_impl.hpp | 2 +- usrc/protocol_impl/function_impl/basic_fn.cpp | 4 ++-- zsdk | 2 +- 8 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.settings/language.settings.xml b/.settings/language.settings.xml index f8ac9b4..72f1dcb 100644 --- a/.settings/language.settings.xml +++ b/.settings/language.settings.xml @@ -5,7 +5,7 @@ - + @@ -16,7 +16,7 @@ - + diff --git a/Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS/cmsis_os.h b/Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS/cmsis_os.h index f53a132..5388d35 100644 --- a/Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS/cmsis_os.h +++ b/Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS/cmsis_os.h @@ -26,7 +26,7 @@ * *---------------------------------------------------------------------------- * - * Portions Copyright © 2016 STMicroelectronics International N.V. All rights reserved. + * Portions Copyright � 2016 STMicroelectronics International N.V. All rights reserved. * Portions Copyright (c) 2013 ARM LIMITED * All rights reserved. * Redistribution and use in source and binary forms, with or without @@ -278,7 +278,7 @@ typedef StaticQueue_t osStaticMessageQDef_t; /// Thread Definition structure contains startup information of a thread. /// \note CAN BE CHANGED: \b os_thread_def is implementation specific in every CMSIS-RTOS. typedef struct os_thread_def { - char *name; ///< Thread name + const char *name; ///< Thread name os_pthread pthread; ///< start address of thread function osPriority tpriority; ///< initial thread priority uint32_t instances; ///< maximum number of instances of that thread function diff --git a/iflytop_canbus_protocol b/iflytop_canbus_protocol index eb739c1..955c39e 160000 --- a/iflytop_canbus_protocol +++ b/iflytop_canbus_protocol @@ -1 +1 @@ -Subproject commit eb739c10f2971294ee3a12e845e9bfb4cb40f32d +Subproject commit 955c39e8b8aa1480b0846a1ae26aaa6ba4e38ce0 diff --git a/usrc/base/config_service.cpp b/usrc/base/config_service.cpp index 468c080..239fa39 100644 --- a/usrc/base/config_service.cpp +++ b/usrc/base/config_service.cpp @@ -12,10 +12,10 @@ static void dump_config(config_t *pcfg) { ZLOGI(TAG, "placeHolder: %08x", pcfg->placeHolder); ZLOGI(TAG, "="); } -static void create_default_config(config_t *default_cfg) { // - default_cfg->configMark = FLASH_MASK_VAL; - default_cfg->placeHolder = 0; // dhcp -} +//static void create_default_config(config_t *default_cfg) { // +// default_cfg->configMark = FLASH_MASK_VAL; +// default_cfg->placeHolder = 0; // dhcp +//} void config_init(void) { ZLOGI(TAG, "config_init"); diff --git a/usrc/protocol_impl/basic/fn_mgr.hpp b/usrc/protocol_impl/basic/fn_mgr.hpp index 864b6a0..de63f72 100644 --- a/usrc/protocol_impl/basic/fn_mgr.hpp +++ b/usrc/protocol_impl/basic/fn_mgr.hpp @@ -22,8 +22,8 @@ #define GET_PARAM(buff, off) ((((int32_t*)(buff))[off])) #define PRAAM_LEN() ((len - sizeof(zcanbus_packet_t)) / 4) -#define CLEAR_BIT(val, bit) (val &= ~(1 << bit)) -#define SET_BIT(val, bit) (val |= (1 << bit)) +#define ZCLEAR_BIT(val, bit) (val &= ~(1 << bit)) +#define ZSET_BIT(val, bit) (val |= (1 << bit)) /*********************************************************************************************************************** * FUNC * diff --git a/usrc/protocol_impl/function_impl/afunction_impl.hpp b/usrc/protocol_impl/function_impl/afunction_impl.hpp index e9c5cbd..232b481 100644 --- a/usrc/protocol_impl/function_impl/afunction_impl.hpp +++ b/usrc/protocol_impl/function_impl/afunction_impl.hpp @@ -1,4 +1,4 @@ -#pragma ocne +#pragma once #include #include diff --git a/usrc/protocol_impl/function_impl/basic_fn.cpp b/usrc/protocol_impl/function_impl/basic_fn.cpp index 3cde232..cd31bce 100644 --- a/usrc/protocol_impl/function_impl/basic_fn.cpp +++ b/usrc/protocol_impl/function_impl/basic_fn.cpp @@ -81,11 +81,11 @@ void fn_cmd_heart_ping(uint8_t from, uint8_t to, zcanbus_packet_t* packet, size_ * @param len */ void fn_cmd_clear_reset_flag(uint8_t from, uint8_t to, zcanbus_packet_t* packet, size_t len) { - CLEAR_BIT(m_boardflag, 0); + ZCLEAR_BIT(m_boardflag, 0); zcanbus_send_ack(packet, NULL, 0); } void basic_fn_init() { m_boardflag = 0x00; - SET_BIT(m_boardflag, 0); + ZSET_BIT(m_boardflag, 0); } \ No newline at end of file diff --git a/zsdk b/zsdk index 7951cee..d1fa524 160000 --- a/zsdk +++ b/zsdk @@ -1 +1 @@ -Subproject commit 7951cee7dfc612be73f402914c12933ddffe37cc +Subproject commit d1fa5248511a3d2ef1c85fbf8e4abac8eab63fc6