Merge branch 'Jovan-ux-feature/minor_fixes'

Minor fixes.

Author: endurodave

port/ssp_opt_cus.h

@@ -48,19 +48,19 @@
 
 typedef enum
 {
-    SSP_INVALID_PORT = 0,	// Must be 0
-    SSP_PORT1 = 1,          /// @TODO: Define port ID's
-    SSP_PORT2 = 2,
-    SSP_MAX_PORTS
-} SspPortId;
+    SSP_INVALID_PORT = 0,   // Must be available and must be 0
+    SSP_PORT1 = 1,          // PORT1 (may be replaced....), must be 1
+    SSP_PORT2 = 2,          // PORT2 (may be replaced....)
+    SSP_MAX_PORTS           // Must be available and last no.
+} SspPortId;                // Enum OBLIGATORY!
 
 typedef enum
 {
-    SSP_SOCKET_MIN = 0,	    // Must be 0
+    SSP_SOCKET_MIN = 0,	    // Must be available and must be 0
     SSP_SOCKET_COMMAND = SSP_SOCKET_MIN, /// @TODO: Define socket ID's
     SSP_SOCKET_STATUS,
     SSP_SOCKET_LOG,
-    SSP_SOCKET_MAX
-} SspSocketId;
+    SSP_SOCKET_MAX          // Must be available and last no.
+} SspSocketId;              // Enum OBLIGATORY!
 
 #endif	//#ifndef SSP_OPT_CUS_H

ssp/ssp.c

@@ -92,8 +92,19 @@ typedef struct
     SspData* sspDataForAckNak;
 } SspComObj;
 
+
+/*
+SendTransId SSP transport protocol should be different from 0 (random value) after initialization (restart process).
+A weakness of the SSP protocol is that it is always started at 0.
+If the process restarts on the host side after the first transfer,
+is discarded on the embedded side if another protocol with a transfer counter of 0 is received after the first protocol.
+
+qick fix - never reset the counter to 0 after initialization.
+*/
+static UINT8 g_u8SendTransId = 0U;
+
 // Private module data
-static SspComObj self;
+static SspComObj self = {0};
 
 // Private functions
 static SendData* AllocSendData(UINT16 dataSize);
@@ -655,7 +666,7 @@ void SSP_Term(void)
     UINT16 portId;
 
     // Iterate over all ports
-    for (portId=SSP_PORT1; portId<SSP_MAX_PORTS; portId++)
+    for (portId=1; portId<SSP_MAX_PORTS; portId++)
     {
         // Remove all outgoing messages from list
         while ((sendData = ListFront(portId)) != NULL)
@@ -668,6 +679,11 @@ void SSP_Term(void)
     SSPOSAL_LockDestroy(self.hSspLock);
     self.hSspLock = SSP_OSAL_INVALID_HANDLE_VALUE;
     SSPCOM_Term();
+    self.initOnce = FALSE;
+
+#ifdef USE_FB_ALLOCATOR
+    ALLOC_Term();
+#endif
 }
 
 /// Open a socket on a port. Each socket may only be opened one time. Socket ID's
@@ -771,7 +787,8 @@ SspErr SSP_SendMultiple(UINT8 srcSocketId, UINT8 destSocketId, INT16 numData,
         sendData->sspData->packet.header.bodySize = (UINT8)dataSize;
         sendData->sspData->packet.header.srcId = srcSocketId;
         sendData->sspData->packet.header.destId = destSocketId;
-        sendData->sspData->packet.header.transId = self.sendTransId++;
+        self.sendTransId = g_u8SendTransId++;
+        sendData->sspData->packet.header.transId = self.sendTransId;
         sendData->sspData->packet.header.type = MSG_TYPE_DATA;
 
         // Insert the outgoing message into the list
@@ -867,7 +884,7 @@ void SSP_Process()
     BOOL powerSave = TRUE;
 
     // Iterate over all ports
-    for (portId=SSP_PORT1; portId<SSP_MAX_PORTS; portId++)
+    for (portId=1; portId<SSP_MAX_PORTS; portId++)
     {
         // Is the port open?
         if (SSPCOM_IsPortOpen((SspPortId)portId) == TRUE)

ssp/ssp_com.c

@@ -70,7 +70,7 @@ typedef struct
 } SspComObj;
 
 // Private module data
-static SspComObj self;
+static SspComObj self = {0};
 
 // Private functions
 static UINT8 Checksum(const UINT8* data, UINT16 dataSize);
@@ -407,6 +407,7 @@ void SSPCOM_Term(void)
 
     SSPHAL_Term();
     SSPOSAL_Term();
+    self.initOnce = FALSE;
 }
 
 /// Allocate packet body data.

ssp/ssp_opt.h

@@ -40,7 +40,7 @@
 // Define to output log messages
 #define USE_SSP_TRACE
 
-// Define uses fixed block allocator. Undefine uses malloc/free. 
+// Define uses fixed block allocator. Undefine uses malloc/free.
 #define USE_FB_ALLOCATOR
 
 // Arduino build options
@@ -73,20 +73,20 @@
 
 typedef enum
 {
-    SSP_INVALID_PORT = 0,	// Must be 0
-    SSP_PORT1 = 1,          /// @TODO: Define port ID's
-    SSP_PORT2 = 2,
-    SSP_MAX_PORTS
-} SspPortId;
+    SSP_INVALID_PORT = 0,   // Must be available and must be 0
+    SSP_PORT1 = 1,          // PORT1 (may be replaced....), must be 1
+    SSP_PORT2 = 2,          // PORT2 (may be replaced....)
+    SSP_MAX_PORTS           // Must be available and last no.
+} SspPortId;                // Enum OBLIGATORY!
 
 typedef enum
 {
-    SSP_SOCKET_MIN = 0,	    // Must be 0
+    SSP_SOCKET_MIN = 0,	    // Must be available and must be 0
     SSP_SOCKET_COMMAND = SSP_SOCKET_MIN, /// @TODO: Define socket ID's
     SSP_SOCKET_STATUS,
     SSP_SOCKET_LOG,
-    SSP_SOCKET_MAX
-} SspSocketId;
+    SSP_SOCKET_MAX          // Must be available and last no.
+} SspSocketId;              // Enum OBLIGATORY!
 
 #endif	//#ifdef SSP_CONFIG
 #endif	//#ifndef SSP_OPT_H