validation: lora: CAD option

include/infuse/validation/lora.h

@@ -29,6 +29,8 @@ enum {
 	VALIDATION_LORA_TX = BIT(0),
 	/** Receive a packet */
 	VALIDATION_LORA_RX = BIT(1),
+	/** Perform channel activity detection */
+	VALIDATION_LORA_CAD = BIT(2),
 };
 
 /**

samples/validation/Kconfig

@@ -63,4 +63,8 @@ configdefault SNTP_AUTO
 configdefault INFUSE_IMU_SELF_TEST
 	default y
 
+choice LORA_MODULE_BACKEND
+	default LORA_MODULE_BACKEND_LORA_BASICS_MODEM
+endchoice
+
 source "Kconfig.zephyr"

samples/validation/src/main.c

@@ -180,7 +180,7 @@ K_THREAD_DEFINE(nrf_modem_thread, 2048, nrf_modem_validator, NULL, NULL, NULL, 5
 #if CONFIG_LORA
 static void lora_validation_run(const struct device *dev)
 {
-	if (infuse_validation_lora(dev, VALIDATION_LORA_TX) == 0) {
+	if (infuse_validation_lora(dev, VALIDATION_LORA_TX | VALIDATION_LORA_CAD) == 0) {
 		atomic_inc(&validators_passed);
 	} else {
 		atomic_inc(&validators_failed);

subsys/validation/validation_lora.c

@@ -60,6 +60,27 @@ int infuse_validation_lora(const struct device *dev, uint8_t flags)
 		}
 	}
 
+	if (flags & VALIDATION_LORA_CAD) {
+		config.tx = false;
+		rc = lora_config(dev, &config);
+		if (rc < 0) {
+			VALIDATION_REPORT_ERROR(TEST, "RX Config failed (%d)", rc);
+			goto test_end;
+		}
+
+		/* Run CAD */
+		VALIDATION_REPORT_INFO(TEST, "Starting CAD");
+		rc = lora_cad(dev, 2);
+		if (rc == -ENOTSUP) {
+			VALIDATION_REPORT_INFO(TEST, "CAD not supported");
+		} else if (rc < 0) {
+			VALIDATION_REPORT_ERROR(TEST, "CAD failed (%d)", rc);
+			goto test_end;
+		} else {
+			VALIDATION_REPORT_VALUE(TEST, "CAD_RESULT", "%d", rc);
+		}
+	}
+
 	if (flags & VALIDATION_LORA_RX) {
 		config.tx = false;
 		rc = lora_config(dev, &config);

west.yml

@@ -12,7 +12,7 @@ manifest:
 
   projects:
     - name: zephyr
-      revision: a4559311529e347b1d857b85a47004d7cf86b880
+      revision: 0740a0473aa748df0b431ca21c15181527b4c816
       # Limit imported repositories to reduce clone time
       import:
         name-allowlist: