Resolve "Update add_property api calls"

Closes #18

Author: jalbright-geon

docker/Dockerfile.rocky9

@@ -23,7 +23,7 @@ WORKDIR /opt
 
 RUN set -ex; \
  . /opt/rh/gcc-toolset-13/enable; \
- git clone --branch v0.1.0 https://github.com/geontech/composite.git; \
+ git clone --branch 11-add-rest-server-for-command-and-control https://github.com/geontech/composite.git; \
  cd composite; \
  cmake -B docker-build \
  -DCMAKE_INSTALL_PREFIX=/usr/local \

examples/write.json

@@ -1,43 +1,43 @@
 {
  "name" : "Write raw data",
+ "properties" : [
+ {
+ "name" : "msg_size",
+ "value" : "1032"
+ }
+ ],
  "components" : [
  {
  "name" : "udp_source",
  "properties" : [
  {
- "type" : "uint32",
- "name" : "msg_size",
- "value" : 1032 
- },
- {
- "type" : "uint32",
  "name" : "num_msgs",
- "value" : 64 
+ "value" : "64"
  },
  {
- "type" : "string",
  "name" : "ip_addr",
  "value" : "127.0.0.1" 
  },
  {
- "type" : "uint32",
  "name" : "port",
- "value" : 9999
+ "value" : "9999"
  }
  ]
  },
  {
- "name" : "file_writer",
+ "name" : "histogram",
  "properties" : [
  {
- "type" : "string",
- "name" : "filename",
- "value" : "example.dat"
+ "name" : "transport",
+ "value" : "vita49" 
+ },
+ {
+ "name" : "sample_rate",
+ "value" : "32768"
  },
  {
- "type" : "uint64",
- "name" : "num_bytes",
- "value" : 100000000
+ "name" : "adc_bits",
+ "value" : "16"
  }
  ]
  }
@@ -49,7 +49,7 @@
  "port" : "data_out"
  },
  "input" : {
- "component" : "file_writer",
+ "component" : "histogram",
  "port" : "data_in"
  }
  }

src/components/aligned_mem_writer/CMakeLists.txt

@@ -45,6 +45,7 @@ target_include_directories(aligned_mem_writer
 target_link_libraries(aligned_mem_writer
  PRIVATE
  composite::composite
+ spdlog::spdlog_header_only
 )
 # Install
 install(TARGETS aligned_mem_writer

src/components/aligned_mem_writer/component.hpp

@@ -32,7 +32,7 @@ class aligned_mem_writer : public composite::component {
  aligned_mem_writer() : composite::component("aligned_mem_writer") {
  add_port(m_in_port.get());
  add_property("filename", &m_filename);
- add_property("num_bytes", &m_num_bytes);
+ add_property("num_bytes", &m_num_bytes).units("bytes");
  }
 
  ~aligned_mem_writer() override {

src/components/exp_smooth/CMakeLists.txt

@@ -48,6 +48,7 @@ target_include_directories(exp_smooth
 target_link_libraries(exp_smooth
  PRIVATE
  composite::composite
+ spdlog::spdlog_header_only
 )
 # Install
 install(TARGETS exp_smooth

src/components/exp_smooth/component.hpp

@@ -29,22 +29,23 @@ class exp_smooth : public composite::component {
  using input_t = aligned::aligned_mem<T>;
  using input_port_t = composite::input_port<std::unique_ptr<input_t>>;
  using output_port_t = composite::output_port<std::unique_ptr<input_t>>;
+ using enum composite::config_type;
 public:
  exp_smooth() : composite::component("exp_smooth") {
  add_port(m_in_port.get());
  add_port(m_out_port.get());
- add_property("num_averages", &m_num_averages);
+ add_property("num_averages", &m_num_averages).configurability(RUNTIME).change_listener([this]() {
+ if (m_num_averages > 0) {
+ m_alpha = T{1} - std::pow(T{10}, (std::log10(1 - .98) / m_num_averages));
+ }
+ m_work = std::make_unique<work<T>>(m_alpha);
+ m_prev_psd.reset();
+ return true;
+ });
  }
 
  ~exp_smooth() override = default;
 
- auto initialize() -> void override {
- if (m_num_averages > 0) {
- m_alpha -= std::pow(T{10}, (std::log10(1 - .98) / m_num_averages));
- }
- m_work = std::make_unique<work<T>>(m_alpha);
- }
-
  auto process() -> composite::retval override {
  using enum composite::retval;
  auto [data, ts] = m_in_port->get_data();

src/components/fft/CMakeLists.txt

@@ -48,6 +48,7 @@ target_include_directories(fft
 target_link_libraries(fft
  PRIVATE
  composite::composite
+ spdlog::spdlog_header_only
  fftw3f
  fftw3f_threads
  fftw3

src/components/fft/component.hpp

@@ -23,6 +23,7 @@
 #include "overlay.hpp"
 #include "windows.hpp"
 
+#include <bit>
 #include <composite/component.hpp>
 #include <complex>
 #include <fftw3.h>
@@ -36,26 +37,32 @@ class fft : public composite::component {
  using window_t = aligned::aligned_mem<T>;
  using input_port_t = composite::input_port<std::unique_ptr<fft_t>>;
  using output_port_t = composite::output_port<std::unique_ptr<fft_t>>;
+ using enum composite::config_type;
 public:
  fft() : composite::component("fft") {
  add_port(m_in_port.get());
  add_port(m_out_port.get());
- add_property("window", &m_window_type);
- add_property("fft_size", &m_fft_size);
+ add_property("window", &m_window_type).change_listener([this]() {
+ if ((m_window_type == "BLACKMAN_HARRIS") || (m_window_type == "HAMMING")) {
+ return true;
+ }
+ return false;
+ });
+ add_property("fft_size", &m_fft_size).configurability(RUNTIME).change_listener([this]() {
+ return std::has_single_bit(m_fft_size);
+ });
  add_property("fftw_threads", &m_fftw_threads);
- add_property("shift", &m_shift);
+ add_property("shift", &m_shift).configurability(RUNTIME);
  }
 
  ~fft() override = default;
 
- auto initialize() -> void override {
- // Init window
+ auto property_change_handler() -> void override {
  if (m_window_type == "BLACKMAN_HARRIS") {
  m_window = windows::blackman_harris<T>(m_fft_size);
  } else if (m_window_type == "HAMMING") {
  m_window = windows::hamming<T>(m_fft_size);
  }
- // Init fftw
  m_fft_plan = std::make_unique<plan_t>(m_fft_size, m_fftw_threads, m_shift);
  }
 

src/components/histogram/CMakeLists.txt

@@ -45,6 +45,7 @@ target_include_directories(histogram
 target_link_libraries(histogram
  PRIVATE
  composite::composite
+ spdlog::spdlog_header_only
 )
 # Install
 install(TARGETS histogram

src/components/histogram/component.cpp

@@ -25,10 +25,10 @@ histogram::histogram() : composite::component("histogram") {
  add_port(m_in_port.get());
  add_port(m_out_port.get());
  add_property("transport", &m_transport);
- add_property("msg_size", &m_msg_size);
+ add_property("msg_size", &m_msg_size).units("bytes");
  add_property("byteswap", &m_byteswap);
- add_property("adc_bits", &m_adc_bits);
- add_property("sample_rate", &m_sample_rate);
+ add_property("adc_bits", &m_adc_bits).units("bits");
+ add_property("sample_rate", &m_sample_rate).units("sps");
  add_property("display_as_bits", &m_display_as_bits);
 }