Update post review.

SFE-Brudnerd · SFE-Brudnerd · commit 5aef0e479fd1 · 2025-03-26T09:48:44.000-06:00
Change setConfig to accept individual arguments.
Change constructors to use {} for member variable initializers rather than ().
In copy assignment of sfTkArdUART and sfTkArdUARTBus, add a check that doesn't self-reassign.
In sfTkArdUARTBus, change raw pointers to `std::unique_ptr` to make clean up easier.
Modify `test_uart.ino` to match new `setConfig` format.
diff --git a/src/sfTk/sfTkIUART.h b/src/sfTk/sfTkIUART.h
@@ -29,14 +29,14 @@ typedef enum _sfTkUARTParity
 } sfTkUARTParity_t;
 
 inline const char* parityToString(sfTkUARTParity_t parity) {
-    switch(parity) {
-        case kUARTParityEven:  return "Even";
-        case kUARTParityOdd:   return "Odd";
-        case kUARTParityNone:  return "None";
-        case kUARTParityMark:  return "Mark";
-        case kUARTParitySpace: return "Space";
-        default:               return "Unknown";
-    }
+    static const char* parityArray[] = {"Even", "Odd", "None", "Mark", "Space"};
+    
+    // if the parity is out of bounds, return "Unknown"
+    if(parity < kUARTParityEven || parity > kUARTParitySpace)
+        return "Unknown";
+
+    // return the parity string
+    return parityArray[((uint8_t)parity) - 1];
 }
 
 typedef enum _sfTkUARTStopBits
@@ -47,12 +47,14 @@ typedef enum _sfTkUARTStopBits
 } sfTkUARTStopBits_t;
 
 inline const char* stopBitsToString(sfTkUARTStopBits_t stopBits) {
-    switch(stopBits) {
-        case kUARTStopBitsOne:        return "One";
-        case kUARTStopBitsOneAndHalf: return "OneAndHalf";
-        case kUARTStopBitsTwo:        return "Two";
-        default:                      return "Unknown";
-    }
+    static const char* stopBitsArray[] = {"One", "OneAndHalf", "Two"};
+    
+    // Return "Unknown" if index is out of bounds (less than 0 or greater than 2)
+    if (stopBits < kUARTStopBitsOne || stopBits > kUARTStopBitsTwo)
+        return "Unknown";
+
+    // Return the stop bits string
+    return stopBitsArray[(((uint8_t)stopBits) >> 4) - 1];
 }
 
 typedef enum _sfTkUARTDataBits
@@ -64,13 +66,14 @@ typedef enum _sfTkUARTDataBits
 } sfTkUARTDataBits_t;
 
 inline const uint8_t dataBitsToValue(sfTkUARTDataBits_t dataBits) {
-    switch(dataBits) {
-        case kUARTDataBitsFive:   return 5;
-        case kUARTDataBitsSix:    return 6;
-        case kUARTDataBitsSeven:  return 7;
-        case kUARTDataBitsEight:  return 8;
-        default:                  return 0; // Invalid data bits
-    }
+    static const uint8_t dataBitsArray[] = {5, 6, 7, 8};
+    
+    // Check if data bits are within valid range
+    if (dataBits < kUARTDataBitsFive || dataBits > kUARTDataBitsEight)
+        return 0;
+
+    // Extract index using bit shift (removing first 8 bits) and subtract 1
+    return dataBitsArray[(((uint16_t)dataBits) >> 8) - 1];
 }
 
 typedef struct _sfTkUARTConfig
