yf_zjb před 4 roky
rodič
revize
ec27f3a4b0

binární
Application_CBD/.settings/.rtmenus


+ 76 - 0
Application_CBD/applications/control.c

@@ -59,6 +59,78 @@ uint8_t ctr_Fan_IN(uint8_t status_ws)
     }
     return 0;
 }
+/**************************机器人********************************/
+void ctr_Motor_Robot(uint8_t status_ws)
+{
+    unsigned int close_timeout = 0;
+    unsigned int open_timeout = 0;
+    rt_pin_mode(LIMIT_OPEN, PIN_MODE_INPUT);
+    rt_pin_mode(LIMIT_CLOSE, PIN_MODE_INPUT);
+    rt_pin_mode(Motor_Power, PIN_MODE_OUTPUT);
+    rt_pin_mode(Motor_Direction_Button, PIN_MODE_INPUT);
+    rt_pin_mode(Motor_Direction_Ctr, PIN_MODE_OUTPUT);
+    rt_pin_write(Motor_Power,OFF);
+    rt_pin_write(Motor_Direction_Ctr,ON);
+    if(status_ws == ON)
+    {
+        //检测按键状态
+        while(rt_pin_read(Motor_Direction_Button)==1)
+        {
+            while(rt_pin_read(LIMIT_CLOSE)==1)
+            {
+                rt_pin_write(Motor_Direction_Ctr,ON);
+                close_timeout++;
+                //打开电机驱动器电源,默认关闭
+                rt_pin_write(Motor_Power,ON);
+                if(close_timeout==1)
+                {
+                    rt_pin_write(Motor_Power,OFF);
+                    rt_thread_delay(50);
+                    rt_pin_write(Motor_Power,ON);
+                }
+                rt_thread_delay(50);
+                if(close_timeout>500)
+                {
+                    close_timeout = 500;
+                    rt_pin_write(Motor_Power,OFF);
+                }
+            }
+            if(rt_pin_read(LIMIT_CLOSE)==0)
+            {
+                rt_pin_write(Motor_Power,OFF);  //关闭驱动器电源
+            }
+            rt_thread_delay(50);
+            open_timeout = 0;
+        }
+        rt_pin_write(Motor_Power,OFF);
+        rt_thread_delay(100);
+        while(rt_pin_read(Motor_Direction_Button)==0)
+        {
+            while(rt_pin_read(LIMIT_OPEN)==1)
+            {
+                open_timeout ++;
+                //打开电机驱动器电源,默认关闭
+                rt_pin_write(Motor_Power,ON);
+                rt_pin_write(Motor_Direction_Ctr,OFF);
+                if(open_timeout>500)
+                {
+                    open_timeout = 500;
+                    rt_pin_write(Motor_Power,OFF);
+                }
+                rt_thread_delay(50);
+            }
+            if(rt_pin_read(LIMIT_OPEN)==0)
+            rt_pin_write(Motor_Power,OFF);
+            rt_thread_delay(50);
+            close_timeout = 0;
+        }
+        open_timeout = 0;
+        close_timeout = 0;
+    }
+    else {
+        rt_pin_write(Motor_Power,OFF);
+    }
+}
 /*************************吸虫塔*********************************/
 //吸虫电机
 uint8_t ctr_Motor_xichong(uint8_t status_ws)
@@ -1446,11 +1518,15 @@ static void Control_Clear_thread_entry(void *parameter)
 {
     while(1)
     {
+        #if ROBOT_EN ==1
+        ctr_Motor_Robot(ON);
+        #else
         if(device_status.clear_status==1)
         {
             if(ctr_clear(1200)==0)
             ctr_TG_Clear(400);
         }
+        #endif
         rt_thread_delay(100);
     }
 }

+ 11 - 2
Application_CBD/applications/control.h

@@ -16,17 +16,19 @@
 //定制相关//////////////////////////////////////////////////////
 #define LAMP_EN          0              //李新3灯管:0关闭,1打开
 #define SENSOR_EN        0              //温湿度:0关闭,1打开
+#define ROBOT_EN         0              //机器人
 ////////////////////////////////////////////////////////////////
 #if LAMP_EN == 1
     #define VERSION_HK          "1.(3ledv4).41(HK)" //4.0海康-三色光源
 #else
-    #define VERSION_HK          "1.45a.41(HK)"       //4.0海康
+    #define VERSION_HK          "1.46.41(HK)"       //4.0海康
 #endif
