bluetooth: ble_scan: add manufacturer data filter support by PizzaAllTheWay · Pull Request #783 · nrfconnect/sdk-nrf-bm

PizzaAllTheWay · 2026-04-28T15:31:28Z

Port the manufacturer data scan filter from NCS to Bare Metal.

ble_adv_data: new ble_adv_data_manufacturer_data_find() helper.

ble_scan: new BLE_SCAN_MANUFACTURER_DATA_FILTER filter type with CONFIG_BLE_SCAN_MANUFACTURER_DATA_COUNT and CONFIG_BLE_SCAN_MANUFACTURER_DATA_MAX_LEN Kconfig options. Wired through filter add/enable/disable/remove and the adv report handler.

Unit tests added for the new find helper, filter-add paths and event handler, plus regression guards in existing tests.

Changelog entries added under lib_ble_adv and lib_ble_scan.

Clarified the comment around the match_all ADV/SCAN_RSP cache logic.

Feature verified end-to-end using locally modified ble_hrs and ble_hrs_central samples (peripheral advertising Nordic company ID 0x0059 and central configured with a manufacturer data filter). Sample changes are not included in this PR.

github-actions · 2026-04-28T15:37:15Z

You can find the documentation preview for this PR here.

eivindj-nordic · 2026-04-29T08:35:11Z

+ *               @p target_data_len bytes match @p target_data.
+ * @retval false No match, or the advertising data contains no manufacturer-specific data.
+ */
+bool ble_adv_data_manufacturer_data_find(const uint8_t *data, uint16_t data_len,


Let's align with the other _find functions. Use buf, len for encoded advertising data and length. Also align doxygen formatting (one space after variable etc.).

eivindj-nordic · 2026-04-29T08:38:05Z

+		return false;
+	}
+
+	if (target_data_len > parsed_len) {


We don't necessarily know the exact length, rather we should be able to tell the size of the buffer we have and return the amount of bytes copied.

Can you elaborate? I don't quite follow what you're asking for here.

This function is a bool returning find, it doesn't copy anything, it just reports whether a match exists in the advertising data. Is it something about the existing target_data/target_data_len parameters that I'm missing?

eivindj-nordic · 2026-04-29T08:38:29Z

+		return false;
+	}
+
+	return memcmp(&data[data_offset], target_data, target_data_len) == 0;


Lets do the memcpy first then return true.

eivindj-nordic · 2026-04-29T08:38:52Z

+
+

This does not belong in 7c80e5d

eivindj-nordic · 2026-04-29T08:39:45Z

 	TEST_ASSERT_EQUAL(NRF_SUCCESS, nrf_err);
 }

+static void encode_manufacturer_data_test_data(const uint8_t *payload, uint8_t payload_len)


encode_manufacturer_test_data is enough

eivindj-nordic · 2026-04-29T10:17:10Z

 	  Maximum size of the short name to search for in the advertisement report.

+config BLE_SCAN_MANUFACTURER_DATA_MAX_LEN
+	int "Maximum size for the manufacturer data to search in the advertisement report"


Align with Kconfigs above.

eivindj-nordic · 2026-04-29T10:17:30Z

 	  Maximum number of filters for UUIDs.

+config BLE_SCAN_MANUFACTURER_DATA_COUNT
+	int "Number of manufacturer data filters"


Align with other Kconfigs.

eivindj-nordic · 2026-04-29T10:18:01Z


 	test_ble_scan_init();

-	nrf_err = ble_scan_filters_enable(&ble_scan, 0x20, true);


Put in the same commit as the changes to ble_scan!

eivindj-nordic · 2026-04-29T10:18:31Z


 #define UUID 0x2312

+/* Nordic Semiconductor company identifier (Bluetooth SIG assigned). */


Squash commit adding tests with ble_scan code changes.

eivindj-nordic · 2026-04-29T10:20:01Z

 	TEST_ASSERT_EQUAL(0, scan_event.filter_match.filter_match.short_name_filter_match);
 	TEST_ASSERT_EQUAL(0, scan_event.filter_match.filter_match.appearance_filter_match);
 	TEST_ASSERT_EQUAL(1, scan_event.filter_match.filter_match.uuid_filter_match);
+	TEST_ASSERT_EQUAL(0, scan_event.filter_match.filter_match.manufacturer_data_filter_match);


Add test case for manufacturer_data_filter_match equal to 1

test_ble_scan_on_ble_evt_adv_report_device_manufacturer_data() already covers that case, it asserts scan_event.filter_match.filter_match.manufacturer_data_filter_match == 1 on a successful match.

Did you mean an additional test, like a combined filter case (similar to test_ble_scan_on_ble_evt_adv_report_device_name_and_appearance()) where manufacturer data matches together with another filter? Could you elaborate?

Ok, I assume you meant an extra case with multiple manufacturer data filters, so I added test_ble_scan_on_ble_evt_adv_report_device_multiple_manufacturer_data() (two manuf filters registered). Also bumped CONFIG_BLE_SCAN_MANUFACTURER_DATA_COUNT to 2 and updated test_ble_scan_filter_add_manufacturer_data_error_no_mem() accordingly. Let me know if that's what you had in mind.

peknis · 2026-05-05T05:12:13Z

