zhunk 3 месяцев назад
Родитель
Сommit
be1ec5ccc1

+ 1 - 1
Application_cbd_apm32f1/.settings/language.settings.xml

@@ -5,7 +5,7 @@
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
-			<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="-475015324938722023" id="ilg.gnuarmeclipse.managedbuild.cross.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT ARM Cross GCC Built-in Compiler Settings " parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="-457473403581831892" id="ilg.gnuarmeclipse.managedbuild.cross.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT ARM Cross GCC Built-in Compiler Settings " parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>

+ 3 - 1
Application_cbd_apm32f1/applications/app_flashdb.c

@@ -185,7 +185,9 @@ retry_init:
             fdb_kv_get_blob(&kvdb, "filter_used",fdb_blob_make(&blob, &flashdb_value.filter_used,sizeof(flashdb_value.filter_used)));
             fdb_kv_get_blob(&kvdb, "freq_filter",fdb_blob_make(&blob, &flashdb_value.freq_filter,sizeof(flashdb_value.freq_filter)));
             fdb_kv_get_blob(&kvdb, "filter_max", fdb_blob_make(&blob, &flashdb_value.filter_max, sizeof(flashdb_value.filter_max)));
-
+            if(flashdb_value.filter_used>default_filter_max){
+                flashdb_value.filter_used = default_filter_max;
+            }
             FDB_INFO("boot_count:%d\n",   boot_count);
             FDB_INFO("boot_time:%d\n",    boot_time[0]);
             FDB_INFO("tape_used:%d\n",    flashdb_value.tape_used);

+ 10 - 9
Application_cbd_apm32f1/applications/control.c

@@ -156,13 +156,13 @@ void turnlimit(void)
 uint8_t Replace_Filter(void)
 {
     //释放推杆电机
-    ctr_cangmen_down(OPEN);
-    //持续10S
+    ctr_cangmen_up(OPEN);
+    //持续5S
     for(uint32_t i=0;i<10;i++){
         rt_thread_delay(1000);
     }
     //滤网传送
-    ctr_cangmen_up(OPEN);
+    ctr_cangmen_down(OPEN);
     //读取光控ADC值超时5S
     for(uint32_t i=0;i<100;i++)
     {
@@ -172,20 +172,20 @@ uint8_t Replace_Filter(void)
         //超时上报预警
         if(i==99)
         {
-            char *translate = makeJson_Warn("Replace_Filter","filter timeout");
-            DTU_Write("%s",translate);
-            rt_free(translate);
+//            char *translate = makeJson_Warn("Replace_Filter","filter timeout");
+//            DTU_Write("%s",translate);
+//            rt_free(translate);
             break;
         }
     }
-    ctr_cangmen_up(OFF);
+    ctr_cangmen_down(OFF);
     //关闭推杆电机
-    ctr_cangmen_down(CLOSE);
+    ctr_cangmen_up(CLOSE);
         //持续10S
     for(uint32_t i=0;i<10;i++){
         rt_thread_delay(1000);
     }
-    ctr_cangmen_down(OFF);
+    ctr_cangmen_up(OFF);
     flashdb_value.filter_used++;
     //保存到flashdb
     app_flashdb_save("filter_used",flashdb_value.filter_used);
@@ -907,6 +907,7 @@ void ResetInit(void)
     //关闭Y轴驱动电源
     ctr_Collect_Fan(OFF);
     //关闭X轴驱动电源
+    ctr_cangmen_up(CLOSE);
 }
 
 //工作状态检测

+ 4 - 5
Application_cbd_apm32f1/applications/control.h

@@ -32,12 +32,10 @@ typedef struct  _packed
     uint8_t pre_temp;             //培养仓温度
     uint8_t box_temp;             //箱体温度
     uint8_t auto_test_sw;         //一键测试   0-关   1-开
