Quellcode durchsuchen

update xyv3 to 1.3.3

yf_zjb vor 2 Jahren
Ursprung
Commit
0c7a7d890d

BIN
Application_CBD/Debug/Application_CBD.bin


BIN
Application_CBD/Debug/Application_CBD.elf


Datei-Diff unterdrückt, da er zu groß ist
+ 1963 - 1954
Application_CBD/Debug/Application_CBD.map


BIN
Application_CBD/Debug/applications/beep.o


BIN
Application_CBD/Debug/applications/control.o


BIN
Application_CBD/Debug/applications/dtu_uart2.o


BIN
Application_CBD/Debug/applications/hmi.o


BIN
Application_CBD/Debug/applications/main.o


BIN
Application_CBD/Debug/applications/sht30_collect.o


BIN
Application_CBD/Debug/packages/EasyFlash-latest/src/ef_env.o


BIN
Application_CBD/Debug/packages/EasyFlash-latest/src/ef_fal_port.o


BIN
Application_CBD/Debug/packages/EasyFlash-latest/src/ef_log.o


BIN
Application_CBD/Debug/packages/freemodbus-latest/port/user_mb_app_m.o


BIN
Application_CBD/Debug/rt-thread/src/kservice.o


+ 27 - 10
Application_CBD/applications/control.c

@@ -2443,7 +2443,6 @@ void WorkTask(void)
 //拍照性诱工作任务流程
 void WorkTask_XYV3(void)
 {
-
     int cal_n = device_status.cul_time * 60;
     LOG_I("工作状态:%d",device_status.work_status);
     LOG_I("开关机状态:%d",device_status.ds);
@@ -2462,15 +2461,7 @@ void WorkTask_XYV3(void)
                 device_status.photo_ws = 2;
                 cal_n = device_status.cul_time * 60;
             }
-//            time_t time_take;
-//            time(&time_take);
-//            static struct tm alarm_takephpoto;
-//            alarm_takephpoto =*localtime(&time_take);
-//            if((alarm_takephpoto.tm_hour)==17&&(alarm_takephpoto.tm_min==0)&&(alarm_takephpoto.tm_sec==0))
-//            {
-//                device_status.photo_ws = 1;
-//            }
-//            LOG_I("当前时间:%d:%d:%d",alarm_takephpoto.tm_hour,alarm_takephpoto.tm_min,alarm_takephpoto.tm_sec);
+//          LOG_I("当前时间:%d:%d:%d",alarm_takephpoto.tm_hour,alarm_takephpoto.tm_min,alarm_takephpoto.tm_sec);
             rt_thread_delay(1000);
         }
     }
@@ -2554,6 +2545,32 @@ static void Control_Clear_thread_entry(void *parameter)
             Motor_shake(1,400);
             device_status.clear_status = 0;
         }
+        #if 0
+        if(device_status.sensor_485_sta==0){
+            time_t time_TT;
+            time(&time_TT);
+            static struct tm alarm_time_TT;
+            alarm_time_TT =*localtime(&time_TT);
+            LOG_I("当前小时:%d",alarm_time_TT.tm_hour);
+            if((alarm_time_TT.tm_hour)>5&&(alarm_time_TT.tm_hour)<19)
+            {
+                float voltage_sun = atof(device_status.voltage) + alarm_time_TT.tm_hour * 0.1;
+
+                sprintf(device_status.voltage_sun,"%0.1f",(float)voltage_sun);
+            }else{
+                sprintf(device_status.voltage_sun,"0.0");
+            }
+            if(alarm_time_TT.tm_hour==1&&alarm_time_TT.tm_min==0&&alarm_time_TT.tm_sec==30){   //记录当前太阳能电池板电压
+                ef_set_env_blob("voltage_night", &device_status.voltage_sun, sizeof(device_status.voltage_sun));
+            }else if(alarm_time_TT.tm_hour==15&&alarm_time_TT.tm_min==30&&alarm_time_TT.tm_sec==30){
+                char voltage_temp[8];
+                ef_get_env_blob("voltage_night",&voltage_temp,sizeof(voltage_temp),NULL);
+                if(atof(device_status.voltage_sun)-atof(voltage_temp)<0.5){ //电压差小于0.5,则判定充电故障
+
+                }
+            }
+        }
+        #endif
         rt_thread_delay(100);
         #endif
         #endif

+ 2 - 1
Application_CBD/applications/control.h

@@ -36,7 +36,7 @@
 
 #define VERSION_BZY         "2.60"                   //孢子仪
 
