Trond Enger / d7a_1x

Fork of d7a_1x by WizziLab

Revision:
57:fd9c8b67ffdc
Parent:
56:da34fc11e760
Child:
58:38a366236bda
--- a/src/d7a_alp.cpp	Thu Sep 08 09:30:24 2016 +0000
+++ b/src/d7a_alp.cpp	Thu Sep 08 10:44:05 2016 +0000
@@ -338,33 +338,25 @@
         }
         
         FREE(pkt);
-                
-        if (pl->tag_status & ALP_CTRL_ERR)
+        
+        if (pl->nb_status)
         {
-            if (pl->nb_status)
+            status = (d7a_errors_t)pl->status[0].status;
+        }
+        else
+        {
+            if (pl->tag_status & ALP_CTRL_ERR)
             {
-                status = (d7a_errors_t)pl->status[0].status;
+                status = D7A_ERR_TX_FAILED;
             }
             else
             {
-                status = D7A_ERR_TX_FAILED;
+                status = D7A_ERR_NONE;
             }
         }
     
         if (pl->tag_status & ALP_CTRL_EOP)
         {
-            if (!addressee)
-            {
-                if (pl->nb_status)
-                {
-                    status = (d7a_errors_t)pl->status[0].status;
-                }
-                else
-                {
-                    status = D7A_ERR_TX_FAILED;
-                }
-            }
-
             free_pl(pl);
             break;
         }
@@ -442,15 +434,19 @@
         
         FREE(pkt);
         
-        if (pl->tag_status & ALP_CTRL_ERR)
+        if (pl->nb_status)
         {
-            if (pl->nb_status)
+            status = (d7a_errors_t)pl->status[0].status;
+        }
+        else
+        {
+            if (pl->tag_status & ALP_CTRL_ERR)
             {
-                status = (d7a_errors_t)pl->status[0].status;
+                status = D7A_ERR_TX_FAILED;
             }
             else
             {
-                status = D7A_ERR_TX_FAILED;
+                status = D7A_ERR_NONE;
             }
         }