修改 : 压板赋值；

README.md

@@ -60,4 +60,5 @@
 5.  增加 : led函数；
 
 # 202601(04-11)
-01. 修改 : 开出接口；
+01. 修改 : 开出接口；
+02. 修改 : 压板赋值；

app_public/fuxi_public/fuxi_bsp/include/bspconfig.h

@@ -30,14 +30,12 @@
 //----------------------------- 设备架构  ---------------------------
 #define EQU_SLOT_NUM_MAX		16
 
-#define EQU_SLOT_AC_BEGIN		1	// 采样板起始槽位
+/* 注意目前板卡位置 0开入 1开出 2采样 3led */
+#define EQU_SLOT_AC_BEGIN		2	// 采样板起始槽位
 #define EQU_SLOT_AC_NUM			1	// 一个装置支持AC板的最大槽数。1 -> 2 DTUv5采用两块采样板
-#define EQU_SLOT_AC_CHN			16   // 每个槽中支持的最大AC通道数
+#define EQU_SLOT_AC_CHN			16  // 每个槽中支持的最大AC通道数
 #define EQU_DB_YX_NUM			32	// 数据总线长度
 
-#define	EQU_SLOT_NUM_06			6 // DTUv5 目前配置卡槽数量为6，后续根据需求修改
-#define EQU_SLOT_AC_BEGIN06		0 // 定义6卡槽DTUv5中AC采样板的卡槽开始位置
-
 //----------------------------- 线路开关  ---------------------------
 #define SWITCH_NUM_MAX			1  // 6  // 开关数量，本装置实际支持的开关数，不包含级联部分。
 #define SWITCH_NUM_EXT			31 // 扩展开关数量，后面部分供级联用。

app_public/fuxi_public/fuxi_bsp/include/debug_print.h

