Repair partial scrambling

This commit is contained in:
supowang
2019-09-29 15:31:28 +08:00
parent c9c423555a
commit b7017358b9
18 changed files with 74 additions and 74 deletions

View File

@@ -172,11 +172,11 @@ void SysTick_Handler(void)
/* USER CODE END SysTick_IRQn 0 */
HAL_IncTick();
if(tos_knl_is_running()) //OS<4F><53>ʼ<EFBFBD><CABC><EFBFBD><EFBFBD>,<2C><>ִ<EFBFBD><D6B4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ĵ<EFBFBD><C4B5>ȴ<EFBFBD><C8B4><EFBFBD>
if(tos_knl_is_running())
{
tos_knl_irq_enter(); //<2F><><EFBFBD><EFBFBD><EFBFBD>ж<EFBFBD>
tos_tick_handler(); //<2F><><EFBFBD><EFBFBD>ucos<6F><73>ʱ<EFBFBD>ӷ<EFBFBD><D3B7><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
tos_knl_irq_leave(); //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>л<EFBFBD><D0BB><EFBFBD><EFBFBD>ж<EFBFBD>
tos_knl_irq_enter();
tos_tick_handler();
tos_knl_irq_leave();
}
//HAL_SYSTICK_IRQHandler();
/* USER CODE BEGIN SysTick_IRQn 1 */

View File

@@ -273,7 +273,7 @@
<Group>
<GroupName>WMLIB</GroupName>
<tvExp>0</tvExp>
<tvExp>1</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel>
<RteFlg>0</RteFlg>

View File

@@ -128,11 +128,11 @@ void SysTick_Handler(void)
/* USER CODE END SysTick_IRQn 0 */
HAL_IncTick();
if(tos_knl_is_running()) //OS<4F><53>ʼ<EFBFBD><CABC><EFBFBD><EFBFBD>,<2C><>ִ<EFBFBD><D6B4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ĵ<EFBFBD><C4B5>ȴ<EFBFBD><C8B4><EFBFBD>
if(tos_knl_is_running())
{
tos_knl_irq_enter(); //<2F><><EFBFBD><EFBFBD><EFBFBD>ж<EFBFBD>
tos_tick_handler(); //<2F><><EFBFBD><EFBFBD>TencentOS tiny<6E><79>ʱ<EFBFBD>ӷ<EFBFBD><D3B7><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
tos_knl_irq_leave(); //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>л<EFBFBD><D0BB><EFBFBD><EFBFBD>ж<EFBFBD>
tos_knl_irq_enter();
tos_tick_handler();
tos_knl_irq_leave();
}
/* USER CODE BEGIN SysTick_IRQn 1 */

View File

@@ -186,11 +186,11 @@ void SysTick_Handler(void)
/* USER CODE END SysTick_IRQn 0 */
HAL_IncTick();
if(tos_knl_is_running()) //OS<4F><53>ʼ<EFBFBD><CABC><EFBFBD><EFBFBD>,<2C><>ִ<EFBFBD><D6B4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ĵ<EFBFBD><C4B5>ȴ<EFBFBD><C8B4><EFBFBD>
if(tos_knl_is_running())
{
tos_knl_irq_enter(); //<2F><><EFBFBD><EFBFBD><EFBFBD>ж<EFBFBD>
tos_tick_handler(); //<2F><><EFBFBD><EFBFBD>TencentOS tiny<6E><79>ʱ<EFBFBD>ӷ<EFBFBD><D3B7><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
tos_knl_irq_leave(); //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>л<EFBFBD><D0BB><EFBFBD><EFBFBD>ж<EFBFBD>
tos_knl_irq_enter();
tos_tick_handler();
tos_knl_irq_leave();
}
/* USER CODE BEGIN SysTick_IRQn 1 */

View File

@@ -187,11 +187,11 @@ void SysTick_Handler(void)
/* USER CODE END SysTick_IRQn 0 */
HAL_IncTick();
if(tos_knl_is_running()) //OS?a<><61>o??<3F><>1<EFBFBD><31><EFBFBD><EFBFBD>?,2????DD?y3?<3F><>|<7C><>?|<7C><>???<3F><><EFBFBD><EFBFBD>??|<7C><><EFBFBD>衧a
if(tos_knl_is_running())
{
tos_knl_irq_enter(); //??<3F><><EFBFBD><EFBFBD>??D??
tos_tick_handler(); //|<7C><>??<3F><>??TencentOS tiny|<7C><>?<3F><>o?<3F><>?<3F><>??<3F><>t??3<><33>?D<><44><EFBFBD><EFBFBD>
tos_knl_irq_leave(); //??<3F><><EFBFBD><EFBFBD>?<3F><>?<3F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>????D??<3F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>a?D??
tos_knl_irq_enter();
tos_tick_handler();
tos_knl_irq_leave();
}
/* USER CODE BEGIN SysTick_IRQn 1 */

