Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rename #1131

Closed
wants to merge 48 commits into from
Closed

Rename #1131

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
482c652
add open5G_rx submodule
catkira Mar 14, 2023
261e957
add folder for open5G_rx library
catkira Mar 14, 2023
17de3d7
add Makefile for open5G_rx
catkira Mar 14, 2023
a00b9d4
add Makefile open5G_rx_constr.ttcl open5G_rx_ip.tcl
catkira Mar 14, 2023
eb53b9c
add bus definitions to open5G_rx_ip.tcl
catkira Mar 14, 2023
bd42aca
add missing file to open5G_rx_ip.tcl
catkira Mar 15, 2023
6fcfc26
add FFT_demod tap file creating to open5G_rx_ip.tcl
catkira Mar 15, 2023
12396ae
improve open5G_rx_ip.tcl
catkira Mar 16, 2023
d75c93a
WIP
catkira Mar 16, 2023
678b521
use system python in open5G_rx_ip.tcl
catkira Mar 17, 2023
4181300
create pluto5G project
catkira Mar 27, 2023
f78fca0
Merge branch 'open5G' of github.com:catkira/adi-hdl into open5G
catkira Mar 27, 2023
aac7443
simplift synthesis script to use Vivado's python3.8 (tested with Viva…
catkira Mar 29, 2023
ffe51a9
- remove decimator und interpolator
catkira Mar 29, 2023
a8ba1a5
add open5G_rx core to pluto5G project
catkira Mar 30, 2023
3ac399d
update open5G_rx submodule
catkira Mar 30, 2023
ff5e2a9
Create a new branch antsdr, add support for ANTSDR
black-pigeon Jun 19, 2021
0487361
Edit the ANTSDR hdl project makefile
black-pigeon Jun 22, 2021
ef9bda1
Edit Block Diagram paramter, enable SD card
black-pigeon Jul 8, 2021
15840e8
add support for antsdr e310
black-pigeon Aug 12, 2021
42f1c43
ddr width fixed
black-pigeon Aug 28, 2021
f16935f
edit rf switch xdc
black-pigeon Feb 19, 2022
ea184c5
add ant5G
catkira Apr 1, 2023
998b4f3
fix: set adi_env.tcl path to new location
catkira Apr 1, 2023
30aec3d
add open5G_rx to ant5G
catkira Apr 1, 2023
78ee861
add missing core to open5G_rx_ip.tcl
catkira Apr 3, 2023
1fb2ebb
add false path constraint for input fifo CDC
catkira Apr 4, 2023
1058be5
add false path constraint for reset CDC from clk_i to sample_clk_i
catkira Apr 4, 2023
745b6d1
update open5G_rx submodule
catkira Apr 6, 2023
4f2d06b
change complex_multiplier.v to complex_multiplier.sv
catkira Apr 8, 2023
40f7f46
update open5G_rx submodule
catkira Apr 9, 2023
92880cc
update to new open5G_rx submodule and fix tcl files
catkira Apr 11, 2023
64bccbd
rename project name from ant5G to ant_5G
catkira Apr 18, 2023
780e108
udpate open5G_rx submodule
catkira Apr 20, 2023
9fd5b35
update open5G_rx submodule
catkira Apr 20, 2023
b0e0f2f
add missing tvalid connection from ad936x to open5G_rx
catkira Apr 20, 2023
5ff3686
add missing parameters for open5G_rx instantiation
catkira Apr 20, 2023
50e10f5
update submodule
catkira Apr 20, 2023
f66aa25
udpate open5G_rx submodule
catkira Apr 23, 2023
3777209
update open5G_rx submodule
catkira Apr 24, 2023
3414938
update open5G_rx submodule
catkira Apr 25, 2023
19cef44
udpate open5G_rx submodule
catkira Apr 25, 2023
c1a2689
update open5G_rx submodule
catkira May 1, 2023
dc81ffc
update open5G_rx submodule
catkira May 2, 2023
caa8210
specify HALF_CP_ADVANCE parameter of Open5G_rx core
catkira May 2, 2023
9a68635
set HALF_CP_ADVANCE = 1
catkira May 4, 2023
3469bfb
update open5G_rx submodule
catkira May 8, 2023
83c409f
rename open5G_rx to open5G_phy
catkira May 25, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "submodules/open5G_rx"]
path = submodules/open5G_phy
url = https://github.com/catkira/open5G_phy.git
8 changes: 8 additions & 0 deletions library/open5G_phy/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
LIBRARY_NAME := open5G_phy

GENERIC_DEPS += hdl/receiver.sv

XILINX_DEPS += open5G_phy_ip.tcl
XILINX_DEPS += open5G_phy_constr.ttcl