@@ -67,12 +67,16 @@
     printf(DP_COLOR_RED "[ERR][%s:%d] " fmt DP_COLOR_NONE "\r\n", __func__, __LINE__, ##args)
 
 
+#define dp_info_nt_rt(fmt, args...) \
+    rt_printf(DP_COLOR_WATHET fmt DP_COLOR_NONE "\r\n", ##args)
 #define dp_err_n_s_rt(fmt, args...) \
     rt_printf(DP_COLOR_RED "[ERR] " DP_COLOR_NONE DP_COLOR_BLUE fmt DP_COLOR_NONE "\r\n", ##args)
 #define dp_err_n_c_rt(fmt, args...) \
     rt_printf(DP_COLOR_RED "[ERR][%s:%d] " DP_COLOR_NONE DP_COLOR_BLUE fmt DP_COLOR_NONE "\r\n", __func__, __LINE__, ##args)
 
     
+#define dp_info_nt_pk(fmt, args...) \
+    printk(DP_COLOR_WATHET fmt DP_COLOR_NONE "\r\n", ##args)
 #define dp_err_n_s_pk(fmt, args...) \
     printk(DP_COLOR_RED "[ERR] " DP_COLOR_NONE DP_COLOR_BLUE fmt DP_COLOR_NONE "\r\n", ##args)
 #define dp_err_n_c_pk(fmt, args...) \

app_public/fuxi_public/fuxi_bsp/source/ad7616.c

@@ -554,6 +554,7 @@ static void updata_adc(struct t_shmdata_adc *sample_data0, uint16_t us_adc_dot_i
     int index = 0;
 	static int mod = 0;
     int opt = ((g_adc_dots_data_count & (ADC_REC_SAMPLE_RATE - 1)) == 0) ? TRUE : FALSE;
+    // uint32_t ul_adc_idx_1 = 0, ul_adc_idx_2 = 0;
 
     // ÿƬ16·
     for (uint8_t j = 0; j < CFG_ADC_CHANNEL; j++)
@@ -569,10 +570,11 @@ static void updata_adc(struct t_shmdata_adc *sample_data0, uint16_t us_adc_dot_i
         else
         {
             g_adc_dots_rec[g_adc_dots_index_rec][j] = sample_data0->data.usa_sample_dots[j][us_adc_dot_index0];
-
+            // ul_adc_idx_1 = g_adc_dots_index_rec;
             if (opt == TRUE)
             {
                 g_adc_dots[j][g_adc_dots_index] = sample_data0->data.usa_sample_dots[j][us_adc_dot_index0];
+                // ul_adc_idx_2 = g_adc_dots_index;
             }
         }
     }
@@ -614,7 +616,7 @@ static void updata_adc(struct t_shmdata_adc *sample_data0, uint16_t us_adc_dot_i
             // Í»±äÁ¿
             if (g_adc_sync == 1 && g_sw_init == 1)
             {
-                // protect_tbl_qd();
+                protect_tbl_qd();
             }
         }
     }

app_public/fuxi_public/fuxi_bsp/source/ch423s.c

@@ -431,6 +431,25 @@ void ch423sio_handle_mode(void)
 {
     uint8_t uc_updata = 0;
 
+#if (0) /* ²âÊÔ´òÓ¡´úÂë */
+    static uint64_t sull_printf_led = 0;
+    if (sull_printf_led++ >= (10 * 10))
+    {
+        sull_printf_led = 0;
+        dp_info_n_c("dTCounter = %d", dTCounter);
+        for (uint8_t j = 0; j < LED_MAX_NUM; j++)
+        {
+            dp_info_n_c("[%02d] uc_en = %d, mode = %d, state = %d, ul_time = %d, ul_count = %d",
+                        j,
+                        mst_led_cfg[j].uc_en,
+                        mst_led_cfg[j].uc_mode,
+                        mst_led_cfg[j].uc_state,
+                        mst_led_cfg[j].ul_time,
+                        mst_led_cfg[j].ul_count);
+        }
+    }
+#endif
+
     for (uint8_t i = 0; i < LED_MAX_NUM; i++)
     {
         if (mst_led_cfg[i].uc_en == 0)

app_public/fuxi_public/fuxi_bsp/source/dido.c

@@ -506,7 +506,6 @@ void dido_do_poll(void)
 void dido_qd_set_keeptime(u32 us)
 {
     g_do_st[DO_QD_KC].us_keep = us;
-    dp_err_n_c_rt("us = %ld", us);
 }
 
 #if !defined CPU_FUXI

app_public/fuxi_public/fuxi_bsp/source/freq.c

@@ -106,68 +106,68 @@ static int get_shm_f(uint8_t *out_data)
 */
 float freq_get(unsigned int index)
 {
-	u32 e;
-	float 	freq = 50.0;
-	struct t_shmdata_freq shm_f;
-	int ret = 0;
-	
-#ifdef DTIM_FREQ_DEBUG //added by sunxi: for FUXI
-	static int start_stat_flag = 0;
+    u32 e;
+    float freq = 50.0;
+    struct t_shmdata_freq shm_f;
+    int ret = 0;
+
+#ifdef DTIM_FREQ_DEBUG // added by sunxi: for FUXI
+    static int start_stat_flag = 0;
+
+    if (start_stat_flag == 0)
+    {
+        start_stat_flag++;
+        freq_stat_reset();
+    }
 
-	if(start_stat_flag == 0)
-	{
-		start_stat_flag++;
-		freq_stat_reset();
-	}
-		
 #endif
-	
-	if(index >= CFG_FREQ_NUM)
-	{
-		return 0.0;
-	}
-	if(g_ui_freq[index] == UI_NUM)
-	{
-		return 0.0;
-	}
 
-	// 额定值100V的20%是20V(20%一般是一个测试点),保证测试点频率可用，所以选19V。
-	// 20160825:测试发现只要能够测到频率，就基本是准的，所以将门槛降低到5v，满足电子互感器
-	// 额定值57.735v的要求。
-	e = _Mul_Div_U(sqrt_32fix(g_ui[g_ui_freq[index]].m2[0]), 256, g_ui[g_ui_freq[index]].m2_factor_k);
-	if(e < Q16_BASE*5)
-	{
-		return 0.0;
-	}
+    if (index >= CFG_FREQ_NUM)
+    {
+        return 0.0;
+    }
+
+    if (g_ui_freq[index] == UI_NUM)
+    {
+        return 0.0;
+    }
 
-//==============>
-//added by sunxi: for FUXI
+    // 额定值100V的20%是20V(20%一般是一个测试点),保证测试点频率可用，所以选19V。
+    // 20160825:测试发现只要能够测到频率，就基本是准的，所以将门槛降低到5v，满足电子互感器
+    // 额定值57.735v的要求。
+    e = _Mul_Div_U(sqrt_32fix(g_ui[g_ui_freq[index]].m2[0]), 256, g_ui[g_ui_freq[index]].m2_factor_k);
+    if (e < Q16_BASE * 5)
+    {
+        return 0.0;
+    }
 
-	//从共享内存中读取频率到freq
-	ret = get_shm_f((uint8_t *)&shm_f);
-	// printf("ret=%d, us_updata=%u, us_op=%u, us_op_bk=%u, freq0=%u, freq0=%u, crc=%u\n\n",
-	// 	ret, shm_f.us_updata, shm_f.us_op, shm_f.us_op_bk, shm_f.us_freq[0], shm_f.us_freq[1], shm_f.us_crc);
+    //==============>
+    // added by sunxi: for FUXI
 
-	if(ret < 0)
-		return 0.0;
+    // 从共享内存中读取频率到freq
+    ret = get_shm_f((uint8_t *)&shm_f);
+    // printf("ret=%d, us_updata=%u, us_op=%u, us_op_bk=%u, freq0=%u, freq0=%u, crc=%u\n\n",
+    // 	ret, shm_f.us_updata, shm_f.us_op, shm_f.us_op_bk, shm_f.us_freq[0], shm_f.us_freq[1], shm_f.us_crc);
 
-	// freq = (float)shm_f.us_freq[index]/1000;
+    if (ret < 0)
+        return 0.0;
+
+    // freq = (float)shm_f.us_freq[index]/1000;
     freq = (float)shm_f.us_freq[index] * 0.001f;
 
 #ifdef DTIM_FREQ_DEBUG
-	rt_stat_in(&g_stat_freq[index],rt_round(shm_f.us_freq[index]*Q16_BASE));
+    rt_stat_in(&g_stat_freq[index], rt_round(shm_f.us_freq[index] * Q16_BASE));
 #endif
-	
-	//将频率范围限定在45hz到55hz。
-	if(freq>=44.0 && freq <= 56.0)
-	{
-		g_freqency[index] = freq;
-	}
-//<=================
-	
-	return g_freqency[index];
-}
 
+    // 将频率范围限定在45hz到55hz。
+    if (freq >= 44.0 && freq <= 56.0)
+    {
+        g_freqency[index] = freq;
+    }
+    //<=================
+
+    return g_freqency[index];
+}
 
 int freq_stat_reset(void)
 {

dtu/dtu_main_t536/app/Sys.c

@@ -294,8 +294,8 @@ void app_yb_refresh(void)
     {
         if (FA_ALL_EN(sw))
         {
-            fresh_set_soe(EV_TYPE_S, !g_tRelay[sw].run_stu.fa_ls, 0, sw); // 分段模式
-            fresh_set_soe(EV_TYPE_L, g_tRelay[sw].run_stu.fa_ls, 0, sw);  // 联络模式
+            fresh_set_soe(EV_TYPE_S, !g_tRelay[sw].run_stu.fa_ls, false, sw); // 分段模式
+            fresh_set_soe(EV_TYPE_L, g_tRelay[sw].run_stu.fa_ls, false, sw);  // 联络模式
         }
 
         // 自供电功能投入
@@ -307,30 +307,22 @@ void app_yb_refresh(void)
             else if (!g_tRelay[sw].run_stu.fa_ls || BH_ALL_EN(sw)) // 分段或者保护模式退出自转电SOE
                 fresh_set_soe(EV_FA_LL_EN, 0, false, sw);
         }
-        // soft_yb
-        // 只关联软压板: EV_KZ_YB/EV_EDIT_YB		(出口/远方)
-        fresh_set_soe(EV_KZ_YB, pRunSet->tSwSet[sw].btt_yxyb_gnzck, 0, sw);
-        fresh_set_soe(EV_EDIT_YB, pRunSet->bTT_EDIT_YB, 0, sw);
-
-        // 关联硬压板
-#if defined GD_AREA_ECZD_2020
-        fresh_set_soe(EV_CHZ_YB, CHZ_ALL_EN(sw), 0, sw); // 重合闸投入
-#else
-    fresh_set_soe(EV_CHZ_YB, !CHZ_ALL_EN(sw), 0, sw); // 停用重合闸
-#endif
-
-        // EV_BH_YB (功能总)
-        fresh_set_soe(EV_BH_YB, FUN_ALL_EN(sw), 0, sw);
-
-#if defined GD_AREA_ZHONGSHAN || defined GD_AREA_ZHONGSHAN_2020 || defined GD_AREA_ECZD_2020
-        // EV_GOOSE_YBTT/EV_FA_YBTT/EV_BH_YBTT (goose/fa/bh)
-        fresh_set_soe(EV_BH_YBTT, BH_ALL_EN(sw), 0, sw);
-        fresh_set_soe(EV_FA_YBTT, FA_ALL_EN(sw), 0, sw);
-        fresh_set_soe(EV_GOOSE_YBTT, BH_GOOSE_EN(sw), 0, sw);
-#endif
+    
+        fresh_set_soe(EV_BH_YB, FUN_ALL_EN(sw), false, sw);
+        fresh_set_soe(EV_BH_YBTT, BH_ALL_EN(sw), false, sw);
+        fresh_set_soe(EV_CHZ_YB, CHZ_ALL_EN(sw), false, sw);
+        fresh_set_soe(EV_FA_YBTT, FA_ALL_EN(sw), false, sw);
+        fresh_set_soe(EV_GOOSE_YBTT, BH_GOOSE_EN(sw), false, sw);
+        fresh_set_soe(EV_JZS_YBTT, JZS_ALL_EN(sw), false, sw);
+        fresh_set_soe(EV_TQ_YBTT, TYTQ_ALL_EN(sw), false, sw);
+        fresh_set_soe(EV_JL_YBTT, JL_ALL_EN(sw), false, sw);
+        fresh_set_soe(EV_XDLJD_YBTT, pRunSet->tSwSet[sw].btt_gnyb_xdljd, false, sw);
+        fresh_set_soe(EV_XLDXGJ_YBTT, pRunSet->tSwSet[sw].btt_gnyb_xldxgj, false, sw);
+        fresh_set_soe(EV_BTDCD_YBTT, pRunSet->tSwSet[sw].btt_gnyb_btdcd, false, sw);
+    
+        fresh_set_soe(EV_KZ_YB, pRunSet->tSwSet[sw].btt_yxyb_gnzck, false, sw);
+        fresh_set_soe(EV_EDIT_YB, pRunSet->bTT_EDIT_YB, false, sw);
 
-        fresh_set_soe(EV_TQ_YBTT, TYTQ_ALL_EN(sw), 0, sw);
-        fresh_set_soe(EV_JL_YBTT, !JL_ALL_EN(sw), 0, sw); // 自动解列软压板
 #ifdef YB_STHD_CHECK
         // 功能总
         if ((((short)g_sw_pub.di_cfg_index[PUB_DI_BHALL] != INDEX_INVALLID) && (pRunSet->tSwSet[sw].btt_yxyb_gnztt != g_run_stu.bhall)) ||

dtu/dtu_main_t536/app/defineSys.h

@@ -12,7 +12,7 @@
 #ifndef _DEFINE_SYS_H
 #define _DEFINE_SYS_H
 
-#define DEVICE_VERSION_INFORMATION "NW24_20260104_008" // NW2022意思是按照22年南网标准文件（总调）来做的
+#define DEVICE_VERSION_INFORMATION "NW24_20260105_009" // NW2022意思是按照22年南网标准文件（总调）来做的
 
 #ifdef ___defineSys____//！！！此宏定义不开启，以下宏不直接开启，只用于注释显示
 

dtu/dtu_main_t536/app/main.c

@@ -182,6 +182,28 @@ int app_main (void *unused)
     // msleep(500);
 #endif
 
+
+#if (1)
+    dp_err_n_c_rt("JZS_ALL_EN(0) = %d", JZS_ALL_EN(0));
+    dp_err_n_c_rt("KZ_OUT_ALL_EN(0) = %d", KZ_OUT_ALL_EN(0));
+    dp_err_n_c_rt("FUN_ALL_EN(0) = %d(%d, %d, %d)", FUN_ALL_EN(0), g_run_stu.bhall, pRunSet->tSwSet[0].btt_yxyb_gnztt, g_tRelay[0].run_stu.bhztt);
+    dp_err_n_c_rt("BH_GOOSE_EN_YB(0) = %d", BH_GOOSE_EN_YB(0));
+    dp_err_n_c_rt("BH_GOOSE_EN(0) = %d", BH_GOOSE_EN(0));
+    dp_err_n_c_rt("BH_GOOSE_COMMERR(0) = %d", BH_GOOSE_COMMERR(0));
+    dp_err_n_c_rt("BH_ALL_2(0) = %d", BH_ALL_2(0));
+    dp_err_n_c_rt("BH_ALL_EN(0) = %d", BH_ALL_EN(0));
+    dp_err_n_c_rt("FA_ALL_EN(0) = %d", FA_ALL_EN(0));
+    dp_err_n_c_rt("CHZ_ALL_EN(0) = %d", CHZ_ALL_EN(0));
+    dp_err_n_c_rt("TYTQ_ALL_EN(0) = %d", TYTQ_ALL_EN(0));
+    dp_err_n_c_rt("JL_ALL_EN(0) = %d", JL_ALL_EN(0));
+    dp_err_n_s_rt("pRunSet->dTBLValue[0] = %d", pRunSet->dTBLValue[0]);
+    dp_err_n_s_rt("pRunSet->dYC_num = %d", pRunSet->dYC_num);
+    dp_err_n_s_rt("toc[BH_GL1].dI = %d", pRunSet->tSwSet[0].toc[BH_GL1].dI);
+    dp_err_n_s_rt("toc[BH_GL1].dT = %d", pRunSet->tSwSet[0].toc[BH_GL1].dT);
+    dp_err_n_s_rt("tRunPara.dTBatBegin = %d", tRunPara.dTBatBegin);
+    dp_err_n_s_rt("tRunPara.dTBatInterval = %d", tRunPara.dTBatInterval);
+#endif
+
 	{
 		struct timespec ts;
 		struct rtc_time_t ct;
@@ -292,15 +314,6 @@ int app_main (void *unused)
 #endif		
 		//us0 = ustimer_get_origin();
 		rt_stat_other_in(7,bsp_ustimer_get_duration(us0)/USTIMER_US);
-#if (0)
-        static uint64_t ull_test_timer_ml = 0;
-        ull_test_timer_ml++;
-        if (ull_test_timer_ml >= (25 * 100))
-        {
-            ull_test_timer_ml = 0;
-            dp_err_n_c("app_main dTCounter = %d", dTCounter);
-        }
-#endif
 	}
 #ifdef CPU_FUXI
 	watchdog_remove_item(wdt_id_mainloop);

dtu/dtu_main_t536/app/protect.c

@@ -486,13 +486,16 @@ int protect_tbl_qd(void)
     {
         TRELAY_T *pR = &g_tRelay[sw];
         // 保护已启动,直接返回
-        if (pR->zqd)
+        if (pR->zqd || 0 == pRunSet->dTBLValue[sw])
         {
             continue;
         }
 
         // 保护未启动，获取故障的第一个点时刻，作为故障启动时刻,+1是因为
-        if ((wIQdCnt[sw][SW_AC_IA] == 0) && (wIQdCnt[sw][SW_AC_IB] == 0) && (wIQdCnt[sw][SW_AC_IC] == 0) && (wIQdCnt[sw][SW_AC_I0] == 0))
+        if ((wIQdCnt[sw][SW_AC_IA] == 0) &&
+            (wIQdCnt[sw][SW_AC_IB] == 0) &&
+            (wIQdCnt[sw][SW_AC_IC] == 0) &&
+            (wIQdCnt[sw][SW_AC_I0] == 0))
         {
             pR->t_rcd_qd = dTCounter + 1;
             pR->us_tbl = ustimer_get_origin();
@@ -540,7 +543,7 @@ int protect_tbl_qd(void)
                 if (wIQdCnt[sw][i] >= TBLQDDSMK)
                 {
                     pR->uBHQD.bFlag.bTBQD = true;
-                    rt_printf("protect_tbl_qd:i=%d,daaa=%d,dTBLValue=%d.\r\n", i, daaa, pRunSet->dTBLValue[sw]);
+                    dp_info_nt_rt("protect_tbl_qd:i = %d, daaa = %d, dTBLValue = %d. sw = %d", i, daaa, pRunSet->dTBLValue[sw], sw);
                     break;
                 }
             }
@@ -548,7 +551,6 @@ int protect_tbl_qd(void)
             {
                 if (wIQdCnt[sw][i] >= 1)
                 {
-
                     wIQdCnt[sw][i]--;
                 }
             }
@@ -1278,7 +1280,7 @@ static int _protect_zzfg(void)
     pR->fzqd = 0;
     pR->fzdz = 0;
     pR->fzzzdz = 0;
-    rt_printf("开关%d整组复归\r\n", sw);
+    dp_info_nt_rt("开关%d整组复归", sw);
     return 0;
 }
 

dtu/dtu_main_t536/app/protect.h

@@ -59,7 +59,7 @@
 #define CHZ_ALL_EN(sw)              (pRunSet->tSwSet[sw].btt_gnyb_zdchz && g_tRelay[sw].run_stu.chzyb && !g_tRelay[sw].run_stu.bsch)
 
 // ͬÆÚºÏÕ¢Èíѹ°å
-#define TYTQ_ALL_EN(sw)             (!FUN_ALL_EN(sw) || !pRunSet->tSwSet[sw].btt_gnyb_tqhz)
+#define TYTQ_ALL_EN(sw)             (FUN_ALL_EN(sw) && pRunSet->tSwSet[sw].btt_gnyb_tqhz)
 
 // ½âÁÐѹ°å
 #define JL_ALL_EN(sw)               (FUN_ALL_EN(sw) && pRunSet->tSwSet[sw].btt_gnyb_zdjl)

dtu/dtu_main_t536/app/set.c

@@ -2355,7 +2355,6 @@ bool MakeRunSet(bool bFirst)
         fIn = (float)(g_ui[ui_begin + SW_AC_IA].m2_factor_k) / 256.0;
         fKI0 = (float)(g_ui[ui_begin + SW_AC_I0].m2_factor_k) / 256.0;
         ptSet->dTBLValue[sw] = GetSetNormal(psetbuf[CSTSET_TBLQD].ff, fIn); // 突变量
-        dp_err_n_c_rt("ptSet->dTBLValue[%d] = %d, %f", i, ptSet->dTBLValue[sw], psetbuf[CSTSET_TBLQD].ff);
         ptSet->dIWL_SQR[sw] = GetSetSQR(psetbuf[CSTSET_IWL].ff, fIn);
 
 #ifndef DISP_CHZOKCHR_2_SW
@@ -2895,6 +2894,7 @@ bool MakeRunSet(bool bFirst)
             poc->dI = GetSetSQR(psetbuf[SET_LXYX_I + sw * SW_SET_NUMBER].ff, fKI0);
             poc->dI_fh = _Mul_Div_U(poc->dI, 96, 100); // 返回值
         }
+
         // 智能分布式定值
         {
             GOC_SET *poc = &ptSet->tSwSet[sw].tGocSet;
@@ -3101,8 +3101,7 @@ bool MakeRunSet(bool bFirst)
 
 #ifdef XDL_ZT
         // 小电流接地
-        ptSet->tSwSet[sw].bTT_xdlgj = (((WORD)psetbuf[SET_XDL_TT + sw * SW_SET_NUMBER].ff == 1) ? true : false || ((WORD)psetbuf[SET_XDL_TT + sw * SW_SET_NUMBER].ff == 2) ? true
-                                                                                                                                                                           : false);
+        ptSet->tSwSet[sw].bTT_xdlgj = (((WORD)psetbuf[SET_XDL_TT + sw * SW_SET_NUMBER].ff == 1) ? true : false || ((WORD)psetbuf[SET_XDL_TT + sw * SW_SET_NUMBER].ff == 2) ? true : false);
         ptSet->tSwSet[sw].bTT_xdltz = (((WORD)psetbuf[SET_XDL_TT + sw * SW_SET_NUMBER].ff == 2) ? true : false);
         if (ptSet->tSwSet[sw].bTT_xdlgj || ptSet->tSwSet[sw].bTT_xdltz)
         {
@@ -3131,13 +3130,10 @@ bool MakeRunSet(bool bFirst)
 #ifdef FUNC_DRIVE
         ptSet->tSwSet[sw].btt_gnyb_btdcd = ((WORD)psetbuf[SET_XDL_YB + sw * SW_SET_NUMBER].ff == 1) ? true : false; // 不停电传动功能软压板
         fresh_set_soe(EV_DRIVE, ptSet->tSwSet[sw].btt_gnyb_btdcd, bFirst, 0);
-        for (sw = 0; sw < SWITCH_NUM_MAX; sw++)
-        {
-            ptSet->tSwSet[sw].dT_Drive_hz = GetSetTIME(psetbuf[SET_DRIVE_HZ_T + sw * SW_SET_NUMBER].ff);
-            ptSet->tSwSet[sw].dT_Drive_fz = GetSetTIME(psetbuf[SET_DRIVE_FZ_T + sw * SW_SET_NUMBER].ff);
-            ptSet->tSwSet[sw].dT_fz_end = GetSetTIME(psetbuf[SET_FZ_END_T + sw * SW_SET_NUMBER].ff);
-            ptSet->tSwSet[sw].dT_hz_end = GetSetTIME(psetbuf[SET_HZ_END_T].ff);
-        }
+        ptSet->tSwSet[sw].dT_Drive_hz = GetSetTIME(psetbuf[SET_DRIVE_HZ_T + sw * SW_SET_NUMBER].ff);
+        ptSet->tSwSet[sw].dT_Drive_fz = GetSetTIME(psetbuf[SET_DRIVE_FZ_T + sw * SW_SET_NUMBER].ff);
+        ptSet->tSwSet[sw].dT_fz_end = GetSetTIME(psetbuf[SET_FZ_END_T + sw * SW_SET_NUMBER].ff);
+        ptSet->tSwSet[sw].dT_hz_end = GetSetTIME(psetbuf[SET_HZ_END_T].ff);
 #endif
 
         ptSet->tSwSet[sw].bTT_IBSCHZ = (((WORD)psetbuf[SET_CH_DLBS_TT + sw * SW_SET_NUMBER].ff == 1) ? true : false);
@@ -3536,21 +3532,6 @@ bool MakeRunSet(bool bFirst)
 
     m_runsection = pRunSet->section;
 
-#if (1)
-    dp_err_n_c_rt("JZS_ALL_EN(0) = %d", JZS_ALL_EN(0));
-    dp_err_n_c_rt("KZ_OUT_ALL_EN(0) = %d", KZ_OUT_ALL_EN(0));
-    dp_err_n_c_rt("FUN_ALL_EN(0) = %d(%d, %d, %d)", FUN_ALL_EN(0), g_run_stu.bhall, pRunSet->tSwSet[0].btt_yxyb_gnztt, g_tRelay[0].run_stu.bhztt);
-    dp_err_n_c_rt("BH_GOOSE_EN_YB(0) = %d", BH_GOOSE_EN_YB(0));
-    dp_err_n_c_rt("BH_GOOSE_EN(0) = %d", BH_GOOSE_EN(0));
-    dp_err_n_c_rt("BH_GOOSE_COMMERR(0) = %d", BH_GOOSE_COMMERR(0));
-    dp_err_n_c_rt("BH_ALL_2(0) = %d", BH_ALL_2(0));
-    dp_err_n_c_rt("BH_ALL_EN(0) = %d", BH_ALL_EN(0));
-    dp_err_n_c_rt("FA_ALL_EN(0) = %d", FA_ALL_EN(0));
-    dp_err_n_c_rt("CHZ_ALL_EN(0) = %d", CHZ_ALL_EN(0));
-    dp_err_n_c_rt("TYTQ_ALL_EN(0) = %d", TYTQ_ALL_EN(0));
-    dp_err_n_c_rt("JL_ALL_EN(0) = %d", JL_ALL_EN(0));
-#endif
-
 #if !defined CPU_FUXI
     create_set_data_txt();
 #endif

dtu/dtu_main_t536/app/switch.c

@@ -1786,6 +1786,7 @@ int sw_cal_app(void)
 
     return 0;
 }
+
 void sw_factor_cp(void) // 保存校正的系数，根据第一路电流的配置，是按CT默认100A校正还是51欧校正
 {
     bool b100A = false;
@@ -2077,12 +2078,12 @@ int sw_auto_adjust(int ui_angle0)
         // 检查幅值是否超范围
         if (fv < minfv)
         {
-            rt_printf("sw_auto_adjust(invalid):i=%d,fv=%f,minfv=%f\r\n", i, fv, minfv);
+            dp_err_n_c_rt("sw_auto_adjust(invalid):i = %d, fv = %f, minfv = %f", i, fv, minfv);
             continue;
         }
         else if (fv > maxfv)
         {
-            rt_printf("sw_auto_adjust(err):i=%d,fv=%f,maxfv=%f\r\n", i, fv, maxfv);
+            dp_err_n_c_rt("sw_auto_adjust(err):i = %d, fv=%f, maxfv = %f", i, fv, maxfv);
             return -1;
         }
 
@@ -2090,7 +2091,7 @@ int sw_auto_adjust(int ui_angle0)
         factor = baseValue / fv;
         if (CheckFloatSet(&factor, MAX_FACTOR, MIN_FACTOR) > 0)
         {
-            rt_printf("sw_auto_adjust(err):i=%d,fv=%f,factor=%f.\r\n", i, fv, factor);
+            dp_err_n_c_rt("sw_auto_adjust(err):i = %d, fv= %f, factor = %f.", i, fv, factor);
             return -2;
         }
 
@@ -2098,10 +2099,10 @@ int sw_auto_adjust(int ui_angle0)
         factor_e_c_set(g_equ_config_ac[cfg_index].slot, g_equ_config_ac[cfg_index].index, factor);
 #ifdef PROTECT_AC_ADJUST
         factor = baseValue / fv_p;
-        rt_printf("fv_p=%f,baseValue=%f,factor=%f\r\n", fv_p, baseValue, factor);
+        dp_info_nt_rt("fv_p = %f, baseValue = %f, factor = %f", fv_p, baseValue, factor);
         if (CheckFloatSet(&factor, MAX_FACTOR, MIN_FACTOR) > 0)
         {
-            rt_printf("sw_auto_adjust(err) protect ac:i=%d,fv=%f,factor_p=%f.\r\n", i, fv, factor);
+            dp_err_n_c_rt("sw_auto_adjust(err) protect ac:i = %d, fv = %f, factor_p = %f.", i, fv, factor);
             return -2;
         }
         // 保存校正系数
@@ -2135,7 +2136,7 @@ int sw_auto_adjust(int ui_angle0)
             factor += 360.0;
         }
 
-        rt_printf("sw_auto_adjust(ang):i=%d,fv=%f,factor=%f.\r\n", i, fv, factor);
+        dp_info_nt_rt("sw_auto_adjust(ang):i = %02d, fv = %f, factor = %f.", i, fv, factor);
         if (factor < MIN_PHASE)
         {
             return -3;

dtu/dtu_main_t536/main_mod.c

@@ -201,16 +201,17 @@ int cal_thread (void *arg)
 
     sch_par.sched_priority = 8;
 
-	pthread_setschedparam(pthread_self(), SCHED_RR, &sch_par);   // 设置当前线程优先级暂定 20200910
+    pthread_setschedparam(pthread_self(), SCHED_RR, &sch_par); // 设置当前线程优先级暂定 20200910
 
-	while(SystemInit_finish_flag == false)
-	{
-		msleep(10);
-	}
+    while (SystemInit_finish_flag == false)
+    {
+        msleep(10);
+    }
 
     uint32_t wdt_id;
-    int rc = watchdog_add_item("cal_thread", &wdt_id,120);
-    if(rc != 0) {
+    int rc = watchdog_add_item("cal_thread", &wdt_id, 120);
+    if (rc != 0)
+    {
         printf("can not add cal_thread task to wdt\r\n");
         return -1;
     }
@@ -218,18 +219,18 @@ int cal_thread (void *arg)
     ms = 50;
     us0 = ustimer_get_origin();
 
-	prctl(PR_SET_NAME, "cal_thread");
+    prctl(PR_SET_NAME, "cal_thread");
 #ifdef RT_THREAD_DEBUG
-	rt_printf("Thread created successfully: %s, PID: %d LWP: %d\r\n", 
-              	"cal_thread", (int)getpid(), (int)syscall(SYS_gettid));
+    rt_printf("Thread created successfully: %s, PID: %d LWP: %d\r\n",
+              "cal_thread", (int)getpid(), (int)syscall(SYS_gettid));
 #endif
-    while(1)
+    while (1)
     {
-    	watchdog_feed(wdt_id);
-		
+        watchdog_feed(wdt_id);
+
         // 100ms执行一次
-        ms = 50 - (ustimer_get_duration(us0)/USTIMER_US+ 500)/1000;
-        if(ms < 0)
+        ms = 50 - (ustimer_get_duration(us0) / USTIMER_US + 500) / 1000;
+        if (ms < 0)
         {
             ms = 0;
         }
@@ -237,20 +238,20 @@ int cal_thread (void *arg)
         us0 = ustimer_get_origin();
 
         // 检查是否需要退出。
-        if(g_exit_flag)
+        if (g_exit_flag)
         {
-			//complete_and_exit(&exit_completion2, 1);
-			break;
-		}
+            // complete_and_exit(&exit_completion2, 1);
+            break;
+        }
 
-		sw_cal_app();
-		hisory_file_app();
-		//pw_quality_app();
-	}
+        sw_cal_app();
+        hisory_file_app();
+        // pw_quality_app();
+    }
 
-	watchdog_remove_item(wdt_id);
+    watchdog_remove_item(wdt_id);
 
-	return 0;
+    return 0;
 }
 
 int main_mod_is_exit(void)

dtu/dtu_main_t536/sh/t536/Makefile

@@ -8,7 +8,7 @@ endif
 CC 	=	aarch64-none-linux-gnu-gcc
 
 IFLAGS  = -idirafter dummyinc
-# CFLAGS	= -O0 -g -Wshadow -Wformat -Wall -W -Wno-unused-parameter -Wno-unused-but-set-variable -Wno-pointer-sign 
+# CFLAGS	= -O0 -g -Wshadow -Wformat -w -W -Wno-unused-parameter -Wno-unused-but-set-variable -Wno-pointer-sign -Wno-date-time
 CFLAGS	= -O2 -g -Wshadow -Wformat -w -W -Wno-unused-parameter -Wno-unused-but-set-variable -Wno-pointer-sign -Wno-date-time
 CPUFLAGS = -mcpu=cortex-a55
 #FPFLAGS = -mfdivdu -mfloat-abi=hard -mhard-float -mdouble-float