View File

@@ -187,11 +187,11 @@ void SysTick_Handler(void)
/* USER CODE END SysTick_IRQn 0 */
HAL_IncTick();
if(tos_knl_is_running()) //OS?a<><61>o??<3F><>1<EFBFBD><31><EFBFBD><EFBFBD>?,2????DD?y3?<3F><>|<7C><>?|<7C><>???<3F><><EFBFBD><EFBFBD>??|<7C><><EFBFBD>衧a
if(tos_knl_is_running())
{
tos_knl_irq_enter(); //??<3F><><EFBFBD><EFBFBD>??D??
tos_tick_handler(); //|<7C><>??<3F><>??TencentOS tiny|<7C><>?<3F><>o?<3F><>?<3F><>??<3F><>t??3<><33>?D<><44><EFBFBD><EFBFBD>
tos_knl_irq_leave(); //??<3F><><EFBFBD><EFBFBD>?<3F><>?<3F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>????D??<3F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>a?D??
tos_knl_irq_enter();
tos_tick_handler();
tos_knl_irq_leave();
}
/* USER CODE BEGIN SysTick_IRQn 1 */

View File

@@ -128,11 +128,11 @@ void SysTick_Handler(void)
/* USER CODE END SysTick_IRQn 0 */
HAL_IncTick();
if(tos_knl_is_running()) //OS<4F><53>ʼ<EFBFBD><CABC><EFBFBD><EFBFBD>,<2C><>ִ<EFBFBD><D6B4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ĵ<EFBFBD><C4B5>ȴ<EFBFBD><C8B4><EFBFBD>
if(tos_knl_is_running())
{
tos_knl_irq_enter(); //<2F><><EFBFBD><EFBFBD><EFBFBD>ж<EFBFBD>
tos_tick_handler(); //<2F><><EFBFBD><EFBFBD>TencentOS tiny<6E><79>ʱ<EFBFBD>ӷ<EFBFBD><D3B7><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
tos_knl_irq_leave(); //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>л<EFBFBD><D0BB><EFBFBD><EFBFBD>ж<EFBFBD>
tos_knl_irq_enter();
tos_tick_handler();
tos_knl_irq_leave();
}
/* USER CODE BEGIN SysTick_IRQn 1 */

View File

@@ -128,11 +128,11 @@ void SysTick_Handler(void)
/* USER CODE END SysTick_IRQn 0 */
HAL_IncTick();
if(tos_knl_is_running()) //OS<4F><53>ʼ<EFBFBD><CABC><EFBFBD><EFBFBD>,<2C><>ִ<EFBFBD><D6B4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ĵ<EFBFBD><C4B5>ȴ<EFBFBD><C8B4><EFBFBD>
if(tos_knl_is_running())
{
tos_knl_irq_enter(); //<2F><><EFBFBD><EFBFBD><EFBFBD>ж<EFBFBD>
tos_tick_handler(); //<2F><><EFBFBD><EFBFBD>TencentOS tiny<6E><79>ʱ<EFBFBD>ӷ<EFBFBD><D3B7><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
tos_knl_irq_leave(); //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>л<EFBFBD><D0BB><EFBFBD><EFBFBD>ж<EFBFBD>
tos_knl_irq_enter();
tos_tick_handler();
tos_knl_irq_leave();
}
/* USER CODE BEGIN SysTick_IRQn 1 */

View File

@@ -186,11 +186,11 @@ void SysTick_Handler(void)
/* USER CODE END SysTick_IRQn 0 */
HAL_IncTick();
if(tos_knl_is_running()) //OS?a<><61>??<3F><><EFBFBD><EFBFBD>?,2??<3F><>DD?y3<79><33><EFBFBD><EFBFBD>?<3F>̡<EFBFBD>?<3F><><EFBFBD><EFBFBD>|<7C><><EFBFBD><EFBFBD>
if(tos_knl_is_running())
{
tos_knl_irq_enter(); //??<3F><>??D??
tos_tick_handler(); //<2F>̡¨<CCA1>?TencentOS tiny<6E><79>?<3F><><EFBFBD><EFBFBD>?<3F><><EFBFBD><EFBFBD>t??3<><33>D<EFBFBD><44>
tos_knl_irq_leave(); //<2F><EFBFBD><E4A3A4><EFBFBD>騨????D??<3F><><EFBFBD><EFBFBD>?D??
tos_knl_irq_enter();
tos_tick_handler();
tos_knl_irq_leave();
}
/* USER CODE BEGIN SysTick_IRQn 1 */

