update

.settings/language.settings.xml

@@ -5,7 +5,7 @@
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
-			<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="-1573541530361677026" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="860587862030231004" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>
@@ -16,7 +16,7 @@
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
-			<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="-1558051425230093555" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="876077967161814475" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>

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

iflytop_canbus_protocol

@@ -1 +1 @@
-Subproject commit eb739c10f2971294ee3a12e845e9bfb4cb40f32d
+Subproject commit 955c39e8b8aa1480b0846a1ae26aaa6ba4e38ce0

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");

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                                                         *

usrc/protocol_impl/function_impl/afunction_impl.hpp

@@ -1,4 +1,4 @@
-#pragma ocne
+#pragma once
 #include <stddef.h>
 #include <stdio.h>
 

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);
 }

zsdk

@@ -1 +1 @@
-Subproject commit 7951cee7dfc612be73f402914c12933ddffe37cc
+Subproject commit d1fa5248511a3d2ef1c85fbf8e4abac8eab63fc6