esp32: Fixes in order to get the US915 certification passing.

Author: Daniel Campora

esp32/mods/modlora.c

@@ -558,6 +558,8 @@ static void McpsConfirm (McpsConfirm_t *McpsConfirm) {
 }
 
 static void McpsIndication (McpsIndication_t *mcpsIndication) {
+    bool bDoEcho = true;
+
     if (mcpsIndication->Status != LORAMAC_EVENT_INFO_STATUS_OK) {
         return;
     }
@@ -590,8 +592,22 @@ static void McpsIndication (McpsIndication_t *mcpsIndication) {
     lora_obj.snr = mcpsIndication->Snr;
     lora_obj.sfrx = mcpsIndication->RxDatarate;
 
-    if (lora_obj.ComplianceTest.Running == true) {
-        lora_obj.ComplianceTest.DownLinkCounter++;
+    if ((mcpsIndication->Port == 224) && (lora_obj.ComplianceTest.Enabled == true)
+        && (lora_obj.ComplianceTest.Running == true)) {
+       MibRequestConfirm_t mibReq;
+        mibReq.Type = MIB_CHANNELS_DATARATE;
+        LoRaMacMibGetRequestConfirm( &mibReq );
+        if (mcpsIndication->Buffer[0] == 4)     { // echo service
+            if (ValidatePayloadLength(mcpsIndication->BufferSize, mibReq.Param.ChannelsDatarate, 0)) {
+                lora_obj.ComplianceTest.DownLinkCounter++;
+            } else {
+                // do not increment the downlink counter and don't send the echo either
+                bDoEcho = false;
+            }
+        } else {
+            // increament the downlink counter anyhow
+            lora_obj.ComplianceTest.DownLinkCounter++;
+        }
     }
 
     // printf("MCPS indication!=%d :%d\n", mcpsIndication->BufferSize, mcpsIndication->Port);
@@ -674,10 +690,15 @@ static void McpsIndication (McpsIndication_t *mcpsIndication) {
                         break;
                     case 4: // (vii)
                         // return the payload
-                        if (mcpsIndication->BufferSize <= LORA_PAYLOAD_SIZE_MAX) {
-                            memcpy((void *)rx_data_isr.data, mcpsIndication->Buffer, mcpsIndication->BufferSize);
-                            rx_data_isr.len = mcpsIndication->BufferSize;
-                            xQueueSend(xRxQueue, (void *)&rx_data_isr, 0);
+                        if (bDoEcho) {
+                            if (mcpsIndication->BufferSize <= LORA_PAYLOAD_SIZE_MAX) {
+                                memcpy((void *)rx_data_isr.data, mcpsIndication->Buffer, mcpsIndication->BufferSize);
+                                rx_data_isr.len = mcpsIndication->BufferSize;
+                                xQueueSend(xRxQueue, (void *)&rx_data_isr, 0);
+                            }
+                        } else {
+                            // set the state back to 1
+                            lora_obj.ComplianceTest.State = 1;
                         }
                         // printf("Crypto message received\n");
                         break;

esp32/tools/lora/certification/certification.py

@@ -89,7 +89,7 @@ def run(self):
                         self.s.send(self.tx_payload)
                     except Exception:
                         pass
-                    time.sleep(1)
+                    time.sleep(1.5)
 
                     if self.lora.compliance_test().link_check:
                         self.tx_payload = bytes([5, self.lora.compliance_test().demod_margin,