print_payload_as_hex

tapparelj · Dec 14, 2023 · a002311 · a002311
1 parent 2a1f4ec
commit a002311
Show file tree

Hide file tree

Showing 15 changed files with 60 additions and 35 deletions.
diff --git a/examples/lora_RX.py b/examples/lora_RX.py
@@ -7,7 +7,7 @@
 # GNU Radio Python Flow Graph
 # Title: Lora Rx
 # Author: Tapparel Joachim@EPFL,TCL
-# GNU Radio version: 3.10.5.1
+# GNU Radio version: v3.11.0.0git-604-gd7f88722
 
 from gnuradio import gr
 from gnuradio.filter import firdes
@@ -69,7 +69,7 @@ def __init__(self):
         self.lora_sdr_fft_demod_0 = lora_sdr.fft_demod( soft_decoding, True)
         self.lora_sdr_dewhitening_0 = lora_sdr.dewhitening()
         self.lora_sdr_deinterleaver_0 = lora_sdr.deinterleaver( soft_decoding)
-        self.lora_sdr_crc_verif_0 = lora_sdr.crc_verif( True, False)
+        self.lora_sdr_crc_verif_0 = lora_sdr.crc_verif( 1, False)
 
 
         ##################################################

diff --git a/examples/lora_TX.py b/examples/lora_TX.py
@@ -7,7 +7,7 @@
 # GNU Radio Python Flow Graph
 # Title: Lora Tx
 # Author: Tapparel Joachim@EPFL,TCL
-# GNU Radio version: 3.10.5.1
+# GNU Radio version: v3.11.0.0git-604-gd7f88722
 
 from gnuradio import blocks
 import pmt

diff --git a/examples/tx_rx_functionality_check.grc b/examples/tx_rx_functionality_check.grc
@@ -199,6 +199,7 @@ blocks:
     maxoutbuf: '0'
     minoutbuf: '0'
     num_ports: '1'
+    showports: 'False'
     type: complex
     vlen: '1'
   states:
@@ -241,7 +242,7 @@ blocks:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [1576, 252.0]
+    coordinate: [1584, 244.0]
     rotation: 0
     state: enabled
 - name: channels_channel_model_0
@@ -290,12 +291,12 @@ blocks:
     maxoutbuf: '0'
     minoutbuf: '0'
     output_crc_check: 'False'
-    print_rx_msg: 'True'
+    print_rx_msg: '1'
   states:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [256, 424.0]
+    coordinate: [248, 424.0]
     rotation: 180
     state: enabled
 - name: lora_sdr_deinterleaver_0
@@ -575,4 +576,4 @@ connections:
 
 metadata:
   file_format: 1
-  grc_version: 3.10.5.1
+  grc_version: v3.11.0.0git-604-gd7f88722
diff --git a/examples/tx_rx_functionality_check.py b/examples/tx_rx_functionality_check.py
@@ -7,7 +7,7 @@
 # GNU Radio Python Flow Graph
 # Title: Tx Rx Functionality Check
 # Author: Tapparel Joachim@EPFL,TCL
-# GNU Radio version: 3.10.5.1
+# GNU Radio version: v3.11.0.0git-604-gd7f88722
 
 from gnuradio import blocks
 import pmt
@@ -66,7 +66,7 @@ def __init__(self):
         self.lora_sdr_fft_demod_0 = lora_sdr.fft_demod( soft_decoding, True)
         self.lora_sdr_dewhitening_0 = lora_sdr.dewhitening()
         self.lora_sdr_deinterleaver_0 = lora_sdr.deinterleaver( soft_decoding)
