Skip to content

Commit

Permalink
Update outdated IS-12 links
Browse files Browse the repository at this point in the history
  • Loading branch information
lo-simon committed Sep 15, 2023
1 parent 8b4d0d1 commit b7a24e5
Show file tree
Hide file tree
Showing 7 changed files with 224 additions and 225 deletions.
6 changes: 3 additions & 3 deletions Development/nmos-cpp-node/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -288,17 +288,17 @@
//"ocsp_request_max": 30,

// manufacturer_name [node]: the manufacturer name of the NcDeviceManager used for NMOS Control Protocol
// See https://specs.amwa.tv/ms-05-02/branches/v1.0-dev/docs/Framework.html#ncdevicemanager
// See https://specs.amwa.tv/ms-05-02/branches/v1.0.x/docs/Framework.html#ncdevicemanager
//"manufacturer_name": "",

// product_name/product_key/product_revision_level [node]: the product description of the NcDeviceManager used for NMOS Control Protocol
// See https://specs.amwa.tv/ms-05-02/branches/v1.0-dev/docs/Framework.html#ncproduct
// See https://specs.amwa.tv/ms-05-02/branches/v1.0.x/docs/Framework.html#ncproduct
//"product_name": "",
//"product_key": "",
//"product_revision_level": "",

// serial_number [node]: the serial number of the NcDeviceManager used for NMOS Control Protocol
// See https://specs.amwa.tv/ms-05-02/branches/v1.0-dev/docs/Framework.html#ncdevicemanager
// See https://specs.amwa.tv/ms-05-02/branches/v1.0.x/docs/Framework.html#ncdevicemanager
//"serial_number": "",

"don't worry": "about trailing commas"
Expand Down
199 changes: 99 additions & 100 deletions Development/nmos/control_protocol_resource.cpp

Large diffs are not rendered by default.

202 changes: 101 additions & 101 deletions Development/nmos/control_protocol_resource.h

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions Development/nmos/control_protocol_resources.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ namespace nmos
return details::make_block(1, value::null(), U("root"), U("Root"), value::null(), value::null(), value::array());
}

// See https://specs.amwa.tv/ms-05-02/branches/v1.0-dev/docs/Framework.html#ncdevicemanager
// See https://specs.amwa.tv/ms-05-02/branches/v1.0.x/docs/Framework.html#ncdevicemanager
resource make_device_manager(nc_oid oid, const nmos::settings& settings)
{
using web::json::value;
Expand All @@ -56,7 +56,7 @@ namespace nmos
return{ is12_versions::v1_0, types::nc_object, std::move(data), true };
}

