Use common::Atof in PixelDmx params parsing

Switch floating-point parsing in PixelDmxParams from `json::Atof` to `common::Atof` and include `utils_string.h` to match the new utility source. Also normalize several preprocessor guards from `#if defined(...)`/`#if !defined(...)` to `#ifdef`/`#ifndef` for consistency without changing behavior.

Author: vanvught

lib-pixeldmx/src/json/pixeldmxparams.cpp

@@ -34,6 +34,7 @@
 #include "configstore.h"
 #include "configurationstore.h"
 #include "common/utils/utils_flags.h"
+#include "common/utils/utils_string.h"
 #include "pixelconfiguration.h"
 #include "pixeldmxconfiguration.h"
 #if defined(CONFIG_PIXELDMX_ENABLE_GAMMATABLE)
@@ -94,14 +95,14 @@ void PixelDmxParams::SetGroupingCount(const char* val, uint32_t len) {
 }
 
 void PixelDmxParams::SetLowCode(const char* val, uint32_t len) {
-    store_dmxled.low_code = pixel::ConvertTxH(json::Atof(val, len));
+    store_dmxled.low_code = pixel::ConvertTxH(common::Atof(val, len));
 }
 
 void PixelDmxParams::SetHighCode(const char* val, uint32_t len) {
-    store_dmxled.high_code = pixel::ConvertTxH(json::Atof(val, len));
+    store_dmxled.high_code = pixel::ConvertTxH(common::Atof(val, len));
 }
 
-#if defined(OUTPUT_DMX_PIXEL_MULTI)
+#ifdef OUTPUT_DMX_PIXEL_MULTI
 void PixelDmxParams::SetActiveOutputs(const char* val, uint32_t len) {
     store_dmxled.active_outputs = ParseValue<uint8_t>(val, len);
 }
@@ -134,13 +135,13 @@ void PixelDmxParams::SetStartUniPort(const char* key, uint32_t key_len, const ch
     store_dmxled.start_universe[index] = ParseValue<uint16_t>(val, val_len);
 }
 
-#if defined(RDM_RESPONDER)
+#ifdef RDM_RESPONDER
 void PixelDmxParams::SetDmxStartAddress(const char* val, uint32_t len) {
     store_dmxled.dmx_start_address = ParseValue<uint16_t>(val, len);
 }
 #endif
 