-    uint8_t cold_status;          //制冷状态   0-关   1-开
-    uint8_t cold_sw;              //制冷开关   0-关   1-开
-    uint8_t wind_sw;              //风机开关   0-关   1-开
+    uint8_t replace_filter_sw;    //滤网替换开关   0-关   1-开
     uint8_t collect_fan_status;   //采集状态   0-关   1-开
     uint8_t autotakepic;          //对焦拍照   0-关   1-开
-    uint8_t calibrate_slide;            //校准开关   0-关   1 X 2 Y 3 Z
+    uint8_t calibrate_slide;      //校准开关   0-关   1 X 2 Y 3 Z
     uint8_t develop_flag;         //是否进入培养模式
     uint8_t cool_fan_status;      //散热风机状态 0-停止 1-打开
     uint8_t fsl_sw;               //凡士林开关:0-关,1-开
@@ -65,6 +63,7 @@ typedef struct  _packed
     uint8_t up_status;       //上仓门状态 0-停止 1-打开 2-关闭
     uint8_t down_status;     //下仓门状态 0-停止 1-打开 2-关闭
     uint8_t clear_status;    //清扫状态   0-停止 1-开始
+    uint8_t cold_status;
     uint8_t shake_ws;        //震动       0-关   1-开
     uint8_t heatvalue;       //加热设定温度
     uint8_t ctr_up_motor;    //上仓门,    1打开,0关闭
@@ -316,7 +315,7 @@ uint32_t ctr_move(uint8_t DIR_,uint8_t dir_,uint32_t dis_,uint32_t pulse);
 void stop_move(void);
 void slidelock();    //电机移动完毕后上锁
 void turnlimit(void);   //位移兼限位开关功能
-
+uint8_t Replace_Filter(void);
 /***************************************************/
 //线程
 

+ 16 - 1
Application_cbd_apm32f1/applications/dtu_uart2.c

@@ -981,7 +981,7 @@ int parseDtu(char *json_string)
                   }
               }else if(strcmp(METHOD->valuestring,"tape_reset")==0) {   //{"jsonrpc":"2.0","method":"tape_reset","params":{"tape_max":50000},"id":1}
                   flashdb_value.tape_used = 0;
-                  app_flashdb_save("tape_reset", &flashdb_value.tape_used);
+                  app_flashdb_save("tape_used", &flashdb_value.tape_used);
                   if(PARAMS!=NULL&&PARAMS->type==cJSON_Object){
                       cJSON* tape_max = cJSON_GetObjectItem(PARAMS,"tape_max");
                       if(tape_max!=RT_NULL){
@@ -991,6 +991,21 @@ int parseDtu(char *json_string)
                           }
                       }
                   }
+              }else if(strcmp(METHOD->valuestring,"filter_reset")==0) {   //{"jsonrpc":"2.0","method":"tape_reset","params":{"tape_max":50000},"id":1}
+                  flashdb_value.filter_used = 0;
+                  app_flashdb_save("filter_used", &flashdb_value.filter_used);
+                  if(PARAMS!=NULL&&PARAMS->type==cJSON_Object){
+                      cJSON* filter_max = cJSON_GetObjectItem(PARAMS,"filter_max");
+                      if(filter_max!=RT_NULL){
+                          flashdb_value.filter_max = filter_max->valueint;
+                          if(flashdb_value.filter_max>0){
+                              app_flashdb_save("filter_max", &flashdb_value.filter_max);
+                          }
+                      }
+                  }
+              }else if(strcmp(METHOD->valuestring,"selfclean")==0) {
+                  device_status.replace_filter_sw = 1;
+                  LOG_I("接收到自清洁指令!");
               }
               else{
                   LOG_W("未知的命令: %s", METHOD->valuestring);

+ 4 - 6
Application_cbd_apm32f1/applications/hmi.c

@@ -575,6 +575,10 @@ static void Ctr_Mortor_entry(void* parameter)
             DTU_Write(take_start);
             rt_free(take_start);
         }
