zhunk 1 год назад
Родитель
Сommit
7a1532ccc8

+ 1 - 1
Application_CBD/.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="-488933207592522130" 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="1271424796576257041" 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>

+ 14 - 7
Application_cbd_apm32f1/applications/control.c

@@ -971,6 +971,7 @@ void WorkTask_BZYV2(void)
         ctr_lamp(OFF,1);    //镇流器关=X轴开关:开
         ctr_swz(OFF);
         ctr_Collect_Fan(OFF);
+
         while(device_status.work_status ==0){
             rt_thread_delay(10000);
             LOG_W("等待设备进入工作");
@@ -1007,35 +1008,41 @@ void WorkTask_BZYV2(void)
 /* 入口函数-工作状态检测 */
 static void Work_status_thread_entry(void *parameter)
 {
-     while(1)
+     while(device_status.ds==1)
      {
          while(alarmCheck(device_status.collecting_sh1,device_status.collecting_eh1) == ON)
          {
              device_status.work_status = 1;
-             device_status.work_done = 1;
              LOG_I("the alarm1 workflag was ON");
+             device_status.work_done=1;
              rt_thread_delay(1000);
          }
-
+         //如果当前时间大于collecting_eh1,开始拍照
 
          while(alarmCheck(device_status.collecting_sh2,device_status.collecting_eh2) == ON)
          {
            device_status.work_status = 1;
-           device_status.work_done = 1;
+           device_status.work_done=1;
            LOG_I("the alarm2 workflag was ON");
            rt_thread_delay(1000);
          }
+         //如果当前时间大于collecting_eh2,开始拍照
 
          while(alarmCheck(device_status.collecting_sh3,device_status.collecting_eh3) == ON)
          {
-             device_status.work_done = 1;
              device_status.work_status = 1;
+             device_status.work_done=1;
              LOG_I("the alarm3 workflag was ON");
+
              rt_thread_delay(1000);
          }
-         //当前时间大于3段定时结束时间
          device_status.work_status = 0;
-         device_status.work_done = 0;
+         //如果当前时间大于
+         if(device_status.work_done!=0)
+         {
+             rt_thread_delay(1000*30);
+             device_status.work_done = 0;
+         }
          rt_thread_delay(1000);
      }
 }