diff --git a/app_wells_0407/workspace1/wells/.settings/language.settings.xml b/app_wells_0407/workspace1/wells/.settings/language.settings.xml index e0aac1d..bbe1f9d 100644 --- a/app_wells_0407/workspace1/wells/.settings/language.settings.xml +++ b/app_wells_0407/workspace1/wells/.settings/language.settings.xml @@ -5,7 +5,7 @@ - + diff --git a/app_wells_0407/workspace1/wells/.settings/org.eclipse.core.resources.prefs b/app_wells_0407/workspace1/wells/.settings/org.eclipse.core.resources.prefs index 99f26c0..d8cbfe4 100644 --- a/app_wells_0407/workspace1/wells/.settings/org.eclipse.core.resources.prefs +++ b/app_wells_0407/workspace1/wells/.settings/org.eclipse.core.resources.prefs @@ -1,2 +1,3 @@ eclipse.preferences.version=1 +encoding//applications/main.c=UTF-8 encoding/=UTF-8 diff --git a/app_wells_0407/workspace1/wells/.settings/projcfg.ini b/app_wells_0407/workspace1/wells/.settings/projcfg.ini index cf43526..748b791 100644 --- a/app_wells_0407/workspace1/wells/.settings/projcfg.ini +++ b/app_wells_0407/workspace1/wells/.settings/projcfg.ini @@ -1,5 +1,5 @@ #RT-Thread Studio Project Configuration -#Wed Apr 09 16:56:57 CST 2025 +#Fri May 09 10:27:36 CST 2025 project_type=rtt chip_name=STM32L071RB cpu_name=None @@ -18,6 +18,6 @@ tool_chain=gcc uart_name=uart1 tx_pin_name=PA9 rtt_nano_path= -output_project_path=E\:\\project\\software_2025\\app_wells_0407\\workspace1 +output_project_path=D\:\\Documents\\00-Work\\05-DT-KNY-ZNFJ2405\\01-Wells_RTthread\\test_version\\app_wells_0407\\workspace1 hardware_adapter=J-Link project_name=wells diff --git a/app_wells_0407/workspace1/wells/app/app_gps.c b/app_wells_0407/workspace1/wells/app/app_gps.c index def3586..c2c68a7 100644 --- a/app_wells_0407/workspace1/wells/app/app_gps.c +++ b/app_wells_0407/workspace1/wells/app/app_gps.c @@ -63,7 +63,7 @@ bool app_gps_data_read(uint32_t *latitude, uint32_t *longitude) parse_flag = true; //热启动 - //if(gps_data.gps_warm_start == false) + if(gps_data.gps_warm_start == false) { break; } @@ -96,6 +96,10 @@ bool app_gps_data_read(uint32_t *latitude, uint32_t *longitude) if(parse_flag == true) { + if(gps_data.gps_warm_start == true) + { + gps_data.gps_warm_start = false; + } *latitude = gps_data.lat_value; *longitude = gps_data.lon_value; return true; diff --git a/app_wells_0407/workspace1/wells/applications/main.c b/app_wells_0407/workspace1/wells/applications/main.c index d08f0b8..d84bf94 100644 --- a/app_wells_0407/workspace1/wells/applications/main.c +++ b/app_wells_0407/workspace1/wells/applications/main.c @@ -121,13 +121,13 @@ int main(void) app_iwdg_refresh(); //开启GPS电源 - LOG_OUT("gps_reset wait\r\n"); +// LOG_OUT("gps_reset wait\r\n"); gps_init_cmd(); rt_thread_mdelay(1000); //设置距离传感器 - LOG_OUT("distance_reset wait\r\n"); +// LOG_OUT("distance_reset wait\r\n"); bsp_distance_signal(); rt_thread_mdelay(1000);