Unconditionally set DMX slots; refactor status JSON

Always apply rounded up slot count when configuring DMX (move SetDmxSlots earlier and remove the conditional that skipped zero values). Refactor json_status_dmx to build the top-level Dmx array by delegating to the per-port Dmx(...) function (old PortInfo helper is commented out and array assembly/commas are handled here). Also apply a small whitespace/comment formatting tweak in dmxconst.h.

Author: vanvught

lib-dmx/include/dmxconst.h

@@ -60,8 +60,8 @@ inline constexpr uint32_t kMabTimeMin = 12;                                  ///
 inline constexpr uint32_t kMabTimeMax = 1000000;                             ///< 1s
 inline constexpr uint32_t kRefreshRateDefault = 40;                          ///< 40 Hz
 inline constexpr uint32_t kPeriodDefault = (1000000U / kRefreshRateDefault); ///< 25000 us
-inline constexpr uint32_t kBreakToBreakTimeMin = 1204;                     ///< us
+inline constexpr uint32_t kBreakToBreakTimeMin = 1204;                       ///< us
 } // namespace transmit
 } // namespace dmx
 
-#endif  // DMXCONST_H_
+#endif // DMXCONST_H_

lib-dmx/src/json/dmxsendparams.cpp

@@ -99,6 +99,7 @@ void DmxSendParams::Set()
 
     dmx.SetDmxBreakTime(store_dmx_send.break_time);
     dmx.SetDmxMabTime(store_dmx_send.mab_time);
+    dmx.SetDmxSlots(RoundupSlots(store_dmx_send.slots_count));
 
     uint32_t period = 0;
     if (store_dmx_send.refresh_rate != 0)
@@ -107,11 +108,6 @@ void DmxSendParams::Set()
     }
     dmx.SetDmxPeriodTime(period);
 
-    if (store_dmx_send.slots_count != 0)
-    {
-        dmx.SetDmxSlots(RoundupSlots(store_dmx_send.slots_count));
-    }
-
 #ifndef NDEBUG
     Dump();
 #endif

lib-dmx/src/json/json_status_dmx.cpp

@@ -11,30 +11,18 @@
 
 namespace json::status
 {
-static uint32_t PortInfo(char* out_buffer, uint32_t out_buffer_size, uint32_t port_index)
-{
-    const auto kDirection = Dmx::Get()->GetPortDirection(port_index) == ::dmx::PortDirection::kInput ? ::dmxnode::PortDirection::kInput : ::dmxnode::PortDirection::kOutput;
-    auto length = static_cast<uint32_t>(snprintf(out_buffer, out_buffer_size, 
-    "{\"port\":\"%c\",\"direction\":\"%s\"},", 
-    static_cast<char>('A' + port_index), 
-    dmxnode::GetPortDirection(kDirection)));
-
-    return length;
-}
-
-uint32_t Dmx(char* out_buffer, uint32_t out_buffer_size) {
-    out_buffer[0] = '[';
-    uint32_t length = 1;
+//static uint32_t PortInfo(char* out_buffer, uint32_t out_buffer_size, uint32_t port_index)
+//{
+//    const auto kDirection = Dmx::Get()->GetPortDirection(port_index) == ::dmx::PortDirection::kInput ? ::dmxnode::PortDirection::kInput : ::dmxnode::PortDirection::kOutput;
+//    auto length = static_cast<uint32_t>(snprintf(out_buffer, out_buffer_size, 
+//    "{\"port\":\"%c\",\"direction\":\"%s\"},", 
+//    static_cast<char>('A' + port_index), 
+//    dmxnode::GetPortDirection(kDirection)));
+//
+//    return length;
+//}
 
-    for (uint32_t port_index = 0; port_index < ::dmx::config::max::PORTS; port_index++)
-    {
-        length += PortInfo(&out_buffer[length], out_buffer_size - length, port_index);
-    }
 
-    out_buffer[length - 1] = ']';
-
-    return length;	
-}
 uint32_t Dmx(char* out_buffer, uint32_t out_buffer_size, uint32_t port_index) {
     if (port_index < ::dmx::config::max::PORTS)
     {
@@ -52,4 +40,20 @@ uint32_t Dmx(char* out_buffer, uint32_t out_buffer_size, uint32_t port_index) {
 
     return 0;	
 }
+
+uint32_t Dmx(char* out_buffer, uint32_t out_buffer_size) {
+    out_buffer[0] = '[';
+    uint32_t length = 1;
+
+    for (uint32_t port_index = 0; port_index < ::dmx::config::max::PORTS; port_index++)
+    {
+        length += Dmx(&out_buffer[length], out_buffer_size - length, port_index);
+		out_buffer[length++] = ',';
+    }
+
+    out_buffer[length - 1] = ']';
+
+    return length;	
+}
+
 }  // namespace json::status