include ../scripts/library.mk
1 change: 1 addition & 0 deletions library/open5G_phy/hdl
5 changes: 5 additions & 0 deletions library/open5G_phy/open5G_phy_constr.ttcl
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<: set ComponentName [getComponentNameString] :>
<: setOutputDirectory "./" :>
<: setFileName [ttcl_add $ComponentName "_constr"] :>
<: setFileExtension ".xdc" :>
<: setFileProcessingOrder late :>
144 changes: 144 additions & 0 deletions library/open5G_phy/open5G_phy_ip.tcl
Original file line number Diff line number Diff line change
@@ -0,0 +1,144 @@
# ip

source ../../scripts/adi_env.tcl
source $ad_hdl_dir/library/scripts/adi_ip_xilinx.tcl

global VIVADO_IP_LIBRARY

exec -ignorestderr python3 -m pip install -U --user pip
exec -ignorestderr python3 -m pip install --user --no-deps py3gpp
exec python3 ../../submodules/open5G_rx/tools/generate_FFT_demod_tap_file.py --NFFT=8 --CP_LEN=18 --CP_ADVANCE=9 --OUT_DW=16
exec python3 ../../submodules/open5G_rx/tools/generate_PSS_tap_file.py --PSS_LEN=128 --TAP_DW=32 --N_id_2=0
exec python3 ../../submodules/open5G_rx/tools/generate_PSS_tap_file.py --PSS_LEN=128 --TAP_DW=32 --N_id_2=1
exec python3 ../../submodules/open5G_rx/tools/generate_PSS_tap_file.py --PSS_LEN=128 --TAP_DW=32 --N_id_2=2

adi_ip_create open5G_phy
set_property part xc7z010clg400-1 [current_project]
set proj_fileset [get_filesets sources_1]
add_files -norecurse -scan_for_includes -fileset $proj_fileset [list \
"hdl/receiver.sv" \
"hdl/receiver_regmap.sv" \
"hdl/dot_product.sv" \
"hdl/Peak_detector.sv" \
"hdl/atan.sv" \
"hdl/atan2.sv" \
"hdl/div.sv" \
"hdl/LFSR/LFSR.sv" \
"hdl/AXI_lite_interface.sv" \
"hdl/AXIS_FIFO.sv" \
"hdl/CFO_calc.sv" \
"hdl/frame_sync.sv" \
"hdl/channel_estimator.sv" \
"hdl/axis_fifo_asym.sv" \
"hdl/demap.sv" \
"hdl/PSS_correlator.sv" \
"hdl/PSS_correlator_mr.sv" \
"hdl/PSS_detector.sv" \
"hdl/PSS_detector_regmap.sv" \
"hdl/ressource_grid_subscriber.sv" \
"hdl/SSS_detector.sv" \
"hdl/axis_axil_fifo.sv" \
"hdl/FFT_demod.sv" \
"hdl/FFT/fft/fft.v" \
"hdl/FFT/fft/int_fftNk.v" \
"hdl/FFT/fft/int_dif2_fly.v" \
"hdl/FFT/math/cmult/int_cmult_dsp48.v" \
"hdl/FFT/math/cmult/int_cmult18x25_dsp48.v" \
"hdl/FFT/math/cmult/int_cmult_dbl18_dsp48.v" \
"hdl/FFT/math/cmult/int_cmult_dbl35_dsp48.v" \
"hdl/FFT/math/cmult/int_cmult_trpl18_dsp48.v" \
"hdl/FFT/math/cmult/int_cmult_trpl52_dsp48.v" \
"hdl/FFT/math/mults/mlt35x25_dsp48e1.v" \
"hdl/FFT/math/mults/mlt35x27_dsp48e2.v" \
"hdl/FFT/math/mults/mlt42x18_dsp48e1.v" \
"hdl/FFT/math/mults/mlt44x18_dsp48e2.v" \
"hdl/FFT/math/mults/mlt52x25_dsp48e1.v" \
"hdl/FFT/math/mults/mlt52x27_dsp48e2.v" \
"hdl/FFT/math/mults/mlt59x18_dsp48e1.v" \
"hdl/FFT/math/mults/mlt61x18_dsp48e2.v" \
"hdl/FFT/math/int_addsub_dsp48.v" \
"hdl/FFT/buffers/dynamic_block_scaling.v" \
"hdl/FFT/buffers/inbuf_half_path.v" \
"hdl/FFT/buffers/outbuf_half_path.v" \
"hdl/FFT/buffers/int_bitrev_order.v" \
"hdl/FFT/twiddle/rom_twiddle_int.v" \
"hdl/FFT/twiddle/row_twiddle_tay.v" \
"hdl/FFT/delay/int_align_fft.v" \
"hdl/FFT/delay/int_delay_line.v" \
"hdl/CIC/cic_d.sv" \
"hdl/CIC/comb.sv" \
"hdl/CIC/integrator.sv" \
"hdl/CIC/downsampler.sv" \
"hdl/CIC/downsampler_variable.sv" \
"hdl/DDS/dds.sv" \
"hdl/complex_multiplier/complex_multiplier.sv" \
"hdl/axil_interconnect_wrap_1x4.v" \
"hdl/verilog-axi/axil_interconnect.v" \
"hdl/verilog-axi/arbiter.v" \
"hdl/verilog-axi/priority_encoder.v"]

