From 1461242454b6d962e2f47f4d1d76c9d8eb98b2c8 Mon Sep 17 00:00:00 2001 From: lh <3191213465@qq.com> Date: Mon, 3 Aug 2026 11:20:40 +0800 Subject: [PATCH] =?UTF-8?q?=E5=81=87=E6=95=B0=E6=8D=AE1.5M=E5=AD=97?= =?UTF-8?q?=E8=8A=82=E5=BA=94=E7=94=A8=E8=B7=9F=E9=9A=8F=EF=BC=88=E9=81=8D?= =?UTF-8?q?=E5=8E=86=E6=A8=A1=E6=8B=9F=E5=BA=94=E7=94=A8=20=E5=A4=84?= =?UTF-8?q?=E7=90=86=EF=BC=89=EF=BC=8C12w=E5=AD=97=E8=8A=82=E8=BE=93?= =?UTF-8?q?=E5=85=A5=E6=95=B0=E6=8D=AE=EF=BC=88=E6=9C=AA=E6=A8=A1=E6=8B=9F?= =?UTF-8?q?=E5=8D=8F=E8=AE=AE=E5=A4=84=E7=90=86=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- TSCP/src/APP/APP_API.c | 4 ++-- TSCP/src/MSCP/PFM/PFM_InputOutput.c | 2 ++ TSCP/src/MSCP/SFM/SFM_2x2.c | 8 ++++++++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/TSCP/src/APP/APP_API.c b/TSCP/src/APP/APP_API.c index 0fedd7b..7ad9bd3 100644 --- a/TSCP/src/APP/APP_API.c +++ b/TSCP/src/APP/APP_API.c @@ -588,8 +588,8 @@ ENUM_CM_RETURN APP_API_MainFunc(void) debug_infor_printf("app proc end at %llu us,used %d us\n", endCycTick, (CM_INT32)((endCycTick - startCycTick) / 1000)); //gFollowDataLen = GetCiAppData(gFollowData); - memset(gFollowData,0x02,1024*500); - MSCP_SetFollowData(gFollowData, 1024*500); + memset(gFollowData,0x00,1024*1500); + MSCP_SetFollowData(gFollowData, 1024*1500); return retVal; } diff --git a/TSCP/src/MSCP/PFM/PFM_InputOutput.c b/TSCP/src/MSCP/PFM/PFM_InputOutput.c index c1b3b86..6eb1541 100644 --- a/TSCP/src/MSCP/PFM/PFM_InputOutput.c +++ b/TSCP/src/MSCP/PFM/PFM_InputOutput.c @@ -461,6 +461,8 @@ void PFM_InputProc(void) /*- 外网安全数据接收 */ PFM_CFC_Check(26); g_2x2oo2_rx[g_2x2oo2_base][s_2x2oo2_OutnetSafe].mine_len = (CM_UINT32)SFM_RxOutnetSafe(g_2x2oo2_rx[g_2x2oo2_base][s_2x2oo2_OutnetSafe].p_mine_buf, (CM_UINT32)g_2x2oo2_rx[g_2x2oo2_base][s_2x2oo2_OutnetSafe].buf_size); + g_2x2oo2_rx[g_2x2oo2_base][s_2x2oo2_OutnetSafe].mine_len = g_PFM_Cfg.OutnetSafePack_Len; + CM_Memset(g_2x2oo2_rx[g_2x2oo2_base][s_2x2oo2_OutnetSafe].p_mine_buf, 0x00u, g_PFM_Cfg.OutnetSafePack_Len, g_2x2oo2_rx[g_2x2oo2_base][s_2x2oo2_OutnetSafe].buf_size); MSCP_LOG_MSG("g_2x2oo2_rx[g_2x2oo2_base][s_2x2oo2_OutnetSafe].mine_len = %d\n",g_2x2oo2_rx[g_2x2oo2_base][s_2x2oo2_OutnetSafe].mine_len); /*判断外网透传使能开关*/ if((CM_UINT32)0x55u == g_PFM_Cfg.M_OutnetRaw_Enable) diff --git a/TSCP/src/MSCP/SFM/SFM_2x2.c b/TSCP/src/MSCP/SFM/SFM_2x2.c index 297d71f..3d10d15 100644 --- a/TSCP/src/MSCP/SFM/SFM_2x2.c +++ b/TSCP/src/MSCP/SFM/SFM_2x2.c @@ -2635,6 +2635,7 @@ void SFM_2x2_EndProc(void) CM_UINT8 type = 0u; /*接收到的跟随数据类型 1 CRC 2 全数据*/ static CM_UINT8 debounce = 0u; /*防抖计数*/ CM_UINT8 SendFollowDataType = 0u; + CM_UINT32 i = 0u; if(ENUM_4x2_MASTER == stat) @@ -2643,6 +2644,7 @@ void SFM_2x2_EndProc(void) curTickTest[0] = CM_GetTick(); /* 条件 本地对系是备或者宕机 && 对地A是备或者宕机 && 对地B是备或者宕机*/ SendFollowDataType = SFM_GetAppFollowType(); + SendFollowDataType = 0; if(1u == SendFollowDataType) { /*- 发送跟随数据 */ @@ -2696,14 +2698,20 @@ void SFM_2x2_EndProc(void) { /*- 是否收到了最新的应用跟随数据 */ /*- 调用应用API覆盖应用关键数据 */ + //retFollowUp = APP_API_FollowUp(g_RxAppFollow, (CM_UINT32)g_RxAppFollow_len); //CM_RE_ASSERT(ENUM_CM_TRUE == retFollowUp, SFM_2x2_MODE, DARK_FAULT_CODE_FUN_ORDER_9, TSCP_DARK_ASSERT_2); + for(i = 0u; i < g_RxAppFollow_len; i++) + { + g_RxAppFollow[i] = 0; + } s_2x2_Ctrl.AppFollowCmpFailFlag = 0u; } else { MSCP_LOG_MSG("no follow data\n"); } + curTickTest[1] = CM_GetTick(); } else {