From 3d4b02e492406dc237bfe99a326b8d0415a53249 Mon Sep 17 00:00:00 2001
From: Gregg <homespan@icloud.com>
Date: Sun, 31 Mar 2024 21:40:00 -0500
Subject: [PATCH] created getDataGeneric() and getStringGeneric()

Though this simplifies the code, the code size is still the same - compiler must have already optimized these functions.
---
 src/HomeSpan.h | 35 ++++++++---------------------------
 src/src.ino    |  1 +
 2 files changed, 9 insertions(+), 27 deletions(-)

diff --git a/src/HomeSpan.h b/src/HomeSpan.h
index 777b675..e0563a8 100644
--- a/src/HomeSpan.h
+++ b/src/HomeSpan.h
@@ -661,19 +661,15 @@ class SpanCharacteristic{
     return(uvGet<T>(newValue));
   }
     
-  char *getString(){
+  char *getStringGeneric(UVal &val){
     if(format>=FORMAT::STRING)
-        return value.STRING;
+        return val.STRING;
 
     return NULL;
   }
 
-  char *getNewString(){
-    if(format>=FORMAT::STRING)
-        return newValue.STRING;
-
-    return NULL;
-  }
+  char *getString(){return(getStringGeneric(value));}
+  char *getNewString(){return(getStringGeneric(newValue));}
 
   void setString(const char *val, boolean notify=true){ 
 
@@ -682,12 +678,12 @@ class SpanCharacteristic{
     setValFinish(notify);    
   }
 
-  size_t getData(uint8_t *data, size_t len){    
+  size_t getDataGeneric(uint8_t *data, size_t len, UVal &val){    
     if(format<FORMAT::DATA)
       return(0);
 
     size_t olen;
-    int ret=mbedtls_base64_decode(data,len,&olen,(uint8_t *)value.STRING,strlen(value.STRING));
+    int ret=mbedtls_base64_decode(data,len,&olen,(uint8_t *)val.STRING,strlen(val.STRING));
     
     if(data==NULL)
       return(olen);
@@ -700,23 +696,8 @@ class SpanCharacteristic{
     return(olen);
   }
 
-  size_t getNewData(uint8_t *data, size_t len){    
-    if(format<FORMAT::DATA)
-      return(0);
-
-    size_t olen;
-    int ret=mbedtls_base64_decode(data,len,&olen,(uint8_t *)newValue.STRING,strlen(newValue.STRING));
-    
-    if(data==NULL)
-      return(olen);
-      
-    if(ret==MBEDTLS_ERR_BASE64_BUFFER_TOO_SMALL)
-      LOG0("\n*** WARNING:  Can't decode Characteristic::%s with getData().  Destination buffer is too small (%d out of %d bytes needed)!\n\n",hapName,len,olen);
-    else if(ret==MBEDTLS_ERR_BASE64_INVALID_CHARACTER)
-      LOG0("\n*** WARNING:  Can't decode Characteristic::%s with getData().  Data is not in base-64 format!\n\n",hapName);
-      
-    return(olen);
-  }  
+  size_t getData(uint8_t *data, size_t len){return(getDataGeneric(data,len,value));}
+  size_t getNewData(uint8_t *data, size_t len){return(getDataGeneric(data,len,newValue));}
 
   void setData(uint8_t *data, size_t len, boolean notify=true){
 
diff --git a/src/src.ino b/src/src.ino
index aa236a0..a2a4477 100644
--- a/src/src.ino
+++ b/src/src.ino
@@ -116,6 +116,7 @@ struct HomeSpanTV : Service::Television {
   static void setTVName(const char *buf, void *arg){
     HomeSpanTV *hsTV=(HomeSpanTV *)arg;
     hsTV->tvname->setString("New Name");
+    Serial.printf("Reset TV Name to '%s'\n",hsTV->tvname->getString());
   }
 
   static void changeOrder(const char *buf, void *arg){