moved strings to flash - suggestion by DjordjeMandic

Author: KrX3D

wled00/syslog.cpp

@@ -3,29 +3,31 @@
 
 #include "syslog.h"
 
-static const __FlashStringHelper* protoNames[] = { F("BSD"), F("RFC5424"), F("RAW") };
-
-const char* getFacilityName(uint8_t code) {
-  switch (code) {
-    case 0:  return "KERN";
-    case 1:  return "USER";
-    case 3:  return "DAEMON";
-    case 5:  return "SYSLOG";
-    case 16: return "LCL0";
-    case 17: return "LCL1";
-    case 18: return "LCL2";
-    case 19: return "LCL3";
-    case 20: return "LCL4";
-    case 21: return "LCL5";
-    case 22: return "LCL6";
-    case 23: return "LCL7";
-    default: return "UNKNOWN";
-  }
-}
+static const char* const protoNames[] PROGMEM = {
+  PSTR("BSD"),
+  PSTR("RFC5424"),
+  PSTR("RAW"),
+  PSTR("UNKNOWN")
+};
+static const uint8_t protoCount = sizeof(protoNames)/sizeof(*protoNames);
 
-static const char* severityNames[] = {
-  "EMERG","ALERT","CRIT","ERR","WARNING","NOTICE","INFO","DEBUG"
+static const char* const facilityNames[] PROGMEM = {
+  PSTR("KERN"),   PSTR("USER"),   PSTR("UNKNOWN"), PSTR("DAEMON"),
+  PSTR("UNKNOWN"),PSTR("SYSLOG"), PSTR("UNKNOWN"), PSTR("UNKNOWN"),
+  PSTR("UNKNOWN"),PSTR("UNKNOWN"),PSTR("UNKNOWN"), PSTR("UNKNOWN"),
+  PSTR("UNKNOWN"),PSTR("UNKNOWN"),PSTR("UNKNOWN"), PSTR("UNKNOWN"),
+  PSTR("LCL0"),   PSTR("LCL1"),   PSTR("LCL2"),    PSTR("LCL3"),
+  PSTR("LCL4"),   PSTR("LCL5"),   PSTR("LCL6"),    PSTR("LCL7"),
+  PSTR("UNKNOWN")  // catch-all at index 24
 };
+static const uint8_t facCount   = sizeof(facilityNames)/sizeof(*facilityNames);
+
+static const char* const severityNames[] PROGMEM = {
+  PSTR("EMERG"), PSTR("ALERT"), PSTR("CRIT"),  PSTR("ERR"),
+  PSTR("WARN"),  PSTR("NOTE"),  PSTR("INFO"),  PSTR("DEBUG"),
+  PSTR("UNKNOWN")
+};
+static const uint8_t sevCount = sizeof(severityNames) / sizeof(*severityNames);
 
 SyslogPrinter::SyslogPrinter() : 
   _lastOperationSucceeded(true),
@@ -40,29 +42,33 @@ void SyslogPrinter::begin(const char* host, uint16_t port,
 					  uint8_t facility, uint8_t severity, uint8_t protocol) {
 
   DEBUG_PRINTF_P(PSTR("===== WLED SYSLOG CONFIGURATION =====\n"));
-  DEBUG_PRINTF_P(PSTR(" Hostname:  %s\n"), syslogHost);
-  DEBUG_PRINTF_P(PSTR(" Cached IP:  %s\n"), syslogHostIP.toString().c_str());
-  DEBUG_PRINTF_P(PSTR(" Port:       %u\n"), (unsigned)syslogPort);
-  DEBUG_PRINTF_P(PSTR(" Protocol:   %u (%s)\n"),
-    protocol,
-    protocol <= 2 ? (const char*)protoNames[protocol] : "UNKNOWN"
-  );
-  DEBUG_PRINTF_P(PSTR(" Facility:   %u (%s)\n"),
-                 (unsigned)facility,
-                 getFacilityName(facility));
-  DEBUG_PRINTF_P(PSTR(" Severity:   %u (%s)\n"),
-                 (unsigned)severity,
-                 (severity <  sizeof(severityNames)/sizeof(severityNames[0]))
-                   ? severityNames[severity]
-                   : PSTR("UNKNOWN"));
+  DEBUG_PRINTF_P(PSTR(" Hostname:  %s\n"), host);
+  DEBUG_PRINTF_P(PSTR(" Cached IP: %s\n"), syslogHostIP.toString().c_str());
+  DEBUG_PRINTF_P(PSTR(" Port:      %u\n"), (unsigned)port);
+
+  // Protocol
+  uint8_t pidx = protocol < (protoCount - 1) ? protocol : (protoCount - 1);
+  const char* pstr = (const char*)pgm_read_ptr(&protoNames[pidx]);
+  DEBUG_PRINTF_P(PSTR(" Protocol:  %u (%s)\n"), (unsigned)protocol, pstr);
+
+  // — Facility
+  uint8_t fidx = facility < (facCount - 1) ? facility : (facCount - 1);
+  const char* fstr = (const char*)pgm_read_ptr(&facilityNames[fidx]);
+  DEBUG_PRINTF_P(PSTR(" Facility:  %u (%s)\n"), (unsigned)facility, fstr);
+
+  // Severity
+  uint8_t idx = severity < sevCount-1 ? severity : sevCount-1;
+  const char* sevStr = (const char*)pgm_read_ptr(&severityNames[idx]);
+  DEBUG_PRINTF_P(PSTR(" Severity:  %u (%s)\n"), (unsigned)severity, sevStr);
+
   DEBUG_PRINTF_P(PSTR("======================================\n"));
-  
+
   strlcpy(syslogHost, host, sizeof(syslogHost));
   syslogPort = port;
   _facility = facility;
   _severity = severity;
   _protocol = protocol;
-  
+
   // clear any cached IP so resolveHostname() will run next write()  
   syslogHostIP = IPAddress(0,0,0,0);
 }
@@ -195,15 +201,17 @@ size_t SyslogPrinter::write(const uint8_t *buf, size_t size, uint8_t severity) {
 
   // Handle different syslog protocol formats
   switch (_protocol) {
-    case SYSLOG_PROTO_BSD:	  
+    case SYSLOG_PROTO_BSD:
       // RFC 3164 format: <PRI>TIMESTAMP HOSTNAME APP-NAME: MESSAGE
       syslogUdp.printf("<%d>", pri);
 
       if (ntpEnabled && ntpConnected) {
         // Month abbreviation
-        const char* months[] = {"Jan", "Feb", "Mar", "Apr", "May", "Jun", 
-                               "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"};
-        
+        static const char* const months[] = {
+          "Jan","Feb","Mar","Apr","May","Jun",
+          "Jul","Aug","Sep","Oct","Nov","Dec"
+        };
+
         syslogUdp.printf("%s %2d %02d:%02d:%02d ", 
                         months[month(localTime) - 1], 
                         day(localTime),
@@ -212,7 +220,7 @@ size_t SyslogPrinter::write(const uint8_t *buf, size_t size, uint8_t severity) {
                         second(localTime));
       } else {
         // No valid time available
-        syslogUdp.print("Jan 01 00:00:00 ");
+        syslogUdp.print(F("Jan 01 00:00:00 "));
       }
 
       // Add hostname and app name
@@ -239,14 +247,14 @@ size_t SyslogPrinter::write(const uint8_t *buf, size_t size, uint8_t severity) {
                         second(localTime));
       } else {
         // No valid time available
-        syslogUdp.print("1970-01-01T00:00:00Z ");
+        syslogUdp.print(F("1970-01-01T00:00:00Z "));
       }
 
       // Add hostname, app name, and other fields (using - for empty fields)
       syslogUdp.print(cleanHostname);
       syslogUdp.print(" ");
       syslogUdp.print(_appName);
-      syslogUdp.print(" - - - "); // PROCID, MSGID, and STRUCTURED-DATA are empty
+      syslogUdp.print(F(" - - - ")); // PROCID, MSGID, and STRUCTURED-DATA are empty
 
       // Add message content
       size = syslogUdp.write(buf, size);

wled00/syslog.h

@@ -3,6 +3,11 @@
 #include <WString.h>
 #include <WiFiUdp.h>
 
+// Buffer management
+#ifndef SYSLOG_BUFFER_SIZE
+  #define SYSLOG_BUFFER_SIZE 128
+#endif
+
 // Syslog facility codes
 #define SYSLOG_KERN     	0  // kernel messages
 #define SYSLOG_USER     	1  // user-level messages
@@ -46,27 +51,23 @@ class SyslogPrinter : public Print {
     uint8_t _protocol;
     String _appName;
 
-    // Buffer management
-    #ifndef SYSLOG_BUFFER_SIZE
-      #define SYSLOG_BUFFER_SIZE 128
-    #endif
     char _buffer[SYSLOG_BUFFER_SIZE]; // Buffer for collecting characters
 
     size_t _bufferIndex;
     void flushBuffer();
-    
+
   public:
     SyslogPrinter();
 	void begin(const char* host, uint16_t port,
                uint8_t facility = SYSLOG_LOCAL0,
                uint8_t severity = SYSLOG_DEBUG,
                uint8_t protocol = SYSLOG_PROTO_BSD);
     void setAppName(const String &appName);
-    
+
     // Print interface implementation
     virtual size_t write(uint8_t c);
     virtual size_t write(const uint8_t *buf, size_t size);
-    
+
     // Severity override for specific messages
     size_t write(const uint8_t *buf, size_t size, uint8_t severity);