-        self.lora_sdr_crc_verif_0 = lora_sdr.crc_verif( True, False)
+        self.lora_sdr_crc_verif_0 = lora_sdr.crc_verif( 1, False)
         self.lora_sdr_add_crc_0 = lora_sdr.add_crc(has_crc)
         self.channels_channel_model_0 = channels.channel_model(
             noise_voltage=(10**(-SNRdB/20)),

diff --git a/examples/tx_rx_hier_functionality_check.grc b/examples/tx_rx_hier_functionality_check.grc
@@ -321,4 +321,4 @@ connections:
 
 metadata:
   file_format: 1
-  grc_version: 3.10.5.1
+  grc_version: v3.11.0.0git-604-gd7f88722
diff --git a/examples/tx_rx_hier_functionality_check.py b/examples/tx_rx_hier_functionality_check.py
@@ -7,7 +7,7 @@
 # GNU Radio Python Flow Graph
 # Title: Tx Rx Hier Functionality Check
 # Author: Tapparel Joachim@EPFL,TCL
-# GNU Radio version: 3.10.5.1
+# GNU Radio version: v3.11.0.0git-604-gd7f88722
 
 from gnuradio import blocks
 import pmt

diff --git a/examples/tx_rx_simulation.py b/examples/tx_rx_simulation.py
@@ -7,7 +7,7 @@
 # GNU Radio Python Flow Graph
 # Title: Tx Rx Simulation
 # Author: Tapparel Joachim@EPFL,TCL
-# GNU Radio version: 3.10.5.1
+# GNU Radio version: v3.11.0.0git-604-gd7f88722
 
 from gnuradio import blocks
 import pmt
@@ -64,7 +64,7 @@ def __init__(self):
         self.lora_sdr_fft_demod_0 = lora_sdr.fft_demod( soft_decoding, False)
         self.lora_sdr_dewhitening_0 = lora_sdr.dewhitening()
         self.lora_sdr_deinterleaver_0 = lora_sdr.deinterleaver( soft_decoding)
-        self.lora_sdr_crc_verif_0 = lora_sdr.crc_verif( True, False)
+        self.lora_sdr_crc_verif_0 = lora_sdr.crc_verif( 1, False)
         self.lora_sdr_add_crc_0 = lora_sdr.add_crc(has_crc)
         self.channels_channel_model_0 = channels.channel_model(
             noise_voltage=(10**(-SNRdB/20)),

diff --git a/examples/tx_rx_usrp.grc b/examples/tx_rx_usrp.grc
@@ -239,7 +239,7 @@ blocks:
     maxoutbuf: '0'
     minoutbuf: '0'
     output_crc_check: 'False'
-    print_rx_msg: 'True'
+    print_rx_msg: '1'
   states:
     bus_sink: false
     bus_source: false
@@ -1236,4 +1236,4 @@ connections:
 
 metadata:
   file_format: 1
-  grc_version: 3.10.5.1
+  grc_version: v3.11.0.0git-604-gd7f88722
diff --git a/examples/tx_rx_usrp.py b/examples/tx_rx_usrp.py
@@ -7,7 +7,7 @@
 # GNU Radio Python Flow Graph
 # Title: Tx Rx Usrp
 # Author: Tapparel Joachim@EPFL,TCL
-# GNU Radio version: 3.10.5.1
+# GNU Radio version: v3.11.0.0git-604-gd7f88722
 
 from gnuradio import blocks
 import pmt
@@ -98,7 +98,7 @@ def __init__(self):
         self.lora_sdr_fft_demod_0 = lora_sdr.fft_demod( soft_decoding, False)
         self.lora_sdr_dewhitening_0 = lora_sdr.dewhitening()
         self.lora_sdr_deinterleaver_0 = lora_sdr.deinterleaver( soft_decoding)
-        self.lora_sdr_crc_verif_0 = lora_sdr.crc_verif( True, False)
+        self.lora_sdr_crc_verif_0 = lora_sdr.crc_verif( 1, False)
         self.lora_sdr_add_crc_0 = lora_sdr.add_crc(has_crc)
         self.blocks_multiply_const_vxx_0 = blocks.multiply_const_cc(10**((Att_dB)/20))
         self.blocks_multiply_const_vxx_0.set_min_output_buffer(10000000)

diff --git a/grc/lora_sdr_crc_verif.block.yml b/grc/lora_sdr_crc_verif.block.yml
@@ -8,16 +8,16 @@ parameters:
 -   id: print_rx_msg
     label: print_rx_msg
     dtype: enum
-    options: ['False', 'True']
-    option_labels: ['No', 'Yes']
+    options: [0, 1, 2]
+    option_labels: ['None', 'ASCII', 'Hex']
+    default: 1
 -   id: output_crc_check
     label: output_crc_check
     dtype: enum
     options: ['False', 'True']
     option_labels: ['No', 'Yes']
     default: 'False'
 
-
 inputs:
 -   domain: stream
     dtype: byte
@@ -42,7 +42,7 @@ documentation: |-
     Calculate the CRC of the received data and compare it with the received CRC.
       Parameters:
         rx_log: filename where to store the received messages and their timestamp, put "" for no log. "Walltime,payload\n"
-        print_rx_msg: Print or not the received message.
+        print_rx_msg: Print the received message in the terminal with the specified format. 0: None, 1: ASCII, 2: Hex
         output_crc_check: Ouput a stream of bytes containing either 0 or 1 based on the CRC check. If enabled, both stream output must be connected.
       Input:
         in: stream of payload bytes

diff --git a/include/gnuradio/lora_sdr/crc_verif.h b/include/gnuradio/lora_sdr/crc_verif.h
@@ -36,6 +36,11 @@ namespace gr {
     class LORA_SDR_API crc_verif : virtual public gr::block
     {
      public:
+     enum Print_type{
+      NONE,
+      ASCII,
+      HEX
+     };
       typedef std::shared_ptr<crc_verif> sptr;
 
       /*!
@@ -46,7 +51,7 @@ namespace gr {
        * class. lora_sdr::crc_verif::make is the public interface for
        * creating new instances.
        */
-      static sptr make(bool print_rx_msg, bool output_crc_check);
+      static sptr make(int print_rx_msg, bool output_crc_check);
     };
 
   } // namespace lora_sdr

diff --git a/lib/crc_verif_impl.cc b/lib/crc_verif_impl.cc
@@ -7,30 +7,32 @@
 #include "crc_verif_impl.h"
 
 #include <gnuradio/lora_sdr/utilities.h> // for print color
+#include "gnuradio/lora_sdr/crc_verif.h"
 
 namespace gr
 {
     namespace lora_sdr
     {
 
         crc_verif::sptr
-        crc_verif::make(bool print_rx_msg, bool output_crc_check)
+        crc_verif::make(int print_rx_msg, bool output_crc_check)
         {
             return gnuradio::get_initial_sptr(new crc_verif_impl(print_rx_msg, output_crc_check));
         }
 
         /*
          * The private constructor
          */
-        crc_verif_impl::crc_verif_impl(bool print_rx_msg, bool output_crc_check)
+        crc_verif_impl::crc_verif_impl(int print_rx_msg, bool output_crc_check)
             : gr::block("crc_verif",
                         gr::io_signature::make(1, 1, sizeof(uint8_t)),
                         gr::io_signature::make2(0, 2, sizeof(uint8_t), sizeof(uint8_t))),
-              print_rx_msg(print_rx_msg),
+                        print_rx_msg(print_rx_msg),
                   output_crc_check(output_crc_check)
         {
             message_port_register_out(pmt::mp("msg"));
             set_tag_propagation_policy(TPP_DONT);
+
         }
 
         /*
@@ -151,11 +153,19 @@ namespace gr
 		                curent_tag.offset = nitems_written(0);
 		                add_item_tag(0, curent_tag);
                     }
-
-                    if (print_rx_msg)
+                    if (print_rx_msg != NONE)
                     {
-                        std::cout << "rx msg: " << message_str << std::endl
-                                  << std::endl;
+                        if(print_rx_msg == ASCII)
+                            std::cout << "rx msg: " << message_str << std::endl;                        
+                        else if(print_rx_msg == HEX){
+                            std::cout << "rx msg: ";
+                            for (int i = 0; i < (int)m_payload_len; i++){
+                                std::cout << std::hex <<"0x"<< (int)in_buff[i] << std::dec;
+                                if(i != (int)m_payload_len-1)
+                                    std::cout << ", ";
+                            }
+                            std::cout << std::endl;
+                        }
 
                         if (crc_valid)
                             std::cout << "CRC valid!" << std::endl
@@ -191,8 +201,17 @@ namespace gr
                 }
                 cnt++;
                 in_buff.erase(in_buff.begin(), in_buff.begin() + m_payload_len );
-                if (print_rx_msg)
+                if (print_rx_msg == ASCII)
                     std::cout << "rx msg: " << message_str << std::endl;
+                else if(print_rx_msg == HEX){
+                    std::cout << "rx msg: ";
+                    for (int i = 0; i < (int)m_payload_len; i++){
+                        std::cout << std::hex <<"0x"<< (int)in_buff[i]<< std::dec;
+                        if(i != (int)m_payload_len-1)
+                            std::cout << ", ";
+                    }
+                    std::cout << std::endl;
+                }
                 message_port_pub(pmt::intern("msg"), pmt::mp(message_str));
 
                 return m_payload_len;

diff --git a/lib/crc_verif_impl.h b/lib/crc_verif_impl.h
@@ -18,7 +18,7 @@ namespace gr {
         char m_char;///< A new char of the payload
         bool new_frame; ///<indicate a new frame
         std::vector<uint8_t> in_buff;///< input buffer containing the data bytes and CRC if any
-        bool print_rx_msg;  ///< print received message in terminal or not
+        int print_rx_msg;  ///< print received message in terminal. 0: no print, 1: ASCII, 2: HEX
         bool output_crc_check; ///< output the result of the payload CRC check
         tag_t curent_tag; ///< the most recent tag for the packet we are currently processing
 
@@ -44,7 +44,7 @@ namespace gr {
         unsigned int crc16(uint8_t* data, uint32_t len);
 
      public:
-      crc_verif_impl(bool print_rx_msg, bool output_crc_check);
+      crc_verif_impl(int print_rx_msg, bool output_crc_check);
       ~crc_verif_impl();
 
       void forecast (int noutput_items, gr_vector_int &ninput_items_required);

diff --git a/python/lora_sdr/bindings/crc_verif_python.cc b/python/lora_sdr/bindings/crc_verif_python.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 Free Software Foundation, Inc.
+ * Copyright 2023 Free Software Foundation, Inc.
  *
  * This file is part of GNU Radio
  *
@@ -16,7 +16,7 @@
 /* BINDTOOL_GEN_AUTOMATIC(0) */
 /* BINDTOOL_USE_PYGCCXML(0) */
 /* BINDTOOL_HEADER_FILE(crc_verif.h)                                        */
-/* BINDTOOL_HEADER_FILE_HASH(f21d76dec9ed1d7a8019b05dbdcceee7) */
+/* BINDTOOL_HEADER_FILE_HASH(0c1080da98c3ced88d2f4a26b7d592da) */
 /***********************************************************************************/
 
 #include <pybind11/complex.h>

diff --git a/python/lora_sdr/bindings/docstrings/crc_verif_pydoc_template.h b/python/lora_sdr/bindings/docstrings/crc_verif_pydoc_template.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 Free Software Foundation, Inc.
+ * Copyright 2023 Free Software Foundation, Inc.
  *
  * This file is part of GNU Radio
  *