-#define VERSION_HK_2000W    "1.42.4(2000W)"         //4.0水稻
+#define VERSION_HK_2000W    "1.43.4(2000W)"         //4.0水稻
 #define VERSION_ZP          "1.39.1(ZP)"            //1.0转盘
 #define VERSION_GK          "1.38.1(GK)"            //1.0高空
 #define VERSION_XCT         "1.9.6(HK)"             //吸虫塔-海康
 #define VERSION_V5          "1.2.5(HK)"             //5.0
+#define VERSION_Robot       "1.0(robot)"               //展厅机器人
 #define CompileTime         rt_sprintf(device_status.driver_compile,"%s-%s",__DATE__,__TIME__)              //编译时间,每次更新代码修改
 /*********************************************************************/
 typedef struct{
@@ -191,6 +193,13 @@ uint8_t ctr_Motor_xifu(uint8_t status_ws);
 #define FAN_I   GET_PIN(B,11)
 uint8_t ctr_Fan_IN(uint8_t status_ws);
 uint8_t ctr_Fan_PUT(uint8_t status_ws);
+/*******************************定制展厅机器人************************************/
+#define LIMIT_OPEN GET_PIN(B,8)
+#define LIMIT_CLOSE GET_PIN(B,5)
+#define Motor_Power GET_PIN(B,10)                       //电机驱动供电
+#define Motor_Direction_Button GET_PIN(B,9)             //IO输入,检测按键状态,用于控制方向
+#define Motor_Direction_Ctr GET_PIN(B,15)               //IO输出,控制电机运动方向
+void ctr_Motor_Robot(uint8_t status_ws);
 /***************************************************************/
 /***************************************************************/
 uint8_t ctr_Heat(uint8_t status_heat);          //加热

+ 41 - 22
Application_CBD/applications/hmi.c

@@ -411,15 +411,16 @@ static void HMI_Decode(char *cmd,uint8_t cmd_len)
     }
     //定时设置
     else if (strstr(rx_buffer,"saveClockSet=")!=NULL) {
-        char sun_str[3],start_str[3],stop_str[3],timeswitch_str[3];
+        char value_str[10];
+        memset(value_str,0,sizeof(value_str));
         rt_kprintf("时间设置!\n");
         var=strstr(rx_buffer,"=");
         var++;
-        strncpy(sun_str,var,2);
-        if(atoi(sun_str) > 0 && atoi(sun_str) <12)
+        strncpy(value_str,var,2);
+        if(atoi(value_str) > 0 && atoi(value_str) <12)
         {
             #if LAMP_EN == 0
-            device_status.sunBar=atoi(sun_str);
+            device_status.sunBar=atoi(value_str);
             ef_set_env_blob("sunBar", &device_status.sunBar, sizeof(device_status.sunBar));
             #else
             rt_kprintf("光控定时设置失败!!!,三光源模式!!\n");
@@ -434,39 +435,42 @@ static void HMI_Decode(char *cmd,uint8_t cmd_len)
 //            device_status.light_over_tim = device_status.sunBar * 3600 + nowstamp_num;
         }
         else {
-            rt_kprintf("参数设置异常(光控时长):%d!!!%d",atoi(sun_str));
+            rt_kprintf("参数设置异常(光控时长):%d!!!%d",atoi(value_str));
         }
+        memset(value_str,0,sizeof(value_str));
         //时控开始时间
-        strncpy(start_str,var+2,2);
-        if(atoi(start_str) >= 0 && atoi(start_str) < 24)
+        strncpy(value_str,var+2,2);
+        if(atoi(value_str) >= 0 && atoi(value_str) < 24)
         {
-            device_status.startBar=atoi(start_str);
+            device_status.startBar=atoi(value_str);
             ef_set_env_blob("startBar", &device_status.startBar, sizeof(device_status.startBar));
         }
         else {
-            rt_kprintf("参数设置异常(开始):%d!!!",atoi(start_str));
+            rt_kprintf("参数设置异常(开始):%d!!!",atoi(value_str));
         }
+        memset(value_str,0,sizeof(value_str));
         //
-        strncpy(stop_str,var+4,2);
-        if(atoi(stop_str) >= 0&& atoi(stop_str) < 24)
+        strncpy(value_str,var+4,2);
+        if(atoi(value_str) >= 0&& atoi(value_str) < 24)
         {
-            device_status.stopBar=atoi(stop_str);
+            device_status.stopBar=atoi(value_str);
             ef_set_env_blob("stopBar", &device_status.stopBar, sizeof(device_status.stopBar));
         }
         else {
-            rt_kprintf("参数设置异常(结束):%d!!!",atoi(stop_str));
+            rt_kprintf("参数设置异常(结束):%d!!!",atoi(value_str));
         }
+        memset(value_str,0,sizeof(value_str));
         //
-        strncpy(timeswitch_str,var+7,2);
-        if(atoi(timeswitch_str) >= 0 && atoi(timeswitch_str) <= 1)
+        strncpy(value_str,var+7,2);
+        if(atoi(value_str) >= 0 && atoi(value_str) <= 1)
         {
             #if LAMP_EN == 0
-            device_status.timeSwitch=atoi(timeswitch_str);
+            device_status.timeSwitch=atoi(value_str);
             ef_set_env_blob("timeSwitch", &device_status.timeSwitch, sizeof(device_status.timeSwitch));
             #endif
         }
         else {
-            rt_kprintf("参数设置异常(模式):%d!!!",atoi(timeswitch_str));
+            rt_kprintf("参数设置异常(模式):%d!!!",atoi(value_str));
         }
         //2022/06/23,add:
         rt_sprintf(device_status.json_w_clock,"屏幕操作:修改工作时间:开始-%d,结束-%d,模式-%d(0-光控,1-时控)操作时间:%04d-%02d-%02d %02d:%02d:%02d",device_status.startBar,device_status.stopBar,device_status.timeSwitch,tm.tm_year+1900,tm.tm_mon+1,tm.tm_mday,tm.tm_hour,tm.tm_min,tm.tm_sec);
@@ -518,6 +522,7 @@ static void HMI_Decode(char *cmd,uint8_t cmd_len)
         else {
             rt_kprintf("参数设置失败!!!\n");
         }
+        rt_thread_delay(1000);
         MA_save();
         rt_free(var);
         rt_kprintf("系统设置已保存:收集时间-%d,加热时间-%d,加热温度-%d,音量-%d,自动关屏-%d\n",device_status.clt_time,device_status.heattime,device_status.heatvalue,device_status.vol,device_status.thsp);
@@ -753,8 +758,14 @@ static void HMI_Decode(char *cmd,uint8_t cmd_len)
             ef_set_env_blob("version_type",&device_status.version_type,sizeof(device_status.version_type));        //版本类型
             MA_save();
         }