+        if(device_status.replace_filter_sw==1){
+            Replace_Filter();
+            device_status.replace_filter_sw = 0;
+        }
         rt_thread_delay(100);
     }
 }
@@ -690,7 +694,6 @@ void Check_ParamConfig(void)
         device_status.collt_min_sh3 = 0;
         device_status.collt_min_eh3 = 0;
 
-        device_status.cold_sw = 0;
         device_status.heat_sw =0;
         device_status.cul_time = 1;
         device_status.run_sta = 0;
@@ -720,11 +723,8 @@ void Check_ParamConfig(void)
         ef_set_env_blob("version_type",&device_status.version_type,sizeof(device_status.version_type));        //版本类型
         ef_set_env_blob("env_t",&device_status.tempture,sizeof(device_status.tempture));        //温度
         ef_set_env_blob("env_h",&device_status.humidity,sizeof(device_status.humidity));        //湿度
-        ef_set_env_blob("platform",&device_status.mqttcfg1,sizeof(device_status.mqttcfg1));        //上传平台
 
         ef_set_env_blob("cul_time",&device_status.cul_time,sizeof(device_status.cul_time));     //采集时间
-        ef_set_env_blob("cold_sw",&device_status.cold_sw,sizeof(device_status.cold_sw));        //制冷开关
-        ef_set_env_blob("heat_sw",&device_status.heat_sw,sizeof(device_status.heat_sw));        //加热开关
         ef_set_env_blob("collecting_sh1",&device_status.collecting_sh1,sizeof(device_status.collecting_sh1));        //风机开关
         ef_set_env_blob("collecting_eh1",&device_status.collecting_eh1,sizeof(device_status.collecting_eh1));        //采集时间
         ef_set_env_blob("collecting_sh2",&device_status.collecting_sh2,sizeof(device_status.collecting_sh2));        //采集时间
@@ -787,8 +787,6 @@ void Check_ParamConfig(void)
         ef_get_env_blob("platform",&device_status.mqttcfg1,sizeof(device_status.mqttcfg1),NULL);                    //平台地址
         /*孢子仪*/
         ef_get_env_blob("cul_time",&device_status.cul_time,sizeof(device_status.cul_time),NULL);                    //培养时间
-        ef_get_env_blob("cold_sw",&device_status.cold_sw,sizeof(device_status.cold_sw),NULL);                       //制冷开关
-        ef_get_env_blob("heat_sw",&device_status.heat_sw,sizeof(device_status.heat_sw),NULL);                       //加热开关
         ef_get_env_blob("collecting_sh1",&device_status.collecting_sh1,sizeof(device_status.collecting_sh1),NULL);  //采集开始1
         ef_get_env_blob("collecting_eh1",&device_status.collecting_eh1,sizeof(device_status.collecting_eh1),NULL);  //采集结束1
         ef_get_env_blob("collecting_sh2",&device_status.collecting_sh2,sizeof(device_status.collecting_sh2),NULL);  //采集开始2

+ 2 - 1
Application_cbd_apm32f1/readme.md

@@ -1,7 +1,8 @@
 # 2026-08-18 更新说明
 	#define VERSION_BZY         "3.2.0"                   //孢子仪
 	1、电流采集适配PCBV2
-	2、
+	2、自清洁功能调整;
+	3、滤网重置
 # 2026-08-17 更新说明
 	#define VERSION_BZY         "3.1.0"                   //孢子仪2.1
 	1、为保证备用电池功能正常使用:

+ 1 - 1
CBD_FOTA_BootLoader/.settings/language.settings.xml

@@ -5,7 +5,7 @@
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
-			<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="1369183061114295484" id="ilg.gnuarmeclipse.managedbuild.cross.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT ARM Cross GCC Built-in Compiler Settings " parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="1302267756298846076" id="ilg.gnuarmeclipse.managedbuild.cross.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT ARM Cross GCC Built-in Compiler Settings " parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>