Merge pull request #75 from Luos-io/tx_it

Tx it

Author: Salem-Tho

Robus/inc/config.h

@@ -10,9 +10,6 @@
 /*******************************************************************************
  * Definitions
  ******************************************************************************/
-#define TRUE 1
-#define FALSE 0
-
 #define DEFAULTID 0x00
 #define PROTOCOL_REVISION 0
 #define BROADCAST_VAL 0x0FFF
@@ -23,8 +20,8 @@
 #define MAX_DATA_MSG_SIZE 128
 #define MAX_MULTICAST_ADDRESS 1
 
-#ifndef NBR_NAK_RETRY
-#define NBR_NAK_RETRY 10
+#ifndef NBR_RETRY
+#define NBR_RETRY 10
 #endif
 
 #ifndef MAX_CONTAINER_NUMBER

Robus/inc/context.h

@@ -19,11 +19,10 @@ typedef struct
 {
 
     // Variables
-    node_t node;    /*!< Node informations. */
-    RxCom_t rx;     /*!< Receiver informations. */
-    TxCom_t tx;     /*!< Transmitter informations. */
-    uint8_t ack;    /*!< Ack informations. */
-    PortMng_t port; /*!< port informations. */
+    node_t node;        /*!< Node informations. */
+    RxCom_t rx;         /*!< Receiver informations. */
+    TxCom_t tx;         /*!< Transmitter informations. */
+    PortMng_t port;     /*!< port informations. */
 
     //Virtual container management
     ll_container_t ll_container_table[MAX_CONTAINER_NUMBER]; /*!< Virtual Container table. */

Robus/inc/msg_alloc.h

@@ -31,7 +31,6 @@ void MsgAlloc_ValidHeader(uint8_t valid, uint16_t data_size);
 void MsgAlloc_InvalidMsg(void);
 void MsgAlloc_EndMsg(void);
 void MsgAlloc_SetData(uint8_t data);
-void MsgAlloc_SetMessage(msg_t *msg);
 error_return_t MsgAlloc_IsEmpty(void);
 void MsgAlloc_UsedMsgEnd(void);
 
@@ -51,4 +50,11 @@ error_return_t MsgAlloc_GetLuosTaskSize(uint16_t luos_task_id, uint16_t *size);
 uint16_t MsgAlloc_LuosTasksNbr(void);
 void MsgAlloc_ClearMsgFromLuosTasks(msg_t *msg);
 
+// Tx tasks create, get and consume
+error_return_t MsgAlloc_SetTxTask(ll_container_t *ll_container_pt, uint8_t *data, uint16_t crc, uint16_t size, uint8_t locahost, uint8_t ack);
+void MsgAlloc_PullMsgFromTxTask(void);
+void MsgAlloc_PullContainerFromTxTask(uint16_t container_id);
+error_return_t MsgAlloc_GetTxTask(ll_container_t **ll_container_pt, uint8_t **data, uint16_t *size, uint8_t *locahost);
+error_return_t MsgAlloc_TxAllComplete(void);
+
 #endif /* _MSGALLOC_H_ */

Robus/inc/robus.h

@@ -27,6 +27,6 @@ void Robus_ContainersClear(void);
 error_return_t Robus_SendMsg(ll_container_t *ll_container, msg_t *msg);
 uint16_t Robus_TopologyDetection(ll_container_t *ll_container);
 node_t *Robus_GetNode(void);
-void Robus_DelayUs(uint32_t delay);
+void Robus_Flush(void);
 
 #endif /* _ROBUS_H_ */

Robus/inc/robus_struct.h

@@ -20,17 +20,16 @@
  ******************************************************************************/
 typedef struct __attribute__((__packed__))
 {
-    uint8_t msg_stack_ratio;
+    uint8_t rx_msg_stack_ratio;
     uint8_t luos_stack_ratio;
+    uint8_t tx_msg_stack_ratio;
+    uint8_t buffer_occupation_ratio;
     uint8_t msg_drop_number;
 } memory_stats_t;
 
 typedef struct __attribute__((__packed__))
 {
-    uint8_t msg_nbr;
-    uint8_t fail_msg_nbr;
-    uint8_t *max_collision_retry;
-    uint8_t *max_nak_retry;
+    uint8_t *max_retry;
 } ll_stats_t;
 /*
  * This structure is used to get the message addressing mode list.

Robus/inc/transmission.h

@@ -12,11 +12,20 @@
 /*******************************************************************************
  * Definitions
  ******************************************************************************/
+typedef enum
+{
+    TX_DISABLE, /*!< transmission with ack */
+    TX_OK,      /*!< transmission ok */
+    TX_NOK      /*!< transmission fail */
+
+} transmitStatus_t;
+
 typedef struct
 {
-    uint8_t *data;
-    volatile uint8_t lock;
-    volatile uint8_t collision;
+    volatile uint8_t lock;            // Transmit lock state
+    uint8_t *data;                    // data to compare for collision detection
+    volatile transmitStatus_t status; // data to compare for collision detection
+    volatile uint8_t collision;       // true is a collision occure during this transmission.
 } TxCom_t;
 /*******************************************************************************
  * Variables
@@ -26,7 +35,7 @@ typedef struct
  * Function
  ******************************************************************************/
 void Transmit_SendAck(void);
-error_return_t Transmit_Process(uint8_t *data, uint16_t size);
-void Transmit_WaitUnlockTx(void);
+void Transmit_Process(void);
+void Transmit_End(void);
 
 #endif /* _TRANSMISSION_H_ */