Skip to content

Commit

Permalink
Merge pull request #1 from EttusResearch/maint-1.1
Browse files Browse the repository at this point in the history
OARER V1.1 Release
  • Loading branch information
dylan-baros authored Mar 31, 2022
2 parents 97f63f9 + 54d5848 commit 14fba57
Show file tree
Hide file tree
Showing 49 changed files with 4,934 additions and 212 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
## Expected Behavior ##
<!--- [What you expect to happen] -->

## Actual Behaviour ##
## Actual Behavior ##
<!--- [What happens instead e.g. error message] -->

## Steps to reproduce the problem ##
Expand Down
9 changes: 5 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
.vscode/settings.json
build/
.vscode/c_cpp_properties.json
**/.vscode
uhd_GitSource
tools/temp/
**/temp
**/build
**/__pycache__

21 changes: 0 additions & 21 deletions .vscode/launch.json

This file was deleted.

5 changes: 5 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ target_link_libraries(UHD_BOOST INTERFACE ${UHD_LIBRARIES} ${Boost_LIBRARIES})
########################################################################

add_subdirectory(lib)
add_subdirectory(docs)

########################################################################
# Make the executable
Expand Down Expand Up @@ -97,6 +98,10 @@ add_executable(Arch_txrx_fullduplex examples/Arch_txrx_fullduplex.cpp)
message(STATUS "Linking Arch_txrx_fullduplex.")
target_link_libraries(Arch_txrx_fullduplex PRIVATE UHD_BOOST Arch_lib)

add_executable(Arch_pipe examples/Arch_pipe.cpp)
message(STATUS "Linking Arch_pipe.")
target_link_libraries(Arch_pipe PRIVATE UHD_BOOST Arch_lib)

add_executable(Arch_dynamic_tx examples/Arch_dynamic_tx.cpp)
message(STATUS "Linking Arch_dynamic_tx.")
target_link_libraries(Arch_dynamic_tx PRIVATE UHD_BOOST Arch_lib)
Expand Down
4 changes: 0 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
# Development Branch!

You are currently in the development branch of the Open Architecture for Radar and EW Research. Please checkout either a tagged release or a stable branch. This Development branch has the latest features that the team is working on. There will likely be bugs and some features may not be completely implemented. Developing applications based off this branch is not recommended. Use this branch to watch and give feedback on what we are currently working on!

# Open Architecture for Radar and EW Research

Welcome to the Open Architecture for Radar and EW Research software distribution. refarch-multich is the free and open-source reference architecture code for building a multi-channel USRP-based Radar and EW Research system, designed by NI.
Expand Down
90 changes: 90 additions & 0 deletions config/01-network-manager-all.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,90 @@
# Let NetworkManager manage all devices on this system
network:
version: 2
renderer: NetworkManager
ethernets:
enp193s0f0:
addresses: [192.168.50.1/24]
gateway4: 0.0.0.0
mtu: 9000
#usrp 0
#NIC C
enp193s0f1:
addresses: [192.168.60.1/24]
gateway4: 0.0.0.0
mtu: 9000
#usrp 1
enp193s0f2:
addresses: [192.168.70.1/24]
gateway4: 0.0.0.0
mtu: 9000
#usrp 2
enp193s0f3:
addresses: [192.168.80.1/24]
gateway4: 0.0.0.0
mtu: 9000
#usrp 3
enp1s0f0:
addresses: [192.168.30.1/24]
gateway4: 0.0.0.0
mtu: 9000
#usrp 4
#NIC B
enp1s0f1:
addresses: [192.168.40.1/24]
gateway4: 0.0.0.0
mtu: 9000
#usrp 5
enp1s0f2:
addresses: [192.168.10.1/24]
gateway4: 0.0.0.0
mtu: 9000
#usrp 6
enp1s0f3:
addresses: [192.168.20.1/24]
gateway4: 0.0.0.0
mtu: 9000
#usrp 7
enp37s0f0:
addresses: [192.168.11.1/24]
gateway4: 0.0.0.0
mtu: 9000
#usrp 8
#NIC A
enp37s0f1:
addresses: [192.168.12.1/24]
gateway4: 0.0.0.0
mtu: 9000
#usrp 9
enp37s0f2:
addresses: [192.168.13.1/24]
gateway4: 0.0.0.0
mtu: 9000
#usrp 10
enp37s0f3:
addresses: [192.168.14.1/24]
gateway4: 0.0.0.0
mtu: 9000
#usrp 11
enp225s0f0:
addresses: [192.168.15.1/24]
gateway4: 0.0.0.0
mtu: 9000
#usrp 12
#NIC D
enp225s0f1:
addresses: [192.168.16.1/24]
gateway4: 0.0.0.0
mtu: 9000
#usrp 13
enp225s0f2:
addresses: [192.168.17.1/24]
gateway4: 0.0.0.0
mtu: 9000
#usrp 14
enp225s0f3:
addresses: [192.168.18.1/24]
gateway4: 0.0.0.0
mtu: 9000
#usrp 15

7 changes: 7 additions & 0 deletions config/export_uhd_lib.sh
Original file line number Diff line number Diff line change
@@ -1 +1,8 @@
#!/bin/bash
#
# Copyright 2010-2012,2014-2015 Ettus Research LLC
# Copyright 2021 Ettus Research, a National Instruments Company
#
# SPDX-License-Identifier: GPL-3.0-or-later
#
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib
2 changes: 1 addition & 1 deletion config/nicrb.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash
#
# Copyright 2021 Ettus Research, a National Instruments Company
# Copyright 2021-2022 Ettus Research, a National Instruments Brand
#
# SPDX-License-Identifier: GPL-3.0-or-later
#
Expand Down
3 changes: 1 addition & 2 deletions config/sysctrl_config.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#!/bin/bash
#
# Copyright 2010-2012,2014-2015 Ettus Research LLC
# Copyright 2021 Ettus Research, a National Instruments Company
# Copyright 2021-2022 Ettus Research, a National Instruments Brand
#
# SPDX-License-Identifier: GPL-3.0-or-later
#
Expand Down
Loading

0 comments on commit 14fba57

Please sign in to comment.