Add ansi_colour.h and tidy up headers

Add new common/include/ansi_colour.h providing ansi::Colours helpers for foreground/background ANSI escape sequences. Apply consistent formatting and small API-preserving cleanups across multiple headers (namespace/bracing style, whitespace, line breaks) and update copyright years to 2025-2026. Affected files: common/include/common/utils/utils_array.h, common/include/firmware/pixeldmx/show.h, and several json headers (json_format_helpers.h, json_helpers.h, json_jsondoc.h, json_key.h, json_params_base.h, json_parsehelper.h, json_parser.h, json_tokenizer.h). Changes are stylistic or minor refactors only; no functional behavior changes intended.

Author: vanvught

common/include/ansi_colour.h

@@ -0,0 +1,110 @@
+/**
+ * @file ansi_colour.h
+ *
+ */
+/* Copyright (C) 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
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#ifndef ANSI_COLOUR_H_
+#define ANSI_COLOUR_H_
+
+namespace ansi {
+// https://github.com/shiena/ansicolor/blob/master/README.md
+struct Colours {
+    enum class Colour { 
+		kBlack, 
+		kRed, 
+		kGreen, 
+		kYellow, 
+		kBlue, 
+		kMagenta, 
+		kCyan, 
+		kWhite, 
+		kDefault
+	};
+
+    struct Fg {
+        static constexpr char kBlack[] = "\x1b[30m";
+        static constexpr char kRed[] = "\x1b[31m";
+        static constexpr char kGreen[] = "\x1b[32m";
+        static constexpr char kYellow[] = "\x1b[33m";
+        static constexpr char kWhite[] = "\x1b[37m";
+        static constexpr char kDefault[] = "\x1b[39m";
+    };
+
+    static constexpr const char* Foreground(Colour colour) {
+        switch (colour) {
+            case Colour::kBlack:
+                return ansi::Colours::Fg::kBlack;
+                break;
+            case Colour::kRed:
+                return ansi::Colours::Fg::kRed;
+                break;
+            case Colour::kGreen:
+                return ansi::Colours::Fg::kGreen;
+                break;
+            case Colour::kYellow:
+                return ansi::Colours::Fg::kYellow;
+                break;
+            case Colour::kWhite:
+                return ansi::Colours::Fg::kWhite;
+                break;
+            default:
+                return ansi::Colours::Fg::kDefault;
+                break;
+        }
+    };
+
+    struct Bg {
+        static constexpr char kBlack[] = "\x1b[40m";
+        static constexpr char kRed[] = "\x1b[41m";
+        static constexpr char kGreen[] = "\x1b[42m";
+        static constexpr char kYellow[] = "\x1b[43m";
+        static constexpr char kWhite[] = "\x1b[47m";
+        static constexpr char kDefault[] = "\x1b[49m";
+    };
+
+    static constexpr const char* Background(Colour colour) {
+        switch (colour) {
+            case Colour::kBlack:
+                return ansi::Colours::Bg::kBlack;
+                break;
+            case Colour::kRed:
+                return ansi::Colours::Bg::kRed;
+                break;
+            case Colour::kGreen:
+                return ansi::Colours::Bg::kGreen;
+                break;
+            case Colour::kYellow:
+                return ansi::Colours::Bg::kYellow;
+                break;
+            case Colour::kWhite:
+                return ansi::Colours::Bg::kWhite;
+                break;
+            default:
+                return ansi::Colours::Bg::kDefault;
+                break;
+        }
+    };
+};
+} // namespace ansi
+
+#endif // ANSI_COLOUR_H_

common/include/common/utils/utils_array.h

@@ -2,7 +2,7 @@
  * @file utils_array.h
  *
  */