// See https://specs.amwa.tv/ms-05-02/branches/v1.0-dev/docs/Framework.html#ncclassmanager
// See https://specs.amwa.tv/ms-05-02/branches/v1.0.x/docs/Framework.html#ncclassmanager
resource make_class_manager(nc_oid oid, const nmos::experimental::control_protocol_state& control_protocol_state)
{
using web::json::value;
Expand Down
4 changes: 2 additions & 2 deletions Development/nmos/control_protocol_state.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ namespace nmos
control_classes =
{
// Control class models
// See https://specs.amwa.tv/ms-05-02/branches/v1.0-dev/models/classes/#control-class-models-for-branch-v10-dev
// See https://specs.amwa.tv/ms-05-02/branches/v1.0.x/models/classes/#control-class-models-for-branch-v10-dev
{ nc_object_class_id, make_control_class(U("NcObject class descriptor"), nc_object_class_id, U("NcObject"), to_vector(make_nc_object_properties()),
to_methods_vector(make_nc_object_methods(),
{
Expand Down Expand Up @@ -161,7 +161,7 @@ namespace nmos
datatypes =
{
// Dataype models
// See https://specs.amwa.tv/ms-05-02/branches/v1.0-dev/models/datatypes/#datatype-models-for-branch-v10-dev
// See https://specs.amwa.tv/ms-05-02/branches/v1.0.x/models/datatypes/#datatype-models-for-branch-v10-dev
{ U("NcClassId"), {make_nc_class_id_datatype()} },
{ U("NcOid"), {make_nc_oid_datatype()} },
{ U("NcTouchpoint"), {make_nc_touchpoint_datatype()} },
Expand Down
28 changes: 14 additions & 14 deletions Development/nmos/control_protocol_typedefs.h
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ namespace nmos
};
}

// See https://specs.amwa.tv/ms-05-02/branches/v1.0-dev/docs/Framework.html#ncmethodresult
// See https://specs.amwa.tv/ms-05-02/branches/v1.0.x/docs/Framework.html#ncmethodresult
struct nc_method_result
{
nc_method_status::status status;
Expand Down Expand Up @@ -119,7 +119,7 @@ namespace nmos
}

// NcElementId
// See https://specs.amwa.tv/ms-05-02/branches/v1.0-dev/docs/Framework.html#ncelementid
// See https://specs.amwa.tv/ms-05-02/branches/v1.0.x/docs/Framework.html#ncelementid
struct nc_element_id
{
uint16_t level;
Expand All @@ -137,14 +137,14 @@ namespace nmos
};

// NcEventId
// See https://specs.amwa.tv/ms-05-02/branches/v1.0-dev/docs/Framework.html#nceventid
// See https://specs.amwa.tv/ms-05-02/branches/v1.0.x/docs/Framework.html#nceventid
typedef nc_element_id nc_event_id;
// NcEventIds for NcObject
// SEe https://specs.amwa.tv/ms-05-02/branches/v1.0.x/docs/Framework.html#ncobject
const nc_event_id nc_object_property_changed_event_id(1, 1);

// NcMethodId
// See https://specs.amwa.tv/ms-05-02/branches/v1.0-dev/docs/Framework.html#ncmethodid
// See https://specs.amwa.tv/ms-05-02/branches/v1.0.x/docs/Framework.html#ncmethodid
typedef nc_element_id nc_method_id;
// NcMethodIds for NcObject
// See https://specs.amwa.tv/ms-05-02/branches/v1.0.x/docs/Framework.html#ncobject
Expand All @@ -167,7 +167,7 @@ namespace nmos
const nc_method_id nc_class_manager_get_datatype_method_id(3, 2);

// NcPropertyId
// See https://specs.amwa.tv/ms-05-02/branches/v1.0-dev/docs/Framework.html#ncpropertyid
// See https://specs.amwa.tv/ms-05-02/branches/v1.0.x/docs/Framework.html#ncpropertyid
typedef nc_element_id nc_property_id;
// NcPropertyIds for NcObject
// See https://specs.amwa.tv/ms-05-02/branches/v1.0.x/docs/Framework.html#ncobject
Expand Down Expand Up @@ -216,29 +216,29 @@ namespace nmos
const nc_property_id nc_ident_beacon_active_property_id(3, 1);

// NcId
// See https://specs.amwa.tv/ms-05-02/branches/v1.0-dev/docs/Framework.html#ncid
// See https://specs.amwa.tv/ms-05-02/branches/v1.0.x/docs/Framework.html#ncid
typedef uint32_t nc_id;

// NcName
// See https://specs.amwa.tv/ms-05-02/branches/v1.0-dev/docs/Framework.html#ncname
// See https://specs.amwa.tv/ms-05-02/branches/v1.0.x/docs/Framework.html#ncname
typedef utility::string_t nc_name;

// NcOid
// See https://specs.amwa.tv/ms-05-02/branches/v1.0-dev/docs/Framework.html#ncoid
// See https://specs.amwa.tv/ms-05-02/branches/v1.0.x/docs/Framework.html#ncoid
typedef uint32_t nc_oid;
// See https://specs.amwa.tv/ms-05-02/branches/v1.0.x/docs/Blocks.html
const nc_oid root_block_oid{ 1 };

// NcUri
// See https://specs.amwa.tv/ms-05-02/branches/v1.0-dev/docs/Framework.html#ncuri
// See https://specs.amwa.tv/ms-05-02/branches/v1.0.x/docs/Framework.html#ncuri
typedef utility::string_t nc_uri;

// NcUuid
// See https://specs.amwa.tv/ms-05-02/branches/v1.0-dev/docs/Framework.html#ncuuid
// See https://specs.amwa.tv/ms-05-02/branches/v1.0.x/docs/Framework.html#ncuuid
typedef utility::string_t nc_uuid;

// NcClassId
// See https://specs.amwa.tv/ms-05-02/branches/v1.0-dev/docs/Framework.html#ncclassid
// See https://specs.amwa.tv/ms-05-02/branches/v1.0.x/docs/Framework.html#ncclassid
typedef std::vector<int32_t> nc_class_id;
// See https://specs.amwa.tv/ms-05-02/branches/v1.0.x/docs/Framework.html#ncobject
const nc_class_id nc_object_class_id({ 1 });
Expand All @@ -260,11 +260,11 @@ namespace nmos
const nc_class_id nc_receiver_monitor_protected_class_id({ 1, 2, 3, 1 });

// NcTouchpoint
// See https://specs.amwa.tv/ms-05-02/branches/v1.0-dev/docs/Framework.html#nctouchpoint
// See https://specs.amwa.tv/ms-05-02/branches/v1.0.x/docs/Framework.html#nctouchpoint
typedef utility::string_t nc_touch_point;

// NcPropertyChangeType
// See https://specs.amwa.tv/ms-05-02/branches/v1.0-dev/docs/Framework.html#ncpropertychangetype
// See https://specs.amwa.tv/ms-05-02/branches/v1.0.x/docs/Framework.html#ncpropertychangetype
namespace nc_property_change_type
{
enum type
Expand All @@ -277,7 +277,7 @@ namespace nmos
}

// NcPropertyChangedEventData
// See https://specs.amwa.tv/ms-05-02/branches/v1.0-dev/docs/Framework.html#ncpropertychangedeventdata
// See https://specs.amwa.tv/ms-05-02/branches/v1.0.x/docs/Framework.html#ncpropertychangedeventdata
struct nc_property_changed_event_data
{
nc_property_id property_id;
Expand Down
6 changes: 3 additions & 3 deletions Development/nmos/settings.h
Original file line number Diff line number Diff line change
Expand Up @@ -366,17 +366,17 @@ namespace nmos
const web::json::field_as_integer_or ocsp_request_max{ U("ocsp_request_max"), 30 };

// manufacturer_name [node]: the manufacturer name of the NcDeviceManager used for NMOS Control Protocol
// See https://specs.amwa.tv/ms-05-02/branches/v1.0-dev/docs/Framework.html#ncdevicemanager
// See https://specs.amwa.tv/ms-05-02/branches/v1.0.x/docs/Framework.html#ncdevicemanager
const web::json::field_as_string_or manufacturer_name{ U("manufacturer_name"), U("") };

// product_name/product_key/product_revision_level [node]: the product description of the NcDeviceManager used for NMOS Control Protocol
// See https://specs.amwa.tv/ms-05-02/branches/v1.0-dev/docs/Framework.html#ncproduct
// See https://specs.amwa.tv/ms-05-02/branches/v1.0.x/docs/Framework.html#ncproduct
const web::json::field_as_string_or product_name{ U("product_name"), U("") };
const web::json::field_as_string_or product_key{ U("product_key"), U("") };
const web::json::field_as_string_or product_revision_level{ U("product_revision_level"), U("") };

// serial_number [node]: the serial number of the NcDeviceManager used for NMOS Control Protocol
// See https://specs.amwa.tv/ms-05-02/branches/v1.0-dev/docs/Framework.html#ncdevicemanager
// See https://specs.amwa.tv/ms-05-02/branches/v1.0.x/docs/Framework.html#ncdevicemanager
const web::json::field_as_string_or serial_number{ U("serial_number"), U("") };
}
}
Expand Down

0 comments on commit b7a24e5

Please sign in to comment.