Conversion en commentaires non doc
Permet de réduire les conflits à la génération de la doc auto
This commit is contained in:
parent
d4e6ba4042
commit
873eafb77f
2 changed files with 42 additions and 41 deletions
|
@ -59,17 +59,17 @@ public:
|
||||||
void Join();
|
void Join();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
/**********************************************************************/
|
/* *********************************************************************
|
||||||
/* Shared data */
|
* Shared data
|
||||||
/**********************************************************************/
|
* ********************************************************************/
|
||||||
ComMonitor monitor;
|
ComMonitor monitor;
|
||||||
ComRobot robot;
|
ComRobot robot;
|
||||||
int robotStarted = 0;
|
int robotStarted = 0;
|
||||||
int move = MESSAGE_ROBOT_STOP;
|
int move = MESSAGE_ROBOT_STOP;
|
||||||
|
|
||||||
/**********************************************************************/
|
/* *********************************************************************
|
||||||
/* Tasks */
|
* Tasks
|
||||||
/**********************************************************************/
|
* ********************************************************************/
|
||||||
RT_TASK th_server;
|
RT_TASK th_server;
|
||||||
RT_TASK th_sendToMon;
|
RT_TASK th_sendToMon;
|
||||||
RT_TASK th_receiveFromMon;
|
RT_TASK th_receiveFromMon;
|
||||||
|
@ -77,31 +77,32 @@ private:
|
||||||
RT_TASK th_startRobot;
|
RT_TASK th_startRobot;
|
||||||
RT_TASK th_move;
|
RT_TASK th_move;
|
||||||
|
|
||||||
/**********************************************************************/
|
/* *********************************************************************
|
||||||
/* Mutex */
|
* Mutex
|
||||||
/**********************************************************************/
|
* ********************************************************************/
|
||||||
RT_MUTEX mutex_monitor;
|
RT_MUTEX mutex_monitor;
|
||||||
RT_MUTEX mutex_robot;
|
RT_MUTEX mutex_robot;
|
||||||
RT_MUTEX mutex_robotStarted;
|
RT_MUTEX mutex_robotStarted;
|
||||||
RT_MUTEX mutex_move;
|
RT_MUTEX mutex_move;
|
||||||
|
|
||||||
/**********************************************************************/
|
/* *********************************************************************
|
||||||
/* Semaphores */
|
* Semaphores
|
||||||
/**********************************************************************/
|
* ********************************************************************/
|
||||||
RT_SEM sem_barrier;
|
RT_SEM sem_barrier;
|
||||||
RT_SEM sem_openComRobot;
|
RT_SEM sem_openComRobot;
|
||||||
RT_SEM sem_serverOk;
|
RT_SEM sem_serverOk;
|
||||||
RT_SEM sem_startRobot;
|
RT_SEM sem_startRobot;
|
||||||
|
|
||||||
/**********************************************************************/
|
/* *********************************************************************
|
||||||
/* Message queues */
|
* Message queues
|
||||||
/**********************************************************************/
|
**********************************************************************/
|
||||||
int MSG_QUEUE_SIZE;
|
int MSG_QUEUE_SIZE;
|
||||||
RT_QUEUE q_messageToMon;
|
RT_QUEUE q_messageToMon;
|
||||||
|
|
||||||
/**********************************************************************/
|
/* *********************************************************************
|
||||||
/* Tasks' functions */
|
* Tasks' functions
|
||||||
/**********************************************************************/
|
* ********************************************************************/
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief Thread handling server communication with the monitor.
|
* @brief Thread handling server communication with the monitor.
|
||||||
*/
|
*/
|
||||||
|
@ -132,9 +133,9 @@ private:
|
||||||
*/
|
*/
|
||||||
[[noreturn]] void MoveTask(void *arg);
|
[[noreturn]] void MoveTask(void *arg);
|
||||||
|
|
||||||
/**********************************************************************/
|
/* *********************************************************************
|
||||||
/* Queue services */
|
* Queue services
|
||||||
/**********************************************************************/
|
* ********************************************************************/
|
||||||
/**
|
/**
|
||||||
* Write a message in a given queue
|
* Write a message in a given queue
|
||||||
* @param queue Queue identifier
|
* @param queue Queue identifier
|
||||||
|
|
Loading…
Reference in a new issue