From 1c9506048be53599f03a00622fdd848b304dd91c Mon Sep 17 00:00:00 2001
From: ranchuan <rd05cqmcloud.com>
Date: Sat, 9 Dec 2023 10:45:43 +0800
Subject: [PATCH] =?UTF-8?q?V0.06=20=E6=B0=94=E7=BC=B8=E5=8A=A8=E4=BD=9C?=
 =?UTF-8?q?=E4=B9=8B=E5=90=8E800ms=E7=9B=B4=E6=8E=A5=E8=AF=B7=E6=B1=82?=
 =?UTF-8?q?=E6=B3=A8=E7=A0=81=EF=BC=8C=E4=B8=8D=E8=AF=BB=E5=8F=96=E5=88=B0?=
 =?UTF-8?q?=E4=BD=8D=E4=BF=A1=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 source/ReadMe.txt           |  4 ++++
 source/main/compiler_info.h |  4 ++--
 source/prebuild.py          |  2 +-
 source/task/process.c       | 32 ++++++++++++++++++++++++--------
 4 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/source/ReadMe.txt b/source/ReadMe.txt
index a1dd17e..00edb2b 100644
--- a/source/ReadMe.txt
+++ b/source/ReadMe.txt
@@ -189,6 +189,10 @@
 2023.11.16
     V0.05
     uid追溯改为10年，密码上报反序
+2023.11.21
+    test_output 添加控制指定通道的功能
+2023.12.8
+    V0.06 气缸动作之后800ms直接请求注码，不读取到位信号
     
     
     
\ No newline at end of file
diff --git a/source/main/compiler_info.h b/source/main/compiler_info.h
index 339c2d9..fbdff18 100644
--- a/source/main/compiler_info.h
+++ b/source/main/compiler_info.h
@@ -6,8 +6,8 @@
 
 
 
-#define BUILD_DATE  "2023-11-16 09:58:59"
-#define SOFT_VERSION  "0.05"
+#define BUILD_DATE  "2023-12-08 13:59:32"
+#define SOFT_VERSION  "0.06"
 
 
 
diff --git a/source/prebuild.py b/source/prebuild.py
index 4a3ca17..f211e16 100644
--- a/source/prebuild.py
+++ b/source/prebuild.py
@@ -7,7 +7,7 @@ from datetime import datetime, timedelta
 
 
 # 定义软件版本号
-SOFT_VERION = "0.05"
+SOFT_VERION = "0.06"
 
 
 
diff --git a/source/task/process.c b/source/task/process.c
index cc8212a..631af3f 100644
--- a/source/task/process.c
+++ b/source/task/process.c
@@ -332,7 +332,9 @@ static void process_check_start(void *arg)
   
   // 设置到位回调
   void process_pos(void *arg);
-  input_set_callback_once(GET_POS_CHANNEL(s->step),1,process_pos,s);
+  //input_set_callback_once(GET_POS_CHANNEL(s->step),1,process_pos,s);
+  // 800ms后开始注码
+  later_execute(process_pos,s,800);
 
   // 选择当前使用的总线
   output_set(&s->bus_sel,GET_BUS_CHANNEL(s->step));
@@ -648,22 +650,36 @@ static int test_output(list_def *argv)
   int power=0;
   if(list_length(argv)<2){
     cmd_print("param num too less.");
-    cmd_print("param: on/off.");
+    cmd_print("param0: on/off.");
+    cmd_print("param1: 1,2,3,4,5,6,7,8,9,10.");
     return -1;
   }
+  list_def *channels=0;
+  if(list_length(argv)<3){
+    channels=list_temp(list_creat_int());
+    for(int i=0;i<10;i++){
+      list_append_int(channels,i);
+    }
+  }else{
+    channels=(str_atod_list(list_get_str(argv,2),','));
+  }
+  cmd_print("channels:%s",str_temp(list_string(channels)));
   power=(strcmp(list_get_str(argv,1),"on")==0)?1:0;
   // 这里默认驱动已经打开
-  for(int i=0;i<OUTPUT_CHANNEL_NUM;i++)
+  for(int i=0;i<list_length(channels);i++)
   {
-    gpioout_name[7]='0'+i;
-    out=dev_get(gpioout_name);
-    if(out){
-      out->set(out,power);
+    int index=list_get_int(channels,i);
+    if(index>=0&&index<OUTPUT_CHANNEL_NUM){
+      gpioout_name[7]='0'+index;
+      out=dev_get(gpioout_name);
+      if(out){
+        out->set(out,power);
+      }
     }
   }
   return 0;
 }
 
-commend_export(test_output,test_output,"ctrl out state,param: on/off")
+commend_export(test_output,test_output,"ctrl out state,param: on/off [channels]")