Make FPS controllable

Led/Device.cpp

@@ -74,9 +74,11 @@ struct led_protocol : public ossia::net::protocol_base
       return;
     }
 
-    constexpr float frequency = 60;
-    m_timer.set_delay(std::chrono::milliseconds{
-        static_cast<int>(1000.0f / static_cast<float>(frequency))});
+    auto fps = std::clamp(set.fps, 0.001f, 1000.f);
+    if (set.fps <= 0.f)
+      fps = 30.;
+    m_timer.set_delay(
+        std::chrono::milliseconds{static_cast<int>(1000.0f / fps)});
   }
 
   ~led_protocol()

Led/ProtocolSettingsWidget.cpp

@@ -47,11 +47,16 @@ ProtocolSettingsWidget::ProtocolSettingsWidget(QWidget* parent)
   m_format = new QComboBox{this};
   m_format->addItems({"GRB", "RGB"});
 
+  m_fps = new QDoubleSpinBox{this};
+  m_fps->setRange(0.001, 1000);
+  m_fps->setValue(60.);
+
   auto layout = new QFormLayout;
   layout->addRow(tr("Name"), m_deviceNameEdit);
   layout->addRow(tr("Device"), m_spiDevice);
   layout->addRow(tr("Pixels"), m_pixels);
   layout->addRow(tr("Format"), m_format);
+  layout->addRow(tr("FPS"), m_fps);
 
   setLayout(layout);
 }
@@ -69,6 +74,7 @@ Device::DeviceSettings ProtocolSettingsWidget::getSettings() const
   settings.num_pixels = this->m_pixels->value();
   settings.format
       = static_cast<NeoPixelsFormat>(this->m_format->currentIndex());
+  settings.fps = this->m_fps->value();
   s.deviceSpecificSettings = QVariant::fromValue(settings);
 
   return s;
@@ -83,5 +89,6 @@ void ProtocolSettingsWidget::setSettings(
   m_spiDevice->setText(specif.device);
   m_pixels->setValue(specif.num_pixels);
   m_format->setCurrentIndex(static_cast<int>(specif.format));
+  m_fps->setValue(specif.fps);
 }
 }

Led/ProtocolSettingsWidget.hpp

@@ -8,6 +8,7 @@
 
 class QLineEdit;
 class QSpinBox;
+class QDoubleSpinBox;
 class QTableWidget;
 class QPushButton;
 
@@ -28,5 +29,6 @@ class ProtocolSettingsWidget final : public Device::ProtocolSettingsWidget
   QLineEdit* m_spiDevice{};
   QSpinBox* m_pixels{};
   QComboBox* m_format{};
+  QDoubleSpinBox* m_fps{};
 };
 }

Led/SpecificSettings.hpp

@@ -17,6 +17,7 @@ struct SpecificSettings
     int num_pixels{12};
     int speed{800};
     NeoPixelsFormat format{NeoPixelsFormat::GRB};
+    float fps{60.f};
 };
 }
 

Led/SpecificSettingsSerialization.cpp

@@ -6,14 +6,14 @@
 template <>
 void DataStreamReader::read(const Led::SpecificSettings& n)
 {
-  m_stream << n.device << n.num_pixels << n.speed << n.format;
+  m_stream << n.device << n.num_pixels << n.speed << n.format << n.fps;
   insertDelimiter();
 }
 
 template <>
 void DataStreamWriter::write(Led::SpecificSettings& n)
 {
-  m_stream >> n.device >> n.num_pixels >> n.speed >> n.format;
+  m_stream >> n.device >> n.num_pixels >> n.speed >> n.format >> n.fps;
   checkDelimiter();
 }
 
@@ -24,6 +24,7 @@ void JSONReader::read(const Led::SpecificSettings& n)
   obj["Pixels"] = n.num_pixels;
   obj["Speed"] = n.speed;
   obj["Format"] = n.format;
+  obj["FPS"] = n.fps;
 }
 
 template <>
@@ -33,4 +34,5 @@ void JSONWriter::write(Led::SpecificSettings& n)
   n.num_pixels <<= obj["Pixels"];
   n.speed <<= obj["Speed"];
   n.format <<= obj["Format"];
+  n.fps <<= obj["FPS"];
 }