-        else {
-
+    }
+    else if (strstr(rx_buffer,"SwversionV30")!=NULL) {
+        if(device_status.version_type != 30)
+        {
+            device_status.version_type = 30;
+            sprintf(device_status.driver, "%s",VERSION_Robot);
+            ef_set_env_blob("version_type",&device_status.version_type,sizeof(device_status.version_type));        //版本类型
+            MA_save();
         }
     }
     else if (strstr(rx_buffer,"putTest.switchFAN_PU=1")!=NULL) {
@@ -947,21 +958,24 @@ static void Ctr_Mortor_entry(void* parameter)
         }
         if(device_status.photo_ws==1)
         {
+            ctr_led(ON);
             //打开补光灯
-            if(photo_led_sec==100)
+            if(photo_led_sec==400)
             {
-                ctr_led(ON);
                 DTU_Write("takephoto.mp3");
                 //延时
                 rt_thread_delay(1000);
                 rt_kprintf("\n测试拍照!\n");
                 Hk_Take_io();
+                char *takephotojson = makeJson_takephoto();
+                DTU_Write("%s",takephotojson);
+                rt_free(takephotojson);
             }
             photo_led_sec--;
             if(photo_led_sec==0)
             {
                 ctr_led(OFF);
-                photo_led_sec = 100;
+                photo_led_sec = 450;
                 device_status.photo_ws = 0;
                 HMI_WRITE("sysTest.switchPhoto.val=0");
                 HMI_WRITE("sysTest.switchFill.val=0");
@@ -1163,6 +1177,9 @@ void Check_ParamConfig(void)
             rt_pin_write(HK_5000W_P,ON);
             rt_sprintf(device_status.driver, "%s",VERSION_XCT);
         }
+        else if (device_status.version_type==30) {
+            rt_sprintf(device_status.driver, "%s",VERSION_Robot);
+        }
         if(device_status.iccid[0]!=8)
         {
             rt_sprintf(device_status.iccid,"87654321000000000000");
@@ -1214,6 +1231,7 @@ void Check_ParamConfig(void)
 #if SENSOR_EN==1
         mb_master_samlpe();
 #endif
+#if ROBOT_EN == 0
         uint16_t connect_num=0;
         //等待联网,
         while(atoi(device_status.net)==1)
@@ -1238,6 +1256,7 @@ void Check_ParamConfig(void)
         }
         if(device_status.version_type==6) device_status.timeSwitch = 1;
         DTU_Write("%s",makeJson_Warn("turnon", "device_stm32"));
+#endif
     }
 }
 void ResetParamDefault(void)

