Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update MPSL and SoftDevice Controller #1060

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
description: MPSL Front-End Module common
git_revision: 6b731415b4eaa21e5013c5dc3dfa7f70900e3d78
timestamp: '2023-07-18T09:56:17Z'
git_revision: 2624f1233ba69a736c1088cf900324acca186578
timestamp: '2023-08-02T13:31:10Z'
Binary file modified mpsl/fem/common/lib/cortex-m4/hard-float/libmpsl_fem_common.a
Binary file not shown.
4 changes: 2 additions & 2 deletions mpsl/fem/common/lib/cortex-m4/hard-float/manifest.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
description: MPSL Front-End Module common
git_revision: 6b731415b4eaa21e5013c5dc3dfa7f70900e3d78
timestamp: '2023-07-18T09:57:28Z'
git_revision: 2624f1233ba69a736c1088cf900324acca186578
timestamp: '2023-08-02T13:31:35Z'
Binary file modified mpsl/fem/common/lib/cortex-m4/soft-float/libmpsl_fem_common.a
Binary file not shown.
4 changes: 2 additions & 2 deletions mpsl/fem/common/lib/cortex-m4/soft-float/manifest.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
description: MPSL Front-End Module common
git_revision: 6b731415b4eaa21e5013c5dc3dfa7f70900e3d78
timestamp: '2023-07-18T09:57:28Z'
git_revision: 2624f1233ba69a736c1088cf900324acca186578
timestamp: '2023-08-02T13:31:35Z'
Binary file not shown.
4 changes: 2 additions & 2 deletions mpsl/fem/common/lib/cortex-m4/softfp-float/manifest.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
description: MPSL Front-End Module common
git_revision: 6b731415b4eaa21e5013c5dc3dfa7f70900e3d78
timestamp: '2023-07-18T09:57:28Z'
git_revision: 2624f1233ba69a736c1088cf900324acca186578
timestamp: '2023-08-02T13:31:35Z'
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
description: MPSL Front-End Module nrf21540_gpio
git_revision: 6b731415b4eaa21e5013c5dc3dfa7f70900e3d78
timestamp: '2023-07-18T09:56:17Z'
git_revision: 2624f1233ba69a736c1088cf900324acca186578
timestamp: '2023-08-02T13:31:10Z'
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
description: MPSL Front-End Module nrf21540_gpio
git_revision: 6b731415b4eaa21e5013c5dc3dfa7f70900e3d78
timestamp: '2023-07-18T09:57:28Z'
git_revision: 2624f1233ba69a736c1088cf900324acca186578
timestamp: '2023-08-02T13:31:35Z'
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
description: MPSL Front-End Module nrf21540_gpio
git_revision: 6b731415b4eaa21e5013c5dc3dfa7f70900e3d78
timestamp: '2023-07-18T09:57:28Z'
git_revision: 2624f1233ba69a736c1088cf900324acca186578
timestamp: '2023-08-02T13:31:35Z'
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
description: MPSL Front-End Module nrf21540_gpio
git_revision: 6b731415b4eaa21e5013c5dc3dfa7f70900e3d78
timestamp: '2023-07-18T09:57:28Z'
git_revision: 2624f1233ba69a736c1088cf900324acca186578
timestamp: '2023-08-02T13:31:35Z'
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ extern "C" {
#endif

/**
* @brief Updates the built-in nRF21540 model using provided parameters.
* @brief Update the built-in nRF21540 model using provided parameters.
*
* For given values of @p p_environment, this function populates the contents
* of an internally stored, built-in MPSL nRF21540 power model.
Expand All @@ -45,7 +45,7 @@ extern "C" {
void mpsl_fem_nrf21540_power_model_builtin_update(const mpsl_fem_external_conditions_t * p_environment);

/**
* @brief Gets the pointer to the built-in nRF21540 model.
* @brief Get the pointer to the built-in nRF21540 model.
*
* The pointer returned by this function can be used as a parameter to
* @ref mpsl_fem_power_model_set that results in the built-in model being selected.
Expand Down
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
description: MPSL Front-End Module nrf21540_gpio_spi
git_revision: 6b731415b4eaa21e5013c5dc3dfa7f70900e3d78
timestamp: '2023-07-18T09:56:17Z'
git_revision: 2624f1233ba69a736c1088cf900324acca186578
timestamp: '2023-08-02T13:31:10Z'
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
description: MPSL Front-End Module nrf21540_gpio_spi
git_revision: 6b731415b4eaa21e5013c5dc3dfa7f70900e3d78
timestamp: '2023-07-18T09:57:28Z'
git_revision: 2624f1233ba69a736c1088cf900324acca186578
timestamp: '2023-08-02T13:31:35Z'
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
description: MPSL Front-End Module nrf21540_gpio_spi
git_revision: 6b731415b4eaa21e5013c5dc3dfa7f70900e3d78
timestamp: '2023-07-18T09:57:28Z'
git_revision: 2624f1233ba69a736c1088cf900324acca186578
timestamp: '2023-08-02T13:31:35Z'
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
description: MPSL Front-End Module nrf21540_gpio_spi
git_revision: 6b731415b4eaa21e5013c5dc3dfa7f70900e3d78
timestamp: '2023-07-18T09:57:28Z'
git_revision: 2624f1233ba69a736c1088cf900324acca186578
timestamp: '2023-08-02T13:31:35Z'
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
description: MPSL Front-End Module simple_gpio
git_revision: 6b731415b4eaa21e5013c5dc3dfa7f70900e3d78
timestamp: '2023-07-18T09:56:17Z'
git_revision: 2624f1233ba69a736c1088cf900324acca186578
timestamp: '2023-08-02T13:31:10Z'
Binary file not shown.
4 changes: 2 additions & 2 deletions mpsl/fem/simple_gpio/lib/cortex-m4/hard-float/manifest.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
description: MPSL Front-End Module simple_gpio
git_revision: 6b731415b4eaa21e5013c5dc3dfa7f70900e3d78
timestamp: '2023-07-18T09:57:28Z'
git_revision: 2624f1233ba69a736c1088cf900324acca186578
timestamp: '2023-08-02T13:31:35Z'
Binary file not shown.
4 changes: 2 additions & 2 deletions mpsl/fem/simple_gpio/lib/cortex-m4/soft-float/manifest.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
description: MPSL Front-End Module simple_gpio
git_revision: 6b731415b4eaa21e5013c5dc3dfa7f70900e3d78
timestamp: '2023-07-18T09:57:28Z'
git_revision: 2624f1233ba69a736c1088cf900324acca186578
timestamp: '2023-08-02T13:31:35Z'
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
description: MPSL Front-End Module simple_gpio
git_revision: 6b731415b4eaa21e5013c5dc3dfa7f70900e3d78
timestamp: '2023-07-18T09:57:28Z'
git_revision: 2624f1233ba69a736c1088cf900324acca186578
timestamp: '2023-08-02T13:31:35Z'
Binary file modified mpsl/lib/cortex-m33+nodsp/soft-float/libmpsl.a
Binary file not shown.
4 changes: 2 additions & 2 deletions mpsl/lib/cortex-m33+nodsp/soft-float/manifest.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
description: Multi-Protocol Service Layer (MPSL)
git_revision: 6b731415b4eaa21e5013c5dc3dfa7f70900e3d78
timestamp: '2023-07-18T09:56:17Z'
git_revision: 2624f1233ba69a736c1088cf900324acca186578
timestamp: '2023-08-02T13:31:10Z'
Binary file modified mpsl/lib/cortex-m4/hard-float/libmpsl.a
Binary file not shown.
4 changes: 2 additions & 2 deletions mpsl/lib/cortex-m4/hard-float/manifest.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
description: Multi-Protocol Service Layer (MPSL)
git_revision: 6b731415b4eaa21e5013c5dc3dfa7f70900e3d78
timestamp: '2023-07-18T09:57:28Z'
git_revision: 2624f1233ba69a736c1088cf900324acca186578
timestamp: '2023-08-02T13:31:36Z'
Binary file modified mpsl/lib/cortex-m4/soft-float/libmpsl.a
Binary file not shown.
4 changes: 2 additions & 2 deletions mpsl/lib/cortex-m4/soft-float/manifest.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
description: Multi-Protocol Service Layer (MPSL)
git_revision: 6b731415b4eaa21e5013c5dc3dfa7f70900e3d78
timestamp: '2023-07-18T09:57:28Z'
git_revision: 2624f1233ba69a736c1088cf900324acca186578
timestamp: '2023-08-02T13:31:36Z'
Binary file modified mpsl/lib/cortex-m4/softfp-float/libmpsl.a
Binary file not shown.
4 changes: 2 additions & 2 deletions mpsl/lib/cortex-m4/softfp-float/manifest.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
description: Multi-Protocol Service Layer (MPSL)
git_revision: 6b731415b4eaa21e5013c5dc3dfa7f70900e3d78
timestamp: '2023-07-18T09:57:28Z'
git_revision: 2624f1233ba69a736c1088cf900324acca186578
timestamp: '2023-08-02T13:31:36Z'
2 changes: 2 additions & 0 deletions softdevice_controller/CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ Bug fixes
This could happen if the device was running an advertiser and a periodic activity like a scanner/initiator, a periodic advertiser, a connection etc.
This issue would not occur if scan window was configured to be equal to scan interval (DRGN-19039).
* Fixed an issue where the continuous extended scanner would not be able to receive the ``AUX_ADV_IND`` packet if the time between the ``ADV_EXT_IND`` and ``AUX_ADV_IND`` was more than 840 μs (DRGN-19460).
* Fixed an issue where the stack would dereference a NULL pointer when a resolvable :c:enum:`own_address_type` was used in the HCI Le Extended Create Connection V2 command while the resolving list was empty (DRGN-19580).
* Fixed an issue where the HCI Reset command would not clear the channel map set by the host using the HCI Le Set Host Channel Classification command (DRGN-19623).

nRF Connect SDK v2.4.0
**********************
Expand Down
77 changes: 40 additions & 37 deletions softdevice_controller/include/sdc_hci_vs.h
Original file line number Diff line number Diff line change
Expand Up @@ -81,10 +81,10 @@ enum sdc_hci_opcode_vs
SDC_HCI_OPCODE_CMD_VS_SET_ADV_RANDOMNESS = 0xfd0c,
/** @brief See @ref sdc_hci_cmd_vs_compat_mode_window_offset_set(). */
SDC_HCI_OPCODE_CMD_VS_COMPAT_MODE_WINDOW_OFFSET_SET = 0xfd0d,
/** @brief See @ref sdc_hci_cmd_vs_set_power_control_apr_handling(). */
SDC_HCI_OPCODE_CMD_VS_SET_POWER_CONTROL_APR_HANDLING = 0xfd0e,
/** @brief See @ref sdc_hci_cmd_vs_qos_channel_survey_enable(). */
SDC_HCI_OPCODE_CMD_VS_QOS_CHANNEL_SURVEY_ENABLE = 0xfd0e,
/** @brief See @ref sdc_hci_cmd_vs_set_power_control_apr_handling(). */
SDC_HCI_OPCODE_CMD_VS_SET_POWER_CONTROL_APR_HANDLING = 0xfd0f,
};

