@@ -17,7 +17,7 @@
#define SENSOR_EN 0 //温湿度:0关闭,1打开
////////////////////////////////////////////////////////////////
-#define VERSION_BZY "2.5.7" //孢子仪
+#define VERSION_BZY "2.5.8" //孢子仪
/*********************************************************************/
@@ -1413,6 +1413,7 @@ static void Ctr_Mortor_entry(void* parameter)
LOG_D("等待Y轴电机完成复位!");
rt_thread_delay(1000);
}
+ rt_thread_delay(1000);
//Y轴电机运行到指定距离
slide_para.ydir = 1;
//slide_para.ydis = 3350;
@@ -1775,6 +1776,7 @@ void Check_ParamConfig(void)
{
device_status.timeSwitch = 0;
LOG_W("Time not set:%04d-%02d-%02d %02d:%02d:%02d",tm.tm_year+1900,tm.tm_mon+1,tm.tm_mday,tm.tm_hour,tm.tm_min,tm.tm_sec);
+ break;
connect_num = 0;
@@ -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="1370363418186249174" 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 "${INPUTS}"" prefer-non-shared="true">
+ <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 "${INPUTS}"" prefer-non-shared="true">
<language-scope id="org.eclipse.cdt.core.gcc"/>
<language-scope id="org.eclipse.cdt.core.g++"/>
</provider>