Merge pull request #139 from Luos-io/rc_2.1.0

Rc 2.1.0

Author: JeromeGalan

Profiles/State/profile_state.c

@@ -1,5 +1,6 @@
 #include "profile_state.h"
 
+#include "timestamp.h"
 /******************************************************************************
  * @brief function converting Luos messages into data and reverse.
  * @param service the target service
@@ -23,6 +24,14 @@ void ProfileState_Handler(service_t *service, msg_t *msg)
                 pub_msg.header.target      = msg->header.source;
                 pub_msg.header.size        = sizeof(bool);
                 memcpy(&pub_msg.data, &profile_state->state, sizeof(bool));
+
+                // if data are timestamped,  create a dedicated luos message to handle it
+                if (Timestamp_GetToken(&profile_state->state))
+                {
+                    Timestamp_EncodeMsg(&pub_msg, &profile_state->state);
+                }
+
+                // send message on the network
                 Luos_SendMsg(service, &pub_msg);
             }
             break;

Robus/inc/config.h

@@ -44,6 +44,9 @@
 #define NBR_PORT 2
 #endif
 
+// Tab of byte. + 2 for overlap ID because aligned to byte
+#define MASK_SIZE ((MAX_SERVICE_NUMBER / 8) + 2)
+
 /*******************************************************************************
  * Variables
  ******************************************************************************/

Robus/inc/context.h

@@ -15,6 +15,14 @@
 /*******************************************************************************
  * Definitions
  ******************************************************************************/
+
+typedef struct
+{
+    network_state_t state;
+    bool timeout_run;
+    uint32_t timeout;
+} network_lock_t;
+
 typedef struct
 {
 
@@ -27,7 +35,15 @@ typedef struct
     // Low level service management
     ll_service_t ll_service_table[MAX_SERVICE_NUMBER]; /*!< Low level Service table. */
     uint16_t ll_service_number;                        /*!< Low level Service number. */
+    uint8_t IDMask[MASK_SIZE];
+    uint16_t ShiftMask;
+
+    // network management
+    network_lock_t node_connected;
 
+    uint8_t filter_state;
+    uint16_t filter_id;
+    uint8_t verbose;
 } context_t;
 
 /*******************************************************************************

Robus/inc/robus.h

@@ -8,10 +8,17 @@
 #define _ROBUS_H_
 
 #include <stdint.h>
+#include <stdbool.h>
 #include "robus_struct.h"
 /*******************************************************************************
  * Definitions
  ******************************************************************************/
+typedef enum
+{
+    NETWORK_LINK_DOWN,
+    NETWORK_LINK_CONNECTING,
+    NETWORK_LINK_UP
+} network_state_t;
 
 /*******************************************************************************
  * Variables
@@ -28,5 +35,10 @@ error_return_t Robus_SendMsg(ll_service_t *ll_service, msg_t *msg);
 uint16_t Robus_TopologyDetection(ll_service_t *ll_service);
 node_t *Robus_GetNode(void);
 void Robus_Flush(void);
+void Robus_ShiftMaskCalculation(uint16_t ID, uint16_t ServiceNumber);
+void Robus_SetNodeDetected(network_state_t);
+network_state_t Robus_IsNodeDetected(void);
+void Robus_SetFilterState(uint8_t state, ll_service_t *service);
+void Robus_SetVerboseMode(uint8_t mode);
 
 #endif /* _ROBUS_H_ */

Robus/inc/robus_struct.h

@@ -148,10 +148,13 @@ typedef enum
 {
     // protocol level command
     WRITE_NODE_ID,   /*!< Get and save a new given node ID. */
-    RESET_DETECTION, /*!< Reset detection*/
+    START_DETECTION, /*!< Start a detection*/
+    END_DETECTION,   /*!< Detect the end of a detection*/
     SET_BAUDRATE,    /*!< Set Robus baudrate*/
     ASSERT,          /*!< Node Assert message (only broadcast with a source as a node */
-    ROBUS_PROTOCOL_NB,
+
+    /*!< Compatibility area*/
+    ROBUS_PROTOCOL_NB = 13,
 } robus_cmd_t;
 
 typedef void (*RX_CB)(ll_service_t *ll_service, msg_t *msg);

Robus/inc/timestamp.h

@@ -0,0 +1,42 @@
+/******************************************************************************
+ * @file timestamp feature
+ * @brief time stamp data
+ * @author Luos
+ * @version 0.0.0
+ ******************************************************************************/
+#ifndef _TIMESTAMP_H_
+#define _TIMESTAMP_H_
+
+#include "stdint.h"
+#include "stdbool.h"
+#include "config.h"
+#include "service_structs.h"
+/*******************************************************************************
+ * Definitions
+ ******************************************************************************/
+typedef struct timestamp_token
+{
+    uint64_t timestamp;
+    void *target;
+    struct timestamp_token *next;
+} timestamp_token_t;
+
+/*******************************************************************************
+ * Variables
+ ******************************************************************************/
+
+/*******************************************************************************
+ * Function
+ ******************************************************************************/
+
+// functions to use on data to time stamp
+void Timestamp_Tag(timestamp_token_t *token, void *target);
+timestamp_token_t *Timestamp_GetToken(void *target);
+
+// functions to use on luos messages
+bool Timestamp_IsTimestampMsg(msg_t *msg);
+void Timestamp_TagMsg(msg_t *msg);
+void Timestamp_EncodeMsg(msg_t *msg, void *target);
+void Timestamp_DecodeMsg(msg_t *msg, uint64_t *timestamp);
+
+#endif /* _TIMESTAMP_H_ */

Robus/inc/transmission.h

@@ -34,6 +34,7 @@ typedef struct
 /*******************************************************************************
  * Function
  ******************************************************************************/
+uint16_t ll_crc_compute(uint8_t *, uint16_t, uint16_t);
 void Transmit_SendAck(void);
 void Transmit_Process(void);
 void Transmit_End(void);

Robus/src/msg_alloc.c

@@ -165,6 +165,16 @@ void MsgAlloc_Init(memory_stats_t *memory_stats)
     {
         mem_stat = memory_stats;
     }
+    ctx.ShiftMask = 0;
+    for (uint16_t i = 0; i < MASK_SIZE; i++)
+    {
+        ctx.IDMask[i] = 0;
+    }
+    // Filter State
+    ctx.filter_id    = 0;
+    ctx.filter_state = true;
+    // Verbose
+    ctx.verbose = LOCALHOST;
     // Reset have been made
     reset_needed = false;
 }