fix snr block

tkn-tub · Sep 20, 2023 · 8cf6fd9 · 8cf6fd9
1 parent 89bff09
commit 8cf6fd9
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 10 deletions.
diff --git a/examples/rl-wifi-rt/gr-grgym-ieee802-11/grgym/grc/gnugym_gnugym_snr_cb.block.yml b/examples/rl-wifi-rt/gr-grgym-ieee802-11/grgym/grc/gnugym_gnugym_snr_cb.block.yml
@@ -7,8 +7,8 @@ category: '[gnugym]'
 parameters:
 -   id: algo
     label: Algorithm
-    dtype: int
-    default: gnugym.LS
+    dtype: raw
+    default: gnugym.LS_SNR
     options: [gnugym.LS_SNR, gnugym.LMS_SNR, gnugym.COMB_SNR, gnugym.STA_SNR]
     option_labels: [LS, LMS, COMB, STA]
     category: standard
@@ -52,7 +52,7 @@ outputs:
 
 templates:
     imports: from gnuradio import gnugym
-    make: gnugym.gnugym_snr_cb(${algo}, ${freq}, ${bw}, ${log}, ${debug})
+    make: gnuradio.gnugym.gnugym_snr_cb(${algo}, ${freq}, ${bw}, ${log}, ${debug})
     callbacks:
     - set_algorithm(${algo})
     - set_frequency(${freq})

diff --git a/examples/rl-wifi-rt/gr-grgym-ieee802-11/grgym/include/gnuradio/gnugym/gnugym_snr_cb.h b/examples/rl-wifi-rt/gr-grgym-ieee802-11/grgym/include/gnuradio/gnugym/gnugym_snr_cb.h
@@ -26,16 +26,17 @@
 #include <gnuradio/gnugym/api.h>
 #include <gnuradio/block.h>
 
-enum EqualizerSNR {
-	LS_SNR   = 0,
-	LMS_SNR  = 1,
-	COMB_SNR = 2,
-	STA_SNR  = 3,
-};
 
 namespace gr {
   namespace gnugym {
 
+    enum EqualizerSNR {
+        LS_SNR   = 0,
+        LMS_SNR  = 1,
+        COMB_SNR = 2,
+        STA_SNR  = 3,
+    };
+
     /*!
      * \brief <+description of block+>
      * \ingroup gnugym

diff --git a/examples/rl-wifi-rt/gr-grgym-ieee802-11/grgym/python/bindings/gnugym_snr_cb_python.cc b/examples/rl-wifi-rt/gr-grgym-ieee802-11/grgym/python/bindings/gnugym_snr_cb_python.cc
@@ -14,7 +14,7 @@
 /* BINDTOOL_GEN_AUTOMATIC(0)                                                       */
 /* BINDTOOL_USE_PYGCCXML(0)                                                        */
 /* BINDTOOL_HEADER_FILE(gnugym_snr_cb.h)                                        */
-/* BINDTOOL_HEADER_FILE_HASH(986d5b15d6f5f548f32a988f90bb9392)                     */
+/* BINDTOOL_HEADER_FILE_HASH(d930e70495011579c07d3e490e77d4d3)                     */
 /***********************************************************************************/
 
 #include <pybind11/complex.h>
@@ -44,6 +44,17 @@ void bind_gnugym_snr_cb(py::module& m)
 
 
         ;
+
+
+        py::enum_<::gr::gnugym::EqualizerSNR>(m,"EqualizerSNR")
+        .value("LS_SNR", ::gr::gnugym::LS_SNR) // 0
+        .value("LMS_SNR", ::gr::gnugym::LMS_SNR) // 1
+        .value("COMB_SNR", ::gr::gnugym::COMB_SNR) // 2
+        .value("STA_SNR", ::gr::gnugym::STA_SNR) // 3
+        .export_values()
+    ;
+
+    py::implicitly_convertible<int, ::gr::gnugym::EqualizerSNR>();