@@ -85,28 +88,12 @@ class sfTkIUART : public sfTkISerial
 {
 public:
     /**
-     *  @brief Constructor for the UART bus
-     * 
-     */
-    sfTkIUART(void)
-    {
-        _config.baudRate = kDefaultBaudRate;
-        _config.parity = kUARTParityNone;
-        _config.stopBits = kUARTStopBitsOne;
-        _config.dataBits = kUARTDataBitsEight;
-    }
-
-    /**
-     * @brief Constructor for the UART bus with the baud rate passed in
+     * @brief Default constructor for the UART bus
      * 
      * @param baudRate
      */
-    sfTkIUART(uint32_t baudRate)
+    sfTkIUART(uint32_t baudRate = kDefaultBaudRate) : _config{kDefaultBaudRate, kUARTDataBitsEight, kUARTParityNone, kUARTStopBitsOne}
     {
-        _config.baudRate = baudRate;
-        _config.parity = kUARTParityNone;
-        _config.stopBits = kUARTStopBitsOne;
-        _config.dataBits = kUARTDataBitsEight;
     }
 
     /**
@@ -217,16 +204,28 @@ class sfTkIUART : public sfTkISerial
     /**
      * @brief setter for the internal config object
      * 
-     * @param config The config struct to set
+     * @param baudRate The baud rate to set
+     * @param dataBits The data bits to set
+     * @param parity The parity to set
+     * @param stopBits The stop bits to set
      * @return sfTkError_t Returns ksfTkErrOk on success, or ksfTkErrFail code
      */
-    virtual sfTkError_t setConfig(const sfTkUARTConfig_t config)
+    virtual sfTkError_t setConfig(const uint32_t baudRate = kDefaultBaudRate, 
+                                  const sfTkUARTDataBits_t dataBits = kDefaultDataBits, 
+                                  const sfTkUARTParity_t parity = kDefaultParity, 
+                                  const sfTkUARTStopBits_t stopBits = kDefaultStopBits)
     {
-        if(_config.baudRate != config.baudRate || 
-            _config.stopBits != config.stopBits || 
-            _config.parity != config.parity || 
-            _config.dataBits != config.dataBits)
-                _config = config;
+        if(_config.baudRate != baudRate)
+            _config.baudRate = baudRate;
+        
+        if(_config.dataBits != dataBits)
+            _config.dataBits = dataBits;
+        
+        if(_config.parity != parity)
+            _config.parity = parity;
+
+        if(_config.stopBits != stopBits)
+            _config.stopBits = stopBits;
 
         return ksfTkErrOk;
     }
diff --git a/src/sfTkArdUART.cpp b/src/sfTkArdUART.cpp
@@ -152,13 +152,22 @@ sfTkError_t sfTkArdUART::setDataBits(const sfTkUARTDataBits_t dataBits)
     return _start(); // start the port again
 }
 
-sfTkError_t sfTkArdUART::setConfig(const sfTkUARTConfig_t config)
+sfTkError_t sfTkArdUART::setConfig(const uint32_t baudRate, 
+                      const sfTkUARTDataBits_t dataBits, 
+                      const sfTkUARTParity_t parity, 
+                      const sfTkUARTStopBits_t stopBits)
 {
-    if(_config.baudRate != config.baudRate || 
-        _config.stopBits != config.stopBits || 
-        _config.parity != config.parity || 
-        _config.dataBits != config.dataBits)
-            _config = config;
+    if(_config.baudRate != baudRate)
+        _config.baudRate = baudRate;
+        
+    if(_config.dataBits != dataBits)
+        _config.dataBits = dataBits;
+        
+    if(_config.parity != parity)
+        _config.parity = parity;
+
+    if(_config.stopBits != stopBits)
+        _config.stopBits = stopBits;
 
     return _start(); // start the port again
 }
diff --git a/src/sfTkArdUART.h b/src/sfTkArdUART.h
@@ -13,6 +13,9 @@
 
 #pragma once
 
+#include <cstddef>
+#include <memory>
+
 #include <Arduino.h>
 #include <api/HardwareSerial.h>
 #include <api/Print.h>
@@ -23,7 +26,6 @@
 #include "sfTk/sfTkError.h"
 #include "sfTk/sfTkISerial.h"
 #include "sfTkArduino.h"
-#include <cstddef>
 #include <sfTk/sfTkIUART.h>
 #include <sfTk/sfTkISerialBus.h>
 
