From caa4e61b89de9083ff353e804e7e59811d071451 Mon Sep 17 00:00:00 2001 From: ranchuan Date: Tue, 23 Jan 2024 18:13:09 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9can=E6=80=BB=E7=BA=BF?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=BB=B6=E6=97=B6=E7=AE=97=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- checher_slave.uvoptx | 6 +++--- source/elec_det/driver/JQDriver.c | 7 +++++++ source/elec_det/elec_judge.c | 2 ++ source/main/compiler_info.h | 4 ++-- source/main/main.c | 14 ++++++++++++++ source/prebuild.py | 2 +- source/soft/debug.c | 20 +++++++++++++++++++- source/soft/debug.h | 2 ++ source/task/prot_uc.c | 11 ++--------- 9 files changed, 52 insertions(+), 16 deletions(-) diff --git a/checher_slave.uvoptx b/checher_slave.uvoptx index 1d7aac3..16fae3c 100644 --- a/checher_slave.uvoptx +++ b/checher_slave.uvoptx @@ -299,7 +299,7 @@ 1 0 - 0 + 1 18 @@ -344,7 +344,7 @@ 0 ST-LINKIII-KEIL_SWO - -U52FF6E065266545441081687 -O206 -SF500 -C0 -A0 -I0 -HNlocalhost -HP7184 -P1 -N00("ARM CoreSight SW-DP") -D00(2BA01477) -L00(0) -TO18 -TC10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO15 -FD20000000 -FC1000 -FN1 -FF0STM32F10x_512.FLM -FS08000000 -FL080000 -FP0($$Device:STM32F103RC$Flash\STM32F10x_512.FLM) + -U52FF6E065266545441081687 -O206 -SF4000 -C0 -A0 -I0 -HNlocalhost -HP7184 -P1 -N00("ARM CoreSight SW-DP") -D00(2BA01477) -L00(0) -TO18 -TC10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO15 -FD20000000 -FC1000 -FN1 -FF0STM32F10x_512.FLM -FS08000000 -FL080000 -FP0($$Device:STM32F103RC$Flash\STM32F10x_512.FLM) 0 @@ -550,7 +550,7 @@ 1 0 - 1 + 0 18 diff --git a/source/elec_det/driver/JQDriver.c b/source/elec_det/driver/JQDriver.c index 2904a47..4b615b1 100644 --- a/source/elec_det/driver/JQDriver.c +++ b/source/elec_det/driver/JQDriver.c @@ -571,6 +571,13 @@ void JQ_FastDisChage(uint8_t sw) cmd_buf[1] = sw; JQ_SendBroadCast(cmd_buf,2); } +//@brief 检桥丝 +void JQ_BridgeWire(void) +{ + static uint8_t cmd_buf[1] = {0x8E}; + JQ_SendBroadCast(cmd_buf,1); +} + //@brief 复位 void JQ_Reset(void) { diff --git a/source/elec_det/elec_judge.c b/source/elec_det/elec_judge.c index b7a187e..42fe458 100644 --- a/source/elec_det/elec_judge.c +++ b/source/elec_det/elec_judge.c @@ -101,6 +101,8 @@ static void elec_task_judge(elec_judge_def *e,int index,uint8_t *data) if(temprange[i].min||temp>task->range[i].max){ elec_add_errcode(e,task->range[i].err); DBG_WARN("task ret_index:%d vaule=%d,err:%d",i,temp,task->range[i].err); + }else{ + // DBG_LOG("task ret_index:%d vaule=%d",i,temp); } } } diff --git a/source/main/compiler_info.h b/source/main/compiler_info.h index 34b5f4a..66b7c2c 100644 --- a/source/main/compiler_info.h +++ b/source/main/compiler_info.h @@ -6,8 +6,8 @@ -#define BUILD_DATE "2024-01-12 15:13:50" -#define SOFT_VERSION "2.13" +#define BUILD_DATE "2024-01-18 15:29:08" +#define SOFT_VERSION "2.14" diff --git a/source/main/main.c b/source/main/main.c index 1869505..7b4369e 100644 --- a/source/main/main.c +++ b/source/main/main.c @@ -101,6 +101,20 @@ static int test(list_def *argv) +static int debug_en(list_def *argv) +{ + if(list_length(argv)<2){ + cmd_print("param num too less."); + return -1; + } + int en=str_atoi(list_get_str(argv,1)); + debug_enable(en); + cmd_print("debug_en:%d",en); + return 0; +} +commend_export(debug,debug_en,"enable or disable debug log.") + + static int scheme_info(list_def *argv) { diff --git a/source/prebuild.py b/source/prebuild.py index e474221..16649c3 100644 --- a/source/prebuild.py +++ b/source/prebuild.py @@ -7,7 +7,7 @@ import mycopy # 定义软件版本号 -SOFT_VERION = "2.13" +SOFT_VERION = "2.14" diff --git a/source/soft/debug.c b/source/soft/debug.c index 295419d..5afa7ee 100644 --- a/source/soft/debug.c +++ b/source/soft/debug.c @@ -46,6 +46,7 @@ typedef struct{ struct rt_mutex mutex; #endif uart_def *uart; + int enable; }self_def; static self_def g_data; @@ -89,12 +90,29 @@ void debug_log(const char *file,const char *fun,int line,int level,const char *f va_end(args); memcpy(&log_buf[length],"\r\n",2); length+=2; - DBG_DEV_WRITE((const uint8_t *)log_buf,length); + if(g_data.enable!=0){ + DBG_DEV_WRITE((const uint8_t *)log_buf,length); + } #ifdef RT_THREAD rt_mutex_release(&g_data.mutex); #endif } + +void debug_enable(int enable) +{ + g_data.enable=enable; +} + +#else + +void debug_enable(int enable) +{ + +} + + + #endif diff --git a/source/soft/debug.h b/source/soft/debug.h index 16887c6..17c1785 100644 --- a/source/soft/debug.h +++ b/source/soft/debug.h @@ -61,6 +61,8 @@ int debug_init(void); void debug_log(const char *file,const char *fun,int line,int level,const char *fmt, ...); +void debug_enable(int enable); + #else #define debug_init() diff --git a/source/task/prot_uc.c b/source/task/prot_uc.c index 0cae1c6..9eeaded 100644 --- a/source/task/prot_uc.c +++ b/source/task/prot_uc.c @@ -312,21 +312,14 @@ static int protu_send_ontime(protu_def *p,send_pkt_def *s) // 每ms传输的字节数为253/23=11, // 考虑can总线自动重传保留1/3的余量 int wnd_tick=((arr_length(s->t)+4)/5+2); - int delay=tick%(wnd_tick*(p->num)); + int delay=wnd_tick*(p->num); int gap=p->rank*wnd_tick; int ret=0; - if(delay<=gap){ - delay=gap-delay; - }else{ - delay=gap+(wnd_tick*(p->num))-delay; - } if(p->silent!=0){ // 广播命令在指定时间窗口发送 - //later_execute(protu_send_later,s,delay); g_send_pkt.wnd_tick=wnd_tick; g_send_pkt.gap=gap; - while(p->timer->read(p->timer)<(tick+delay)); - // protu_send_later(s); + while((p->timer->read(p->timer)%delay)!=gap); g_send_pkt.send_tick_ms=p->timer->read(p->timer); ret= protu_send(s->p,s->t,wnd_tick-1); g_send_pkt.send_end_tick_ms=p->timer->read(p->timer);