Bluetooth: Mesh: fix NO_ACTIONS scheduling

If the Scheduler Setup Server receives a Scheduler Action Set message
setting the next scheduled task to NO_ACTIONS, it will schedule the
next task in line.

Previously, the "canceled" task would be executed if it was first in
line.

Signed-off-by: Håvard Reierstad <[email protected]>

Author: HaavardRei

subsys/bluetooth/mesh/scheduler_srv.c

@@ -399,6 +399,7 @@ static void run_scheduler(struct bt_mesh_scheduler_srv *srv)
 	uint8_t planned_idx = get_least_time_index(srv);
 
 	if (planned_idx == BT_MESH_SCHEDULER_ACTION_ENTRY_COUNT) {
+		k_work_cancel_delayable(&srv->delayed_work);
 		return;
 	}
 
@@ -639,6 +640,23 @@ static int action_set(const struct bt_mesh_model *model, struct bt_mesh_msg_ctx
 		run_scheduler(srv);
 	}
 
+	if ((srv->sch_reg[idx].action == BT_MESH_SCHEDULER_NO_ACTIONS) &&
+	    (srv->active_bitmap & BIT(idx))) {
+		WRITE_BIT(srv->active_bitmap, idx, 0);
+
+		bool reschedule = srv->idx == idx;
+
+		if (srv->active_bitmap == 0) {
+			srv->idx = BT_MESH_SCHEDULER_ACTION_ENTRY_COUNT;
+			srv->last_idx = BT_MESH_SCHEDULER_ACTION_ENTRY_COUNT;
+		}
+
+		/* If the current action is set to NO_ACTIONS, schedule the next in line, if any */
+		if (reschedule) {
+			run_scheduler(srv);
+		}
+	}
+
 	if (srv->action_set_cb) {
 		srv->action_set_cb(srv, ctx, idx, &srv->sch_reg[idx]);
 	}