/** @brief VS subevent Code values. */
Expand Down Expand Up @@ -465,7 +465,10 @@ typedef __PACKED_STRUCT
typedef __PACKED_STRUCT
{
uint16_t conn_handle;
/** @brief Phy value to apply transmit power level adjustment. */
/** @brief PHY value to apply transmit power level adjustment on. Values 0x01, 0x02, 0x03, and
* 0x04 correspond to LE 1M PHY, LE 2M PHY, LE Coded PHY with S=8 data coding, and LE
* Coded PHY with S=2 data coding respectively.
*/
uint8_t phy;
/** @brief The transmit power level adjustment to request in dBm unit. */
int8_t delta;
Expand Down Expand Up @@ -525,7 +528,19 @@ typedef __PACKED_STRUCT
uint8_t enable;
} sdc_hci_cmd_vs_compat_mode_window_offset_set_t;

/** @brief Set APR handling witin LE Power Control Request command parameter(s). */
/** @brief Enable the Quality of Service (QoS) channel survey module. command parameter(s). */
typedef __PACKED_STRUCT
{
/** @brief Set to 0 to disable, 1 to enable, all other values are RFU. */
uint8_t enable;
/** @brief Requested average interval for the measurements and reports. Valid range is from 7500
* to 4000000. If set to 0, the channel survey role will be scheduled at every available
* opportunity.
*/
uint32_t interval_us;
} sdc_hci_cmd_vs_qos_channel_survey_enable_t;