@@ -38,7 +40,7 @@ class sfTkArdUART : public sfTkIUART
     /**
      * @brief Constructor
      */
-    sfTkArdUART(void) : sfTkIUART(), _hwSerial(nullptr)
+    sfTkArdUART(void) : sfTkIUART(), _hwSerial{nullptr}
     {
     }
 
@@ -47,7 +49,7 @@ class sfTkArdUART : public sfTkIUART
      * 
      * @param baudRate The baud rate to set
      */
-    sfTkArdUART(uint32_t baudRate) : sfTkIUART(baudRate), _hwSerial(nullptr)
+    sfTkArdUART(uint32_t baudRate) : sfTkIUART(baudRate), _hwSerial{nullptr}
     {
     }
 
@@ -56,7 +58,7 @@ class sfTkArdUART : public sfTkIUART
      * 
      * @param config The UART configuration settings.
      */
-    sfTkArdUART(sfTkUARTConfig_t config) : sfTkIUART(config), _hwSerial(nullptr)
+    sfTkArdUART(sfTkUARTConfig_t config) : sfTkIUART(config), _hwSerial{nullptr}
     {
     }
 
@@ -65,14 +67,14 @@ class sfTkArdUART : public sfTkIUART
      * 
      * @param uartPort Port for UART communication.
      */
-    sfTkArdUART(arduino::HardwareSerial &hwSerial) : sfTkIUART(), _hwSerial(&hwSerial)
+    sfTkArdUART(arduino::HardwareSerial &hwSerial) : sfTkIUART(), _hwSerial{&hwSerial}
     {
     }
 
     /**
      * @brief Copy Constructor
      */
-    sfTkArdUART(sfTkArdUART const &rhs) : sfTkIUART(rhs._config), _hwSerial(rhs._hwSerial)
+    sfTkArdUART(sfTkArdUART const &rhs) : sfTkIUART(rhs._config), _hwSerial{rhs._hwSerial}
     {
     }
 
@@ -84,8 +86,11 @@ class sfTkArdUART : public sfTkIUART
      */
     sfTkArdUART &operator=(const sfTkArdUART &rhs)
     {
-        _hwSerial = rhs._hwSerial;
-        _config = rhs._config;
+        if(this != &rhs)
+        {
+            sfTkIUART::operator=(rhs);
+            _hwSerial = rhs._hwSerial;
+        }
         return *this;
     }
 
@@ -214,7 +219,10 @@ class sfTkArdUART : public sfTkIUART
      * @param config The config struct to set
      * @return sfTkError_t Returns ksfTkErrOk on success, or ksfTkErrFail code
      */
-    sfTkError_t setConfig(const sfTkUARTConfig_t config) override;
+    sfTkError_t setConfig(const uint32_t baudRate = kDefaultBaudRate, 
+                          const sfTkUARTDataBits_t dataBits = kDefaultDataBits, 
+                          const sfTkUARTParity_t parity = kDefaultParity, 
+                          const sfTkUARTStopBits_t stopBits = kDefaultStopBits) override;
 
     /**
      * @brief Arduino HardwareSerial functionality mappings.
@@ -316,7 +324,7 @@ class sfTkArdUARTBus : public sfTkISerialBus
      * @brief Constructor for the UART bus
      * 
      */
-    sfTkArdUARTBus(void) : sfTkISerialBus(), _uartPort(nullptr)
+    sfTkArdUARTBus(void) : sfTkISerialBus(), _uartPort{nullptr}
     {
     }
 
@@ -325,7 +333,7 @@ class sfTkArdUARTBus : public sfTkISerialBus
      * 
      * @param uartPort UART port to use
      */
-    sfTkArdUARTBus(sfTkArdUART &uartPort) : sfTkISerialBus(), _uartPort(&uartPort)
+    sfTkArdUARTBus(sfTkArdUART &uartPort) : sfTkISerialBus(), _uartPort{std::make_unique<sfTkArdUART>(uartPort)}
     {
     }
 
