yf_zjb 3 лет назад
Родитель
Сommit
ea9f9d01c7

+ 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="1349501965847690381" 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="1349771054540304169" 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>

+ 26 - 26
Application_CBD/applications/control.c

@@ -65,6 +65,7 @@ uint8_t ctr_Fan_IN(uint8_t status_ws)
 }
 /****************************定制色诱*************************************/
 /**/
+#if Color_EN == 1
 uint8_t Read_Color_Key(rt_base_t key_pin)
 {
     rt_uint32_t sta_s = 0;
@@ -99,19 +100,19 @@ int ctr_Color_board(uint8_t forward,uint16_t time_board)
 {
     if(forward==CLOSE)  //归位
     {
-        if(device_status.cul_time>7) device_status.cul_time=7;
-        if(device_status.cul_time!=7)
-        {
-            uint8_t ct = device_status.cul_time;
-            while(1)
-            {
-                Beep_Tip(100);
-                rt_thread_delay(100);
-                ct--;
-                if(ct==0) break;
-            }
-            //return device_status.cul_time;
-        }
+//        if(device_status.cul_time>7) device_status.cul_time=7;
+//        if(device_status.cul_time!=7)
+//        {
+//            uint8_t ct = device_status.cul_time;
+//            while(1)
+//            {
+//                Beep_Tip(100);
+//                rt_thread_delay(100);
+//                ct--;
+//                if(ct==0) break;
+//            }
+//            //return device_status.cul_time;
+//        }
         if(Read_Color_Limit(LIMIT_RESET)==0)
         {
             LOG_W("已在初始位置!");
@@ -122,12 +123,12 @@ int ctr_Color_board(uint8_t forward,uint16_t time_board)
         ctr_cangmen_up(CLOSE);
         rt_thread_delay(10000);
         ctr_cangmen_up(OFF);
-        if(device_status.cul_time==7&&Read_Color_Limit(LIMIT_BOARD)==0)
-        {
-            LOG_W("第七天!!!");
-            ctr_cangmen_down(CLOSE);
-            rt_thread_delay(500);
-        }
+//        if(device_status.cul_time==7&&Read_Color_Limit(LIMIT_BOARD)==0)
+//        {
+//            LOG_W("第七天!!!");
+//            ctr_cangmen_down(CLOSE);
+//            rt_thread_delay(500);
+//        }
         LOG_W("先打开运行到限位的右侧!");
         while(Read_Color_Limit(LIMIT_BOARD)==0)
         {
@@ -173,8 +174,6 @@ int ctr_Color_board(uint8_t forward,uint16_t time_board)
             rt_thread_delay(10000);
             ctr_cangmen_up(OFF);
         if(device_status.cul_time>1)
-        device_status.cul_time--;
-        ef_set_env_blob("cul_time",&device_status.cul_time,sizeof(device_status.cul_time));     //采集时间
         return 2;
     }
     else if(forward==OPEN)
@@ -211,9 +210,9 @@ int ctr_Color_board(uint8_t forward,uint16_t time_board)
         ctr_cangmen_up(OPEN);
         rt_thread_delay(10000);
         ctr_cangmen_up(OFF);
-        if(device_status.cul_time<7)
-        device_status.cul_time++;
-        ef_set_env_blob("cul_time",&device_status.cul_time,sizeof(device_status.cul_time));     //采集时间
+//        if(device_status.cul_time<7)
+//        device_status.cul_time++;
+//        ef_set_env_blob("cul_time",&device_status.cul_time,sizeof(device_status.cul_time));     //采集时间
         return OPEN;
     }
     else if (forward==RESET) {
@@ -246,10 +245,11 @@ int ctr_Color_board(uint8_t forward,uint16_t time_board)
         }
         ctr_cangmen_down(OFF);
     }
-    device_status.cul_time = 0;
-    ef_set_env_blob("cul_time",&device_status.cul_time,sizeof(device_status.cul_time));     //采集时间
+//    device_status.cul_time = 0;
+    //ef_set_env_blob("cul_time",&device_status.cul_time,sizeof(device_status.cul_time));     //采集时间
     return RESET;   //复位返回0
 }
+#endif
 /**************************机器人********************************/
 void ctr_Motor_Robot(uint8_t status_ws)
 {

+ 5 - 5
Application_CBD/applications/hmi.c

@@ -1204,7 +1204,6 @@ static void Ctr_Mortor_entry(void* parameter)
    /*孢子仪拍照数量*/
    rt_uint16_t photo_setup = 0;
    #if Color_EN ==1
-   if(device_status.cul_time==0)
    ctr_Color_board(RESET, 800);
    #endif
     while(1)
@@ -1774,12 +1773,13 @@ void Check_ParamConfig(void)
         rt_sprintf(device_status.net,"1");
         rt_sprintf(device_status.csq,"0");
         rt_sprintf(device_status.sim,"1");
+
         ctr_router(ON);
         Hmi_Fresh();
-         #if Color_EN == 1
-         Control_clear();
-         Control_heat();
-         #endif
+        #if Color_EN == 1
+        Control_clear();
+        Control_heat();
+        #endif
         if(device_status.dtype!=7)
         {
             Control_clear();

+ 2 - 1
Application_CBD/drivers/board.c

@@ -155,7 +155,8 @@ void HAL_TIM_MspPostInit(TIM_HandleTypeDef* htim)
     GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
     GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
     HAL_GPIO_Init(GPIOC, &GPIO_InitStruct);
-    //__HAL_AFIO_REMAP_TIM3_ENABLE();
+    //吸虫塔屏蔽下面这行,孢子仪打开
+    __HAL_AFIO_REMAP_TIM3_ENABLE();
 
   /* USER CODE BEGIN TIM3_MspPostInit 1 */