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

+ 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="-434655199918149018" 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>

+ 0 - 45
Application_cbd_apm32f1/applications/hmi.c

@@ -1043,51 +1043,6 @@ static void HMI_Decode(void)
         rt_free(var);
         LOG_D("震动时间设置:%d",device_status.shake_sec);
     }
-    //切换大数据平台
-    else if (strstr(rx_buffer,"8.136.98.49")!=NULL)
-    {
-        memset(device_status.json_w_platform,0,sizeof(device_status.json_w_platform));
-        rt_sprintf(device_status.mqttcfg1, "8.136.98.49");
-        ef_set_env_blob("platform", &device_status.mqttcfg1, sizeof(device_status.mqttcfg1));
-        //给RTU发送切换指令
-        if(strstr(device_status.project,"DTU_CBD")!=NULL)
-        {
-            DTU_Write("%s",makeJson_platform("8.136.98.49"));
-            rt_free(makeJson_platform("8.136.98.49"));
-            rt_thread_delay(1000);
-        }
-        //2022/06/23,add:
-        rt_sprintf(device_status.json_w_platform,"屏幕操作:切换平台:8.136.98.49,操作时间:%s",device_status.stamp);
-        json_temp = makeJson_Warn(device_status.json_w_platform, "切换平台");
-        ef_set_env_blob("json_w_platform", &device_status.json_w_platform, sizeof(device_status.json_w_platform));   //将修改屏幕参数操作记录保存到Flash中
-        if(atoi(device_status.net)==0)
-            DTU_Write("%s",json_temp);
-        rt_free(json_temp);
-        rt_thread_delay(1000);
-        MA_save();
-    }
-    else if (strstr(rx_buffer,"120.27.222.26")!=NULL)
-    {
-        memset(device_status.json_w_platform,0,sizeof(device_status.json_w_platform));
-        rt_sprintf(device_status.mqttcfg1, "120.27.222.26");
-        ef_set_env_blob("platform", &device_status.mqttcfg1, sizeof(device_status.mqttcfg1));
-        //给RTU发送切换指令
-        if(strstr(device_status.project,"DTU_CBD")!=NULL)
-        {
-            DTU_Write("%s",makeJson_platform("120.27.222.26"));
-            rt_free(makeJson_platform("120.27.222.26"));
-            rt_thread_delay(1000);
-        }
-        //2022/06/23,add:
-        rt_sprintf(device_status.json_w_platform,"屏幕操作:切换平台:120.27.222.26,操作时间:%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);
-        json_temp = makeJson_Warn(device_status.json_w_platform, "切换平台");
-        ef_set_env_blob("json_w_platform", &device_status.json_w_platform, sizeof(device_status.json_w_platform));   //将修改屏幕参数操作记录保存到Flash中
-        if(atoi(device_status.net)==0)
-            DTU_Write("%s",json_temp);
-        rt_free(json_temp);
-        rt_thread_delay(1000);
-        MA_save();
-    }
     //恢复出厂设置电池
     else if (strstr(rx_buffer,"resetdcDefault")!=NULL)
     {