@@ -334,17 +342,16 @@ class sfTkArdUARTBus : public sfTkISerialBus
      * 
      * @param hwSerial Pass in an underlying hardware serial port
      */
-    sfTkArdUARTBus(arduino::HardwareSerial &hwSerial) : sfTkISerialBus()
+    sfTkArdUARTBus(arduino::HardwareSerial &hwSerial) : sfTkISerialBus(), _uartPort{std::make_unique<sfTkArdUART>(hwSerial)}
     {
-        _uartPort = new sfTkArdUART(hwSerial);
     }
 
     /**
      * @brief Copy constructer 
      * 
      * @param rhs Bus object to be copied
      */
-    sfTkArdUARTBus(sfTkArdUARTBus const &rhs) : sfTkISerialBus(), _uartPort(rhs._uartPort)
+    sfTkArdUARTBus(sfTkArdUARTBus const &rhs) : sfTkISerialBus(), _uartPort{std::make_unique<sfTkArdUART>(*rhs._uartPort)}
     {
     }
 
@@ -356,7 +363,17 @@ class sfTkArdUARTBus : public sfTkISerialBus
      */
     sfTkArdUARTBus &operator=(const sfTkArdUARTBus &rhs)
     {
-        _uartPort = rhs._uartPort;
+        if(this != &rhs)
+        {
+            if(rhs._uartPort)
+            {
+                _uartPort = std::make_unique<sfTkArdUART>(*rhs._uartPort);
+            }
+            else
+            {
+                _uartPort.reset();
+            }
+        }
         return *this;
     }
     
@@ -369,7 +386,7 @@ class sfTkArdUARTBus : public sfTkISerialBus
     sfTkError_t init(void)
     {
         if(!_uartPort)
-            _uartPort = new sfTkArdUART();
+            _uartPort = std::make_unique<sfTkArdUART>();
         return _uartPort->init();
     }
 
@@ -381,7 +398,7 @@ class sfTkArdUARTBus : public sfTkISerialBus
     sfTkError_t init(uint32_t baudRate, bool bInit = false)
     {
         if(!_uartPort)
-            _uartPort = new sfTkArdUART();
+            _uartPort = std::make_unique<sfTkArdUART>();
         return _uartPort->init(baudRate, bInit);
     }
 
@@ -393,7 +410,7 @@ class sfTkArdUARTBus : public sfTkISerialBus
     sfTkError_t init(sfTkUARTConfig_t config, bool bInit = false)
     {
         if(!_uartPort)
-            _uartPort = new sfTkArdUART();
+            _uartPort = std::make_unique<sfTkArdUART>();
         return _uartPort->init(config, bInit);
     }
 
@@ -407,7 +424,7 @@ class sfTkArdUARTBus : public sfTkISerialBus
      */
     sfTkError_t init(sfTkArdUART &uartPort, uint32_t baudRate, bool bInit = false)
     {
-        _uartPort = &uartPort;
+        _uartPort = std::make_unique<sfTkArdUART>(uartPort);
         return _uartPort->init(baudRate, bInit);
     }
 
@@ -421,7 +438,7 @@ class sfTkArdUARTBus : public sfTkISerialBus
      */
     sfTkError_t init(sfTkArdUART &uartPort, sfTkUARTConfig_t config, bool bInit = false)
     {
-        _uartPort = &uartPort;
+        _uartPort = std::make_unique<sfTkArdUART>(uartPort);
         return _uartPort->init(config, bInit);
     }
 
@@ -434,7 +451,7 @@ class sfTkArdUARTBus : public sfTkISerialBus
      */
     sfTkError_t init(sfTkArdUART &uartPort, bool bInit = false)
     {
-        _uartPort = &uartPort;
+        _uartPort = std::make_unique<sfTkArdUART>(uartPort);
         return _uartPort->init(sfTkIUART::kDefaultBaudRate, bInit);
     }
 
