zhunk 1 rok temu
rodzic
commit
d9f50d2bad

+ 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="-436559387563516312" 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="-406456977695124745" 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>

+ 1 - 1
Application_cbd_apm32f1/.settings/projcfg.ini

@@ -1,5 +1,5 @@
 #RT-Thread Studio Project Configuration
-#Wed Jun 18 17:01:42 CST 2025
+#Fri Jun 20 15:41:08 CST 2025
 project_type=rtt
 chip_name=STM32F103RE
 cpu_name=None

+ 1 - 1
Application_cbd_apm32f1/applications/beep.c

@@ -150,7 +150,7 @@ static int init_tim2(void)
     }
 
     /* 设置定时器超时值为5s并启动定时器 */
-    timeout_s.sec = 0;      /* 秒 */
+    timeout_s.sec = 1;      /* 秒 */
     timeout_s.usec = 500000;     /* 微秒 */ //100ms
     if (rt_device_write(hw_dev, 0, &timeout_s, sizeof(timeout_s)) != sizeof(timeout_s))
     {

+ 3 - 1
Application_cbd_apm32f1/applications/dtu_uart2.c

@@ -1003,11 +1003,13 @@ char * makeJson()
         cJSON_AddNumberToObject(pJsonRoot, "CONTRIL", !device_status.timeSwitch);
         cJSON_AddNumberToObject(pJsonRoot, "TT", device_status.sunBar);
         cJSON_AddNumberToObject(pJsonRoot, "WS", device_status.work_status);
-        cJSON_AddNumberToObject(pJsonRoot, "TPS", device_status.tpl);
+        cJSON_AddNumberToObject(pJsonRoot, "TPS", device_status.temp_status);
         cJSON_AddNumberToObject(pJsonRoot, "RPS", device_status.rain_status);
         cJSON_AddNumberToObject(pJsonRoot, "LPS", device_status.sun_status);
         cJSON_AddNumberToObject(pJsonRoot, "TEMPERATURE", 20.2);
         cJSON_AddNumberToObject(pJsonRoot, "HUMIDITY", 60.2);
+        cJSON_AddNumberToObject(pJsonRoot, "VOLTAGE", atof(device_status.voltage));
+        cJSON_AddNumberToObject(pJsonRoot, "CURRENT", atof(device_status.power));
         char *p = cJSON_PrintUnformatted(pJsonRoot);
         if(NULL == p)
         {

+ 2 - 62
Application_cbd_apm32f1/applications/hmi.c

@@ -1561,68 +1561,8 @@ static void Ctr_Mortor_entry(void* parameter)
         }else{
             photo_led_sec = 900;
         }
-        /*对焦拍照*/
-        if(device_status.autotakepic==1)
-        {
-            DTU_Write("autotakephoto");
-            HMI_WRITE("sysTest.auto_flag.txt=\"Autotest\"");
-            //打开步进电机驱动器电源
-            ctr_lamp(ON, 1);
-            //打开补光灯
-            ctr_led(ON);
-            //电机向下运动
-            ctr_Motor_Driver(1, 1, 1000000,1000);
-            rt_thread_delay(1000);
-            LOG_I("电机到达下方!!!");
-            Hk_Take_io();
-            rt_thread_delay(1000);
-            LOG_I("电机开始向上!!!");
-            rt_pin_write(Motor_EN, 1);
-            rt_pin_write(Motor_DIR, 0);
-            beep_set(1000000, 200000);      //2kzh - 50%
-            while(rt_pin_read(LIMIT_UP)==1)
-            {
-                HMI_WRITE("sysTest.result.txt=\"对焦拍照触发次数:%d\"",photo_setup);
-                HMI_WRITE("sysTest.auto_flag.txt=\"AutoTeststart\"");
-                rt_pin_write(Motor_EN, 0);
-                beep_set(0, 0);//驱动器失能
-                Hk_Take_io();              //触发拍照
-                rt_thread_mdelay(200);   //10ms
-                rt_pin_write(Motor_EN, 1);
-                beep_set(1000000, 200000); //驱动器使能
-                rt_thread_mdelay(100);   //10ms
-                beep_set(0, 0); //驱动器失能
-                rt_pin_write(Motor_EN, 0);
-                if(photo_setup>300)         //限制最大拍照数量
-                {
-                    ctr_led(OFF);
-                    device_status.autotakepic=0;
-                    rt_pin_write(Motor_EN, 0); //驱动器失能
-                    beep_set(1000000, 0);      //2kzh - 50%
-                    HMI_WRITE("sysTest.switchAutopic.val=%d",0);
-                    HMI_WRITE("sysTest.auto_flag.txt=\"\"");
-                    ctr_lamp(OFF, 1);
-                    break;
-                }
-                photo_setup++;
-                LOG_I("对焦拍照:%d",photo_setup);
-            }
-            DTU_Write("takephotodone");
-            ctr_led(OFF);
-            rt_pin_write(Motor_EN, 0); //驱动器失能
-            beep_set(1000000, 0);      //2kzh - 50%
-            HMI_WRITE("sysTest.switchAutopic.val=%d",0);
-            device_status.autotakepic=0;
-            photo_setup = 0;
-            HMI_WRITE("sysTest.auto_flag.txt=\"\"");
-            HMI_WRITE("sysTest.switchAutopic.val=%d",0);
-            //关闭步进电机驱动器电源
-            ctr_lamp(OFF, 1);
-            //重置运行标志位
-            device_status.run_sta = 0;
-            ef_set_env_blob("run_sta", &device_status.run_sta, sizeof(device_status.run_sta));
-         }
-        else if (device_status.autotakepic==10) {
+
+        if (device_status.autotakepic==10) {
             //hwtimer2_pwm3_output(1,500000,1,0);
             ctr_Motor86_move(13000,50,1);
             device_status.autotakepic = 0;