From d68a6301d906208197671e41245b5f8102c9d90c Mon Sep 17 00:00:00 2001
From: Nicholas Corgan <n.corgan@gmail.com>
Date: Sat, 6 May 2023 08:31:46 -0500
Subject: [PATCH] Added C++ GRC codegen support for RFE and sink

---
 grc/limesdr_rfe.block.yml     | 39 +++++++++++++-
 grc/limesdr_sink.block.yml    | 95 ++++++++++++++++++++++++++++++++++-
 include/limesdr/rfe.h         | 17 ++++++-
 lib/rfe_impl.cc               | 31 +++++++++++-
 python/bindings/rfe_python.cc |  2 +-
 5 files changed, 176 insertions(+), 8 deletions(-)

diff --git a/grc/limesdr_rfe.block.yml b/grc/limesdr_rfe.block.yml
index 59c7d13..41f0b5a 100644
--- a/grc/limesdr_rfe.block.yml
+++ b/grc/limesdr_rfe.block.yml
@@ -2,7 +2,8 @@
 
 id: limesdr_rfe
 label: LimeRFE Control
-category: '[LimeSuite]'
+category: '[LimeSDR]'
+flags: [cpp, python, throttle]
 
 parameters:
 -   id: comm_type
@@ -99,6 +100,42 @@ templates:
     - set_notch(${notch})
     - set_fan(${fan})
 
+templates:
+    imports: import limesdr
+    make: |-
+        limesdr.rfe(${comm_type},
+        % if comm_type == 0:
+            ${com_port},
+        % else:
+            ${sdr_serial},
+        % endif
+        ${filename}, ${rx_channel}, ${tx_channel}, ${rx_port}, ${tx_port}, ${mode}, ${notch}, ${atten})
+    callbacks:
+    - change_mode(${mode})
+    - set_attenuation(${atten})
+    - set_notch(${notch})
+    - set_fan(${fan})
+
+cpp_templates:
+  packages: ["gnuradio-limesdr"]
+  includes: ["#include <limesdr/rfe.h>"]
+  link: ["gnuradio::gnuradio-limesdr"]
+  translations:
+    "True": "true"
+    "False": "false"
+    "''": '""'
+
+  declarations: "gr::limesdr::rfe::sptr ${id};"
+  make: |-
+    this->${id} = gr::limesdr::rfe::make(
+        ${comm_type},
+        % if comm_type == 0:
+        ${com_port},
+        % else:
+        ${sdr_serial},
+        % endif
+        ${filename}, ${rx_channel}, ${tx_channel}, ${rx_port}, ${tx_port}, ${mode}, ${notch}, ${atten});
+
 documentation: |-
     -------------------------------------------------------------------------------------------------------------------
     COMMUNICATION
diff --git a/grc/limesdr_sink.block.yml b/grc/limesdr_sink.block.yml
index d88551a..9711d3f 100644
--- a/grc/limesdr_sink.block.yml
+++ b/grc/limesdr_sink.block.yml
@@ -1,7 +1,7 @@
 id: limesdr_sink
 label: LimeSDR Sink (TX)
 category: '[LimeSDR]'
-flags: throttle
+flags: [cpp, python, throttle]
 
 parameters:
 - id: serial
@@ -169,7 +169,7 @@ templates:
     % if filename() == "":
 
     self.${id}.set_sample_rate(${samp_rate})
- 
+
     % if int(oversample()) > 0:
     self.${id}.set_oversampling(${oversample})
     % endif
@@ -244,6 +244,97 @@ templates:
   - set_gain(${gain_dB_ch1}, 1)
   - set_tcxo_dac(${dacVal})
 
