xavierarteaga
commented
6 months ago Hi,
Many thanks for your interest. I had a look and there were a couple of mistakes.
Could you try the following patch (edited):
diff --git a/lib/phy/lower/processors/uplink/uplink_processor_impl.cpp b/lib/phy/lower/processors/uplink/uplink_processor_impl.cpp
index 3eb15a14f2..89872af40c 100644
--- a/lib/phy/lower/processors/uplink/uplink_processor_impl.cpp
+++ b/lib/phy/lower/processors/uplink/uplink_processor_impl.cpp
@@ -120,7 +120,7 @@ void lower_phy_uplink_processor_impl::process_symbol_boundary(const baseband_gat
baseband_gateway_timestamp timestamp)
{
// Calculate the subframe index.
- unsigned i_sf = timestamp / nof_samples_per_subframe;
+ unsigned i_sf = static_cast<uint64_t>((timestamp / nof_samples_per_subframe) % (NOF_SFNS * NOF_SUBFRAMES_PER_FRAME));
// Calculate the sample index within the subframe.
unsigned i_sample_sf = timestamp % nof_samples_per_subframe;
diff --git a/lib/radio/uhd/radio_uhd_impl.cpp b/lib/radio/uhd/radio_uhd_impl.cpp
index d7c0b7dcb6..28b95f6bbb 100644
--- a/lib/radio/uhd/radio_uhd_impl.cpp
+++ b/lib/radio/uhd/radio_uhd_impl.cpp
@@ -259,9 +259,6 @@ radio_session_uhd_impl::radio_session_uhd_impl(const radio_configuration::radio&
}
}
- bool is_locked = false;
- std::string sensor_name;
-
// Set sync source.
if (!device.set_sync_source(radio_config.clock)) {
fmt::print("Error: couldn't set sync source: {}\n", device.get_error_message());
@@ -271,21 +268,20 @@ radio_session_uhd_impl::radio_session_uhd_impl(const radio_configuration::radio&
// Set GPS time if GPSDO is selected.
if (radio_config.clock.sync == radio_configuration::clock_sources::source::GPSDO) {
set_time_to_gps_time();
- }
- // Select oscillator sensor name.
- if (radio_config.clock.sync == radio_configuration::clock_sources::source::GPSDO) {
- sensor_name = "gps_locked";
- } else {
- sensor_name = "ref_locked";
+ if (!wait_sensor_locked("gps_locked", true, CLOCK_TIMEOUT_MS)) {
+ // It blocks until sync source is locked.
+ fmt::print("Could not lock reference GPS time source.\n");
+ return;
+ }
}
// Wait until external reference / GPS is locked.
if (radio_config.clock.clock == radio_configuration::clock_sources::source::GPSDO ||
radio_config.clock.clock == radio_configuration::clock_sources::source::EXTERNAL) {
- // blocks until clock source is locked
- if (not wait_sensor_locked(sensor_name, true, CLOCK_TIMEOUT_MS)) {
- fmt::print("Could not lock reference clock source. Sensor: {}={}.\n", sensor_name, is_locked ? "true" : "false");
+ // It blocks until clock source is locked.
+ if (!wait_sensor_locked("ref_locked", true, CLOCK_TIMEOUT_MS)) {
+ fmt::print("Could not lock reference clock source.\n");
return;
}
}
@@ -314,6 +310,7 @@ radio_session_uhd_impl::radio_session_uhd_impl(const radio_configuration::radio&
radio_config.clock.sync != radio_configuration::clock_sources::source::GPSDO) {
device.set_time_unknown_pps(uhd::time_spec_t());
}
// Lists of stream descriptions.
std::vector<radio_uhd_tx_stream::stream_description> tx_stream_description_list;
diff --git a/lib/radio/uhd/radio_uhd_tx_stream.cpp b/lib/radio/uhd/radio_uhd_tx_stream.cpp
index 6326d42f50..d4d9e5ba0c 100644
--- a/lib/radio/uhd/radio_uhd_tx_stream.cpp
+++ b/lib/radio/uhd/radio_uhd_tx_stream.cpp
@@ -81,7 +81,8 @@ void radio_uhd_tx_stream::run_recv_async_msg()
// Enqueue the task again.
if (not async_executor.defer([this]() { run_recv_async_msg(); })) {
- fmt::print(stderr, "Unable to run recv async UHD stream task");
+ fmt::print(stderr, "Unable to run recv async UHD stream task\n");
+ state_fsm.async_task_stopped();
}
}
@@ -347,4 +348,4 @@ void radio_uhd_tx_stream::wait_stop()
unsigned radio_uhd_tx_stream::get_buffer_size() const
{
return max_packet_size;
-}
\ No newline at end of file
+}
diff --git a/lib/ru/generic/ru_controller_generic_impl.cpp b/lib/ru/generic/ru_controller_generic_impl.cpp
index 10b9d0b434..5c9d3d6eda 100644
--- a/lib/ru/generic/ru_controller_generic_impl.cpp
+++ b/lib/ru/generic/ru_controller_generic_impl.cpp
@@ -24,11 +24,14 @@ ru_controller_generic_impl::ru_controller_generic_impl(std::vector<lower_phy_con
void ru_controller_generic_impl::start()
{
- // Calculate starting time from the radio current time plus one hundred milliseconds and rounded to the next subframe.
+ // Calculate starting time from the radio current time plus one hundred milliseconds.
double delay_s = 0.1;
baseband_gateway_timestamp current_time = radio.read_current_time();
baseband_gateway_timestamp start_time = current_time + static_cast<uint64_t>(delay_s * srate_MHz * 1e6);
- start_time = divide_ceil(start_time, static_cast<uint64_t>(srate_MHz * 1e3)) * static_cast<uint64_t>(srate_MHz * 1e3);
+
+ // Round start time to the next subframe.
+ uint64_t sf_duration = static_cast<uint64_t>(srate_MHz * 1e3);
+ start_time = divide_ceil(start_time, sf_duration) * sf_duration;
radio.start(start_time);Let us know how it goes.
Kind regards, Xavier
baolindong
pgawlowicz
Issue Description
[Describe the issue in detail] When using the GPS signal as a synchronization signal, I found that the judgment of the sensor reading in the code may be wrong. The specific problem is that the sensor can actually be read successfully and stored, but the code judgment result is that the sensor reading is unsuccessful.
I tried to modify the code. USRP can be successfully set to GPS time, but after setting it to GPS time, there will be a serious delay problem.
Setup Details
[Specify details of the test setup. This would help us reproduce the problem reliably] e.g. Network configuration, Operation System, Hardware, RF front-end, library and driver versions My network configuration profile ：
My Operation System is Ubuntu 22.04.4 LTS, RF front-end is usrp B210, uhd version is 4.4.0
Expected Behavior
[What you expect to happen] I want the base station to work properly when using gps signal as sync signal.
Actual Behaviour
[What happens instead e.g. error message] When the clock is changed to gpsdo in the configuration file, an error of failure to read the sensor will be displayed (the actual sensor has been successfully read). After modifying the judgment conditions, usrp can set the time to gps time, but a serious time out occur.
Steps to reproduce the problem
[Tell us how to reproduce this issue e.g. RF setup, application config files]
Additional Information
[Any additional information, configuration or data that might be necessary to reproduce the issue] I think the code that determines the error in reading the sensor is:
I tried to make some modifications to the code. After modification, I can set the GPS time, but there will be a time out problem.