+ 1 - 1
Application_CBD/applications/main.c

@@ -118,7 +118,7 @@ static void idle_hook(void)
     time(&now);
     static struct tm alarm_new;
     alarm_new =*localtime(&now);
-    if((alarm_new.tm_hour)==6&&(alarm_new.tm_min==20)&&(alarm_new.tm_sec==0))
+    if((alarm_new.tm_hour)==9&&(alarm_new.tm_min==20)&&(alarm_new.tm_sec==0))
     {
         rt_hw_cpu_reset();
     }

+ 9 - 6
Application_CBD/packages/freemodbus-latest/samples/sample_mb_master.c

@@ -28,11 +28,14 @@
 #define MB_POLL_THREAD_PRIORITY  11
 #define MB_SEND_THREAD_PRIORITY  RT_THREAD_PRIORITY_MAX - 1
 
-#define MB_SEND_REG_START  1034
+//#define MB_SEND_REG_START  1034
+#define MB_SEND_REG_START  0
+
 #define MB_SEND_REG_NUM    10
 
 #define MB_POLL_CYCLE_MS   500
 extern Device_Status_typedef device_status;
+extern USHORT   usMRegInBuf[MB_MASTER_TOTAL_SLAVE_NUM][M_REG_INPUT_NREGS];
 extern USHORT usMRegHoldBuf[MB_MASTER_TOTAL_SLAVE_NUM][M_REG_HOLDING_NREGS];
 extern int mb_master_samlpe(void);
 static void send_thread_entry(void *parameter)
@@ -58,11 +61,11 @@ static void send_thread_entry(void *parameter)
             device_status.sensor_485_sta=1;
             error_count = 0;
             //温度=25并且湿度=30不更新,否则会导致屏幕上显示空
-            if((int)usMRegHoldBuf[0][0]/10!=25&&(int)usMRegHoldBuf[0][1]/10!=30)
-            {
-                rt_sprintf(device_status.tempture,"%d.%d",(int)usMRegHoldBuf[0][0]/10, (uint)usMRegHoldBuf[0][0] % 10);
-                rt_sprintf(device_status.humidity,"%d.%d",(int)usMRegHoldBuf[0][1]/10, (uint)usMRegHoldBuf[0][1] % 10);
-            }
+//            if((int)usMRegHoldBuf[0][0]/10!=25&&(int)usMRegHoldBuf[0][1]/10!=30)
+//            {
+                rt_sprintf(device_status.tempture,"%d.%d",(int)usMRegHoldBuf[0][0]/100, (uint)usMRegHoldBuf[0][0] % 100);
+                rt_sprintf(device_status.humidity,"%d.%d",(int)usMRegHoldBuf[0][1]/100, (uint)usMRegHoldBuf[0][1] % 100);
+//            }
         }
         rt_kprintf("slave data-tem:%d,hum:%d\n",usMRegHoldBuf[0][0],usMRegHoldBuf[0][1]);//0代表从机ID=1
         rt_kprintf("slave data-tem:%s,hum:%s\n",device_status.tempture,device_status.humidity);//0代表从机ID=1

+ 5 - 0
Application_CBD/readme.md

@@ -1,3 +1,8 @@
+## 2022-09-07更新说明:
+# #define VERSION_HK          "1.46.41(HK)"       //4.0海康- 
+# define VERSION_HK_2000W    "1.43.4(2000W)"      //4.0水稻
+- 1.修复系统设置保存后导致时间设置失败问题,原因是重复使用数组未清零;
+
 ## 2022-07-15更新说明:
 - 1.调整雨控检测方式由脉冲改为ADC
 ## 2022-06-24更细说明:

+ 1 - 1
Application_CBD/rtconfig.h

@@ -158,7 +158,7 @@
 #define RT_M_COIL_NCOILS 64
 #define RT_M_REG_INPUT_START 0
 #define RT_M_REG_INPUT_NREGS 10
-#define RT_M_REG_HOLDING_START 1034
+#define RT_M_REG_HOLDING_START 0
 #define RT_M_REG_HOLDING_NREGS 2
 #define RT_M_HD_RESERVE 0
 #define RT_M_IN_RESERVE 4