Move MacCtx.ChannelsNbTransCounter++;

mluis1 · mluis1 · commit 08d2ffa445ca · 2019-06-07T14:06:20.000+02:00
#606
diff --git a/src/mac/LoRaMac.c b/src/mac/LoRaMac.c
@@ -903,7 +903,6 @@ static void ProcessRadioTxDone( void )
     if( MacCtx.NodeAckRequested == false )
     {
         MacCtx.McpsConfirm.Status = LORAMAC_EVENT_INFO_STATUS_OK;
-        MacCtx.ChannelsNbTransCounter++;
     }
 }
 
@@ -2721,6 +2720,10 @@ LoRaMacStatus_t SendFrameOnChannel( uint8_t channel )
     LoRaMacClassBHaltBeaconing( );
 
     MacCtx.MacState |= LORAMAC_TX_RUNNING;
+    if( MacCtx.NodeAckRequested == false )
+    {
+        MacCtx.ChannelsNbTransCounter++;
+    }
 
     // Send now
     Radio.Send( MacCtx.PktBuffer, MacCtx.PktBufferLen );

Original file line number	Diff line number	Diff line change
`@@ -903,7 +903,6 @@ static void ProcessRadioTxDone( void )`
`903`	`903`	`if( MacCtx.NodeAckRequested == false )`
`904`	`904`	`{`
`905`	`905`	`MacCtx.McpsConfirm.Status = LORAMAC_EVENT_INFO_STATUS_OK;`
`906`		`- MacCtx.ChannelsNbTransCounter++;`
`907`	`906`	`}`
`908`	`907`	`}`
`909`	`908`
`@@ -2721,6 +2720,10 @@ LoRaMacStatus_t SendFrameOnChannel( uint8_t channel )`
`2721`	`2720`	`LoRaMacClassBHaltBeaconing( );`
`2722`	`2721`
`2723`	`2722`	`MacCtx.MacState \|= LORAMAC_TX_RUNNING;`
	`2723`	`+ if( MacCtx.NodeAckRequested == false )`
	`2724`	`+ {`
	`2725`	`+ MacCtx.ChannelsNbTransCounter++;`
	`2726`	`+ }`
`2724`	`2727`
`2725`	`2728`	`// Send now`
`2726`	`2729`	`Radio.Send( MacCtx.PktBuffer, MacCtx.PktBufferLen );`