Commit 483a3119 authored by Raul Garcia-Castro's avatar Raul Garcia-Castro
Browse files

Merge branches 'issue-18' and 'issue-18' of... 

Merge branches 'issue-18' and 'issue-18' of https://forge.etsi.org/gitlab/SAREF/saref-core into issue-18

# Conflicts:
#	ontology/saref.ttl
parents 598043ba ceb2cebf

ontology/saref.ttl.orig

+10 −0
Original line number Diff line number Diff line
@@ -484,8 +484,13 @@ saref:EventFunction rdf:type owl:Class ; 
                                      owl:minQualifiedCardinality "1"^^xsd:nonNegativeInteger ;

                                      owl:onClass saref:Measurement

                                    ] ;

<<<<<<< .merge_file_4VyJxR

                    rdfs:comment "A function that allows to notify about some relevant activity; e.g., that a certain threshold value has been exceeded or that some object has moved."@en ;

                    rdfs:label "Event function"@en .

=======

                    rdfs:comment "A function that allows to notify about some relevant activity; e.g., that a certain threshold value has been exceeded or that some object has moved."^^xsd:string ;

                    rdfs:label "Event function"^^xsd:string .

>>>>>>> .merge_file_yFMvQw





###  https://saref.etsi.org/Function
@@ -1033,8 +1038,13 @@ saref:SmokeSensor rdf:type owl:Class ; 
                                    owl:onProperty saref:measuresProperty ;

                                    owl:someValuesFrom saref:Smoke

                                  ] ;

<<<<<<< .merge_file_4VyJxR

                  rdfs:comment "A sensor that performs the saref:SensingFunction and the saref:EventFunction, and is used for the purpose of sensing a property of type saref:Smoke. A saref:SmokeSensor is typically used to saref:accomplish saref:Safety."@en ;

                  rdfs:label "Smoke sensor"@en .

=======

                  rdfs:comment "A sensor that performs the saref:SensingFunction and the saref:EventFunction, and is used for the purpose of sensing a property of type saref:Smoke. A saref:SmokeSensor is typically used to saref:accomplish saref:Safety."^^xsd:string ;

                  rdfs:label "Smoke sensor"^^xsd:string .

>>>>>>> .merge_file_yFMvQw





###  https://saref.etsi.org/StartCommand