zhunk 6 meses atrás
pai
commit
cbbef8f324

+ 0 - 4
Application_cbd_apm32f1/applications/control.c

@@ -906,10 +906,6 @@ u_int8_t alarmCheck(u_int8_t starthour,u_int8_t endhour,u_int8_t startmin,u_int8
 void WorkTask_BZYV2(void)
 {
     if(device_status.ds==1&&device_status.temp_status==0){
-        ctr_lamp(OFF,1);    //镇流器关=X轴开关:开
-        ctr_swz(OFF);
-        ctr_Collect_Fan(OFF);
-
         while(device_status.work_status ==0){
             rt_thread_delay(10000);
             LOG_W("等待设备进入工作");

+ 2 - 1
Application_cbd_apm32f1/applications/control.h

@@ -15,8 +15,9 @@
 #include <rtdevice.h>
 //定制相关//////////////////////////////////////////////////////
 #define SENSOR_EN        0              //温湿度:0关闭,1打开
+#define PCB_V1           0             //1-旧PCB,0-新PCB(模块化)
 ////////////////////////////////////////////////////////////////
-#define VERSION_BZY         "3.3.2"                   //孢子仪
+#define VERSION_BZY         "3.4.3"                   //孢子仪
 
 /*********************************************************************/
 typedef struct  _packed

+ 4 - 12
Application_cbd_apm32f1/applications/dtu_uart2.c

@@ -440,17 +440,7 @@ char * makeJson()
 {
     char utos[5];
 
-    //如果设备工作并且电流小于500,并且不是上电启动灯管异常
-    if(atoi(device_status.power)<400&&device_status.work_status==1&&makejson_sta!=0)
-    {
-        #if LAMP_EN == 0
-        LOG_I("Current is:%d",atoi(device_status.power));
-        if(atoi(device_status.power)>10)        //过滤电流检测芯片损坏导致电流直为0 的异常
-        device_status.lamp_status = 1;
-        #endif
-    }
-
-    if(atoi(device_status.power)>5000)
+    if(atoi(device_status.power)>5000)  //过滤异常值
         rt_sprintf(device_status.power,"0.01");
 
     makejson_sta = 1;
@@ -570,6 +560,7 @@ char * makeJson()
     cJSON_AddNumberToObject(pSubJson,"rcnt",device_status.rebootcnt);
     //电流(当前)
     cJSON_AddStringToObject(pSubJson,"current",device_status.power);
+    cJSON_AddStringToObject(pSubJson,"c_24V_1",device_status.heat_power);
     //电压
     cJSON_AddStringToObject(pSubJson,"vbat",device_status.voltage);
     //数据上传间隔
@@ -579,12 +570,13 @@ char * makeJson()
     cJSON_AddStringToObject(pSubJson,"csq",device_status.csq);
     cJSON_AddNumberToObject(pSubJson, "x_init_dis", device_status.x_init_dis);
     cJSON_AddNumberToObject(pSubJson, "y_init_dis", device_status.y_init_dis);
-    //
+#if 0
     cJSON_AddStringToObject(pSubJson, "windspeed", device_status.windspeed);
     cJSON_AddStringToObject(pSubJson, "winddir", device_status.winddir);
     cJSON_AddStringToObject(pSubJson, "ap", device_status.ap);
     rt_sprintf(utos, "%d",device_status.lux);
     cJSON_AddNumberToObject(pSubJson, "lux", device_status.lux);
+#endif
     char *p = cJSON_PrintUnformatted(pJsonRoot);
     if(NULL == p)
     {

+ 1 - 1
Application_cbd_apm32f1/applications/dtu_uart2.h

@@ -10,7 +10,7 @@
 #ifndef APPLICATIONS_INC_DTU_UART2_H_
 #define APPLICATIONS_INC_DTU_UART2_H_
 #include "cJSON.h"
-#define DTU_UART_NAME "uart2"  /*串口设备名称*/
+#define DTU_UART_NAME "uart5"  /*串口设备名称*/
 #define MAX_DTU_SIZE 1024
 typedef struct{
     char msg_pool[MAX_DTU_SIZE];

+ 28 - 5
Application_cbd_apm32f1/applications/sht30_collect.c

@@ -182,6 +182,27 @@ static void Power_ReadCheck(void *parameter)
     rt_thread_delay(1000);
     while(1)
     {
+
+#if PCB_V1 == 0
+        rt_uint16_t _24v_current_int = moving_average_filter_update(filter,Read_Real_Current());
+        if(_24v_current_int-2430>0)
+        {
+            sprintf(device_status.power,"%.2f",(float)(_24v_current_int-2400)/0.4);
+        }else {
+            sprintf(device_status.power,"0.0");
+        }
+
+        //消除误差
+        if(Read_Heat_Current()-2450<10)
+        {
+            sprintf(device_status.heat_power,"%.f",0.0);
+        }
+        else
+        {
+            //rt_uint16_t _heat_current_int = moving_average_filter_update(filter_hi,Read_Heat_Current());
+            sprintf(device_status.heat_power,"%.2f",(float)(Read_Heat_Current()-2450)/0.1);     //2481-2465
+        }
+        #else
         sprintf(device_status.power,"%.2f",(float)(moving_average_filter_update(filter, (float)Read_Real_Current()))/100.0*2.5);
         //消除误差
         if(Read_Heat_Current()-2465<10)
@@ -192,12 +213,14 @@ static void Power_ReadCheck(void *parameter)
         {
             sprintf(device_status.heat_power,"%.2f",(float)(moving_average_filter_update(filter_hi, Read_Heat_Current())-2465)/0.1);     //2481-2465
         }
+        #endif
+
         //LOG_I("负载电流:%s,加热电流:%s",device_status.power,device_status.heat_power);
 
         if(atof(device_status.voltage)<22.0)    //小于22.0V,并且持续10S,欠压
         {
             bat_cnt++;
-        }else if(atof(device_status.voltage)>24.0)    //大于24.0V,解除欠压
+        }else if(atof(device_status.voltage)>=24.0)    //大于24.0V,解除欠压
         {
             bat_cnt = 0;
             device_status.C01 &= ~(1<<4);
@@ -209,13 +232,9 @@ static void Power_ReadCheck(void *parameter)
             device_status.C01 |= (1<<4);
             device_status.bat_status = 1; //欠压
         }
-        #if ROBOT_EN == 0
         //rt_sprintf(device_status.voltage,"%d.%02d",filter_voltage()/100,filter_voltage()%100);
         sprintf(device_status.voltage,"%.2f",(float)(moving_average_filter_update(filter_v, (float)Read_Real_Voltage()/100)));
-        //LOG_D("voltage is:%sV",device_status.voltage);
-        sprintf(device_status.fuse_voltage, "%d.%02d",Read_Fuse_Voltage()/100,Read_Fuse_Voltage()%100);
 
-        #endif
         rt_thread_mdelay(10);
     }
     moving_average_filter_free(filter);
@@ -240,7 +259,11 @@ int Read_Real_Current(void)
     /* 关闭通道 */
     rt_adc_disable(adc_dev, ADC_DEV_CHANNLE_1);
     //LOG_D("Read_Real_Current:%d,%d",adc1_value,adc1_value * REFER_VOLTAGE/CONVERT_BITS*15);
+#if PCB_V1 == 0
+    return  (adc0_value * REFER_VOLTAGE/CONVERT_BITS*12)+20;
+#else
     return  (ADC_VOL_BASE * (adc1_value*1.0)/(in_adc_17*1.0))*100000;
+#endif
 }
 
 int Read_Heat_Current(void)

+ 9 - 0
Application_cbd_apm32f1/readme.md

@@ -1,3 +1,12 @@
+# 2026-05-20 更新说明
+	#define VERSION_BZY         "3.4.3"                //孢子仪V1.3
+	1、修复电流采集不正确;
+	2、增加安卓屏电流上报;
+	3、删除传感器数据上报;
+# 2026-05-20 更新说明
+	#define VERSION_BZY         "3.4.2"                //孢子仪V1.3
+	1、取消工作线程循环关闭驱动器供电,否则概率会导致对焦故障;
+	2、适配模块化电路板;
 # 2026-04-28 更新说明
 	#define VERSION_BZY         "3.3.2"                //孢子仪V1.3
 	1、修复开机蜂鸣器一直响