-/* 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
@@ -28,12 +28,11 @@
 
 #include <cstddef>
 
-namespace common
-{
-template <typename T, size_t N> constexpr size_t ArraySize(const T (&)[N]) noexcept
-{
+namespace common {
+template <typename T, size_t N> 
+constexpr size_t ArraySize(const T (&)[N]) noexcept {
     return N;
 }
 } // namespace common
 
-#endif  // COMMON_UTILS_UTILS_ARRAY_H_
+#endif // COMMON_UTILS_UTILS_ARRAY_H_

common/include/firmware/pixeldmx/show.h

@@ -32,21 +32,20 @@
 #include "display.h"
 #include "pixelpatterns.h"
 
-namespace common::firmware::pixeldmx
-{
-inline void Show(uint32_t line, pixelpatterns::Pattern pattern = pixelpatterns::Pattern::kNone)
-{
+namespace common::firmware::pixeldmx {
+inline void Show(uint32_t line, pixelpatterns::Pattern pattern = pixelpatterns::Pattern::kNone) {
     auto& configuration = PixelDmxConfiguration::Get();
     auto* display = Display::Get();
     assert(display != nullptr);
 
     display->ClearEndOfLine();
-    display->Printf(line, "%s:%d G%d %s", pixel::GetTypeName(configuration.GetType()), configuration.GetCount(), configuration.GetGroupingCount(),
-                    pixel::GetMapName(configuration.GetMap()));
+    display->Printf(line, "%s:%d G%d %s", 
+		pixel::GetTypeName(configuration.GetType()), 
+		configuration.GetCount(), configuration.GetGroupingCount(), 
+		pixel::GetMapName(configuration.GetMap()));
     display->ClearLine(8); // Status line
 
-    if (pattern != pixelpatterns::Pattern::kNone)
-    {
+    if (pattern != pixelpatterns::Pattern::kNone) {
         display->ClearLine(6);
         display->Printf(6, "%s:%u", PixelPatterns::GetName(pattern), static_cast<uint32_t>(pattern));
     }

common/include/json/json_format_helpers.h

@@ -30,32 +30,27 @@
 #include <cstdint>
 #include <cassert>
 
-namespace format
-{
+namespace format {
 constexpr size_t kFloatBufferSize = 8;   // For "%.2f", "%.1f"
 constexpr size_t kOffsetBufferSize = 12; // For timezone offsets e.g. "+01:00"
 
-inline void Append2Digits(char*& p, uint32_t v)
-{
+inline void Append2Digits(char*& p, uint32_t v) {
     *p++ = static_cast<char>('0' + (v / 10));
     *p++ = static_cast<char>('0' + (v % 10));
 }
 
-inline const char* Float(float value, char (&buf)[kFloatBufferSize], const char* fmt = "%.2f")
-{
+inline const char* Float(float value, char (&buf)[kFloatBufferSize], const char* fmt = "%.2f") {
     snprintf(buf, sizeof(buf), fmt, value);
     return buf;
 }
 
-inline const char* UtcOffset(int32_t hours, uint32_t minutes, char (&buf)[kOffsetBufferSize])
-{
+inline const char* UtcOffset(int32_t hours, uint32_t minutes, char (&buf)[kOffsetBufferSize]) {
     const auto kNegative = hours < 0;
     if (kNegative) hours = -hours;
 
     auto* p = buf;
 
-    if (hours != 0)
-    {
+    if (hours != 0) {
         *p++ = kNegative ? '-' : '+';
     }
 

common/include/json/json_helpers.h

@@ -31,12 +31,9 @@
 
 #include "json/json_jsondoc.h"
 
-namespace json::helpers
-{
+namespace json::helpers {
 // Template wrapper for consistent JSON serialization pattern.
-template <typename Callback> 
-uint32_t Serialize(char* buffer, uint32_t length, Callback&& callback)
-{
+template <typename Callback> uint32_t Serialize(char* buffer, uint32_t length, Callback&& callback) {
     assert(buffer != nullptr);
     assert(length != 0);
 
@@ -47,4 +44,4 @@ uint32_t Serialize(char* buffer, uint32_t length, Callback&& callback)
 }
 } // namespace json::helpers
 
-#endif  // JSON_JSON_HELPERS_H_
+#endif // JSON_JSON_HELPERS_H_

common/include/json/json_jsondoc.h

@@ -2,7 +2,7 @@
  * @file json_jsondoc.h
  *
  */