@@ -448,7 +465,7 @@ class sfTkArdUARTBus : public sfTkISerialBus
      */
     sfTkError_t init(arduino::HardwareSerial &hwSerial, uint32_t baudRate, bool bInit = false)
     {
-        _uartPort = new sfTkArdUART(hwSerial);
+        _uartPort = std::make_unique<sfTkArdUART>(hwSerial);
         return _uartPort->init(baudRate, bInit);
     }
 
@@ -462,7 +479,7 @@ class sfTkArdUARTBus : public sfTkISerialBus
      */
     sfTkError_t init(arduino::HardwareSerial &hwSerial, sfTkUARTConfig_t config, bool bInit = false)
     {
-        _uartPort = new sfTkArdUART(hwSerial);
+        _uartPort = std::make_unique<sfTkArdUART>(hwSerial);
         return _uartPort->init(config, bInit);
     }
 
@@ -475,7 +492,7 @@ class sfTkArdUARTBus : public sfTkISerialBus
      */
     sfTkError_t init(arduino::HardwareSerial &hwSerial, bool bInit = false)
     {
-        _uartPort = new sfTkArdUART(hwSerial);
+        _uartPort = std::make_unique<sfTkArdUART>(hwSerial);
         return _uartPort->init(sfTkIUART::kDefaultBaudRate, bInit);
     }
 
@@ -513,5 +530,5 @@ class sfTkArdUARTBus : public sfTkISerialBus
 
 protected:
     /** The actual UART port */
-    sfTkArdUART *_uartPort;
+    std::unique_ptr<sfTkArdUART> _uartPort;
 };
diff --git a/tests/test_uart/test_uart.ino b/tests/test_uart/test_uart.ino

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,9 @@`
`13`	`13`
`14`	`14`	`#pragma once`
`15`	`15`
	`16`	`+#include <cstddef>`
	`17`	`+#include <memory>`
	`18`	`+`
`16`	`19`	`#include <Arduino.h>`
`17`	`20`	`#include <api/HardwareSerial.h>`
`18`	`21`	`#include <api/Print.h>`
`@@ -23,7 +26,6 @@`
`23`	`26`	`#include "sfTk/sfTkError.h"`
`24`	`27`	`#include "sfTk/sfTkISerial.h"`
`25`	`28`	`#include "sfTkArduino.h"`
`26`		`-#include <cstddef>`
`27`	`29`	`#include <sfTk/sfTkIUART.h>`
`28`	`30`	`#include <sfTk/sfTkISerialBus.h>`
`29`	`31`
`@@ -38,7 +40,7 @@ class sfTkArdUART : public sfTkIUART`
`38`	`40`	`/**`
`39`	`41`	`* @brief Constructor`
`40`	`42`	`*/`
`41`		`- sfTkArdUART(void) : sfTkIUART(), _hwSerial(nullptr)`
	`43`	`+ sfTkArdUART(void) : sfTkIUART(), _hwSerial{nullptr}`
`42`	`44`	`{`
`43`	`45`	`}`
`44`	`46`
`@@ -47,7 +49,7 @@ class sfTkArdUART : public sfTkIUART`
`47`	`49`	`*`
`48`	`50`	`* @param baudRate The baud rate to set`
`49`	`51`	`*/`
`50`		`- sfTkArdUART(uint32_t baudRate) : sfTkIUART(baudRate), _hwSerial(nullptr)`
	`52`	`+ sfTkArdUART(uint32_t baudRate) : sfTkIUART(baudRate), _hwSerial{nullptr}`
`51`	`53`	`{`
`52`	`54`	`}`
`53`	`55`
`@@ -56,7 +58,7 @@ class sfTkArdUART : public sfTkIUART`
`56`	`58`	`*`
`57`	`59`	`* @param config The UART configuration settings.`
`58`	`60`	`*/`
`59`		`- sfTkArdUART(sfTkUARTConfig_t config) : sfTkIUART(config), _hwSerial(nullptr)`
	`61`	`+ sfTkArdUART(sfTkUARTConfig_t config) : sfTkIUART(config), _hwSerial{nullptr}`
