zhunk 7 месяцев назад
Родитель
Сommit
42ceee5adc

+ 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="1337693036051043708" 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="-446626834515254951" 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 - 2
Application_cbd_apm32f1/applications/control.c

@@ -945,10 +945,11 @@ void WorkTask_BZYV2(void)
 /* 入口函数-工作状态检测 */
 static void Work_status_thread_entry(void *parameter)
 {
+    static uint32_t takephoto_cnt = 0;
      while(1)
      {
-
-         if(device_status.ds==0||device_status.temp_status==1){
+         if(device_status.ds==0||
+            device_status.temp_status==1){
              device_status.work_status = 0;
              rt_thread_delay(5000);
              continue;
@@ -981,12 +982,23 @@ static void Work_status_thread_entry(void *parameter)
              rt_thread_delay(1000);
          }
          device_status.work_status = 0;
+
+         if(device_status.autotakepic==2){
+             takephoto_cnt++;
+         }else{
+             takephoto_cnt=0;
+         }
+         if(takephoto_cnt==3600){
+             device_status.autotakepic = 0;
+             takephoto_cnt = 0;
+         }
          //如果当前时间大于
          if(device_status.work_done!=0)
          {
              rt_thread_delay(1000*30);
              device_status.work_done = 0;
          }
+
          rt_thread_delay(1000);
      }
 }

+ 1 - 1
Application_cbd_apm32f1/applications/control.h

@@ -16,7 +16,7 @@
 //定制相关//////////////////////////////////////////////////////
 #define SENSOR_EN        1              //温湿度:0关闭,1打开
 ////////////////////////////////////////////////////////////////
-#define VERSION_BZY         "2.7.17"                   //孢子仪
+#define VERSION_BZY         "2.7.18"                   //孢子仪
 
 /*********************************************************************/
 typedef struct  _packed