-#define VERSION_XY3          "1.2.3"                 //拍照性诱-dtype=8
+#define VERSION_XY3          "1.3.3"                 //拍照性诱-dtype=8
 
 #define CompileTime         rt_sprintf(device_status.driver_compile,"%s-%s",__DATE__,__TIME__)              //编译时间,每次更新代码修改
 /*********************************************************************/
@@ -153,6 +153,7 @@ typedef struct  _packed
     char json_w_platform[128]; //
     char power[8];             //功率
     char voltage[8];           //电池电压
+    char voltage_sun[8];       //太阳能板电压,充电电压
     char cpu_temp[8];          //
     char deviceId[32];         //设备编码
 }Device_Status_typedef;

+ 26 - 6
Application_CBD/applications/dtu_uart2.c

@@ -426,8 +426,29 @@ char * makeJson_takephoto()
     cJSON_Delete(takephoto);
     return takephoto_str;
 }
-
-char *makeJson_Config_BDH(char * deviceId){
+/*重置RTU配置参数*/
+char *makeJson_Config_Reset(void)
+{
+    cJSON * tJsonRoot = NULL;
+    tJsonRoot = cJSON_CreateObject();
+    if(NULL==tJsonRoot)
+    {
+        cJSON_Delete(tJsonRoot);
+        return NULL;
+    }
+    cJSON_AddStringToObject(tJsonRoot, "cmd", "config_reset");
+    char * t = cJSON_PrintUnformatted(tJsonRoot);
+    if(NULL == t)
+    {
+        cJSON_Delete(tJsonRoot);
+        return NULL;
+    }
+    cJSON_Delete(tJsonRoot);
+    return t;
+}
+/*设置BDH设备编码到:RTU*/
+char *makeJson_Config_BDH(char * deviceId)
+{
     cJSON * tJsonRoot = NULL;
     tJsonRoot = cJSON_CreateObject();
     if(NULL==tJsonRoot)
@@ -773,9 +794,8 @@ char * makeJson()
         //倾倒状态
         cJSON_AddStringToObject(pSubJson,"dps","0");
         //cv 充电电压 单位:V 字符串类型
-        cJSON_AddStringToObject(pSubJson,"cv","0.0");
+        cJSON_AddStringToObject(pSubJson,"cv",device_status.voltage_sun);
         //volt_ct电击计数值
-
         rt_sprintf(utos, "%d",device_status.all_ycct);
         cJSON_AddStringToObject(pSubJson,"volt_ct",utos);
 
@@ -1105,7 +1125,7 @@ int parseDtu(char *json_string)
                   if(hum!=NULL&&tmp!=NULL)
                   {
                       //先判断是否是空字符再判断数值是否合理
-                      if(strcmp(hum->valuestring,"")!=0&&atoi(hum->valuestring)>=0&&atoi(hum->valuestring)<=100&&atoi(hum->valuestring)!=30&&device_status.sensor_485_sta==0)
+                      if(strcmp(hum->valuestring,"")!=0&&atoi(hum->valuestring)>=0&&atoi(hum->valuestring)<=100&&atoi(hum->valuestring)!=30&&device_status.sensor_485_sta!=100)
                       {
                           if(atoi(hum->valuestring)!=atoi(device_status.humidity))
                           {
@@ -1120,7 +1140,7 @@ int parseDtu(char *json_string)
                           rt_kprintf("设置湿度失败:%s!!!\n",hum->valuestring);
                       }
                       //先判断是否是空字符再判断数值是否合理
-                      if(strcmp(tmp->valuestring,"")!=0&&atoi(tmp->valuestring)>-50&&atoi(tmp->valuestring)<=100&&device_status.sensor_485_sta==0)
+                      if(strcmp(tmp->valuestring,"")!=0&&atoi(tmp->valuestring)>-50&&atoi(tmp->valuestring)<=100&&device_status.sensor_485_sta!=100)
                       {
                           if(atoi(tmp->valuestring)!=atoi(device_status.tempture))
                           {

+ 1 - 0
Application_CBD/applications/dtu_uart2.h

@@ -33,6 +33,7 @@ char *makeJson_ReadInfo();
 char *makeJson_ParsePhoto();
 char *makeJson_takephoto();
 char *makeJson_Warn(char * s,char *t);
+char *makeJson_Config_Reset(void);
 char *makeJson_Config_BDH(char * deviceId);
 void UpLoad_Data(void);
 char * uint8tostring(uint8_t dat);

+ 17 - 7
Application_CBD/applications/hmi.c

@@ -263,6 +263,8 @@ static void HMI_Decode(void)
         HMI_WRITE("clockSet.stopBar.val=%d",device_status.stopBar);
         //SIM卡状态
         HMI_WRITE("workSta.bt0.val=%d",atoi(device_status.sim));
+        //太阳能板电压
+        HMI_WRITE("menu.voltage_sun.txt=\"%sV\"",device_status.voltage_sun);
         //ID
         HMI_WRITE("menu.equipid.txt=\"%s\"",device_status.imei);
         //HMI_WRITE("workSta.equipid.txt=\"%s\"",device_status.imei);
@@ -673,13 +675,21 @@ static void HMI_Decode(void)
         var = strstr(rx_buffer,"=");
         var ++;
         strncpy(value_str,var,16);  //设备编码为16位
-        rt_sprintf(device_status.deviceId,"%s",value_str);
-        ef_set_env_blob("deviceId", &device_status.deviceId, sizeof(device_status.deviceId));
-        LOG_I("解析到设备编码:%s",device_status.deviceId);
-        char *device_id = makeJson_Config_BDH(device_status.deviceId);
-        //发送json到RTU
-        DTU_Write("%s",device_id);
-        rt_free(device_id);
+        if(strstr(value_str,"0000000000000000")!=RT_NULL){
+            char *config_reset = makeJson_Config_Reset();
+            //发送json到RTU
+            DTU_Write("%s",config_reset);
+            rt_free(config_reset);
+            //恢复RTU的默认配置参数
+        }else{
+            rt_sprintf(device_status.deviceId,"%s",value_str);
+            ef_set_env_blob("deviceId", &device_status.deviceId, sizeof(device_status.deviceId));
+            LOG_I("解析到设备编码:%s",device_status.deviceId);
+            char *device_id = makeJson_Config_BDH(device_status.deviceId);
+            //发送json到RTU
+            DTU_Write("%s",device_id);
+            rt_free(device_id);
+        }
     }
     //定时设置
     else if (strstr(rx_buffer,"saveClockSet=")!=NULL) {

+ 25 - 1
Application_CBD/applications/sample_mb_master.c

@@ -40,6 +40,7 @@ extern SHORT usMRegHoldBuf[MB_MASTER_TOTAL_SLAVE_NUM][M_REG_HOLDING_NREGS];
 
 static void send_thread_entry(void *parameter)
 {
+    BOOL IN_3A = 0;           //数据解析方式设置
     eMBMasterReqErrCode error_code = MB_MRE_NO_ERR;
     rt_uint16_t error_count = 0;
     //USHORT data[3] = {0};
@@ -54,8 +55,9 @@ static void send_thread_entry(void *parameter)
 //                                                              MB_SEND_REG_NUM,     /* register total number */
 //                                                              data,                /* data to be written */
 //                                                              RT_WAITING_FOREVER); /* timeout */
+        #if 0
         error_code = eMBMasterReqReadHoldingRegister(SLAVE_ADDR, MB_SEND_REG_START,2,1000);//读多个保持寄存器
-        rt_kprintf("error_code: %d \n",error_code);//一直出错,我便把错误返回值打印出来
+        rt_kprintf("eMBMasterReqReadHoldingRegister: %d \n",error_code);//一直出错,我便把错误返回值打印出来
         if(error_code==0)
         {
             device_status.sensor_485_sta = 100;
@@ -69,6 +71,27 @@ static void send_thread_entry(void *parameter)
 //                sprintf(device_status.humidity,"%0.01f",(float)usMRegHoldBuf[0][1]/100);
 //            }
         }
+        rt_thread_delay(1000);
+        #endif
+
+
+        error_code = eMBMasterReqReadInputRegister(SLAVE_ADDR, MB_SEND_REG_START,3,1000);
+        rt_kprintf("eMBMasterReqReadInputRegister: %d \n",error_code);//一直出错,把错误返回值打印出来
+        if(error_code==0)
+        {
+            if(IN_3A==0){
+                error_code = eMBMasterReqWriteHoldingRegister(0,0x3A,1,1000);
+                IN_3A = 1;
+                rt_kprintf("数据解析方式设置:%d\n",error_code);
+            }
+            device_status.sensor_485_sta = 200;
+            error_count = 0;
+            for(int i=0;i<3;i++){
+                rt_kprintf("usMRegInBuf:%d-%u\n",i,usMRegInBuf[0][i]);
+            }
+            rt_sprintf(device_status.voltage_sun,"%d.%1d",usMRegInBuf[0][0]/100,usMRegInBuf[0][0]%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
         rt_thread_delay(5000);
@@ -80,6 +103,7 @@ static void send_thread_entry(void *parameter)
             {
                 error_count = 0;
                 device_status.sensor_485_sta = 0;
+
             }
         }
     }

+ 2 - 2
Application_CBD/applications/sht30_collect.c

@@ -153,7 +153,7 @@ static void Power_ReadCheck(void *parameter)
     while(1)
     {
         sprintf(device_status.power,"%.2f",(float)Read_Real_Current()/100*2.5);
-        if(Read_Real_Voltage()/100<10)
+        if(Read_Real_Voltage()/100<11)
         {
             #if ROBOT_EN == 1
             ctr_led(OFF);
@@ -161,7 +161,7 @@ static void Power_ReadCheck(void *parameter)
             #endif
             device_status.bat_status = 1; //欠压
         }
-        else if(Read_Real_Voltage()/100>11){
+        else if(Read_Real_Voltage()/100>12){
             device_status.bat_status = 0; //解除欠压
         #if ROBOT_EN == 1
             ctr_led(ON);        //打开补光灯

+ 1 - 1
Application_CBD/packages/EasyFlash-latest/inc/ef_cfg.h

@@ -92,7 +92,7 @@
 #define EF_START_ADDR             PKG_EASYFLASH_START_ADDR
 
 /* ENV area size. It's at least one empty sector for GC. So it's definition must more then or equal 2 flash sector size. */
-#define ENV_AREA_SIZE             (EF_ERASE_MIN_SIZE * 2) /* default is the double erase min size */
+#define ENV_AREA_SIZE             (EF_ERASE_MIN_SIZE * 16) /* default is the double erase min size */
 
 /* print debug information of flash */
 #ifdef PKG_EASYFLASH_DEBUG

+ 4 - 4
Application_CBD/packages/EasyFlash-latest/src/ef_env.c

@@ -61,7 +61,7 @@
 
 /* the total remain empty sector threshold before GC */
 #ifndef EF_GC_EMPTY_SEC_THRESHOLD
-#define EF_GC_EMPTY_SEC_THRESHOLD                1
+#define EF_GC_EMPTY_SEC_THRESHOLD                2
 #endif
 
 /* the ENV cache table size, it will improve ENV search speed when using cache */
@@ -507,7 +507,7 @@ static uint32_t get_next_env_addr(sector_meta_data_t sector, env_node_obj_t pre_
             addr = find_next_env_addr(addr, sector->addr + SECTOR_SIZE - SECTOR_HDR_DATA_SIZE);
 
             if (addr > sector->addr + SECTOR_SIZE || pre_env->len == 0) {
-                //TODO 扇区连续模式
+                //TODO 锟斤拷锟斤拷锟斤拷锟斤拷模式
                 return FAILED_ADDR;
             }
         } else {
@@ -542,7 +542,7 @@ static EfErrCode read_env(env_node_obj_t env)
         env->crc_is_ok = false;
         return EF_READ_ERR;
     } else if (env->len > SECTOR_SIZE - SECTOR_HDR_DATA_SIZE && env->len < ENV_AREA_SIZE) {
-        //TODO 扇区连续模式,或者写入长度没有写入完整
+        //TODO 锟斤拷锟斤拷锟斤拷锟斤拷模式锟斤拷锟斤拷锟斤拷写锟诫长锟斤拷没锟斤拷写锟斤拷锟斤拷锟斤拷
         EF_ASSERT(0);
     }
 
@@ -1726,7 +1726,7 @@ static bool check_and_recovery_env_cb(env_node_obj_t env, void *arg1, void *arg2
     } else if (env->status == ENV_PRE_WRITE) {
         uint8_t status_table[ENV_STATUS_TABLE_SIZE];
         /* the ENV has not write finish, change the status to error */
-        //TODO 绘制异常处理的状态装换图
+        //TODO �����쳣�����״̬װ��ͼ
         write_status(env->addr.start, status_table, ENV_STATUS_NUM, ENV_ERR_HDR);
         return true;
     }

+ 2 - 1
Application_CBD/packages/EasyFlash-latest/src/ef_fal_port.c

@@ -87,7 +87,8 @@ static const ef_env default_env_set[] = {
         {"collecting_eh2","0"},    //
         {"InsectSpecies","0"},
         {"Power_Type","0"},
-        {"deviceId","0"}            //bdh-设备编码
+        {"deviceId","0"},            //bdh-设备编码
+        {"voltage_night","0"}
 };
 static char log_buf[RT_CONSOLEBUF_SIZE];
 static struct rt_semaphore env_cache_lock;

+ 1 - 1
Application_CBD/rtconfig.h

@@ -156,7 +156,7 @@
 #define RT_M_REG_INPUT_START 0
 #define RT_M_REG_INPUT_NREGS 10
 #define RT_M_REG_HOLDING_START 0
-#define RT_M_REG_HOLDING_NREGS 10
+#define RT_M_REG_HOLDING_NREGS 100
 #define RT_M_HD_RESERVE 0
 #define RT_M_IN_RESERVE 4
 #define RT_M_CO_RESERVE 0