`60`	`62`	`{`
`61`	`63`	`}`
`62`	`64`
`@@ -65,14 +67,14 @@ class sfTkArdUART : public sfTkIUART`
`65`	`67`	`*`
`66`	`68`	`* @param uartPort Port for UART communication.`
`67`	`69`	`*/`
`68`		`- sfTkArdUART(arduino::HardwareSerial &hwSerial) : sfTkIUART(), _hwSerial(&hwSerial)`
	`70`	`+ sfTkArdUART(arduino::HardwareSerial &hwSerial) : sfTkIUART(), _hwSerial{&hwSerial}`
`69`	`71`	`{`
`70`	`72`	`}`
`71`	`73`
`72`	`74`	`/**`
`73`	`75`	`* @brief Copy Constructor`
`74`	`76`	`*/`
`75`		`- sfTkArdUART(sfTkArdUART const &rhs) : sfTkIUART(rhs._config), _hwSerial(rhs._hwSerial)`
	`77`	`+ sfTkArdUART(sfTkArdUART const &rhs) : sfTkIUART(rhs._config), _hwSerial{rhs._hwSerial}`
`76`	`78`	`{`
`77`	`79`	`}`
`78`	`80`
`@@ -84,8 +86,11 @@ class sfTkArdUART : public sfTkIUART`
`84`	`86`	`*/`
`85`	`87`	`sfTkArdUART &operator=(const sfTkArdUART &rhs)`
`86`	`88`	`{`
`87`		`- _hwSerial = rhs._hwSerial;`
`88`		`- _config = rhs._config;`
	`89`	`+ if(this != &rhs)`
	`90`	`+ {`
	`91`	`+ sfTkIUART::operator=(rhs);`
	`92`	`+ _hwSerial = rhs._hwSerial;`
	`93`	`+ }`
`89`	`94`	`return *this;`
`90`	`95`	`}`
`91`	`96`
`@@ -214,7 +219,10 @@ class sfTkArdUART : public sfTkIUART`
`214`	`219`	`* @param config The config struct to set`
`215`	`220`	`* @return sfTkError_t Returns ksfTkErrOk on success, or ksfTkErrFail code`
`216`	`221`	`*/`
`217`		`- sfTkError_t setConfig(const sfTkUARTConfig_t config) override;`
	`222`	`+ sfTkError_t setConfig(const uint32_t baudRate = kDefaultBaudRate,`
	`223`	`+ const sfTkUARTDataBits_t dataBits = kDefaultDataBits,`
	`224`	`+ const sfTkUARTParity_t parity = kDefaultParity,`
	`225`	`+ const sfTkUARTStopBits_t stopBits = kDefaultStopBits) override;`
`218`	`226`
`219`	`227`	`/**`
`220`	`228`	`* @brief Arduino HardwareSerial functionality mappings.`
`@@ -316,7 +324,7 @@ class sfTkArdUARTBus : public sfTkISerialBus`
`316`	`324`	`* @brief Constructor for the UART bus`
`317`	`325`	`*`
`318`	`326`	`*/`
`319`		`- sfTkArdUARTBus(void) : sfTkISerialBus(), _uartPort(nullptr)`
	`327`	`+ sfTkArdUARTBus(void) : sfTkISerialBus(), _uartPort{nullptr}`
`320`	`328`	`{`
`321`	`329`	`}`
`322`	`330`
`@@ -325,7 +333,7 @@ class sfTkArdUARTBus : public sfTkISerialBus`
`325`	`333`	`*`
`326`	`334`	`* @param uartPort UART port to use`
`327`	`335`	`*/`
`328`		`- sfTkArdUARTBus(sfTkArdUART &uartPort) : sfTkISerialBus(), _uartPort(&uartPort)`
	`336`	`+ sfTkArdUARTBus(sfTkArdUART &uartPort) : sfTkISerialBus(), _uartPort{std::make_unique<sfTkArdUART>(uartPort)}`
