t/gr-ieee802-11
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

no custom moving avg

Browse Source
This commit is contained in:
Bastian Bloessl
2018-10-04 10:06:47 +02:00
parent d730126586
commit 4cddc2b740
5 changed files with 0 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files
grc/ieee802_11_moving_average_xx.xml
-43
View File
@@ -1,43 +0,0 @@
<?xml version="1.0"?>
<block>
<name>Moving Average</name>
<key>ieee802_11_moving_average_xx</key>
<category>[IEEE802.11]</category>
<import>import ieee802_11</import>
<make>ieee802_11.moving_average_$(type.fcn)($length)</make>
<callback>set_length($length)</callback>
<param>
<name>Type</name>
<key>type</key>
<type>enum</type>
<option>
<name>Complex</name>
<key>complex</key>
<opt>fcn:cc</opt>
<opt>scale:complex</opt>
</option>
<option>
<name>Float</name>
<key>float</key>
<opt>fcn:ff</opt>
<opt>scale:real</opt>
</option>
</param>
<param>
<name>Length</name>
<key>length</key>
<value>48</value>
<type>int</type>
</param>
<sink>
<name>in</name>
<type>$type</type>
</sink>
<source>
<name>out</name>
<type>$type</type>
</source>
</block>
include/ieee802-11/CMakeLists.txt
-48
View File
@@ -14,60 +14,12 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
include(GrPython)
file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/generate_helper.py "
#!${PYTHON_EXECUTABLE}
import sys, os, re
sys.path.append('${GR_RUNTIME_PYTHONPATH}')
os.environ['srcdir'] = '${CMAKE_CURRENT_SOURCE_DIR}'
os.chdir('${CMAKE_CURRENT_BINARY_DIR}')
if __name__ == '__main__':
sys.path.append('${CMAKE_CURRENT_SOURCE_DIR}/../../python')
import build_utils
root, inp = sys.argv[1:3]
for sig in sys.argv[3:]:
name = re.sub ('X+', sig, root)
d = build_utils.standard_dict(name, sig, 'ieee802_11')
build_utils.expand_template(d, inp)
")
macro(expand_h root)
#make a list of all the generated files
unset(expanded_files_h)
foreach(sig ${ARGN})
string(REGEX REPLACE "X+" ${sig} name ${root})
list(APPEND expanded_files_h ${CMAKE_CURRENT_BINARY_DIR}/${name}.h)
endforeach(sig)
#create a command to generate the files
add_custom_command(
OUTPUT ${expanded_files_h}
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${root}.h.t
COMMAND ${PYTHON_EXECUTABLE} ${PYTHON_DASH_B}
${CMAKE_CURRENT_BINARY_DIR}/generate_helper.py
${root} ${root}.h.t ${ARGN}
)
#install rules for the generated h files
list(APPEND generated_includes ${expanded_files_h})
endmacro(expand_h)
expand_h(moving_average_XX ff cc)
add_custom_target(ieee802_11_generated_includes DEPENDS
${generated_includes}
)
########################################################################
# Install public header files
########################################################################
list(APPEND include_sources
${generated_includes}
api.h
chunks_to_symbols.h
constellations.h
lib/CMakeLists.txt
-73
View File
@@ -19,73 +19,6 @@
# Setup library
########################################################################
include(GrPlatform) #define LIB_SUFFIX
file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/generate_helper.py "
#!${PYTHON_EXECUTABLE}
import sys, os, re
sys.path.append('${GR_RUNTIME_PYTHONPATH}')
os.environ['srcdir'] = '${CMAKE_CURRENT_SOURCE_DIR}'
os.chdir('${CMAKE_CURRENT_BINARY_DIR}')
if __name__ == '__main__':
sys.path.append('${CMAKE_CURRENT_SOURCE_DIR}/../python')
import build_utils
root, inp = sys.argv[1:3]
for sig in sys.argv[3:]:
name = re.sub ('X+', sig, root)
d = build_utils.standard_dict(name, sig, 'ieee802_11')
build_utils.expand_template(d, inp, '_impl')
")
macro(expand_cc_h_impl root)
#make a list of all the generated files
unset(expanded_files_cc_impl)
unset(expanded_files_h_impl)
foreach(sig ${ARGN})
string(REGEX REPLACE "X+" ${sig} name ${root})
list(APPEND expanded_files_cc_impl ${CMAKE_CURRENT_BINARY_DIR}/${name}_impl.cc)
list(APPEND expanded_files_h_impl ${CMAKE_CURRENT_BINARY_DIR}/${name}_impl.h)
list(APPEND expanded_files_h ${CMAKE_CURRENT_BINARY_DIR}/../include/${name}.h)
endforeach(sig)
#create a command to generate the _impl.cc files
add_custom_command(
OUTPUT ${expanded_files_cc_impl}
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${root}_impl.cc.t
COMMAND ${PYTHON_EXECUTABLE} ${PYTHON_DASH_B}
${CMAKE_CURRENT_BINARY_DIR}/generate_helper.py
${root} ${root}_impl.cc.t ${ARGN}
)
#create a command to generate the _impl.h files
add_custom_command(
OUTPUT ${expanded_files_h_impl}
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${root}_impl.h.t
COMMAND ${PYTHON_EXECUTABLE} ${PYTHON_DASH_B}
${CMAKE_CURRENT_BINARY_DIR}/generate_helper.py
${root} ${root}_impl.h.t ${ARGN}
)
#make _impl.cc source files depend on headers to force generation
set_source_files_properties(${expanded_files_cc_impl}
PROPERTIES OBJECT_DEPENDS "${expanded_files_h_impl}"
)
#make _impl.h source files depend on headers to force generation
set_source_files_properties(${expanded_files_h_impl}
PROPERTIES OBJECT_DEPENDS "${expanded_files_h}"
)
#install rules for the generated cc files
list(APPEND generated_sources ${expanded_files_cc_impl})
endmacro(expand_cc_h_impl)
########################################################################
# Invoke macro to generate various sources
########################################################################
include (CheckCCompilerFlag)
CHECK_C_COMPILER_FLAG ("-msse2" SSE2_SUPPORTED)
@@ -94,15 +27,10 @@ if(SSE2_SUPPORTED)
add_definitions(-DIEEE80211_MSSE2)
endif(SSE2_SUPPORTED)
expand_cc_h_impl(moving_average_XX cc ff)
add_custom_target(ieee802_11_generated_sources DEPENDS ${generated_sources})
add_dependencies(ieee802_11_generated_sources ieee802_11_generated_includes)
########################################################################
# Setup library
########################################################################
list(APPEND gr_ieee802_11_sources
${generated_sources}
chunks_to_symbols_impl.cc
constellations_impl.cc
decode_mac.cc
@@ -140,7 +68,6 @@ list(APPEND gr_ieee802_11_libs
)
add_library(gnuradio-ieee802_11 SHARED ${gr_ieee802_11_sources})
add_dependencies(gnuradio-ieee802_11 ieee802_11_generated_sources)
target_link_libraries(gnuradio-ieee802_11 ${gr_ieee802_11_libs})
set_target_properties(gnuradio-ieee802_11 PROPERTIES DEFINE_SYMBOL "gnuradio_ieee802_11_EXPORTS")
swig/CMakeLists.txt
-2
View File
@@ -46,8 +46,6 @@ set(GR_SWIG_DOC_DIRS
${CMAKE_CURRENT_BINARY_DIR}/../include/ieee802-11/
)
set(GR_SWIG_TARGET_DEPS ieee802_11_generated_includes)
GR_SWIG_MAKE(ieee802_11_swig ieee802_11_swig.i)
########################################################################
swig/ieee802_11_swig.i
-6
View File
@@ -29,8 +29,6 @@
#include "ieee802-11/frame_equalizer.h"
#include "ieee802-11/mac.h"
#include "ieee802-11/mapper.h"
#include "ieee802-11/moving_average_cc.h"
#include "ieee802-11/moving_average_ff.h"
#include "ieee802-11/parse_mac.h"
#include "ieee802-11/signal_field.h"
#include "ieee802-11/sync_long.h"
@@ -51,8 +49,6 @@
%include "ieee802-11/frame_equalizer.h"
%include "ieee802-11/mac.h"
%include "ieee802-11/mapper.h"
%include "ieee802-11/moving_average_cc.h"
%include "ieee802-11/moving_average_ff.h"
%include "ieee802-11/parse_mac.h"
%include "ieee802-11/signal_field.h"
%include "ieee802-11/sync_long.h"
@@ -64,8 +60,6 @@ GR_SWIG_BLOCK_MAGIC2(ieee802_11, ether_encap);
GR_SWIG_BLOCK_MAGIC2(ieee802_11, frame_equalizer);
GR_SWIG_BLOCK_MAGIC2(ieee802_11, mac);
GR_SWIG_BLOCK_MAGIC2(ieee802_11, mapper);
GR_SWIG_BLOCK_MAGIC2(ieee802_11, moving_average_cc);
GR_SWIG_BLOCK_MAGIC2(ieee802_11, moving_average_ff);
GR_SWIG_BLOCK_MAGIC2(ieee802_11, parse_mac);
GR_SWIG_BLOCK_MAGIC2(ieee802_11, sync_long);
GR_SWIG_BLOCK_MAGIC2(ieee802_11, sync_short);