Merge pull request #13 from IRNAS/release/v1.2.0

Release v1.2.0

CHANGELOG.md

@@ -6,6 +6,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 
 ## [Unreleased]
 
+## [1.2.0] - 2023-06-21
+
+### Added
+
+-   Correct LF-TX path configuration based on DTS.
+
 ## [1.1.1] - 2023-06-20
 
 ### Fixed
@@ -53,7 +59,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
     -   stream
     -   tx_rx_continous
 
-[Unreleased]: https://github.com/IRNAS/SWL2001-Zephyr/compare/v1.1.1...HEAD
+[Unreleased]: https://github.com/IRNAS/SWL2001-Zephyr/compare/v1.2.0...HEAD
+
+[1.2.0]: https://github.com/IRNAS/SWL2001-Zephyr/compare/v1.1.1...v1.2.0
 
 [1.1.1]: https://github.com/IRNAS/SWL2001-Zephyr/compare/v1.1.0...v1.1.1
 

drivers/ral_lr11xx_bsp_impl/ral_lr11xx_bsp.c

@@ -15,6 +15,7 @@
 
 #include <smtc_modem_api.h>
 
+#include <lr11xx_bindings_def.h>
 #include <lr11xx_board.h>
 #include <lr11xx_radio.h>
 
@@ -168,11 +169,13 @@ void ral_lr11xx_bsp_get_rf_switch_cfg(const void *context,
 	*rf_switch_cfg = config->rf_switch_cfg;
 }
 
-/* NOTE: this implementation is copied from Semtech */
 void ral_lr11xx_bsp_get_tx_cfg(const void *context,
 			       const ral_lr11xx_bsp_tx_cfg_input_params_t *input_params,
 			       ral_lr11xx_bsp_tx_cfg_output_params_t *output_params)
 {
+	const struct device *lr11xx = context;
+	const struct lr11xx_hal_context_cfg_t *config = lr11xx->config;
+
 	int8_t modem_tx_offset;
 
 	// get modem_configured tx power offset
@@ -190,9 +193,22 @@ void ral_lr11xx_bsp_get_tx_cfg(const void *context,
 	if (input_params->freq_in_hz >= 2400000000) {
 		pa_type = LR11XX_WITH_HF_PA;
 	} else {
-		// Modem is acting in subgig band: use LP/HP PA (both LP and HP are connected on
-		// lr11xx evk board)
-		pa_type = LR11XX_WITH_LF_LP_HP_PA;
+		__ASSERT(config->lf_tx_path_options == LR11XX_TX_PATH_LF_LP ||
+				 config->lf_tx_path_options == LR11XX_TX_PATH_LF_HP ||
+				 config->lf_tx_path_options == LR11XX_TX_PATH_LF_LP_HP,
+			 "LF TX path not configured correctly");
+
+		/* Based on DTS configuration, allow only placed RF paths to be used. */
+		if (config->lf_tx_path_options == LR11XX_TX_PATH_LF_LP) {
+			/* Low power path only */
+			pa_type = LR11XX_WITH_LF_LP_PA;
+		} else if (config->lf_tx_path_options == LR11XX_TX_PATH_LF_HP) {
+			/* High power path only */
+			pa_type = LR11XX_WITH_LF_HP_PA;
+		} else {
+			/* Both paths */
+			pa_type = LR11XX_WITH_LF_LP_PA;
+		}
 	}
 
 	// call the configuration function

west.yml

@@ -94,4 +94,4 @@ manifest:
       repo-path: SWDR001-Zephyr
       path: irnas/SWDR001-Zephyr
       remote: irnas
-      revision: v1.3.0
+      revision: v1.4.0