+cpp_templates:
+  packages: ["gnuradio-limesdr"]
+  includes: ["#include <limesdr/sink.h>"]
+  link: ["gnuradio::gnuradio-limesdr"]
+  translations:
+    "True": "true"
+    "False": "false"
+    "''": '""'
+
+  declarations: "gr::limesdr::sink::sptr ${id};"
+  make: |-
+    this->${id} = gr::limesdr::sink::make(${serial}, ${channel_mode}, ${filename}, ${length_tag_name});
+
+    % if filename() == "":
+
+    this->${id}->set_sample_rate(${samp_rate});
+
+    % if int(oversample()) > 0:
+    this->${id}->set_oversampling(${oversample});
+    % endif
+
+    this->${id}->set_center_freq(${rf_freq}, 0);
+
+    % if analog_bandw_ch0() > 0 and (int(channel_mode()) == 0 or int(channel_mode()) == 2):
+    this->${id}->set_bandwidth(${analog_bandw_ch0}, 0);
+    % endif
+
+    % if analog_bandw_ch1() > 0 and int(channel_mode()) > 0:
+    this->${id}->set_bandwidth(${analog_bandw_ch1}, 1);
+    % endif
+
+    % if digital_bandw_ch0() > 0 and (int(channel_mode()) == 0 or int(channel_mode()) == 2):
+    this->${id}->set_digital_filter(${digital_bandw_ch0}, 0);
+    % endif
+
+    % if digital_bandw_ch1() > 0 and int(channel_mode()) > 0:
+    this->${id}->set_digital_filter(${digital_bandw_ch1}, 1);
+    % endif
+
+    % if int(channel_mode()) == 0 or int(channel_mode()) == 2:
+    this->${id}->set_gain(${gain_dB_ch0}, 0);
+    % endif
+
+    % if int(channel_mode()) > 0:
+    this->${id}->set_gain(${gain_dB_ch1}, 1);
+    % endif
+
+    % if int(channel_mode()) == 0 or int(channel_mode()) == 2:
+    this->${id}->set_antenna(${pa_path_ch0}, 0);
+    % endif
+
+    % if int(channel_mode()) > 0:
+    this->${id}->set_antenna(${pa_path_ch1}, 1);
+    % endif
+
+    % if calibr_bandw_ch0() > 0 and (int(channel_mode()) == 0 or int(channel_mode()) == 2):
+    this->${id}->calibrate(${calibr_bandw_ch0}, 0);
+    % endif
+
+    % if calibr_bandw_ch1() > 0 and int(channel_mode()) > 0:
+    this->${id}->calibrate(${calibr_bandw_ch1}, 1);
+    % endif
+
+    % if nco_freq_ch0() != 0 and (int(channel_mode()) == 0 or int(channel_mode()) == 2):
+    this->${id}->set_nco(${nco_freq_ch0},0);
+    % endif
+
+    % if nco_freq_ch1() != 0 and int(channel_mode()) > 0:
+    this->${id}->set_nco(${nco_freq_ch1}, 1);
+    % endif
+
+    % endif # if filename() == ""
+
+    % if int(allow_tcxo_dac) == 1:
+    this->${id}->set_tcxo_dac(${dacVal});
+    % endif
+
+  callbacks:
+  - set_center_freq(${rf_freq}, 0)
+  - set_antenna(${pa_path_ch0}, 0)
+  - set_antenna(${pa_path_ch1}, 1)
+  - set_nco(${nco_freq_ch0}, 0)
+  - set_nco(${nco_freq_ch1}, 1)
+  - set_bandwidth(${analog_bandw_ch0}, 0)
+  - set_bandwidth(${analog_bandw_ch1}, 1)
+  - set_digital_filter(${digital_bandw_ch0}, 0)
+  - set_digital_filter(${digital_bandw_ch1}, 1)
+  - set_gain(${gain_dB_ch0}, 0)
+  - set_gain(${gain_dB_ch1}, 1)
+  - set_tcxo_dac(${dacVal})
+
 asserts:
 - ${ int(channel_mode) >= 0 }
 - ${ 2 >= int(channel_mode) }
diff --git a/include/limesdr/rfe.h b/include/limesdr/rfe.h
index 7638577..0e1bbf4 100644
--- a/include/limesdr/rfe.h
+++ b/include/limesdr/rfe.h
@@ -37,9 +37,22 @@ namespace limesdr {
 class LIMESDR_API rfe
 {
 public:
+    typedef std::shared_ptr<rfe> sptr;
+
+    static sptr make(int comm_type,
+        const std::string &device,
+        const std::string &config_file,
+        char IDRX,
+        char IDTX,
+        char PortRX,
+        char PortTX,
+        char Mode,
+        char Notch,
+        char Atten);
+
     rfe(int comm_type,
-        std::string device,
-        std::string config_file,
+        const std::string &device,
+        const std::string &config_file,
         char IDRX,
         char IDTX,
         char PortRX,
diff --git a/lib/rfe_impl.cc b/lib/rfe_impl.cc
index 4cf3048..85b4d84 100644
--- a/lib/rfe_impl.cc
+++ b/lib/rfe_impl.cc
@@ -32,9 +32,35 @@
 
 namespace gr {
 namespace limesdr {
+
+rfe::sptr rfe::make(
+    int comm_type,
+    const std::string &device,
+    const std::string &config_file,
+    char IDRX,
+    char IDTX,
+    char PortRX,
+    char PortTX,
+    char Mode,
+    char Notch,
+    char Atten)
+{
+    return sptr(new rfe(
+        comm_type,
+        device,
+        config_file,
+        IDRX,
+        IDTX,
+        PortRX,
+        PortTX,
+        Mode,
+        Notch,
+        Atten));
+}
+
 rfe::rfe(int comm_type,
-         std::string device,
-         std::string config_file,
+         const std::string &device_,
+         const std::string &config_file,
          char IDRX,
          char IDTX,
          char PortRX,
@@ -44,6 +70,7 @@ rfe::rfe(int comm_type,
          char Atten)
 {
     set_limesuite_logger();
+    auto device = device_;
 
     gr::configure_default_loggers(
         d_logger,
diff --git a/python/bindings/rfe_python.cc b/python/bindings/rfe_python.cc
index 6c09e12..6bceb62 100644
--- a/python/bindings/rfe_python.cc
+++ b/python/bindings/rfe_python.cc
@@ -10,7 +10,7 @@
 /* BINDTOOL_GEN_AUTOMATIC(0)                                                       */
 /* BINDTOOL_USE_PYGCCXML(0)                                                        */
 /* BINDTOOL_HEADER_FILE(rfe.h)                                                     */
-/* BINDTOOL_HEADER_FILE_HASH(c8af915fcfdda460c8c0cad6f26345d6)                     */
+/* BINDTOOL_HEADER_FILE_HASH(13d9fc789d1818bc73245ab84524c8d5)                     */
 /***********************************************************************************/
 
 #include <pybind11/complex.h>
-- 
2.47.3