/** @brief Set APR handling within LE Power Control Request command parameter(s). */
typedef __PACKED_STRUCT
{
/** @brief Enable or Disable APR handling in controller during LE Power Control Request
Expand All @@ -539,18 +554,6 @@ typedef __PACKED_STRUCT
uint8_t margin;
} sdc_hci_cmd_vs_set_power_control_apr_handling_t;

/** @brief Enable the Quality of Service (QoS) channel survey module. command parameter(s). */
typedef __PACKED_STRUCT
{
/** @brief Set to 0 to disable, 1 to enable, all other values are RFU. */
uint8_t enable;
/** @brief Requested average interval for the measurements and reports. Valid range is from 7500
* to 4000000. If set to 0, the channel survey role will be scheduled at every available
* opportunity.
*/
uint32_t interval_us;
} sdc_hci_cmd_vs_qos_channel_survey_enable_t;

/** @} end of HCI_COMMAND_PARAMETERS */

/**
Expand Down Expand Up @@ -1067,27 +1070,6 @@ uint8_t sdc_hci_cmd_vs_set_adv_randomness(const sdc_hci_cmd_vs_set_adv_randomnes
*/
uint8_t sdc_hci_cmd_vs_compat_mode_window_offset_set(const sdc_hci_cmd_vs_compat_mode_window_offset_set_t * p_params);

/** @brief Set APR handling within LE Power Control Request.
*
* This command enables APR handling within scope of the LE Power Control Request
* procedure by the Link Layer.
*
* When APR handling is enabled, the controller applies received APR to the local
* power settings.
* See Core_v.5.4, Vol 6, Part D, Section 6.27, Fig 6.57,
* and Core_v.5.4, Vol 6, Part B, Section 5.1.17.1.
*
* Event(s) generated (unless masked away):
* When the command is completed, an HCI_Command_Complete event shall be generated.
*
* @param[in] p_params Input parameters.
*
* @retval 0 if success.
* @return Returns value between 0x01-0xFF in case of error.
* See Vol 2, Part D, Error for a list of error codes and descriptions.
*/
uint8_t sdc_hci_cmd_vs_set_power_control_apr_handling(const sdc_hci_cmd_vs_set_power_control_apr_handling_t * p_params);

/** @brief Enable the Quality of Service (QoS) channel survey module.
*
* This vendor specific command is used to enable or disable the channel survey module.
Expand Down Expand Up @@ -1119,6 +1101,27 @@ uint8_t sdc_hci_cmd_vs_set_power_control_apr_handling(const sdc_hci_cmd_vs_set_p
*/
uint8_t sdc_hci_cmd_vs_qos_channel_survey_enable(const sdc_hci_cmd_vs_qos_channel_survey_enable_t * p_params);

/** @brief Set APR handling within LE Power Control Request.
*
* This command enables APR handling within scope of the LE Power Control Request
* procedure by the Link Layer.
*
* When APR handling is enabled, the controller applies received APR to the local
* power settings.
* See Core_v.5.4, Vol 6, Part D, Section 6.27, Fig 6.57,
* and Core_v.5.4, Vol 6, Part B, Section 5.1.17.1.
*
* Event(s) generated (unless masked away):
* When the command is completed, an HCI_Command_Complete event shall be generated.
*
* @param[in] p_params Input parameters.
*
* @retval 0 if success.
* @return Returns value between 0x01-0xFF in case of error.
* See Vol 2, Part D, Error for a list of error codes and descriptions.
*/
uint8_t sdc_hci_cmd_vs_set_power_control_apr_handling(const sdc_hci_cmd_vs_set_power_control_apr_handling_t * p_params);

/** @} end of HCI_VS_API */

/** @} */
Expand Down
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
description: SoftDevice Controller
git_revision: 68d0c8acd0dea4b8471471097261bef4e086402d
ll_subversion_number: '0x20A8'
git_revision: 012da8d40de525cfa3488d2f56e059c824df3d58
ll_subversion_number: '0x20B7'
ll_version_number: '0x0D'
timestamp: '2023-07-18T09:55:52Z'
timestamp: '2023-08-02T13:30:37Z'
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
description: SoftDevice Controller
git_revision: 68d0c8acd0dea4b8471471097261bef4e086402d
ll_subversion_number: '0x10A8'
git_revision: 012da8d40de525cfa3488d2f56e059c824df3d58
ll_subversion_number: '0x10B7'
ll_version_number: '0x0D'
timestamp: '2023-07-18T09:56:10Z'
timestamp: '2023-08-02T13:30:22Z'
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
description: SoftDevice Controller
git_revision: 68d0c8acd0dea4b8471471097261bef4e086402d
ll_subversion_number: '0x10A8'
git_revision: 012da8d40de525cfa3488d2f56e059c824df3d58
ll_subversion_number: '0x10B7'
ll_version_number: '0x0D'
timestamp: '2023-07-18T09:56:10Z'
timestamp: '2023-08-02T13:30:22Z'
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
description: SoftDevice Controller
git_revision: 68d0c8acd0dea4b8471471097261bef4e086402d
ll_subversion_number: '0x10A8'
git_revision: 012da8d40de525cfa3488d2f56e059c824df3d58
ll_subversion_number: '0x10B7'
ll_version_number: '0x0D'
timestamp: '2023-07-18T09:56:10Z'
timestamp: '2023-08-02T13:30:22Z'
Loading