-/* 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
@@ -30,31 +30,26 @@
 #include <cassert>
 #include <cstdio>
 
-class JsonDoc
-{
+class JsonDoc {
    public:
-    JsonDoc(char* buf, uint32_t max_len) : buf_(buf), max_len_(max_len)
-    {
+    JsonDoc(char* buf, uint32_t max_len) : buf_(buf), max_len_(max_len) {
         assert(buf != nullptr);
         assert(max_len > 2); // Need at least space for {}
         Write("{");
     }
 
     ~JsonDoc() = default;
 
-    class KeyProxy
-    {
+    class KeyProxy {
        public:
         KeyProxy(JsonDoc& doc, const char* key) : doc_(doc), key_(key) {}
 
-        KeyProxy& operator=(const char* value)
-        {
+        KeyProxy& operator=(const char* value) {
             doc_.WriteField(key_, value);
             return *this;
         }
 
-        KeyProxy& operator=(uint32_t value)
-        {
+        KeyProxy& operator=(uint32_t value) {
             doc_.WriteField(key_, value);
             return *this;
         }
@@ -71,16 +66,13 @@ class JsonDoc
     uint32_t Size() const { return pos_; }
 
    private:
-    int CopyString(char* dst, size_t size, const char* src)
-    {
-        if (size == 0)
-        {
+    int CopyString(char* dst, size_t size, const char* src) {
+        if (size == 0) {
             return 0;
         }
 
         size_t length = 0;
-        while ((length < size - 1) && (*src != '\0'))
-        {
+        while ((length < size - 1) && (*src != '\0')) {
             *dst++ = *src++;
             ++length;
         }
@@ -89,10 +81,8 @@ class JsonDoc
         return static_cast<int>(length);
     }
 
-    void WriteField(const char* key, const char* value)
-    {
-        if (!first_)
-        {
+    void WriteField(const char* key, const char* value) {
+        if (!first_) {
             Write(",");
         }
 
@@ -104,10 +94,8 @@ class JsonDoc
         first_ = false;
     }
 
-    void WriteField(const char* key, uint32_t value)
-    {
-        if (!first_)
-        {
+    void WriteField(const char* key, uint32_t value) {
+        if (!first_) {
             Write(",");
         }
 
@@ -119,14 +107,10 @@ class JsonDoc
         char* p = num_buf + sizeof(num_buf);
         *--p = '\0';
 
-        if (value == 0)
-        {
+        if (value == 0) {
             *--p = '0';
-        }
-        else
-        {
-            while (value != 0)
-            {
+        } else {
+            while (value != 0) {
                 *--p = static_cast<char>('0' + (value % 10));
                 value /= 10;
             }
@@ -136,22 +120,17 @@ class JsonDoc
         first_ = false;
     }
 
-    void Write(const char* s)
-    {
-        if (pos_ >= max_len_)
-        {
+    void Write(const char* s) {
+        if (pos_ >= max_len_) {
             return;
         }
 
         int ret = CopyString(buf_ + pos_, max_len_ - pos_, s);
 
         // CopyString always null-terminates and returns number of chars copied (excluding null)
-        if (ret >= 0 && static_cast<uint32_t>(ret) + pos_ < max_len_)
-        {
+        if (ret >= 0 && static_cast<uint32_t>(ret) + pos_ < max_len_) {
             pos_ += static_cast<uint32_t>(ret);
-        }
-        else
-        {
+        } else {
             pos_ = max_len_; // Clamp to signal overflow
         }
     }
@@ -162,4 +141,4 @@ class JsonDoc
     uint32_t pos_{0};
 };
 
-#endif  // JSON_JSON_JSONDOC_H_
+#endif // JSON_JSON_JSONDOC_H_