diff --git a/uwb/calibration.conf b/uwb/calibration.conf index efbed76..1605d2b 100644 --- a/uwb/calibration.conf +++ b/uwb/calibration.conf @@ -1,12 +1,12 @@ # common calibration file -ant0.ch5.ant_delay=10:40:00:00 -ant0.ch9.ant_delay=10:40:00:00 +ant0.ch5.ant_delay=2B:40:00:00 +ant0.ch9.ant_delay=15:40:00:00 ant1.ch5.ant_delay=10:40:00:00 ant1.ch9.ant_delay=10:40:00:00 -ant2.ch5.ant_delay=10:40:00:00 -ant2.ch9.ant_delay=10:40:00:00 +ant2.ch5.ant_delay=20:40:00:00 +ant2.ch9.ant_delay=0C:40:00:00 ant3.ch5.ant_delay=10:40:00:00 ant3.ch9.ant_delay=10:40:00:00 diff --git a/uwb/configuration.conf b/uwb/configuration.conf index cadbf01..613d789 100644 --- a/uwb/configuration.conf +++ b/uwb/configuration.conf @@ -8,22 +8,22 @@ [FIRA]ant_sets.ch9.range.tx_ant_set_ranging = 2 [FIRA]ant_sets.ch5.azimuth.rx_ant_set_nonranging = 1 [FIRA]ant_sets.ch5.azimuth.rx_ant_set_ranging = 1 -[FIRA]ant_sets.ch5.azimuth.tx_ant_set_nonranging = 3 -[FIRA]ant_sets.ch5.azimuth.tx_ant_set_ranging = 3 +[FIRA]ant_sets.ch5.azimuth.tx_ant_set_nonranging = 1 +[FIRA]ant_sets.ch5.azimuth.tx_ant_set_ranging = 1 [FIRA]ant_sets.ch9.azimuth.rx_ant_set_nonranging = 1 [FIRA]ant_sets.ch9.azimuth.rx_ant_set_ranging = 1 -[FIRA]ant_sets.ch9.azimuth.tx_ant_set_nonranging = 3 -[FIRA]ant_sets.ch9.azimuth.tx_ant_set_ranging = 3 +[FIRA]ant_sets.ch9.azimuth.tx_ant_set_nonranging = 1 +[FIRA]ant_sets.ch9.azimuth.tx_ant_set_ranging = 1 [FIRA]ant_sets.ch5.azimuth_elevation.rx_ant_set_nonranging = 1 [FIRA]ant_sets.ch5.azimuth_elevation.rx_ant_set_ranging_azimuth = 1 [FIRA]ant_sets.ch5.azimuth_elevation.rx_ant_set_ranging_elevation = 0 -[FIRA]ant_sets.ch5.azimuth_elevation.tx_ant_set_nonranging = 3 -[FIRA]ant_sets.ch5.azimuth_elevation.tx_ant_set_ranging = 3 +[FIRA]ant_sets.ch5.azimuth_elevation.tx_ant_set_nonranging = 1 +[FIRA]ant_sets.ch5.azimuth_elevation.tx_ant_set_ranging = 1 [FIRA]ant_sets.ch9.azimuth_elevation.rx_ant_set_nonranging = 1 [FIRA]ant_sets.ch9.azimuth_elevation.rx_ant_set_ranging_azimuth = 1 [FIRA]ant_sets.ch9.azimuth_elevation.rx_ant_set_ranging_elevation = 0 -[FIRA]ant_sets.ch9.azimuth_elevation.tx_ant_set_nonranging = 3 -[FIRA]ant_sets.ch9.azimuth_elevation.tx_ant_set_ranging = 3 +[FIRA]ant_sets.ch9.azimuth_elevation.tx_ant_set_nonranging = 1 +[FIRA]ant_sets.ch9.azimuth_elevation.tx_ant_set_ranging = 1 [CCC]ant_sets.ch5.range.rx_ant_set_nonranging = 2 [CCC]ant_sets.ch5.range.rx_ant_set_ranging = 2 @@ -37,13 +37,13 @@ [HAL]session_error_monitor_enable = 1 # Antenna Configuration -wifi_sw_cfg=01 +wifi_sw_cfg=fe ant0.config=03 ant1.config=13 ant2.config=02 ant3.config=12 -# Dual Rx (for Tx ANT3) +# Ranging Antenna TX / Two Chain Operation ant_grp0.rf_config.rfoff=00 ant_grp0.rf_config.tx=03 ant_grp0.rf_config.tx_aoa=03 @@ -55,14 +55,14 @@ ant_grp0.rf_config.rx_sts3=0e ant_grp0.ext_sw_config=00 ant_grp0.lna_rxa=01 ant_grp0.lna_rxb=01 -ant_grp0.rx_config=04 +ant_grp0.rx_config=05 ant_grp0.pdoa_segments=02:07:00:00:00:00 -ant_grp0.pdoa_type=01:00:00 +ant_grp0.pdoa_type=00:00:00 ant_grp0.tx_power_control=00 ant_grp0.ch5.pdoa.axisx.lut_id=00 ant_grp0.ch9.pdoa.axisy.lut_id=01 -# Dual Rx (for Tx ANT3) +# Patch Antenna TX / Two Chain Operation ant_grp1.rf_config.rfoff=00 ant_grp1.rf_config.tx=03 ant_grp1.rf_config.tx_aoa=03 @@ -71,7 +71,7 @@ ant_grp1.rf_config.rx_sts0=0e ant_grp1.rf_config.rx_sts1=0e ant_grp1.rf_config.rx_sts2=0e ant_grp1.rf_config.rx_sts3=0e -ant_grp1.ext_sw_config=00 +ant_grp1.ext_sw_config=01 ant_grp1.lna_rxa=01 ant_grp1.lna_rxb=01 ant_grp1.rx_config=04 @@ -81,38 +81,34 @@ ant_grp1.tx_power_control=00 ant_grp1.ch5.pdoa.axisx.lut_id=00 ant_grp1.ch9.pdoa.axisy.lut_id=01 -# Tx ANT2, Dual Rx (for Tx ANT2) +# Ranging Antenna TX / One Chain Operation ant_grp2.rf_config.rfoff=00 ant_grp2.rf_config.tx=03 ant_grp2.rf_config.tx_aoa=03 -ant_grp2.rf_config.rx_ip=0e -ant_grp2.rf_config.rx_sts0=0e -ant_grp2.rf_config.rx_sts1=0e -ant_grp2.rf_config.rx_sts2=0e -ant_grp2.rf_config.rx_sts3=0e +ant_grp2.rf_config.rx_ip=05 +ant_grp2.rf_config.rx_sts0=05 +ant_grp2.rf_config.rx_sts1=05 +ant_grp2.rf_config.rx_sts2=05 +ant_grp2.rf_config.rx_sts3=05 ant_grp2.ext_sw_config=00 -ant_grp2.lna_rxa=01 +ant_grp2.lna_rxa=00 ant_grp2.lna_rxb=01 -ant_grp2.rx_config=05 -ant_grp2.pdoa_segments=02:07:00:00:00:00 -ant_grp2.pdoa_type=00:00:00 +ant_grp2.rx_config=01 ant_grp2.tx_power_control=00 -# Tx ANT3, Dual Rx (for Tx ANT3) +# Patch Antenna TX / One Chain Operation ant_grp3.rf_config.rfoff=00 ant_grp3.rf_config.tx=03 ant_grp3.rf_config.tx_aoa=03 -ant_grp3.rf_config.rx_ip=0e -ant_grp3.rf_config.rx_sts0=0e -ant_grp3.rf_config.rx_sts1=0e -ant_grp3.rf_config.rx_sts2=0e -ant_grp3.rf_config.rx_sts3=0e +ant_grp3.rf_config.rx_ip=06 +ant_grp3.rf_config.rx_sts0=06 +ant_grp3.rf_config.rx_sts1=06 +ant_grp3.rf_config.rx_sts2=06 +ant_grp3.rf_config.rx_sts3=06 ant_grp3.ext_sw_config=01 ant_grp3.lna_rxa=01 -ant_grp3.lna_rxb=01 -ant_grp3.rx_config=05 -ant_grp3.pdoa_segments=02:07:00:00:00:00 -ant_grp3.pdoa_type=00:00:00 +ant_grp3.lna_rxb=00 +ant_grp3.rx_config=00 ant_grp3.tx_power_control=00 pdoa_lut0.data=de:e6:6f:f3:8b:e8:6f:f3:38:ea:6f:f3:e5:eb:6f:f3:92:ed:6f:f3:3f:ef:72:f6:ec:f0:11:f8:99:f2:4a:f9:45:f4:54:fa:f2:f5:44:fb:9f:f7:22:fc:4c:f9:f3:fc:f9:fa:bd:fd:a6:fc:81:fe:53:fe:41:ff:00:00:00:00:ad:01:bf:00:5a:03:7f:01:07:05:43:02:b4:06:0d:03:61:08:de:03:0e:0a:bc:04:bb:0b:ac:05:67:0d:b6:06:14:0f:ef:07:c1:10:8e:09:6e:12:91:0c:1b:14:91:0c:c8:15:91:0c:75:17:91:0c:22:19:91:0c