Add Fw::ExternalString and revise string implementations

Fw/Cmd/CMakeLists.txt

@@ -12,6 +12,5 @@ set(SOURCE_FILES
   "${CMAKE_CURRENT_LIST_DIR}/CmdArgBuffer.cpp"
   "${CMAKE_CURRENT_LIST_DIR}/CmdPacket.cpp"
   "${CMAKE_CURRENT_LIST_DIR}/Cmd.fpp"
-  "${CMAKE_CURRENT_LIST_DIR}/CmdString.cpp"
 )
 register_fprime_module()

Fw/Cmd/CmdString.hpp

@@ -1,37 +1,50 @@
+// ======================================================================
+// @file   CmdString.hpp
+// @author F Prime
+// @brief  A string sized for a command argument
+// ======================================================================
+
 #ifndef FW_CMD_STRING_TYPE_HPP
 #define FW_CMD_STRING_TYPE_HPP
 
 #include <FpConfig.hpp>
-#include <Fw/Types/StringType.hpp>
-#include <Fw/Cfg/SerIds.hpp>
+
+#include "Fw/Cfg/SerIds.hpp"
+#include "Fw/Types/ExternalString.hpp"
 
 namespace Fw {
 
-    class CmdStringArg : public Fw::StringBase {
-        public:
+class CmdStringArg : public ExternalString {
+  public:
+    enum {
+        SERIALIZED_TYPE_ID = FW_TYPEID_CMD_STR,
+        SERIALIZED_SIZE = FW_CMD_STRING_MAX_SIZE + sizeof(FwSizeStoreType)
+    };
 
-            enum {
-                SERIALIZED_TYPE_ID = FW_TYPEID_CMD_STR,
-                SERIALIZED_SIZE = FW_CMD_STRING_MAX_SIZE + sizeof(FwBuffSizeType)
-            };
+    //!< zero-argument constructor
+    CmdStringArg() : ExternalString(this->m_buf, sizeof this->m_buf) {}
 
-            CmdStringArg(const char* src);
-            CmdStringArg(const StringBase& src);
-            CmdStringArg(const CmdStringArg& src);
-            CmdStringArg();
-            CmdStringArg& operator=(const CmdStringArg& other);
-            CmdStringArg& operator=(const StringBase& other);
-            CmdStringArg& operator=(const char* other);
-            ~CmdStringArg();
+    //! const CmdStringArg& constructor
+    CmdStringArg(const CmdStringArg& src) : ExternalString(this->m_buf, sizeof this->m_buf, src) {}
 
-            const char* toChar() const;
-            NATIVE_UINT_TYPE getCapacity() const ; //!< return buffer size
+    //! const StringBase& constructor
+    CmdStringArg(const StringBase& src) : ExternalString(this->m_buf, sizeof this->m_buf, src) {}
 
-        private:
+    //!< const char* source constructor
+    CmdStringArg(const char* src) : ExternalString(this->m_buf, sizeof this->m_buf, src) {}
 
-            char m_buf[FW_CMD_STRING_MAX_SIZE];
-    };
+    //! Operator= (const String&)
+    CmdStringArg& operator=(const CmdStringArg& other) {
+        static_cast<StringBase*>(this)->operator=(other);
+        return *this;
+    }
+
+    //! destructor
+    ~CmdStringArg() {}
 
-}
+  private:
+    char m_buf[FW_CMD_STRING_MAX_SIZE];  //!< storage for string data
+};
+}  // namespace Fw
 
 #endif

Fw/Log/CMakeLists.txt

@@ -12,8 +12,6 @@ set(SOURCE_FILES
   "${CMAKE_CURRENT_LIST_DIR}/LogBuffer.cpp"
   "${CMAKE_CURRENT_LIST_DIR}/LogPacket.cpp"
   "${CMAKE_CURRENT_LIST_DIR}/Log.fpp"
-  "${CMAKE_CURRENT_LIST_DIR}/LogString.cpp"
-  "${CMAKE_CURRENT_LIST_DIR}/TextLogString.cpp"
 
 )
 register_fprime_module()

Fw/Log/LogString.hpp

@@ -1,41 +1,50 @@
+// ======================================================================
+// @file   LogString.hpp
+// @author F Prime
+// @brief  A string sized for an event log entry
+// ======================================================================
+
 #ifndef FW_LOG_STRING_TYPE_HPP
 #define FW_LOG_STRING_TYPE_HPP
 
 #include <FpConfig.hpp>
-#include <Fw/Types/StringType.hpp>
-#include <Fw/Cfg/SerIds.hpp>
+
+#include "Fw/Cfg/SerIds.hpp"
+#include "Fw/Types/ExternalString.hpp"
 
 namespace Fw {
 
-    class LogStringArg : public Fw::StringBase {
-        public:
+class LogStringArg : public ExternalString {
+  public:
+    enum {
+        SERIALIZED_TYPE_ID = FW_TYPEID_LOG_STR,
+        SERIALIZED_SIZE = FW_LOG_STRING_MAX_SIZE + sizeof(FwSizeStoreType)
+    };
 
-            enum {
-                SERIALIZED_TYPE_ID = FW_TYPEID_LOG_STR,
-                SERIALIZED_SIZE = FW_LOG_STRING_MAX_SIZE + sizeof(FwBuffSizeType) // size of buffer + storage of two size words
-            };
+    //!< zero-argument constructor
+    LogStringArg() : ExternalString(this->m_buf, sizeof this->m_buf) {}
 
-            LogStringArg();
-            LogStringArg(const LogStringArg& src); //!< LogStringArg string constructor
-            LogStringArg(const StringBase& src); //!< other string constructor
-            LogStringArg(const char* src); //!< char* source constructor
-            LogStringArg& operator=(const LogStringArg& other); //!< assignment operator
-            LogStringArg& operator=(const StringBase& other); //!< other string assignment operator
-            LogStringArg& operator=(const char* other); //!< char* assignment operator
-            ~LogStringArg();
+    //! const LogStringArg& constructor
+    LogStringArg(const LogStringArg& src) : ExternalString(this->m_buf, sizeof this->m_buf, src) {}
 
-            const char* toChar() const override;
-            NATIVE_UINT_TYPE getCapacity() const override;
+    //! const StringBase& constructor
+    LogStringArg(const StringBase& src) : ExternalString(this->m_buf, sizeof this->m_buf, src) {}
 
-            SerializeStatus serialize(SerializeBufferBase& buffer) const override; //!< serialization function
-            SerializeStatus serialize(SerializeBufferBase& buffer, NATIVE_UINT_TYPE maxLen) const override; //!< serialization function
-            SerializeStatus deserialize(SerializeBufferBase& buffer) override; //!< deserialization function
+    //!< const char* source constructor
+    LogStringArg(const char* src) : ExternalString(this->m_buf, sizeof this->m_buf, src) {}
 
-        private:
+    //! Operator= (const String&)
+    LogStringArg& operator=(const LogStringArg& other) {
+        static_cast<StringBase*>(this)->operator=(other);
+        return *this;
+    }
 
-            char m_buf[FW_LOG_STRING_MAX_SIZE];
-    };
+    //! destructor
+    ~LogStringArg() {}
 
-}
+  private:
+    char m_buf[FW_LOG_STRING_MAX_SIZE];  //!< storage for string data
+};
+}  // namespace Fw
 
 #endif