-#if defined(CONFIG_PIXELDMX_ENABLE_GAMMATABLE)
+#ifdef CONFIG_PIXELDMX_ENABLE_GAMMATABLE
 void PixelDmxParams::SetGammaCorrection(const char* val, uint32_t len) {
     if (len == 1) {
         store_dmxled.flags = common::SetFlagValue(store_dmxled.flags, Flags::Flag::kEnableGamma, v[0] != '0');
@@ -157,7 +158,7 @@ void PixelDmxParams::SetGammaValue(const char* val, uint32_t len) {
         return;
     }
 
-    const auto kV = gamma::GetValidValue(static_cast<uint32_t>(json::Atof(val, 3) * 10));
+    const auto kV = gamma::GetValidValue(static_cast<uint32_t>(common::Atof(val, 3) * 10));
     store_dmxled.gamma_value = static_cast<uint8_t>(kV);
 }
 #endif
@@ -181,16 +182,16 @@ void PixelDmxParams::Set() {
     pixel_configuration.SetLowCode(store_dmxled.low_code);
     pixel_configuration.SetHighCode(store_dmxled.high_code);
     pixel_configuration.SetClockSpeedHz(store_dmxled.spi_speed_hz);
-#if defined(CONFIG_PIXELDMX_ENABLE_GAMMATABLE)
+#ifdef CONFIG_PIXELDMX_ENABLE_GAMMATABLE
     pixel_configuration.SetEnableGammaCorrection(common::IsFlagSet(store_dmxled.flags, Flags::Flag::kEnableGamma));
     pixel_configuration.SetGammaTable(store_dmxled.gamma_value);
 #endif
     auto& pixel_dmx_configuration = PixelDmxConfiguration::Get();
     pixel_dmx_configuration.SetGroupingCount(store_dmxled.grouping_count);
-#if defined(OUTPUT_DMX_PIXEL_MULTI)
+#ifdef OUTPUT_DMX_PIXEL_MULTI
     pixel_dmx_configuration.SetOutputPorts(store_dmxled.active_outputs);
 #endif
-#if !defined(OUTPUT_DMX_PIXEL_MULTI)
+#ifndef OUTPUT_DMX_PIXEL_MULTI
     pixel_dmx_configuration.SetDmxStartAddress(store_dmxled.dmx_start_address);
 #endif
 
@@ -270,16 +271,16 @@ void PixelDmxParams::Dump() {
     for (uint32_t i = 0; i < kMaxStartUniverses; i++) {
         printf(" %s=%d\n", PixelDmxParamsConst::kStartUniPort[i].name, store_dmxled.start_universe[i]);
     }
-#if defined(OUTPUT_DMX_PIXEL_MULTI)
+#ifdef OUTPUT_DMX_PIXEL_MULTI
     printf(" %s=%d\n", DmxLedParamsConst::kActiveOutputPorts.name, store_dmxled.active_outputs);
 #endif
     printf(" %s=%u\n", DmxLedParamsConst::kTestPattern.name, static_cast<unsigned>(store_dmxled.test_pattern));
     printf(" %s=%u\n", DmxLedParamsConst::kSpiSpeedHz.name, static_cast<unsigned>(store_dmxled.spi_speed_hz));
     printf(" %s=%u\n", DmxLedParamsConst::kGlobalBrightness.name, static_cast<unsigned>(store_dmxled.global_brightness));
-#if defined(RDM_RESPONDER)
+#ifdef RDM_RESPONDER
     printf(" %s=%u\n", PixelDmxParamsConst::kDmxStartAddress.name, static_cast<unsigned>(store_dmxled.dmx_start_address));
 #endif
-#if defined(CONFIG_PIXELDMX_ENABLE_GAMMATABLE)
+#ifdef CONFIG_PIXELDMX_ENABLE_GAMMATABLE
     printf(" %s=%d\n", DmxLedParamsConst::kGammaCorrection.name, common::IsFlagSet(store_dmxled.flags, Flags::Flag::kEnableGamma));
     printf(" %s=%1.1f [%u]\n", DmxLedParamsConst::kGammaValue.name, static_cast<float>(store_dmxled.gamma_value) / 10.0f, store_dmxled.gamma_value);
 #endif

lib-showfile/src/json/json_action_showfile.cpp

@@ -1,7 +1,7 @@
 /**
  * @file json_action_showfile.cpp
  */
-/* Copyright (C) 2025 by Arjan van Vught mailto:info@gd32-dmx.org
+/* Copyright (C) 2025-2026 by Arjan van Vught mailto:info@gd32-dmx.org
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -26,10 +26,11 @@
 
 #include "json/json_key.h"
 #include "json/json_parser.h"
-#include "json/json_parsehelper.h"
+#include "common/utils/utils_string.h"
 #include "showfile.h"
 
-static void SetPlayer(const char* val, uint32_t len) {
+namespace {
+void SetPlayer(const char* val, uint32_t len) {
     if (memcmp(val, "play", len) == 0) {
         ShowFile::Instance().Play();
         return;
@@ -45,35 +46,36 @@ static void SetPlayer(const char* val, uint32_t len) {
         return;
     }
 
-#if !defined(CONFIG_SHOWFILE_DISABLE_RECORD)
+#ifndef CONFIG_SHOWFILE_DISABLE_RECORD
     if (memcmp(val, "record", len) == 0) {
         ShowFile::Instance().Record();
         return;
     }
 #endif
 }
 
-static void SetLoop(const char* val, uint32_t len) {
-    if (len != 1) return;
+void SetLoop(const char* val, uint32_t len) {
+    if (len != 1) {
+        return;
+    }
 
     ShowFile::Instance().DoLoop(val[0] != '0');
 }
 
-static void SetShow(const char* val, uint32_t len) {
-    if (len > 2) return;
+void SetShow(const char* val, uint32_t len) {
+    if (len > 2) {
+        return;
+    }
 
-    ShowFile::Instance().SetPlayerShowFileCurrent(json::Atoi(val, len));
+    ShowFile::Instance().SetPlayerShowFileCurrent(common::Atoi(val, len));
 }
 
-static constexpr auto kPlayer = json::MakeSimpleKey("player");
-static constexpr auto kLoop = json::MakeSimpleKey("loop");
-static constexpr auto kShow = json::MakeSimpleKey("show");
+constexpr auto kPlayer = json::MakeSimpleKey("player");
+constexpr auto kLoop = json::MakeSimpleKey("loop");
+constexpr auto kShow = json::MakeSimpleKey("show");
 
-static constexpr json::Key kActionKeys[] = {
-	json::MakeKey(SetPlayer, kPlayer), 
-	json::MakeKey(SetLoop, kLoop), 
-	json::MakeKey(SetShow, kShow)
-};
+constexpr json::Key kActionKeys[] = {json::MakeKey(SetPlayer, kPlayer), json::MakeKey(SetLoop, kLoop), json::MakeKey(SetShow, kShow)};
+} // namespace
 
 namespace json::action {
 void SetShowFile(const char* buffer, uint32_t buffer_size) {