applications: nrf_desktop: LED indicates peer search

pdunaj · pdunaj · commit b8b81a5d9d8d · 2019-11-05T13:01:13.000+01:00
Instead of breathing LED when the device is disconnected, do this
when it is actively searching for a peer.

This commit also shortens the breathing time from 1s to 0.5s.

Jira:DESK-753

Signed-off-by: Pawel Dunaj &lt;pawel.dunaj@nordicsemi.no&gt;
diff --git a/applications/nrf_desktop/configuration/common/led_state.h b/applications/nrf_desktop/configuration/common/led_state.h
@@ -31,6 +31,7 @@ enum led_system_state {
 enum led_peer_state {
 	LED_PEER_STATE_DISCONNECTED,
 	LED_PEER_STATE_CONNECTED,
+	LED_PEER_STATE_PEER_SEARCH,
 	LED_PEER_STATE_CONFIRM_SELECT,
 	LED_PEER_STATE_CONFIRM_ERASE,
 	LED_PEER_STATE_ERASE_ADV,
diff --git a/applications/nrf_desktop/configuration/nrf52840_pca10056/led_state_def.h b/applications/nrf_desktop/configuration/nrf52840_pca10056/led_state_def.h
@@ -31,8 +31,9 @@ static const struct led_effect led_system_state_effect[LED_SYSTEM_STATE_COUNT] =
 
 static const struct led_effect led_peer_state_effect[LED_PEER_CNT][LED_PEER_STATE_COUNT] = {
 	{
-		[LED_PEER_STATE_DISCONNECTED]   = LED_EFFECT_LED_BREATH(1000, LED_COLOR(100)),
+		[LED_PEER_STATE_DISCONNECTED]   = LED_EFFECT_LED_OFF(),
 		[LED_PEER_STATE_CONNECTED]      = LED_EFFECT_LED_ON(LED_COLOR(100)),
+		[LED_PEER_STATE_PEER_SEARCH]    = LED_EFFECT_LED_BREATH(1000, LED_COLOR(100)),
 		[LED_PEER_STATE_CONFIRM_SELECT] = LED_EFFECT_LED_BLINK(50, LED_COLOR(100)),
 		[LED_PEER_STATE_CONFIRM_ERASE]  = LED_EFFECT_LED_BLINK(25, LED_COLOR(100)),
 		[LED_PEER_STATE_ERASE_ADV]	= LED_EFFECT_LED_BREATH(100, LED_COLOR(100)),
diff --git a/applications/nrf_desktop/configuration/nrf52840_pca10059/led_state_def.h b/applications/nrf_desktop/configuration/nrf52840_pca10059/led_state_def.h
@@ -31,15 +31,17 @@ static const struct led_effect led_system_state_effect[LED_SYSTEM_STATE_COUNT] =
 
 static const struct led_effect led_peer_state_effect[LED_PEER_CNT][LED_PEER_STATE_COUNT] = {
 	{
-		[LED_PEER_STATE_DISCONNECTED]   = LED_EFFECT_LED_BREATH(1000, LED_COLOR(100)),
+		[LED_PEER_STATE_DISCONNECTED]   = LED_EFFECT_LED_OFF(),
 		[LED_PEER_STATE_CONNECTED]      = LED_EFFECT_LED_ON(LED_COLOR(100)),
+		[LED_PEER_STATE_PEER_SEARCH]    = LED_EFFECT_LED_BREATH(500, LED_COLOR(100)),
 		[LED_PEER_STATE_CONFIRM_SELECT] = LED_EFFECT_LED_BLINK(50, LED_COLOR(100)),
 		[LED_PEER_STATE_CONFIRM_ERASE]  = LED_EFFECT_LED_BLINK(25, LED_COLOR(100)),
 		[LED_PEER_STATE_ERASE_ADV]	= LED_EFFECT_LED_BREATH(100, LED_COLOR(100)),
 	},
 	{
-		[LED_PEER_STATE_DISCONNECTED]   = LED_EFFECT_LED_BREATH(1000, LED_COLOR(100)),
+		[LED_PEER_STATE_DISCONNECTED]   = LED_EFFECT_LED_OFF(),
 		[LED_PEER_STATE_CONNECTED]      = LED_EFFECT_LED_ON(LED_COLOR(100)),
+		[LED_PEER_STATE_PEER_SEARCH]    = LED_EFFECT_LED_BREATH(500, LED_COLOR(100)),
 		[LED_PEER_STATE_CONFIRM_SELECT] = LED_EFFECT_LED_BLINK(50, LED_COLOR(100)),
 		[LED_PEER_STATE_CONFIRM_ERASE]  = LED_EFFECT_LED_BLINK(25, LED_COLOR(100)),
 		[LED_PEER_STATE_ERASE_ADV]	= LED_EFFECT_LED_BREATH(100, LED_COLOR(100)),
diff --git a/applications/nrf_desktop/configuration/nrf52840_pca20041/led_state_def.h b/applications/nrf_desktop/configuration/nrf52840_pca20041/led_state_def.h
@@ -31,29 +31,33 @@ static const struct led_effect led_system_state_effect[LED_SYSTEM_STATE_COUNT] =
 
 static const struct led_effect led_peer_state_effect[LED_PEER_CNT][LED_PEER_STATE_COUNT] = {
 	{
-		[LED_PEER_STATE_DISCONNECTED]   = LED_EFFECT_LED_BREATH(1000, LED_COLOR(150, 0, 0)),
+		[LED_PEER_STATE_DISCONNECTED]   = LED_EFFECT_LED_OFF(),
 		[LED_PEER_STATE_CONNECTED]      = LED_EFFECT_LED_ON(LED_COLOR(150, 0, 0)),
+		[LED_PEER_STATE_PEER_SEARCH]    = LED_EFFECT_LED_BREATH(500, LED_COLOR(150, 0, 0)),
 		[LED_PEER_STATE_CONFIRM_SELECT] = LED_EFFECT_LED_BLINK(50, LED_COLOR(150, 0, 0)),
 		[LED_PEER_STATE_CONFIRM_ERASE]  = LED_EFFECT_LED_BLINK(25, LED_COLOR(150, 0, 0)),
 		[LED_PEER_STATE_ERASE_ADV]	= LED_EFFECT_LED_BREATH(100, LED_COLOR(150, 0, 0)),
 	},
 	{
-		[LED_PEER_STATE_DISCONNECTED]   = LED_EFFECT_LED_BREATH(1000, LED_COLOR(0, 150, 0)),
+		[LED_PEER_STATE_DISCONNECTED]   = LED_EFFECT_LED_OFF(),
 		[LED_PEER_STATE_CONNECTED]      = LED_EFFECT_LED_ON(LED_COLOR(0, 150, 0)),
+		[LED_PEER_STATE_PEER_SEARCH]    = LED_EFFECT_LED_BREATH(500, LED_COLOR(0, 150, 0)),
 		[LED_PEER_STATE_CONFIRM_SELECT] = LED_EFFECT_LED_BLINK(50, LED_COLOR(0, 150, 0)),
 		[LED_PEER_STATE_CONFIRM_ERASE]  = LED_EFFECT_LED_BLINK(25, LED_COLOR(0, 150, 0)),
 		[LED_PEER_STATE_ERASE_ADV]	= LED_EFFECT_LED_BREATH(100, LED_COLOR(0, 150, 0)),
 	},
 	{
-		[LED_PEER_STATE_DISCONNECTED]   = LED_EFFECT_LED_BREATH(1000, LED_COLOR(0, 0, 150)),
+		[LED_PEER_STATE_DISCONNECTED]   = LED_EFFECT_LED_OFF(),
 		[LED_PEER_STATE_CONNECTED]      = LED_EFFECT_LED_ON(LED_COLOR(0, 0, 150)),
+		[LED_PEER_STATE_PEER_SEARCH]    = LED_EFFECT_LED_BREATH(500, LED_COLOR(0, 0, 150)),
 		[LED_PEER_STATE_CONFIRM_SELECT] = LED_EFFECT_LED_BLINK(50, LED_COLOR(0, 0, 150)),
 		[LED_PEER_STATE_CONFIRM_ERASE]  = LED_EFFECT_LED_BLINK(25, LED_COLOR(0, 0, 150)),
 		[LED_PEER_STATE_ERASE_ADV]	= LED_EFFECT_LED_BREATH(100, LED_COLOR(0, 0, 150)),
 	},
 	{
-		[LED_PEER_STATE_DISCONNECTED]   = LED_EFFECT_LED_BREATH(1000, LED_COLOR(150, 150, 150)),
+		[LED_PEER_STATE_DISCONNECTED]   = LED_EFFECT_LED_OFF(),
 		[LED_PEER_STATE_CONNECTED]      = LED_EFFECT_LED_ON(LED_COLOR(150, 150, 150)),
+		[LED_PEER_STATE_PEER_SEARCH]    = LED_EFFECT_LED_BREATH(500, LED_COLOR(150, 150, 150)),
 		[LED_PEER_STATE_CONFIRM_SELECT] = LED_EFFECT_LED_BLINK(50, LED_COLOR(150, 150, 150)),
 		[LED_PEER_STATE_CONFIRM_ERASE]  = LED_EFFECT_LED_BLINK(25, LED_COLOR(150, 150, 150)),
 		[LED_PEER_STATE_ERASE_ADV]	= LED_EFFECT_LED_BREATH(100, LED_COLOR(150, 150, 150)),
diff --git a/applications/nrf_desktop/configuration/nrf52_pca20037/led_state_def.h b/applications/nrf_desktop/configuration/nrf52_pca20037/led_state_def.h
@@ -28,22 +28,25 @@ static const struct led_effect led_system_state_effect[LED_SYSTEM_STATE_COUNT];
 
 static const struct led_effect led_peer_state_effect[LED_PEER_CNT][LED_PEER_STATE_COUNT] = {
 	{
-		[LED_PEER_STATE_DISCONNECTED]   = LED_EFFECT_LED_BREATH(1000, LED_COLOR(255)),
+		[LED_PEER_STATE_DISCONNECTED]   = LED_EFFECT_LED_OFF(),
 		[LED_PEER_STATE_CONNECTED]      = LED_EFFECT_LED_ON(LED_COLOR(255)),
+		[LED_PEER_STATE_PEER_SEARCH]    = LED_EFFECT_LED_BREATH(500, LED_COLOR(255)),
 		[LED_PEER_STATE_CONFIRM_SELECT] = LED_EFFECT_LED_CLOCK(1, LED_COLOR(255)),
 		[LED_PEER_STATE_CONFIRM_ERASE]  = LED_EFFECT_LED_BLINK(25, LED_COLOR(255)),
 		[LED_PEER_STATE_ERASE_ADV]	= LED_EFFECT_LED_BREATH(100, LED_COLOR(255)),
 	},
 	{
-		[LED_PEER_STATE_DISCONNECTED]   = LED_EFFECT_LED_BREATH(1000, LED_COLOR(255)),
+		[LED_PEER_STATE_DISCONNECTED]   = LED_EFFECT_LED_OFF(),
 		[LED_PEER_STATE_CONNECTED]      = LED_EFFECT_LED_ON(LED_COLOR(255)),
+		[LED_PEER_STATE_PEER_SEARCH]    = LED_EFFECT_LED_BREATH(500, LED_COLOR(255)),
 		[LED_PEER_STATE_CONFIRM_SELECT] = LED_EFFECT_LED_CLOCK(2, LED_COLOR(255)),
 		[LED_PEER_STATE_CONFIRM_ERASE]  = LED_EFFECT_LED_BLINK(25, LED_COLOR(255)),
 		[LED_PEER_STATE_ERASE_ADV]	= LED_EFFECT_LED_BREATH(100, LED_COLOR(255)),
 	},
 	{
-		[LED_PEER_STATE_DISCONNECTED]   = LED_EFFECT_LED_BREATH(1000, LED_COLOR(255)),
+		[LED_PEER_STATE_DISCONNECTED]   = LED_EFFECT_LED_OFF(),
 		[LED_PEER_STATE_CONNECTED]      = LED_EFFECT_LED_ON(LED_COLOR(255)),
+		[LED_PEER_STATE_PEER_SEARCH]    = LED_EFFECT_LED_BREATH(500, LED_COLOR(255)),
 		[LED_PEER_STATE_CONFIRM_SELECT] = LED_EFFECT_LED_CLOCK(3, LED_COLOR(255)),
 		[LED_PEER_STATE_CONFIRM_ERASE]  = LED_EFFECT_LED_BLINK(25, LED_COLOR(255)),
 		[LED_PEER_STATE_ERASE_ADV]	= LED_EFFECT_LED_BREATH(100, LED_COLOR(255)),
diff --git a/applications/nrf_desktop/src/events/Kconfig b/applications/nrf_desktop/src/events/Kconfig
@@ -22,6 +22,10 @@ config DESKTOP_INIT_LOG_BLE_PEER_EVENT
 	bool "BLE peer event"
 	default y
 
+config DESKTOP_INIT_LOG_BLE_PEER_SEARCH_EVENT
+	bool "BLE peer search event"
+	default y
+
 config DESKTOP_INIT_LOG_BLE_PEER_OPERATION_EVENT
 	bool "BLE peer operation event"
 	default y
diff --git a/applications/nrf_desktop/src/events/ble_event.c b/applications/nrf_desktop/src/events/ble_event.c
@@ -51,6 +51,34 @@ EVENT_TYPE_DEFINE(ble_peer_event,
 		  log_ble_peer_event,
 		  &ble_peer_event_info);
 
+static int log_ble_peer_search_event(const struct event_header *eh, char *buf,
+				     size_t buf_len)
+{
+	const struct ble_peer_search_event *event = cast_ble_peer_search_event(eh);
+
+	return snprintf(buf, buf_len, "%sactive", (event->active)?(""):("in"));
+}
+
+static void profile_ble_peer_search_event(struct log_event_buf *buf,
+					  const struct event_header *eh)
+{
+	const struct ble_peer_search_event *event = cast_ble_peer_search_event(eh);
+
+	ARG_UNUSED(event);
+	profiler_log_encode_u32(buf, (u32_t)event->active);
+}
+
+EVENT_INFO_DEFINE(ble_peer_search_event,
+		  ENCODE(PROFILER_ARG_U32),
+		  ENCODE("active"),
+		  profile_ble_peer_search_event);
+
+EVENT_TYPE_DEFINE(ble_peer_search_event,
+		  IS_ENABLED(CONFIG_DESKTOP_INIT_LOG_BLE_PEER_SEARCH_EVENT),
+		  log_ble_peer_search_event,
+		  &ble_peer_search_event_info);
+
+
 static const char * const op_name[] = {
 #define X(name) STRINGIFY(name),
 	PEER_OPERATION_LIST
diff --git a/applications/nrf_desktop/src/events/ble_event.h b/applications/nrf_desktop/src/events/ble_event.h
@@ -93,6 +93,14 @@ struct ble_peer_operation_event {
 };
 EVENT_TYPE_DECLARE(ble_peer_operation_event);
 
+/** @brief BLE peer search event. */
+struct ble_peer_search_event {
+	struct event_header header;
+
+	bool active;
+};
+EVENT_TYPE_DECLARE(ble_peer_search_event);
+
 /** @brief BLE discovery complete event. */
 struct ble_discovery_complete_event {
 	struct event_header header;
diff --git a/applications/nrf_desktop/src/modules/ble_adv.c b/applications/nrf_desktop/src/modules/ble_adv.c
@@ -96,6 +96,16 @@ enum peer_rpa {
 
 static enum peer_rpa peer_is_rpa[CONFIG_BT_ID_MAX];
 
+
+static void broadcast_adv_state(bool active)
+{
+	struct ble_peer_search_event *event = new_ble_peer_search_event();
+	event->active = active;
+	EVENT_SUBMIT(event);
+
+	LOG_INF("Advertising %s", (active)?("started"):("stopped"));
+}
+
 static int ble_adv_stop(void)
 {
 	int err = bt_le_adv_stop();
@@ -112,7 +122,7 @@ static int ble_adv_stop(void)
 
 		state = STATE_IDLE;
 
-		LOG_INF("Advertising stopped");
+		broadcast_adv_state(false);
 	}
 
 	return err;
@@ -270,8 +280,7 @@ static int ble_adv_start(bool can_fast_adv)
 		}
 	}
 
-	LOG_INF("Advertising started");
-
+	broadcast_adv_state(true);
 error:
 	return err;
 }
diff --git a/applications/nrf_desktop/src/modules/ble_scan.c b/applications/nrf_desktop/src/modules/ble_scan.c
@@ -82,6 +82,13 @@ static size_t count_bond(void)
 	return i;
 }
 
+static void broadcast_scan_state(bool active)
+{
+	struct ble_peer_search_event *event = new_ble_peer_search_event();
+	event->active = active;
+	EVENT_SUBMIT(event);
+}
+
 static void scan_stop(void)
 {
 	int err = bt_scan_stop();
@@ -97,6 +104,8 @@ static void scan_stop(void)
 	}
 
 	scanning = false;
+	broadcast_scan_state(scanning);
+
 	k_delayed_work_cancel(&scan_stop_trigger);
 
 	if (count_conn() < CONFIG_BT_MAX_CONN) {
@@ -248,6 +257,7 @@ static void scan_start(void)
 	}
 
 	scanning = true;
+	broadcast_scan_state(scanning);
 
 	k_delayed_work_submit(&scan_stop_trigger, SCAN_DURATION_MS);
 	k_delayed_work_cancel(&scan_start_trigger);
diff --git a/applications/nrf_desktop/src/modules/led_state.c b/applications/nrf_desktop/src/modules/led_state.c
@@ -22,7 +22,8 @@ LOG_MODULE_REGISTER(MODULE, CONFIG_DESKTOP_LED_STATE_LOG_LEVEL);
 
 static enum led_system_state system_state = LED_SYSTEM_STATE_IDLE;
 
-static bool connected;
+static u8_t connected;
+static bool peer_search;
 static enum peer_operation peer_op = PEER_OPERATION_CANCEL;
 static u8_t cur_peer_id;
 
@@ -47,7 +48,9 @@ static void load_peer_state_led(void)
 	case PEER_OPERATION_ERASED:
 	case PEER_OPERATION_CANCEL:
 	case PEER_OPERATION_SCAN_REQUEST:
-		if (connected) {
+		if (peer_search) {
+			state = LED_PEER_STATE_PEER_SEARCH;
+		} else if (connected > 0) {
 			state = LED_PEER_STATE_CONNECTED;
 		}
 		break;
@@ -98,10 +101,12 @@ static bool event_handler(const struct event_header *eh)
 		switch (event->state)  {
 		case PEER_STATE_SECURED:
 		case PEER_STATE_CONNECTED:
-			connected = true;
+			__ASSERT_NO_MSG(connected < UINT8_MAX);
+			connected++;
 			break;
 		case PEER_STATE_DISCONNECTED:
-			connected = false;
+			__ASSERT_NO_MSG(connected > 0);
+			connected--;
 			break;
 		case PEER_STATE_CONN_FAILED:
 			/* Ignore */
@@ -115,6 +120,16 @@ static bool event_handler(const struct event_header *eh)
 		return false;
 	}
 
+	if (is_ble_peer_search_event(eh)) {
+		struct ble_peer_search_event *event =
+			cast_ble_peer_search_event(eh);
+
+		peer_search = event->active;
+		load_peer_state_led();
+
+		return false;
+	}
+
 	if (is_ble_peer_operation_event(eh)) {
 		struct ble_peer_operation_event *event =
 			cast_ble_peer_operation_event(eh);
@@ -167,5 +182,6 @@ static bool event_handler(const struct event_header *eh)
 EVENT_LISTENER(MODULE, event_handler);
 EVENT_SUBSCRIBE(MODULE, module_state_event);
 EVENT_SUBSCRIBE(MODULE, ble_peer_event);
+EVENT_SUBSCRIBE(MODULE, ble_peer_search_event);
 EVENT_SUBSCRIBE(MODULE, ble_peer_operation_event);
 EVENT_SUBSCRIBE(MODULE, battery_state_event);

Original file line number	Diff line number	Diff line change
`@@ -96,6 +96,16 @@ enum peer_rpa {`
`96`	`96`
`97`	`97`	`static enum peer_rpa peer_is_rpa[CONFIG_BT_ID_MAX];`
`98`	`98`
	`99`	`+`
	`100`	`+static void broadcast_adv_state(bool active)`
	`101`	`+{`
	`102`	`+ struct ble_peer_search_event *event = new_ble_peer_search_event();`
	`103`	`+ event->active = active;`
	`104`	`+ EVENT_SUBMIT(event);`
	`105`	`+`
	`106`	`+ LOG_INF("Advertising %s", (active)?("started"):("stopped"));`
	`107`	`+}`
	`108`	`+`
`99`	`109`	`static int ble_adv_stop(void)`
`100`	`110`	`{`
`101`	`111`	`int err = bt_le_adv_stop();`
`@@ -112,7 +122,7 @@ static int ble_adv_stop(void)`
`112`	`122`
`113`	`123`	`state = STATE_IDLE;`
`114`	`124`
`115`		`- LOG_INF("Advertising stopped");`
	`125`	`+ broadcast_adv_state(false);`
`116`	`126`	`}`
`117`	`127`
`118`	`128`	`return err;`
`@@ -270,8 +280,7 @@ static int ble_adv_start(bool can_fast_adv)`
`270`	`280`	`}`
`271`	`281`	`}`
`272`	`282`
`273`		`- LOG_INF("Advertising started");`
`274`		`-`
	`283`	`+ broadcast_adv_state(true);`
`275`	`284`	`error:`
`276`	`285`	`return err;`
`277`	`286`	`}`
Original file line number	Diff line number	Diff line change
`@@ -82,6 +82,13 @@ static size_t count_bond(void)`
`82`	`82`	`return i;`
`83`	`83`	`}`
`84`	`84`
	`85`	`+static void broadcast_scan_state(bool active)`
	`86`	`+{`
	`87`	`+ struct ble_peer_search_event *event = new_ble_peer_search_event();`
	`88`	`+ event->active = active;`
	`89`	`+ EVENT_SUBMIT(event);`
	`90`	`+}`
	`91`	`+`
`85`	`92`	`static void scan_stop(void)`
`86`	`93`	`{`
`87`	`94`	`int err = bt_scan_stop();`
`@@ -97,6 +104,8 @@ static void scan_stop(void)`
`97`	`104`	`}`
`98`	`105`
`99`	`106`	`scanning = false;`
	`107`	`+ broadcast_scan_state(scanning);`
	`108`	`+`
`100`	`109`	`k_delayed_work_cancel(&scan_stop_trigger);`
`101`	`110`
`102`	`111`	`if (count_conn() < CONFIG_BT_MAX_CONN) {`
`@@ -248,6 +257,7 @@ static void scan_start(void)`
`248`	`257`	`}`
`249`	`258`
`250`	`259`	`scanning = true;`
	`260`	`+ broadcast_scan_state(scanning);`
`251`	`261`
`252`	`262`	`k_delayed_work_submit(&scan_stop_trigger, SCAN_DURATION_MS);`
`253`	`263`	`k_delayed_work_cancel(&scan_start_trigger);`