+   * Added:
+
+      * The :c:func:`ble_adv_data_manufacturer_data_find` function to locate manufacturer-specific data in an advertising payload and prefix-match it against a target value.


Suggested change

* Added:

* The :c:func:`ble_adv_data_manufacturer_data_find` function to locate manufacturer-specific data in an advertising payload and prefix-match it against a target value.

* Added the :c:func:`ble_adv_data_manufacturer_data_find` function to locate manufacturer-specific data in an advertising payload and prefix-match it against a target value.

peknis · 2026-05-05T05:12:40Z

+   * Added:
+
+      * The :c:struct:`ble_scan_filter_data` structure as input to the :c:func:`ble_scan_filter_add` function.
+      * Support for filtering by manufacturer-specific data via the :c:macro:`BLE_SCAN_MANUFACTURER_DATA_FILTER` filter type.


Suggested change

* Support for filtering by manufacturer-specific data via the :c:macro:`BLE_SCAN_MANUFACTURER_DATA_FILTER` filter type.

* Support for filtering by manufacturer-specific data using the :c:macro:`BLE_SCAN_MANUFACTURER_DATA_FILTER` filter type.

peknis · 2026-05-05T05:16:14Z

+ *                        vendor payload.
+ * @param[in] target_data_len Length of the target manufacturer data.
+ *
+ * @retval true  If manufacturer-specific data whose first @p target_data_len bytes match


Suggested change

* @retval true If manufacturer-specific data whose first @p target_data_len bytes match

* @retval true If manufacturer-specific data in which the first @p target_data_len bytes matches

Add ble_adv_data_manufacturer_data_find() to locate manufacturer-specific data in an advertising payload and prefix-match it against a target value. Follows the pattern of existing _find helpers for name, uuid and appearance. Modified unit tests to align with changes. Added changelog. Signed-off-by: Martynas Smilingis <martynas.smilingis@nordicsemi.no>

Expand the comment around the match_all cache logic to explain the on-air ADV → SCAN_REQ → SCAN_RSP exchange and why the paired SCAN_RSP is guaranteed to arrive before an ADV from another device. Also clarify the purpose of the buffer swap. No functional changes. Signed-off-by: Martynas Smilingis <martynas.smilingis@nordicsemi.no>

Port the manufacturer data scan filter from NCS to Bare Metal. Adds BLE_SCAN_MANUFACTURER_DATA_FILTER type, manufacturer_data_filter_match flag in ble_scan_filter_match, and plumbing through ble_scan_filter_add, ble_scan_filters_enable, ble_scan_filters_disable, ble_scan_all_filter_remove and the adv report event handler. New Kconfig options: - CONFIG_BLE_SCAN_MANUFACTURER_DATA_COUNT - CONFIG_BLE_SCAN_MANUFACTURER_DATA_MAX_LEN Modified unit tests to align with changes. Added changelog. Signed-off-by: Martynas Smilingis <martynas.smilingis@nordicsemi.no>

github-actions Bot added the doc-required PR must not be merged without tech writer approval. label Apr 28, 2026

PizzaAllTheWay force-pushed the ble-scan-manufacturer-filter branch from 71e578f to db6182f Compare April 28, 2026 15:32

PizzaAllTheWay force-pushed the ble-scan-manufacturer-filter branch from db6182f to 991a6e7 Compare April 28, 2026 15:39

PizzaAllTheWay marked this pull request as ready for review April 28, 2026 15:47

PizzaAllTheWay requested review from a team as code owners April 28, 2026 15:47

PizzaAllTheWay self-assigned this Apr 28, 2026

eivindj-nordic reviewed Apr 29, 2026

View reviewed changes

PizzaAllTheWay force-pushed the ble-scan-manufacturer-filter branch from 991a6e7 to 4dcd5d0 Compare May 4, 2026 16:47

peknis requested changes May 5, 2026

View reviewed changes

PizzaAllTheWay added 2 commits May 5, 2026 09:14

PizzaAllTheWay force-pushed the ble-scan-manufacturer-filter branch from 4dcd5d0 to e3f6b95 Compare May 5, 2026 07:14

peknis approved these changes May 5, 2026

View reviewed changes

PizzaAllTheWay force-pushed the ble-scan-manufacturer-filter branch from e3f6b95 to 356109f Compare May 5, 2026 08:11


		test_ble_scan_init();

		nrf_err = ble_scan_filters_enable(&ble_scan, 0x20, true);


		#define UUID 0x2312

		/* Nordic Semiconductor company identifier (Bluetooth SIG assigned). */

		* Added:

		* The :c:func:`ble_adv_data_manufacturer_data_find` function to locate manufacturer-specific data in an advertising payload and prefix-match it against a target value.

	* Support for filtering by manufacturer-specific data via the :c:macro:`BLE_SCAN_MANUFACTURER_DATA_FILTER` filter type.
	* Support for filtering by manufacturer-specific data using the :c:macro:`BLE_SCAN_MANUFACTURER_DATA_FILTER` filter type.

	* @retval true If manufacturer-specific data whose first @p target_data_len bytes match
	* @retval true If manufacturer-specific data in which the first @p target_data_len bytes matches

Conversation

PizzaAllTheWay commented Apr 28, 2026

Uh oh!

github-actions Bot commented Apr 28, 2026

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants