From b7017358b94d8d06810f68e6890debc0f7bd406c Mon Sep 17 00:00:00 2001 From: supowang Date: Sun, 29 Sep 2019 15:31:28 +0800 Subject: [PATCH] Repair partial scrambling --- .../ALIENTEK_STM32F429/BSP/Src/stm32f4xx_it.c | 8 ++++---- .../KEIL/hello_world/TencentOS_tiny.uvoptx | 2 +- .../NUCLEO_STM32F072RB/BSP/Src/stm32f0xx_it.c | 8 ++++---- .../NUCLEO_STM32F103RB/BSP/Src/stm32f1xx_it.c | 8 ++++---- .../NUCLEO_STM32F746ZG/BSP/Src/stm32f7xx_it.c | 8 ++++---- .../BSP/Src/stm32f7xx_it_noeth.c | 8 ++++---- .../NUCLEO_STM32G070RB/BSP/Src/stm32g0xx_it.c | 8 ++++---- .../NUCLEO_STM32L073RZ/BSP/Src/stm32l0xx_it.c | 8 ++++---- .../NUCLEO_STM32L433RC/BSP/Src/stm32l4xx_it.c | 8 ++++---- .../NUCLEO_STM32L476RG/BSP/Src/stm32l4xx_it.c | 8 ++++---- board/NXP-FRDM-KL27Z/BSP/Src/clock_config.c | 8 ++++---- board/NXP_FRDM_KL25Z/BSP/Src/clock_config.c | 8 ++++---- board/NXP_Kinetis_K64/BSP/Src/main.c | 8 ++++---- board/NXP_LPC824Lite/BSP/Src/clock_config.c | 8 ++++---- board/RHF76_STM32L072CBxx_Lora/Src/board.c | 8 ++++---- board/STM32F103_SIM800A/Src/stm32f1xx_it.c | 8 ++++---- board/TI_MSP432P401R_LaunchPad/BSP/Src/main.c | 8 ++++---- .../source/include/qcloud_shadow.h | 18 +++++++++--------- 18 files changed, 74 insertions(+), 74 deletions(-) diff --git a/board/ALIENTEK_STM32F429/BSP/Src/stm32f4xx_it.c b/board/ALIENTEK_STM32F429/BSP/Src/stm32f4xx_it.c index 3c706730..2c30a4cd 100644 --- a/board/ALIENTEK_STM32F429/BSP/Src/stm32f4xx_it.c +++ b/board/ALIENTEK_STM32F429/BSP/Src/stm32f4xx_it.c @@ -172,11 +172,11 @@ void SysTick_Handler(void) /* USER CODE END SysTick_IRQn 0 */ HAL_IncTick(); - if(tos_knl_is_running()) //OS开始跑了,才执行正常的调度处理 + if(tos_knl_is_running()) { - tos_knl_irq_enter(); //进入中断 - tos_tick_handler(); //调用ucos的时钟服务程序 - tos_knl_irq_leave(); //触发任务切换软中断 + tos_knl_irq_enter(); + tos_tick_handler(); + tos_knl_irq_leave(); } //HAL_SYSTICK_IRQHandler(); /* USER CODE BEGIN SysTick_IRQn 1 */ diff --git a/board/ALIENTEK_W601/KEIL/hello_world/TencentOS_tiny.uvoptx b/board/ALIENTEK_W601/KEIL/hello_world/TencentOS_tiny.uvoptx index 059f328e..71590ac2 100644 --- a/board/ALIENTEK_W601/KEIL/hello_world/TencentOS_tiny.uvoptx +++ b/board/ALIENTEK_W601/KEIL/hello_world/TencentOS_tiny.uvoptx @@ -273,7 +273,7 @@ WMLIB - 0 + 1 0 0 0 diff --git a/board/NUCLEO_STM32F072RB/BSP/Src/stm32f0xx_it.c b/board/NUCLEO_STM32F072RB/BSP/Src/stm32f0xx_it.c index 7ba97e8b..3506e8cb 100644 --- a/board/NUCLEO_STM32F072RB/BSP/Src/stm32f0xx_it.c +++ b/board/NUCLEO_STM32F072RB/BSP/Src/stm32f0xx_it.c @@ -128,11 +128,11 @@ void SysTick_Handler(void) /* USER CODE END SysTick_IRQn 0 */ HAL_IncTick(); - if(tos_knl_is_running()) //OS开始跑了,才执行正常的调度处理 + if(tos_knl_is_running()) { - tos_knl_irq_enter(); //进入中断 - tos_tick_handler(); //调用TencentOS tiny的时钟服务程序 - tos_knl_irq_leave(); //触发任务切换软中断 + tos_knl_irq_enter(); + tos_tick_handler(); + tos_knl_irq_leave(); } /* USER CODE BEGIN SysTick_IRQn 1 */ diff --git a/board/NUCLEO_STM32F103RB/BSP/Src/stm32f1xx_it.c b/board/NUCLEO_STM32F103RB/BSP/Src/stm32f1xx_it.c index b241286e..4025f79d 100644 --- a/board/NUCLEO_STM32F103RB/BSP/Src/stm32f1xx_it.c +++ b/board/NUCLEO_STM32F103RB/BSP/Src/stm32f1xx_it.c @@ -186,11 +186,11 @@ void SysTick_Handler(void) /* USER CODE END SysTick_IRQn 0 */ HAL_IncTick(); - if(tos_knl_is_running()) //OS开始跑了,才执行正常的调度处理 + if(tos_knl_is_running()) { - tos_knl_irq_enter(); //进入中断 - tos_tick_handler(); //调用TencentOS tiny的时钟服务程序 - tos_knl_irq_leave(); //触发任务切换软中断 + tos_knl_irq_enter(); + tos_tick_handler(); + tos_knl_irq_leave(); } /* USER CODE BEGIN SysTick_IRQn 1 */ diff --git a/board/NUCLEO_STM32F746ZG/BSP/Src/stm32f7xx_it.c b/board/NUCLEO_STM32F746ZG/BSP/Src/stm32f7xx_it.c index 38d74139..924b52ab 100644 --- a/board/NUCLEO_STM32F746ZG/BSP/Src/stm32f7xx_it.c +++ b/board/NUCLEO_STM32F746ZG/BSP/Src/stm32f7xx_it.c @@ -187,11 +187,11 @@ void SysTick_Handler(void) /* USER CODE END SysTick_IRQn 0 */ HAL_IncTick(); - if(tos_knl_is_running()) //OS?a¨o??¨1¨¢?,2????DD?y3?ê|ì?|ì???¨¨??|¨¤¨a + if(tos_knl_is_running()) { - tos_knl_irq_enter(); //??¨¨??D?? - tos_tick_handler(); //|ì??¨??TencentOS tiny|ì?¨o?à?¨??¤t??3¨?D¨° - tos_knl_irq_leave(); //??£¤?¤?騨????D??¨¨¨a?D?? + tos_knl_irq_enter(); + tos_tick_handler(); + tos_knl_irq_leave(); } /* USER CODE BEGIN SysTick_IRQn 1 */ diff --git a/board/NUCLEO_STM32F746ZG/BSP/Src/stm32f7xx_it_noeth.c b/board/NUCLEO_STM32F746ZG/BSP/Src/stm32f7xx_it_noeth.c index 6107d2aa..c2d13f03 100644 --- a/board/NUCLEO_STM32F746ZG/BSP/Src/stm32f7xx_it_noeth.c +++ b/board/NUCLEO_STM32F746ZG/BSP/Src/stm32f7xx_it_noeth.c @@ -187,11 +187,11 @@ void SysTick_Handler(void) /* USER CODE END SysTick_IRQn 0 */ HAL_IncTick(); - if(tos_knl_is_running()) //OS?a¨o??¨1¨¢?,2????DD?y3?ê|ì?|ì???¨¨??|¨¤¨a + if(tos_knl_is_running()) { - tos_knl_irq_enter(); //??¨¨??D?? - tos_tick_handler(); //|ì??¨??TencentOS tiny|ì?¨o?à?¨??¤t??3¨?D¨° - tos_knl_irq_leave(); //??£¤?¤?騨????D??¨¨¨a?D?? + tos_knl_irq_enter(); + tos_tick_handler(); + tos_knl_irq_leave(); } /* USER CODE BEGIN SysTick_IRQn 1 */ diff --git a/board/NUCLEO_STM32G070RB/BSP/Src/stm32g0xx_it.c b/board/NUCLEO_STM32G070RB/BSP/Src/stm32g0xx_it.c index 1a660acf..e3b416b3 100644 --- a/board/NUCLEO_STM32G070RB/BSP/Src/stm32g0xx_it.c +++ b/board/NUCLEO_STM32G070RB/BSP/Src/stm32g0xx_it.c @@ -128,11 +128,11 @@ void SysTick_Handler(void) /* USER CODE END SysTick_IRQn 0 */ HAL_IncTick(); - if(tos_knl_is_running()) //OS开始跑了,才执行正常的调度处理 + if(tos_knl_is_running()) { - tos_knl_irq_enter(); //进入中断 - tos_tick_handler(); //调用TencentOS tiny的时钟服务程序 - tos_knl_irq_leave(); //触发任务切换软中断 + tos_knl_irq_enter(); + tos_tick_handler(); + tos_knl_irq_leave(); } /* USER CODE BEGIN SysTick_IRQn 1 */ diff --git a/board/NUCLEO_STM32L073RZ/BSP/Src/stm32l0xx_it.c b/board/NUCLEO_STM32L073RZ/BSP/Src/stm32l0xx_it.c index 6d097a53..8eaab39e 100644 --- a/board/NUCLEO_STM32L073RZ/BSP/Src/stm32l0xx_it.c +++ b/board/NUCLEO_STM32L073RZ/BSP/Src/stm32l0xx_it.c @@ -128,11 +128,11 @@ void SysTick_Handler(void) /* USER CODE END SysTick_IRQn 0 */ HAL_IncTick(); - if(tos_knl_is_running()) //OS开始跑了,才执行正常的调度处理 + if(tos_knl_is_running()) { - tos_knl_irq_enter(); //进入中断 - tos_tick_handler(); //调用TencentOS tiny的时钟服务程序 - tos_knl_irq_leave(); //触发任务切换软中断 + tos_knl_irq_enter(); + tos_tick_handler(); + tos_knl_irq_leave(); } /* USER CODE BEGIN SysTick_IRQn 1 */ diff --git a/board/NUCLEO_STM32L433RC/BSP/Src/stm32l4xx_it.c b/board/NUCLEO_STM32L433RC/BSP/Src/stm32l4xx_it.c index f8ae6575..8786030b 100644 --- a/board/NUCLEO_STM32L433RC/BSP/Src/stm32l4xx_it.c +++ b/board/NUCLEO_STM32L433RC/BSP/Src/stm32l4xx_it.c @@ -186,11 +186,11 @@ void SysTick_Handler(void) /* USER CODE END SysTick_IRQn 0 */ HAL_IncTick(); - if(tos_knl_is_running()) //OS?aê??üá?,2??′DD?y3£μ?μ÷?è′|àí + if(tos_knl_is_running()) { - tos_knl_irq_enter(); //??è??D?? - tos_tick_handler(); //μ÷ó?TencentOS tinyμ?ê±?ó·t??3ìDò - tos_knl_irq_leave(); //′¥·¢è????D??èí?D?? + tos_knl_irq_enter(); + tos_tick_handler(); + tos_knl_irq_leave(); } /* USER CODE BEGIN SysTick_IRQn 1 */ diff --git a/board/NUCLEO_STM32L476RG/BSP/Src/stm32l4xx_it.c b/board/NUCLEO_STM32L476RG/BSP/Src/stm32l4xx_it.c index f8ae6575..9303c2b2 100644 --- a/board/NUCLEO_STM32L476RG/BSP/Src/stm32l4xx_it.c +++ b/board/NUCLEO_STM32L476RG/BSP/Src/stm32l4xx_it.c @@ -186,11 +186,11 @@ void SysTick_Handler(void) /* USER CODE END SysTick_IRQn 0 */ HAL_IncTick(); - if(tos_knl_is_running()) //OS?aê??üá?,2??′DD?y3£μ?μ÷?è′|àí + if(tos_knl_is_running()) { - tos_knl_irq_enter(); //??è??D?? - tos_tick_handler(); //μ÷ó?TencentOS tinyμ?ê±?ó·t??3ìDò - tos_knl_irq_leave(); //′¥·¢è????D??èí?D?? + tos_knl_irq_enter(); + tos_tick_handler(); + tos_knl_irq_leave(); } /* USER CODE BEGIN SysTick_IRQn 1 */ diff --git a/board/NXP-FRDM-KL27Z/BSP/Src/clock_config.c b/board/NXP-FRDM-KL27Z/BSP/Src/clock_config.c index c6b02d80..097375ea 100644 --- a/board/NXP-FRDM-KL27Z/BSP/Src/clock_config.c +++ b/board/NXP-FRDM-KL27Z/BSP/Src/clock_config.c @@ -231,11 +231,11 @@ void BOARD_BootClockVLPR(void) void SysTick_Handler(void) { - if(tos_knl_is_running()) //OS开始跑了,才执行正常的调度处理 + if(tos_knl_is_running()) { - tos_knl_irq_enter(); //进入中断 - tos_tick_handler(); //调用TencentOS tiny的时钟服务程序 - tos_knl_irq_leave(); //触发任务切换软中断 + tos_knl_irq_enter(); + tos_tick_handler(); + tos_knl_irq_leave(); } /* USER CODE BEGIN SysTick_IRQn 1 */ diff --git a/board/NXP_FRDM_KL25Z/BSP/Src/clock_config.c b/board/NXP_FRDM_KL25Z/BSP/Src/clock_config.c index 511ae551..ecbb2050 100644 --- a/board/NXP_FRDM_KL25Z/BSP/Src/clock_config.c +++ b/board/NXP_FRDM_KL25Z/BSP/Src/clock_config.c @@ -299,11 +299,11 @@ void BOARD_BootClockVLPR(void) void SysTick_Handler(void) { - if(tos_knl_is_running()) //OS开始跑了,才执行正常的调度处理 + if(tos_knl_is_running()) { - tos_knl_irq_enter(); //进入中断 - tos_tick_handler(); //调用TencentOS tiny的时钟服务程序 - tos_knl_irq_leave(); //触发任务切换软中断 + tos_knl_irq_enter(); + tos_tick_handler(); + tos_knl_irq_leave(); } /* USER CODE BEGIN SysTick_IRQn 1 */ diff --git a/board/NXP_Kinetis_K64/BSP/Src/main.c b/board/NXP_Kinetis_K64/BSP/Src/main.c index f98771cc..772f3d78 100644 --- a/board/NXP_Kinetis_K64/BSP/Src/main.c +++ b/board/NXP_Kinetis_K64/BSP/Src/main.c @@ -42,11 +42,11 @@ osThreadDef(task2, osPriorityNormal, 1, TASK2_STK_SIZE); void SysTick_Handler(void) { - if(tos_knl_is_running()) //OS开始跑了,才执行正常的调度处理 + if(tos_knl_is_running()) { - tos_knl_irq_enter(); //进入中断 - tos_tick_handler(); //调用TencentOS tiny的时钟服务程序 - tos_knl_irq_leave(); //触发任务切换软中断 + tos_knl_irq_enter(); + tos_tick_handler(); + tos_knl_irq_leave(); } } void task1(void *arg) diff --git a/board/NXP_LPC824Lite/BSP/Src/clock_config.c b/board/NXP_LPC824Lite/BSP/Src/clock_config.c index 0e243e67..3376da4f 100644 --- a/board/NXP_LPC824Lite/BSP/Src/clock_config.c +++ b/board/NXP_LPC824Lite/BSP/Src/clock_config.c @@ -164,11 +164,11 @@ void BOARD_BootClockPll24M(void) } void SysTick_Handler(void) { - if(tos_knl_is_running()) //OS开始跑了,才执行正常的调度处理 + if(tos_knl_is_running()) { - tos_knl_irq_enter(); //进入中断 - tos_tick_handler(); //调用TencentOS tiny的时钟服务程序 - tos_knl_irq_leave(); //触发任务切换软中断 + tos_knl_irq_enter(); + tos_tick_handler(); + tos_knl_irq_leave(); } /* USER CODE BEGIN SysTick_IRQn 1 */ diff --git a/board/RHF76_STM32L072CBxx_Lora/Src/board.c b/board/RHF76_STM32L072CBxx_Lora/Src/board.c index 0b066cad..d8032329 100644 --- a/board/RHF76_STM32L072CBxx_Lora/Src/board.c +++ b/board/RHF76_STM32L072CBxx_Lora/Src/board.c @@ -332,11 +332,11 @@ void SystemClockReConfig( void ) void SysTick_Handler( void ) { HAL_IncTick( ); - if(tos_knl_is_running()) //OS开始跑了,才执行正常的调度处理 + if(tos_knl_is_running()) { - tos_knl_irq_enter(); //进入中断 - tos_tick_handler(); //调用ucos的时钟服务程序 - tos_knl_irq_leave(); //触发任务切换软中断 + tos_knl_irq_enter(); + tos_tick_handler(); + tos_knl_irq_leave(); } //HAL_SYSTICK_IRQHandler( ); } diff --git a/board/STM32F103_SIM800A/Src/stm32f1xx_it.c b/board/STM32F103_SIM800A/Src/stm32f1xx_it.c index d1e6e538..a79ac81c 100644 --- a/board/STM32F103_SIM800A/Src/stm32f1xx_it.c +++ b/board/STM32F103_SIM800A/Src/stm32f1xx_it.c @@ -184,11 +184,11 @@ void SysTick_Handler(void) /* USER CODE END SysTick_IRQn 0 */ HAL_IncTick(); - if(tos_knl_is_running()) //OS开始跑了,才执行正常的调度处理 + if(tos_knl_is_running()) { - tos_knl_irq_enter(); //进入中断 - tos_tick_handler(); //调用tos的时钟服务程序 - tos_knl_irq_leave(); //触发任务切换软中断 + tos_knl_irq_enter(); + tos_tick_handler(); + tos_knl_irq_leave(); } //HAL_SYSTICK_IRQHandler(); /* USER CODE BEGIN SysTick_IRQn 1 */ diff --git a/board/TI_MSP432P401R_LaunchPad/BSP/Src/main.c b/board/TI_MSP432P401R_LaunchPad/BSP/Src/main.c index 8314dbfd..8d9132c9 100644 --- a/board/TI_MSP432P401R_LaunchPad/BSP/Src/main.c +++ b/board/TI_MSP432P401R_LaunchPad/BSP/Src/main.c @@ -67,11 +67,11 @@ osThreadDef(task2, osPriorityNormal, 1, TASK2_STK_SIZE); void SysTick_Handler(void) { - if(tos_knl_is_running()) //OS开始跑了,才执行正常的调度处理 + if(tos_knl_is_running()) { - tos_knl_irq_enter(); //进入中断 - tos_tick_handler(); //调用TencentOS tiny的时钟服务程序 - tos_knl_irq_leave(); //触发任务切换软中断 + tos_knl_irq_enter(); + tos_tick_handler(); + tos_knl_irq_leave(); } } diff --git a/components/connectivity/TencentCloud_SDK/source/include/qcloud_shadow.h b/components/connectivity/TencentCloud_SDK/source/include/qcloud_shadow.h index 119acada..f4067a50 100644 --- a/components/connectivity/TencentCloud_SDK/source/include/qcloud_shadow.h +++ b/components/connectivity/TencentCloud_SDK/source/include/qcloud_shadow.h @@ -73,11 +73,11 @@ typedef struct shadow_device_property_st { } shadow_dev_property_t; /** - * @brief 璁惧灞炴у鐞嗗洖璋冨嚱鏁 + * @brief Define callback when device property change * - * @param pJsonValueBuffer 璁惧灞炴у - * @param valueLength 璁惧灞炴у奸暱搴 - * @param DeviceProperty 璁惧灞炴х粨鏋勪綋 + * @param pJsonValueBuffer property JSON buffer + * @param valueLength property length + * @param DeviceProperty reference to device property */ typedef void (*shadow_property_delta_handler_fn_t)(void *client, const char *json_doc, uint32_t json_doc_len, shadow_dev_property_t *property); @@ -101,12 +101,12 @@ typedef enum qcloud_shadow_request_method_en { } qcloud_shadow_req_method_t; /** - * @brief 姣忔鏂囨。璇锋眰鍝嶅簲鐨勫洖璋冨嚱鏁 + * @brief Define MQTT shadow callback when request response arrived * - * @param method 鏂囨。鎿嶄綔鏂瑰紡 - * @param requestAck 璇锋眰鍝嶅簲绫诲瀷 - * @param pJsonDocument 浜戠鍝嶅簲杩斿洖鐨勬枃妗 - * @param userContext 鐢ㄦ埛鏁版嵁 + * @param method type of request + * @param requestAck response type + * @param pJsonDocument JSON document from server + * @param userContext User context * */ typedef void (*shadow_requset_handler_fn_t)(void *client, qcloud_shadow_req_method_t method, qcloud_shadow_req_state_t req_state, const char *json_doc, void *context);