master/fsm_slave.c
changeset 594 07dd2a7df66e
parent 556 dc5829af044d
child 615 cde783147040
equal deleted inserted replaced
593:78c838980258 594:07dd2a7df66e
   213         return;
   213         return;
   214     }
   214     }
   215 
   215 
   216     if (datagram->state != EC_DATAGRAM_RECEIVED) {
   216     if (datagram->state != EC_DATAGRAM_RECEIVED) {
   217         fsm->state = ec_fsm_slave_state_error;
   217         fsm->state = ec_fsm_slave_state_error;
   218         EC_ERR("Failed to receive station address datagram for slave %i.\n",
   218         EC_ERR("Failed to receive station address datagram for slave %i"
   219                fsm->slave->ring_position);
   219                 " (datagram state %i)\n",
       
   220                 fsm->slave->ring_position, datagram->state);
   220         return;
   221         return;
   221     }
   222     }
   222 
   223 
   223     if (datagram->working_counter != 1) {
   224     if (datagram->working_counter != 1) {
   224         fsm->slave->error_flag = 1;
   225         fsm->slave->error_flag = 1;
   251         return;
   252         return;
   252     }
   253     }
   253 
   254 
   254     if (datagram->state != EC_DATAGRAM_RECEIVED) {
   255     if (datagram->state != EC_DATAGRAM_RECEIVED) {
   255         fsm->state = ec_fsm_slave_state_error;
   256         fsm->state = ec_fsm_slave_state_error;
   256         EC_ERR("Failed to receive AL state datagram from slave %i.\n",
   257         EC_ERR("Failed to receive AL state datagram from slave %i"
   257                fsm->slave->ring_position);
   258                 " (datagram state %i).\n",
       
   259                fsm->slave->ring_position, datagram->state);
   258         return;
   260         return;
   259     }
   261     }
   260 
   262 
   261     if (datagram->working_counter != 1) {
   263     if (datagram->working_counter != 1) {
   262         fsm->slave->error_flag = 1;
   264         fsm->slave->error_flag = 1;
   297         return;
   299         return;
   298     }
   300     }
   299 
   301 
   300     if (datagram->state != EC_DATAGRAM_RECEIVED) {
   302     if (datagram->state != EC_DATAGRAM_RECEIVED) {
   301         fsm->state = ec_fsm_slave_state_error;
   303         fsm->state = ec_fsm_slave_state_error;
   302         EC_ERR("Failed to receive base data datagram for slave %i.\n",
   304         EC_ERR("Failed to receive base data datagram for slave %i"
   303                slave->ring_position);
   305                 " (datagram state %i).\n",
       
   306                slave->ring_position, datagram->state);
   304         return;
   307         return;
   305     }
   308     }
   306 
   309 
   307     if (datagram->working_counter != 1) {
   310     if (datagram->working_counter != 1) {
   308         fsm->slave->error_flag = 1;
   311         fsm->slave->error_flag = 1;
   346         return;
   349         return;
   347     }
   350     }
   348 
   351 
   349     if (datagram->state != EC_DATAGRAM_RECEIVED) {
   352     if (datagram->state != EC_DATAGRAM_RECEIVED) {
   350         fsm->state = ec_fsm_slave_state_error;
   353         fsm->state = ec_fsm_slave_state_error;
   351         EC_ERR("Failed to receive DL status datagram from slave %i.\n",
   354         EC_ERR("Failed to receive DL status datagram from slave %i"
   352                slave->ring_position);
   355                 " (datagram state %i).\n",
       
   356                slave->ring_position, datagram->state);
   353         return;
   357         return;
   354     }
   358     }
   355 
   359 
   356     if (datagram->working_counter != 1) {
   360     if (datagram->working_counter != 1) {
   357         fsm->slave->error_flag = 1;
   361         fsm->slave->error_flag = 1;
   739     }
   743     }
   740 
   744 
   741     if (datagram->state != EC_DATAGRAM_RECEIVED) {
   745     if (datagram->state != EC_DATAGRAM_RECEIVED) {
   742         fsm->state = ec_fsm_slave_state_error;
   746         fsm->state = ec_fsm_slave_state_error;
   743         EC_ERR("Failed to receive sync manager configuration datagram for"
   747         EC_ERR("Failed to receive sync manager configuration datagram for"
   744                " slave %i.\n", slave->ring_position);
   748                " slave %i (datagram state %i).\n",
       
   749                slave->ring_position, datagram->state);
   745         return;
   750         return;
   746     }
   751     }
   747 
   752 
   748     if (datagram->working_counter != 1) {
   753     if (datagram->working_counter != 1) {
   749         slave->error_flag = 1;
   754         slave->error_flag = 1;
   854     }
   859     }
   855 
   860 
   856     if (datagram->state != EC_DATAGRAM_RECEIVED) {
   861     if (datagram->state != EC_DATAGRAM_RECEIVED) {
   857         fsm->state = ec_fsm_slave_state_error;
   862         fsm->state = ec_fsm_slave_state_error;
   858         EC_ERR("Failed to receive process data sync manager configuration"
   863         EC_ERR("Failed to receive process data sync manager configuration"
   859                " datagram for slave %i.\n",
   864                " datagram for slave %i (datagram state %i).\n",
   860                slave->ring_position);
   865                slave->ring_position, datagram->state);
   861         return;
   866         return;
   862     }
   867     }
   863 
   868 
   864     if (datagram->working_counter != 1) {
   869     if (datagram->working_counter != 1) {
   865         slave->error_flag = 1;
   870         slave->error_flag = 1;
   919         return;
   924         return;
   920     }
   925     }
   921 
   926 
   922     if (datagram->state != EC_DATAGRAM_RECEIVED) {
   927     if (datagram->state != EC_DATAGRAM_RECEIVED) {
   923         fsm->state = ec_fsm_slave_state_error;
   928         fsm->state = ec_fsm_slave_state_error;
   924         EC_ERR("Failed to receive FMMUs datagram for slave %i.\n",
   929         EC_ERR("Failed to receive FMMUs datagram for slave %i"
   925                fsm->slave->ring_position);
   930                 " (datagram state %i).\n",
       
   931                fsm->slave->ring_position, datagram->state);
   926         return;
   932         return;
   927     }
   933     }
   928 
   934 
   929     if (datagram->working_counter != 1) {
   935     if (datagram->working_counter != 1) {
   930         fsm->slave->error_flag = 1;
   936         fsm->slave->error_flag = 1;