Fixed missing argument in method

src/vscp/common/mdf.cpp

@@ -9744,11 +9744,11 @@ CMDF::deleteEvent(CMDF_Event *pEvent)
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-// createRegisterStortedSet
+// createRegisterSortedSet
 //
 
 void
-CMDF::createRegisterStortedSet(std::set<uint32_t> &set, uint16_t page)
+CMDF::createRegisterSortedSet(std::set<uint32_t> &set, uint16_t page)
 {
   std::deque<CMDF_Register *> *regset = getRegisterObjList();
   for (auto it = regset->cbegin(); it != regset->cend(); ++it) {

src/vscp/common/mdf.h

@@ -3911,7 +3911,7 @@ class CMDF : public CMDF_Object {
     Create a set with sorted register offsets for a page
     @param set a std_set with offset uint32_t items
   */
-  void createRegisterStortedSet(std::set<uint32_t> &set, uint16_t page);
+  void createRegisterSortedSet(std::set<uint32_t> &set, uint16_t page);
 
   /*!
     Get all registers for a specific page

src/vscp/common/vscp-bootdevice-vscp.cpp

@@ -280,7 +280,7 @@ CBootDevice_VSCP::deviceInit(cguid &ourguid, uint8_t devicecode, bool bAbortOnFi
   if (VSCP_ERROR_SUCCESS !=
       (rv = checkResponse(ex, node_guid, VSCP_TYPE_PROTOCOL_ACK_BOOT_LOADER, VSCP_TYPE_PROTOCOL_NACK_BOOT_LOADER))) {
     // Negative response on bootmode request- return
-    spdlog::debug("VSCP bootloader: NACK recived from set bootloader request.");
+    spdlog::debug("VSCP bootloader: NACK received from set bootloader request.");
     if (nullptr != m_statusCallback) {
       m_statusCallback(-1, "VSCP bootloader: NACK received from set bootloader request.");
     }
@@ -688,9 +688,9 @@ CBootDevice_VSCP::checkResponse(vscpEventEx &ex,
       // Is this a read/write reply from the node?
       if ((VSCP_CLASS1_PROTOCOL == ex.vscp_class) && (response_event_ack == ex.vscp_type) && guid.isSameGUID(ex.GUID)) {
         // ACK response
-        spdlog::debug("VSCP Bootloader: ACK recived.");
+        spdlog::debug("VSCP Bootloader: ACK received.");
         if (nullptr != m_statusCallback) {
-          m_statusCallback(-1, "VSCP Bootloader:ACK recived");
+          m_statusCallback(-1, "VSCP Bootloader:ACK received");
         }
         rv = VSCP_ERROR_SUCCESS;
         break;
@@ -700,9 +700,9 @@ CBootDevice_VSCP::checkResponse(vscpEventEx &ex,
       if ((VSCP_CLASS1_PROTOCOL == ex.vscp_class) && (response_event_nack == ex.vscp_type) &&
           guid.isSameGUID(ex.GUID)) {
         // NACK response
-        spdlog::debug("VSCP Bootloader: NACK recived.");
+        spdlog::debug("VSCP Bootloader: NACK received.");
         if (nullptr != m_statusCallback) {
-          m_statusCallback(-1, "VSCP Bootloader: NACK recived.");
+          m_statusCallback(-1, "VSCP Bootloader: NACK received.");
         }
         rv = VSCP_ERROR_NACK;
         break;

src/vscp/common/vscp-bootdevice-vscp.h

@@ -31,7 +31,6 @@
 
 #include "vscp.h"
 
-#include <string>
 
 // This macro construct a signed integer from two unsigned chars in a safe way
 #define construct_signed16(msb, lsb) ((int16_t) ((((uint16_t) msb) << 8) + (uint16_t) lsb))
@@ -52,9 +51,11 @@ class CBootDevice_VSCP : public CBootDevice {
   /*!
       Constructor
 
-      @param pdll Pointer to opended CANAL object.
+      @param pclient Pointer to active client object.
       @param nodeid Nickname/nodeid for node that should be loaded
-      with new code.
+        with new code.
+      @param statusCallback Status callback function or NULL
+      @param timeout Timeout for response  
   */
   CBootDevice_VSCP(CVscpClient *pclient,
                    uint8_t nodeid,
@@ -67,10 +68,11 @@ class CBootDevice_VSCP : public CBootDevice {
     This is Level I over Level II that uses an interface on
     a remote device to communicate with Level I nodes.
 
-    @param pdll Pointer to opended CANAL object.
+    @param pclient Pointer to active client object.
     @param nodeid Nickname/nodeid for node that should be loaded
     @param guidif GUID for interface.
-    with new code.
+    @param statusCallback Status callback function or NULL
+    @param timeout Timeout for response
 */
   CBootDevice_VSCP(CVscpClient *pclient,
                    uint8_t nodeid,
@@ -83,8 +85,10 @@ class CBootDevice_VSCP : public CBootDevice {
 
       This is a full level II device. No interface, full GUID.
 
-      @param ptcpip Pointer to opened TCP/IP interface object.
+      @param pclient Pointer to active client object.
       @param guid GUID for node to bootload.
+      @param statusCallback Status callback function or NULL
+      @param timeout Timeout for response
   */
   CBootDevice_VSCP(CVscpClient *pclient,
                    cguid &guid,
@@ -186,13 +190,13 @@ class CBootDevice_VSCP : public CBootDevice {
 
   /*!
     Restart remote device
-    @return VSCP_ERROR_SUCCESS is returned on success, ortherwise error code
+    @return VSCP_ERROR_SUCCESS is returned on success, otherwise error code
   */
   int deviceRestart(void);
 
   /*!
     Reboot remote device
-    @return VSCP_ERROR_SUCCESS is returned on success, ortherwise error code
+    @return VSCP_ERROR_SUCCESS is returned on success, otherwise error code
   */
   int deviceReboot(void);
 
@@ -201,7 +205,7 @@ class CBootDevice_VSCP : public CBootDevice {
   /*!
     Write block start to remote device
     @param block Block number to write
-    @param type Memoty type code for memory to write
+    @param type Memory type code for memory to write
     @return VSCP_ERROR_SUCCESS on success.
   */
   int writeBlockStart(uint32_t block, uint8_t type);
@@ -215,7 +219,7 @@ class CBootDevice_VSCP : public CBootDevice {
 
    /*!
       Write a sector
-      @param paddr Pointer to firts byte of 8-byte block to write
+      @param paddr Pointer to first byte of 8-byte block to write
         to remote device
       @param size Number of data bytes to send. Must be less than the
         max event data (8/512)
@@ -236,8 +240,8 @@ class CBootDevice_VSCP : public CBootDevice {
     @param guid GUID for our device the expected event should originate from.
     @param response_event_ack ACK event type.
     @param response_event_nack  NACK event type.
-    @return VSCP_ERROR_SUCCESS if ack is received within the timoeut time. VSCP_ERROR_NACK if NACK
-      event is received. VSCP_ERROR_TIMEOUT if timeout occured.
+    @return VSCP_ERROR_SUCCESS if ack is received within the timeout time. VSCP_ERROR_NACK if NACK
+      event is received. VSCP_ERROR_TIMEOUT if timeout occurred.
   */
   int checkResponse(vscpEventEx &ex,
                     cguid &guid,
@@ -277,7 +281,7 @@ class CBootDevice_VSCP : public CBootDevice {
     it holds 8/512 bytes. It's up to the remote device to handle both
     cases.
 
-    block size can be less then chunk size. This is escpecially true
+    block size can be less then chunk size. This is especially true
     for level II
   */
   uint16_t m_chunkSize;
@@ -286,7 +290,7 @@ class CBootDevice_VSCP : public CBootDevice {
     Block size in bytes
     -------------------
     This is the block size the remote device expect us to send before
-    programing a block.
+    programming a block.
     Programming is done in chunks of 8 or 512 bytes or less until a full
     block has been written.
   */

src/vscp/common/vscp-bootdevice.h

@@ -202,7 +202,7 @@ class CBootDevice {
     @param pmin Pointer to variable that will get min address
     @param pmax Pointer to variable that will get max address
     @return VSCP_ERROR_SUCCESS on success.
-      VSCP_ERROR_INVALID_POINTER if ponters are invalid.
+      VSCP_ERROR_INVALID_POINTER if pointers are invalid.
       VSCP_ERROR_INVALID_PARAMETER if end <= start
       VSCP_ERROR_ERROR if no memory defined in the selected range. value of
         pmin/pmax is zero in this case.
@@ -243,7 +243,7 @@ class CBootDevice {
           and status message (const char *)
     @return VSCP_ERROR_SUCCESS on success.
   */
-  virtual int deviceLoad(std::function<void(int, const char *)> statusCallback = nullptr) = 0;
+  virtual int deviceLoad(std::function<void(int, const char *)> statusCallback = nullptr, bool bAbortOnFirmwareCodeFail = false) = 0;
 
   /*!
     Restart the device
@@ -258,7 +258,7 @@ class CBootDevice {
   CVscpClient *m_pclient;
 
   /*!
-    Tomeout for read operations
+    Timeout for read operations
   */
   uint32_t m_timeout;