Compare commits

..

2 commits

Author SHA1 Message Date
3fabeb9559 changements effectués pour que le merge soit clean 2020-03-31 17:11:31 +02:00
c5892bacc9 ok 2020-03-31 17:07:54 +02:00

View file

@ -658,7 +658,6 @@ void Tasks::StartRobotTaskWithWatchdog(void *arg) {
int killBatteryOk=0; int killBatteryOk=0;
int cpt=1; int cpt=1;
Message * msgSend; Message * msgSend;
int err;
while(1){ while(1){
@ -697,11 +696,13 @@ void Tasks::StartRobotTaskWithWatchdog(void *arg) {
while (killBatteryOk==0) { while (killBatteryOk==0) {
cpt++; cpt++;
if(cpt==2){ if(cpt==2){
rt_mutex_acquire(&mutex_robot, TM_INFINITE);
robot.Write(robot.ReloadWD());
rt_mutex_release(&mutex_robot);
cpt=0; cpt=0;
} }
rt_task_wait_period(NULL); rt_task_wait_period(NULL);
rt_sem_v(&sem_askBattery); rt_sem_v(&sem_askBattery);
rt_mutex_acquire(&mutex_killBattery, TM_INFINITE); rt_mutex_acquire(&mutex_killBattery, TM_INFINITE);
killBatteryOk=killBattery; killBatteryOk=killBattery;
rt_mutex_release(&mutex_killBattery); rt_mutex_release(&mutex_killBattery);
@ -726,7 +727,7 @@ void Tasks::MoveTask(void *arg) {
/**************************************************************************************/ /**************************************************************************************/
/* The task starts here */ /* The task starts here */
/**************************************************************************************/ /**************************************************************************************/
rt_task_set_periodic(NULL, TM_NOW, 1000000000); rt_task_set_periodic(NULL, TM_NOW, 100000000);
while (1) { while (1) {
rt_task_wait_period(NULL); rt_task_wait_period(NULL);