diff --git a/config/config.json b/config/config.json index 55ef912..5d42831 100644 --- a/config/config.json +++ b/config/config.json @@ -176,7 +176,7 @@ "function_name": "adsb_read", "data_type": "BIN_Blank_Text", "buffer_size": 200000, - "use_system_time": true + "ignore_msg_time": true }, { "type": "File_Data_Source", @@ -197,7 +197,7 @@ "file_path": "D:\\ae\\proj\\projects\\ECAP_Server\\data\\BIN_Blank_Text\\ADS-B_195_0205.txt", "data_type": "BIN_Blank_Text", "play_mode": "loop", - "use_system_time": true + "ignore_msg_time": true } ] }, diff --git a/module/Local_Server/Data_Source/Data_Source.h b/module/Local_Server/Data_Source/Data_Source.h index ffe32ca..ebf6b36 100644 --- a/module/Local_Server/Data_Source/Data_Source.h +++ b/module/Local_Server/Data_Source/Data_Source.h @@ -59,7 +59,7 @@ public: double lat{}; double lon{}; double alt{}; - Psc::Copyable_Atomic use_system_time; // 如果启用那么收到消息会自动使用操作系统的时间解析位置, 应对时间戳错的情况 + Psc::Copyable_Atomic ignore_msg_time = false; // 忽略消息时间戳 如果启用 解码位置将不在判断消息自带时间戳 Psc::Copyable_Atomic update_form_gps{}; Psc::Copyable_Atomic show_icao = true; Psc::Copyable_Atomic show_call_sign = false; diff --git a/module/Local_Server/Data_Source/Data_Source_Handler.cpp b/module/Local_Server/Data_Source/Data_Source_Handler.cpp index d553419..7cfad9d 100644 --- a/module/Local_Server/Data_Source/Data_Source_Handler.cpp +++ b/module/Local_Server/Data_Source/Data_Source_Handler.cpp @@ -182,7 +182,7 @@ void Data_Source_Handler::handle_mode_s(std::shared_ptr mode_s_ auto& cfg = Global::instance()->mode_acs; bool time_space_filter = cfg.time_space_filter.load(); bool speed_filter = cfg.speed_filter.load(); - bool use_system_time = source->use_system_time.load(); + bool use_system_time = source->ignore_msg_time.load(); SSR::ADS_B_T::Constraint air_constraint{cfg.max_speed_m_s, cfg.air_pos_timeout, SSR::cpr_cb, time_space_filter, speed_filter, use_system_time}; SSR::ADS_B_T::Constraint surface_constraint{cfg.max_speed_m_s, cfg.surface_pos_timeout, SSR::cpr_cb, time_space_filter, speed_filter, use_system_time}; SSR::parse_mode_s_bin(source.get(), mode_s_msg,