From bc05492892842d41efcdb1f432301e07a7d6d20f Mon Sep 17 00:00:00 2001 From: lo-simon Date: Thu, 28 Mar 2024 13:26:21 +0000 Subject: [PATCH 1/3] Typo --- Development/nmos/control_protocol_ws_api.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Development/nmos/control_protocol_ws_api.h b/Development/nmos/control_protocol_ws_api.h index 3cfee6d5..23cd2ec3 100644 --- a/Development/nmos/control_protocol_ws_api.h +++ b/Development/nmos/control_protocol_ws_api.h @@ -29,7 +29,7 @@ namespace nmos }; } - void send_control_protocol_ws_messages_thread(web::websockets::experimental::listener::websocket_listener& listener, nmos::node_model& model, nmos::websockets& websockets, slog::base_gate& gate_); + void send_control_protocol_ws_messages_thread(web::websockets::experimental::listener::websocket_listener& listener, nmos::node_model& model, nmos::websockets& websockets, slog::base_gate& gate); } #endif From 198b19734dedd898a0517d97399e909bdffa4f79 Mon Sep 17 00:00:00 2001 From: lo-simon Date: Thu, 28 Mar 2024 13:27:33 +0000 Subject: [PATCH 2/3] Update Receiver-Monitor connection activation example --- Development/nmos/control_protocol_handlers.cpp | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/Development/nmos/control_protocol_handlers.cpp b/Development/nmos/control_protocol_handlers.cpp index a248d62f..db92bd2b 100644 --- a/Development/nmos/control_protocol_handlers.cpp +++ b/Development/nmos/control_protocol_handlers.cpp @@ -77,21 +77,24 @@ namespace nmos auto found = find_control_protocol_resource(resources, nmos::types::nc_receiver_monitor, connection_resource.id); if (resources.end() != found && nc_receiver_monitor_class_id == details::parse_nc_class_id(nmos::fields::nc::class_id(found->data))) { - // update receiver-monitor's connectionStatus propertry + // update receiver-monitor's connectionStatus and payloadStatus propertries const auto active = nmos::fields::master_enable(nmos::fields::endpoint_active(connection_resource.data)); - const web::json::value value = active ? nc_connection_status::connected : nc_connection_status::disconnected; + const web::json::value connection_status = active ? nc_connection_status::connected : nc_connection_status::disconnected; + const web::json::value payload_status = active ? nc_payload_status::payload_ok : nc_payload_status::undefined; - // hmm, maybe updating connectionStatusMessage, payloadStatus, and payloadStatusMessage too + // hmm, maybe updating connectionStatusMessage and payloadStatusMessage too const auto property_changed_event = make_property_changed_event(nmos::fields::nc::oid(found->data), { - { nc_receiver_monitor_connection_status_property_id, nc_property_change_type::type::value_changed, value } + { nc_receiver_monitor_connection_status_property_id, nc_property_change_type::type::value_changed, connection_status }, + { nc_receiver_monitor_payload_status_property_id, nc_property_change_type::type::value_changed, payload_status } }); modify_control_protocol_resource(resources, found->id, [&](nmos::resource& resource) { - resource.data[nmos::fields::nc::connection_status] = value; + resource.data[nmos::fields::nc::connection_status] = connection_status; + resource.data[nmos::fields::nc::payload_status] = payload_status; }, property_changed_event); } From 53a452105c2874ac77f040b90e0d4180ecf3793d Mon Sep 17 00:00:00 2001 From: jonathan-r-thorpe <64410119+jonathan-r-thorpe@users.noreply.github.com> Date: Thu, 28 Mar 2024 17:43:20 +0000 Subject: [PATCH 3/3] Update Development/nmos/control_protocol_handlers.cpp --- Development/nmos/control_protocol_handlers.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Development/nmos/control_protocol_handlers.cpp b/Development/nmos/control_protocol_handlers.cpp index db92bd2b..522bcc96 100644 --- a/Development/nmos/control_protocol_handlers.cpp +++ b/Development/nmos/control_protocol_handlers.cpp @@ -77,7 +77,7 @@ namespace nmos auto found = find_control_protocol_resource(resources, nmos::types::nc_receiver_monitor, connection_resource.id); if (resources.end() != found && nc_receiver_monitor_class_id == details::parse_nc_class_id(nmos::fields::nc::class_id(found->data))) { - // update receiver-monitor's connectionStatus and payloadStatus propertries + // update receiver-monitor's connectionStatus and payloadStatus properties const auto active = nmos::fields::master_enable(nmos::fields::endpoint_active(connection_resource.data)); const web::json::value connection_status = active ? nc_connection_status::connected : nc_connection_status::disconnected;