diff --git a/etc/examples/nodes/iec60870-5-104-sequence.conf b/etc/examples/nodes/iec60870-5-104-sequence.conf index b83f925a2..5037b3933 100644 --- a/etc/examples/nodes/iec60870-5-104-sequence.conf +++ b/etc/examples/nodes/iec60870-5-104-sequence.conf @@ -1,46 +1,22 @@ - nodes = { - iec104 = { + iec104_node_seq = { type = "iec60870-5-104" address = "0.0.0.0" port = 2404 ca = 1 out = { - # create a sequence of 5 floats with identical IOAs + # Create a sequence of 5 floats with identical IOAs signals = { asdu_type_id = "M_ME_NA_1" ioa = 4202852 count = 5 } - # interpret the duplicate IOAs as a sequence by incrementing the + + # Interpret the duplicate IOAs as a sequence by incrementing the # IOA with each duplication. This only applies to two adjacent # signals with the same IOA. Specifying an IOA twice with other # IOAs inbetween is an error. duplicate_ioa_is_sequence = true } } - signal = { - type = "signal.v2" - rate = 1 - in = { - signals = { - name = "sine1" - signal = "sine" - frequency = 0.1 - count = 5 - } - } - } } - -paths = ( - { - in = "signal" - out = "iec104" - hooks = ( - { - type = "print" - } - ) - } -) diff --git a/etc/examples/nodes/iec60870-5-104.conf b/etc/examples/nodes/iec60870-5-104.conf index bf017c847..d47b2405a 100644 --- a/etc/examples/nodes/iec60870-5-104.conf +++ b/etc/examples/nodes/iec60870-5-104.conf @@ -1,39 +1,41 @@ nodes = { - iec104 = { + iec104_node = { type = "iec60870-5-104" - # network address and port of the server + # Network address and port of the server # 0.0.0.0 listens on all interfaces address = "0.0.0.0" port = 2404 - # common address of this IEC104 slave + + # Common address of this IEC104 slave ca = 41025 - # queue sizes for this node + + # Queue sizes for this node low_priority_queue = 100 high_priority_queue = 100 out = { - # map signals to information object addresses and asdu data types - # one asdu per specified asdu_type_id/asdu_type+with_timestamp is + # Map signals to information object addresses and ASDU data types + # one ASDU per specified asdu_type_id/asdu_type+with_timestamp is # send for each sample. Signals of the same type are collected - # in a single asdu + # in a single ASDU. signals = ( { - # the asdu data type + # The ASDU data type asdu_type = "normalized-float" - # add 56 bit unix timestamp to asdu + # add 56 bit unix timestamp to ASDU with_timestamp = false # the information object address of this signal ioa = 4202832 }, { - # equivalent to the asdu_type above + # Equivalent to the asdu_type above asdu_type_id = "M_ME_NA_1" ioa = 4202852 }, { - # a boolean value + # A boolean value asdu_type = "single-point" with_timestamp = true ioa = 4206948 @@ -41,46 +43,4 @@ nodes = { ) } } - signal = { - type = "signal.v2" - rate = 1 - in = { - signals = ( - { - name = "sine1" - signal = "sine" - frequency = 0.1 - phase = 90 - }, - { - name = "sine2" - signal = "sine" - frequency = 0.1 - }, - { - name = "bool" - signal = "pulse" - pulse_width = 2 - frequency = 0.05 - } - ) - } - } } - -paths = ( - { - in = "signal" - out = "iec104" - hooks = ( - { - type = "cast" - signal = "bool" - new_type = "boolean" - }, - { - type = "print" - } - ) - } -)