`329`	`337`	`{`
`330`	`338`	`}`
`331`	`339`
`@@ -334,17 +342,16 @@ class sfTkArdUARTBus : public sfTkISerialBus`
`334`	`342`	`*`
`335`	`343`	`* @param hwSerial Pass in an underlying hardware serial port`
`336`	`344`	`*/`
`337`		`- sfTkArdUARTBus(arduino::HardwareSerial &hwSerial) : sfTkISerialBus()`
	`345`	`+ sfTkArdUARTBus(arduino::HardwareSerial &hwSerial) : sfTkISerialBus(), _uartPort{std::make_unique<sfTkArdUART>(hwSerial)}`
`338`	`346`	`{`
`339`		`- _uartPort = new sfTkArdUART(hwSerial);`
`340`	`347`	`}`
`341`	`348`
`342`	`349`	`/**`
`343`	`350`	`* @brief Copy constructer`
`344`	`351`	`*`
`345`	`352`	`* @param rhs Bus object to be copied`
`346`	`353`	`*/`
`347`		`- sfTkArdUARTBus(sfTkArdUARTBus const &rhs) : sfTkISerialBus(), _uartPort(rhs._uartPort)`
	`354`	`+ sfTkArdUARTBus(sfTkArdUARTBus const &rhs) : sfTkISerialBus(), _uartPort{std::make_unique<sfTkArdUART>(*rhs._uartPort)}`
`348`	`355`	`{`
`349`	`356`	`}`
`350`	`357`
`@@ -356,7 +363,17 @@ class sfTkArdUARTBus : public sfTkISerialBus`
`356`	`363`	`*/`
`357`	`364`	`sfTkArdUARTBus &operator=(const sfTkArdUARTBus &rhs)`
`358`	`365`	`{`
`359`		`- _uartPort = rhs._uartPort;`
	`366`	`+ if(this != &rhs)`
	`367`	`+ {`
	`368`	`+ if(rhs._uartPort)`
	`369`	`+ {`
	`370`	`+ _uartPort = std::make_unique<sfTkArdUART>(*rhs._uartPort);`
	`371`	`+ }`
	`372`	`+ else`
	`373`	`+ {`
	`374`	`+ _uartPort.reset();`
	`375`	`+ }`
	`376`	`+ }`
`360`	`377`	`return *this;`
`361`	`378`	`}`
`362`	`379`
`@@ -369,7 +386,7 @@ class sfTkArdUARTBus : public sfTkISerialBus`
`369`	`386`	`sfTkError_t init(void)`
`370`	`387`	`{`
`371`	`388`	`if(!_uartPort)`
`372`		`- _uartPort = new sfTkArdUART();`
	`389`	`+ _uartPort = std::make_unique<sfTkArdUART>();`
`373`	`390`	`return _uartPort->init();`
`374`	`391`	`}`
`375`	`392`
`@@ -381,7 +398,7 @@ class sfTkArdUARTBus : public sfTkISerialBus`
`381`	`398`	`sfTkError_t init(uint32_t baudRate, bool bInit = false)`
`382`	`399`	`{`
`383`	`400`	`if(!_uartPort)`
`384`		`- _uartPort = new sfTkArdUART();`
	`401`	`+ _uartPort = std::make_unique<sfTkArdUART>();`
`385`	`402`	`return _uartPort->init(baudRate, bInit);`
`386`	`403`	`}`
`387`	`404`
`@@ -393,7 +410,7 @@ class sfTkArdUARTBus : public sfTkISerialBus`
`393`	`410`	`sfTkError_t init(sfTkUARTConfig_t config, bool bInit = false)`
`394`	`411`	`{`
`395`	`412`	`if(!_uartPort)`
`396`		`- _uartPort = new sfTkArdUART();`
	`413`	`+ _uartPort = std::make_unique<sfTkArdUART>();`
