bug fixes thx Bill B

This commit is contained in:
Max 2022-09-22 13:26:20 -04:00
parent 16e8b53fbf
commit 1cd344a838
4 changed files with 37 additions and 4 deletions

View File

@ -14,6 +14,8 @@ if [ ! -d op25/gr-op25 ]; then
exit
fi
TOP_DIR=$PWD
sudo apt-get update
sudo apt-get build-dep gnuradio
sudo apt-get install gnuradio gnuradio-dev gr-osmosdr librtlsdr-dev libuhd-dev libhackrf-dev libitpp-dev libpcap-dev cmake git swig build-essential pkg-config doxygen python3-numpy python3-waitress python3-requests python3-pip pybind11-dev clang-format libsndfile1-dev
@ -46,6 +48,9 @@ sudo make install
sudo ldconfig
cd ../
cd $TOP_DIR/op25
sh ../scripts/do_sedpy.sh
echo ======
echo ====== NOTICE
echo ======

View File

@ -104,9 +104,14 @@ void bind_message(py::module& m)
.def("to_string",&message::to_string,
D(message,to_string)
)
//.def("to_string",&message::to_string,
// D(message,to_string)
//)
.def("to_string",
[](std::shared_ptr<message> msg) {
std::string s = msg->to_string();
return py::bytes(s); // Return the data without transcoding
})
;

View File

@ -156,7 +156,7 @@ class p25_rx_block (gr.top_block):
self.rtl_found = True
gain_names = self.src.get_gain_names()
for name in gain_names:
if 0: # pending fix crash ### for name in gain_names:
range1 = self.src.get_gain_range(name)
print ("gain: name: %s range: start %d stop %d step %d" % (name, range1[0].start(), range1[0].stop(), range1[0].step()))
if options.gains:

23
scripts/do_sedpy.sh Executable file
View File

@ -0,0 +1,23 @@
#! /bin/sh
me=$0
py=`find . -type f -name '*.py' | grep -v doxy`
files=`grep -l 'filter\.firdes\.WIN_' $py`
for f in $files; do
echo $me editing $f
sed -i 's/filter\.firdes\.WIN_/fft.window.WIN_/' $f
done
files=`grep -l 'gr\.msg_queue' $py`
for f in $files; do
echo $me editing $f
sed -i 's/gr\.msg_queue/op25.msg_queue/' $f
done
files=`grep -l 'gr\.message' $py`
for f in $files; do
echo $me editing $f
sed -i 's/gr\.message/op25.message/' $f
done