set_property top receiver $proj_fileset
update_compile_order -fileset sources_1

adi_ip_properties_lite open5G_phy
set_property vendor_display_name Catkira [ipx::current_core]
set_property vendor Catkira [ipx::current_core]
set_property company_url http://www.github.com/catkira/open5G_rx [ipx::current_core]
set_property display_name "Open5G_phy" [ipx::current_core]
set_property description "Open5G PHY" [ipx::current_core]
adi_ip_ttcl open5G_rx "open5G_rx_constr.ttcl"

set project_dir [get_property DIRECTORY [current_project]]/
set_property value $project_dir [ipx::get_user_parameters TAP_FILE_PATH -of_objects [ipx::current_core]]
set_property value $project_dir [ipx::get_hdl_parameters TAP_FILE_PATH -of_objects [ipx::current_core]]

adi_add_bus "s_axis_in" "slave" \
"xilinx.com:interface:axis_rtl:1.0" \
"xilinx.com:interface:axis:1.0" \
{
{"s_axis_in_tvalid" "TVALID"} \
{"s_axis_in_tdata" "TDATA"} \
}
adi_add_bus_clock "sample_clk_i" "s_axis_in"

adi_add_bus "m_axis_out" "master" \
"xilinx.com:interface:axis_rtl:1.0" \
"xilinx.com:interface:axis:1.0" \
{
{"m_axis_out_tvalid" "TVALID"} \
{"m_axis_out_tdata" "TDATA"} \
}

adi_ip_infer_mm_interfaces open5G_phy
set memory_maps [ipx::get_memory_maps * -of_objects [ipx::current_core]]
foreach map $memory_maps {
ipx::remove_memory_map [lindex $map 2] [ipx::current_core]
}

set raddr_width [expr [get_property SIZE_LEFT [ipx::get_ports -nocase true s_axi_if_araddr -of_objects [ipx::current_core]]] + 1]
set waddr_width [expr [get_property SIZE_LEFT [ipx::get_ports -nocase true s_axi_if_awaddr -of_objects [ipx::current_core]]] + 1]
if {$raddr_width != $waddr_width} {
puts [format "WARNING: AXI address width mismatch for %s (r=%d, w=%d)" $ip_name $raddr_width, $waddr_width]
set range 65536
} else {
if {$raddr_width >= 16} {
set range 65536
} else {
set range [expr 1 << $raddr_width]
}
}

ipx::add_memory_map {s_axi_if} [ipx::current_core]
set_property slave_memory_map_ref {s_axi_if} [ipx::get_bus_interfaces s_axi_if -of_objects [ipx::current_core]]
ipx::add_address_block {axi_lite} [ipx::get_memory_maps s_axi_if -of_objects [ipx::current_core]]
set_property range $range [ipx::get_address_blocks axi_lite \
-of_objects [ipx::get_memory_maps s_axi_if -of_objects [ipx::current_core]]]
#ipx::associate_bus_interfaces -clock clk_i -reset reset_n [ipx::current_core]
adi_add_bus_clock "clk_i" "m_axis_out:s_axi_if" "reset_n"

#ipx::infer_bus_interface reset_ni xilinx.com:signal:reset_rtl:1.0 [ipx::current_core]
#ipx::add_bus_parameter POLARITY [ipx::get_bus_interfaces reset_ni -of_objects [ipx::current_core]]
#set_property value ACTIVE_LOW [ipx::get_bus_parameters POLARITY -of_objects [ipx::get_bus_interfaces reset_ni -of_objects [ipx::current_core]]]

ipx::create_xgui_files [ipx::current_core]
ipx::save_core [ipx::current_core]
21 changes: 21 additions & 0 deletions projects/ant/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
####################################################################################
## Copyright 2018(c) Analog Devices, Inc.
## Auto-generated, do not modify!
####################################################################################

PROJECT_NAME := ant

M_DEPS += ../common/xilinx/adi_fir_filter_constr.xdc
M_DEPS += ../common/xilinx/adi_fir_filter_bd.tcl
M_DEPS += ../../library/common/ad_iobuf.v
M_DEPS += ../../library/util_cdc/sync_bits.v
M_DEPS += ../../library/common/util_pulse_gen.v
M_DEPS += ../../library/common/ad_bus_mux.v
M_DEPS += ../../library/axi_ad9361/axi_ad9361_delay.tcl

LIB_DEPS += axi_ad9361
LIB_DEPS += axi_dmac
LIB_DEPS += util_pack/util_cpack2
LIB_DEPS += util_pack/util_upack2

include ../scripts/project-xilinx.mk
Loading