`397`	`414`	`return _uartPort->init(config, bInit);`
`398`	`415`	`}`
`399`	`416`
`@@ -407,7 +424,7 @@ class sfTkArdUARTBus : public sfTkISerialBus`
`407`	`424`	`*/`
`408`	`425`	`sfTkError_t init(sfTkArdUART &uartPort, uint32_t baudRate, bool bInit = false)`
`409`	`426`	`{`
`410`		`- _uartPort = &uartPort;`
	`427`	`+ _uartPort = std::make_unique<sfTkArdUART>(uartPort);`
`411`	`428`	`return _uartPort->init(baudRate, bInit);`
`412`	`429`	`}`
`413`	`430`
`@@ -421,7 +438,7 @@ class sfTkArdUARTBus : public sfTkISerialBus`
`421`	`438`	`*/`
`422`	`439`	`sfTkError_t init(sfTkArdUART &uartPort, sfTkUARTConfig_t config, bool bInit = false)`
`423`	`440`	`{`
`424`		`- _uartPort = &uartPort;`
	`441`	`+ _uartPort = std::make_unique<sfTkArdUART>(uartPort);`
`425`	`442`	`return _uartPort->init(config, bInit);`
`426`	`443`	`}`
`427`	`444`
`@@ -434,7 +451,7 @@ class sfTkArdUARTBus : public sfTkISerialBus`
`434`	`451`	`*/`
`435`	`452`	`sfTkError_t init(sfTkArdUART &uartPort, bool bInit = false)`
`436`	`453`	`{`
`437`		`- _uartPort = &uartPort;`
	`454`	`+ _uartPort = std::make_unique<sfTkArdUART>(uartPort);`
`438`	`455`	`return _uartPort->init(sfTkIUART::kDefaultBaudRate, bInit);`
`439`	`456`	`}`
`440`	`457`
`@@ -448,7 +465,7 @@ class sfTkArdUARTBus : public sfTkISerialBus`
`448`	`465`	`*/`
`449`	`466`	`sfTkError_t init(arduino::HardwareSerial &hwSerial, uint32_t baudRate, bool bInit = false)`
`450`	`467`	`{`
`451`		`- _uartPort = new sfTkArdUART(hwSerial);`
	`468`	`+ _uartPort = std::make_unique<sfTkArdUART>(hwSerial);`
`452`	`469`	`return _uartPort->init(baudRate, bInit);`
`453`	`470`	`}`
`454`	`471`
`@@ -462,7 +479,7 @@ class sfTkArdUARTBus : public sfTkISerialBus`
`462`	`479`	`*/`
`463`	`480`	`sfTkError_t init(arduino::HardwareSerial &hwSerial, sfTkUARTConfig_t config, bool bInit = false)`
`464`	`481`	`{`
`465`		`- _uartPort = new sfTkArdUART(hwSerial);`
	`482`	`+ _uartPort = std::make_unique<sfTkArdUART>(hwSerial);`
`466`	`483`	`return _uartPort->init(config, bInit);`
`467`	`484`	`}`
`468`	`485`
`@@ -475,7 +492,7 @@ class sfTkArdUARTBus : public sfTkISerialBus`
`475`	`492`	`*/`
`476`	`493`	`sfTkError_t init(arduino::HardwareSerial &hwSerial, bool bInit = false)`
`477`	`494`	`{`
`478`		`- _uartPort = new sfTkArdUART(hwSerial);`
	`495`	`+ _uartPort = std::make_unique<sfTkArdUART>(hwSerial);`
`479`	`496`	`return _uartPort->init(sfTkIUART::kDefaultBaudRate, bInit);`
`480`	`497`	`}`
`481`	`498`
`@@ -513,5 +530,5 @@ class sfTkArdUARTBus : public sfTkISerialBus`
`513`	`530`
`514`	`531`	`protected:`
`515`	`532`	`/** The actual UART port */`
`516`		`- sfTkArdUART *_uartPort;`
	`533`	`+ std::unique_ptr<sfTkArdUART> _uartPort;`
`517`	`534`	`};`