Changed "Check if we expect a ping or a multicast slot" to not perform the check exclusively

mluis1 · mluis1 · commit 6a10f355c2a9 · 2023-09-25T09:58:12.000+02:00
diff --git a/src/mac/LoRaMac.c b/src/mac/LoRaMac.c
@@ -930,7 +930,7 @@ static void ProcessRadioRxDone( void )
             LoRaMacClassBPingSlotTimerEvent( NULL );
             MacCtx.McpsIndication.RxSlot = RX_SLOT_WIN_CLASS_B_PING_SLOT;
         }
-        else if( LoRaMacClassBIsMulticastExpected( ) == true )
+        if( LoRaMacClassBIsMulticastExpected( ) == true )
         {
             LoRaMacClassBSetMulticastSlotState( PINGSLOT_STATE_CALC_PING_OFFSET );
             LoRaMacClassBMulticastSlotTimerEvent( NULL );
@@ -1145,7 +1145,7 @@ static void ProcessRadioRxDone( void )
                     MacCtx.McpsIndication.RxSlot = RX_SLOT_WIN_CLASS_B_PING_SLOT;
                     LoRaMacClassBSetFPendingBit( macMsgData.FHDR.DevAddr, ( uint8_t ) macMsgData.FHDR.FCtrl.Bits.FPending );
                 }
-                else if( LoRaMacClassBIsMulticastExpected( ) == true )
+                if( LoRaMacClassBIsMulticastExpected( ) == true )
                 {
                     LoRaMacClassBSetMulticastSlotState( PINGSLOT_STATE_CALC_PING_OFFSET );
                     LoRaMacClassBMulticastSlotTimerEvent( NULL );

Original file line number	Diff line number	Diff line change
`@@ -930,7 +930,7 @@ static void ProcessRadioRxDone( void )`
`930`	`930`	`LoRaMacClassBPingSlotTimerEvent( NULL );`
`931`	`931`	`MacCtx.McpsIndication.RxSlot = RX_SLOT_WIN_CLASS_B_PING_SLOT;`
`932`	`932`	`}`
`933`		`- else if( LoRaMacClassBIsMulticastExpected( ) == true )`
	`933`	`+ if( LoRaMacClassBIsMulticastExpected( ) == true )`
`934`	`934`	`{`
`935`	`935`	`LoRaMacClassBSetMulticastSlotState( PINGSLOT_STATE_CALC_PING_OFFSET );`
`936`	`936`	`LoRaMacClassBMulticastSlotTimerEvent( NULL );`
`@@ -1145,7 +1145,7 @@ static void ProcessRadioRxDone( void )`
`1145`	`1145`	`MacCtx.McpsIndication.RxSlot = RX_SLOT_WIN_CLASS_B_PING_SLOT;`
`1146`	`1146`	`LoRaMacClassBSetFPendingBit( macMsgData.FHDR.DevAddr, ( uint8_t ) macMsgData.FHDR.FCtrl.Bits.FPending );`
`1147`	`1147`	`}`
`1148`		`- else if( LoRaMacClassBIsMulticastExpected( ) == true )`
	`1148`	`+ if( LoRaMacClassBIsMulticastExpected( ) == true )`
`1149`	`1149`	`{`
`1150`	`1150`	`LoRaMacClassBSetMulticastSlotState( PINGSLOT_STATE_CALC_PING_OFFSET );`
`1151`	`1151`	`LoRaMacClassBMulticastSlotTimerEvent( NULL );`