View File

@@ -186,11 +186,11 @@ void SysTick_Handler(void)
/* USER CODE END SysTick_IRQn 0 */
HAL_IncTick();
if(tos_knl_is_running()) //OS?a<><61>??<3F><><EFBFBD><EFBFBD>?,2??<3F><>DD?y3<79><33><EFBFBD><EFBFBD>?<3F>̡<EFBFBD>?<3F><><EFBFBD><EFBFBD>|<7C><><EFBFBD><EFBFBD>
if(tos_knl_is_running())
{
tos_knl_irq_enter(); //??<3F><>??D??
tos_tick_handler(); //<2F>̡¨<CCA1>?TencentOS tiny<6E><79>?<3F><><EFBFBD><EFBFBD>?<3F><><EFBFBD><EFBFBD>t??3<><33>D<EFBFBD><44>
tos_knl_irq_leave(); //<2F><EFBFBD><E4A3A4><EFBFBD>騨????D??<3F><><EFBFBD><EFBFBD>?D??
tos_knl_irq_enter();
tos_tick_handler();
tos_knl_irq_leave();
}
/* USER CODE BEGIN SysTick_IRQn 1 */

View File

@@ -231,11 +231,11 @@ void BOARD_BootClockVLPR(void)
void SysTick_Handler(void)
{
if(tos_knl_is_running()) //OS<4F><53>ʼ<EFBFBD><CABC><EFBFBD><EFBFBD>,<2C><>ִ<EFBFBD><D6B4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ĵ<EFBFBD><C4B5>ȴ<EFBFBD><C8B4><EFBFBD>
if(tos_knl_is_running())
{
tos_knl_irq_enter(); //<2F><><EFBFBD><EFBFBD><EFBFBD>ж<EFBFBD>
tos_tick_handler(); //<2F><><EFBFBD><EFBFBD>TencentOS tiny<6E><79>ʱ<EFBFBD>ӷ<EFBFBD><D3B7><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
tos_knl_irq_leave(); //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>л<EFBFBD><D0BB><EFBFBD><EFBFBD>ж<EFBFBD>
tos_knl_irq_enter();
tos_tick_handler();
tos_knl_irq_leave();
}
/* USER CODE BEGIN SysTick_IRQn 1 */

View File

@@ -299,11 +299,11 @@ void BOARD_BootClockVLPR(void)
void SysTick_Handler(void)
{
if(tos_knl_is_running()) //OS<4F><53>ʼ<EFBFBD><CABC><EFBFBD><EFBFBD>,<2C><>ִ<EFBFBD><D6B4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ĵ<EFBFBD><C4B5>ȴ<EFBFBD><C8B4><EFBFBD>
if(tos_knl_is_running())
{
tos_knl_irq_enter(); //<2F><><EFBFBD><EFBFBD><EFBFBD>ж<EFBFBD>
tos_tick_handler(); //<2F><><EFBFBD><EFBFBD>TencentOS tiny<6E><79>ʱ<EFBFBD>ӷ<EFBFBD><D3B7><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
tos_knl_irq_leave(); //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>л<EFBFBD><D0BB><EFBFBD><EFBFBD>ж<EFBFBD>
tos_knl_irq_enter();
tos_tick_handler();
tos_knl_irq_leave();
}
/* USER CODE BEGIN SysTick_IRQn 1 */

View File

@@ -42,11 +42,11 @@ osThreadDef(task2, osPriorityNormal, 1, TASK2_STK_SIZE);
void SysTick_Handler(void)
{
if(tos_knl_is_running()) //OS<4F><53>ʼ<EFBFBD><CABC><EFBFBD><EFBFBD>,<2C><>ִ<EFBFBD><D6B4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ĵ<EFBFBD><C4B5>ȴ<EFBFBD><C8B4><EFBFBD>
if(tos_knl_is_running())
{
tos_knl_irq_enter(); //<2F><><EFBFBD><EFBFBD><EFBFBD>ж<EFBFBD>
tos_tick_handler(); //<2F><><EFBFBD><EFBFBD>TencentOS tiny<6E><79>ʱ<EFBFBD>ӷ<EFBFBD><D3B7><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
tos_knl_irq_leave(); //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>л<EFBFBD><D0BB><EFBFBD><EFBFBD>ж<EFBFBD>
tos_knl_irq_enter();
tos_tick_handler();
tos_knl_irq_leave();
}
}
void task1(void *arg)

View File

@@ -164,11 +164,11 @@ void BOARD_BootClockPll24M(void)
}
void SysTick_Handler(void)
{
if(tos_knl_is_running()) //OS<4F><53>ʼ<EFBFBD><CABC><EFBFBD><EFBFBD>,<2C><>ִ<EFBFBD><D6B4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ĵ<EFBFBD><C4B5>ȴ<EFBFBD><C8B4><EFBFBD>
if(tos_knl_is_running())
{
tos_knl_irq_enter(); //<2F><><EFBFBD><EFBFBD><EFBFBD>ж<EFBFBD>
tos_tick_handler(); //<2F><><EFBFBD><EFBFBD>TencentOS tiny<6E><79>ʱ<EFBFBD>ӷ<EFBFBD><D3B7><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
tos_knl_irq_leave(); //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>л<EFBFBD><D0BB><EFBFBD><EFBFBD>ж<EFBFBD>
tos_knl_irq_enter();
tos_tick_handler();
tos_knl_irq_leave();
}
/* USER CODE BEGIN SysTick_IRQn 1 */

View File

@@ -332,11 +332,11 @@ void SystemClockReConfig( void )
void SysTick_Handler( void )
{
HAL_IncTick( );
if(tos_knl_is_running()) //OS<4F><53>ʼ<EFBFBD><CABC><EFBFBD><EFBFBD>,<2C><>ִ<EFBFBD><D6B4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ĵ<EFBFBD><C4B5>ȴ<EFBFBD><C8B4><EFBFBD>
if(tos_knl_is_running())
{
tos_knl_irq_enter(); //<2F><><EFBFBD><EFBFBD><EFBFBD>ж<EFBFBD>
tos_tick_handler(); //<2F><><EFBFBD><EFBFBD>ucos<6F><73>ʱ<EFBFBD>ӷ<EFBFBD><D3B7><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
tos_knl_irq_leave(); //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>л<EFBFBD><D0BB><EFBFBD><EFBFBD>ж<EFBFBD>
tos_knl_irq_enter();
tos_tick_handler();
tos_knl_irq_leave();
}
//HAL_SYSTICK_IRQHandler( );
}

View File

@@ -184,11 +184,11 @@ void SysTick_Handler(void)
/* USER CODE END SysTick_IRQn 0 */
HAL_IncTick();
if(tos_knl_is_running()) //OS<4F><53>ʼ<EFBFBD><CABC><EFBFBD><EFBFBD>,<2C><>ִ<EFBFBD><D6B4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ĵ<EFBFBD><C4B5>ȴ<EFBFBD><C8B4><EFBFBD>
if(tos_knl_is_running())
{
tos_knl_irq_enter(); //<2F><><EFBFBD><EFBFBD><EFBFBD>ж<EFBFBD>
tos_tick_handler(); //<2F><><EFBFBD><EFBFBD>tos<6F><73>ʱ<EFBFBD>ӷ<EFBFBD><D3B7><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
tos_knl_irq_leave(); //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>л<EFBFBD><D0BB><EFBFBD><EFBFBD>ж<EFBFBD>
tos_knl_irq_enter();
tos_tick_handler();
tos_knl_irq_leave();
}
//HAL_SYSTICK_IRQHandler();
/* USER CODE BEGIN SysTick_IRQn 1 */

View File

@@ -67,11 +67,11 @@ osThreadDef(task2, osPriorityNormal, 1, TASK2_STK_SIZE);
void SysTick_Handler(void)
{
if(tos_knl_is_running()) //OS<4F><53>ʼ<EFBFBD><CABC><EFBFBD><EFBFBD>,<2C><>ִ<EFBFBD><D6B4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ĵ<EFBFBD><C4B5>ȴ<EFBFBD><C8B4><EFBFBD>
if(tos_knl_is_running())
{
tos_knl_irq_enter(); //<2F><><EFBFBD><EFBFBD><EFBFBD>ж<EFBFBD>
tos_tick_handler(); //<2F><><EFBFBD><EFBFBD>TencentOS tiny<6E><79>ʱ<EFBFBD>ӷ<EFBFBD><D3B7><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
tos_knl_irq_leave(); //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>л<EFBFBD><D0BB><EFBFBD><EFBFBD>ж<EFBFBD>
tos_knl_irq_enter();
tos_tick_handler();
tos_knl_irq_leave();
}
}

View File

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