Skip to content

Commit f2ce814

Browse files
authored
Merge pull request #464 from wes-johnson/3.x
Cherry-picked PR #436 and #451 into 3.x
2 parents 8b76877 + 1c6bce2 commit f2ce814

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,4 @@ specification/src/main/asciidoc/docinfo-header.html
1212
.settings
1313
Sparkplug_TCK_*.zip
1414
tck/Sparkplug_TCK_*.zip
15+
.pydevproject

specification/src/main/asciidoc/chapters/Sparkplug_5_Operational_Behavior.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -947,7 +947,7 @@ established Sparkplug session and is publishing DATA messages. Now say a new Spa
947947
Application connects to the same MQTT Server that the Edge Node is connected to. On the next DATA
948948
message published by the Edge Node, the Host Application will receive it without ever having
949949
received the BIRTH message(s) associated with the Edge Node. As a result, it can send a 'Rebirth
950-
Request' using the 'Node Control/Refresh' metric to reset its understanding of that Edge Node and
950+
Request' using the 'Node Control/Rebirth' metric to reset its understanding of that Edge Node and
951951
become aware of all metrics associated with it.
952952

953953
These are the rules around the 'Node Control/Rebirth' metric.

specification/src/main/asciidoc/chapters/Sparkplug_6_Payloads.adoc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -979,7 +979,7 @@ The bytes_value of the Sparkplug Metric must be: [0x15, 0xCD, 0x5B, 0x07, 0xB1,
979979
*** Int8Array as an array of packed little endian int8 bytes
980980
*** Google Protocol Buffer Type: bytes
981981
*** Sparkplug enum value: 22
982-
*** Example (Decimal to Metric bytes_value): [-23, 123] -> [0xEF, 0x7B]
982+
*** Example (Decimal to Metric bytes_value): [-23, 123] -> [0xE9, 0x7B]
983983
** _Int16Array_
984984
*** Int16Array as an array of packed little endian int16 bytes
985985
*** Google Protocol Buffer Type: bytes
@@ -1019,12 +1019,12 @@ The bytes_value of the Sparkplug Metric must be: [0x15, 0xCD, 0x5B, 0x07, 0xB1,
10191019
*** FloatArray as an array of packed little endian 32-bit float bytes
10201020
*** Google Protocol Buffer Type: bytes
10211021
*** Sparkplug enum value: 30
1022-
*** Example (Decimal to Metric bytes_value): [1.23, 89.341] -> [0x3F, 0x9D, 0x70, 0xA4, 0x42, 0xB2, 0xAE, 0x98]
1022+
*** Example (Decimal to Metric bytes_value): [1.23, 89.341] -> [0xA4, 0x70, 0x9D, 0x3F, 0x98, 0xAE, 0xB2, 0x42]
10231023
** _DoubleArray_
10241024
*** DoubleArray as an array of packed little endian 64-bit float bytes
10251025
*** Google Protocol Buffer Type: bytes
10261026
*** Sparkplug enum value: 31
1027-
*** Example (Decimal to Metric bytes_value): [12.354213, 1022.9123213] -> [0x40, 0x28, 0xB5, 0x5B, 0x68, 0x05, 0xA2, 0xD7, 0x40, 0x8F, 0xF7, 0x4C, 0x6F, 0x1C, 0x17, 0x8E]
1027+
*** Example (Decimal to Metric bytes_value): [12.354213, 1022.9123213] -> [0xD7, 0xA2, 0x05, 0x68, 0x5B, 0xB5, 0x28, 0x40, 0x8E, 0x17, 0x1C, 0x6F, 0x4C, 0xF7, 0x8F, 0x40]
10281028
** _BooleanArray_
10291029
*** BooleanArray as an array of bit-packed bytes preceeded by a 4-byte integer that represents the
10301030
total number of boolean values
@@ -1043,7 +1043,7 @@ ends on a byte boundary.
10431043
value representing the number of milliseconds since epoch in UTC
10441044
*** Google Protocol Buffer Type: bytes
10451045
*** Sparkplug enum value: 34
1046-
*** Example (DateTime array -> ms since epoch -> Metric bytes_value): ['Wednesday, October 21, 2009 5:27:55.335 AM', 'Friday, June 24, 2022 9:57:55 PM'] -> [1256102875335, 1656107875000] -> [0xC7, 0xD0, 0x90, 0x75, 0x24, 0x01, 0xB8, 0xBA, 0xB8, 0x97, 0x81, 0x01]
1046+
*** Example (DateTime array -> ms since epoch -> Metric bytes_value): ['Wednesday, October 21, 2009 5:27:55.335 AM', 'Friday, June 24, 2022 9:57:55 PM'] -> [1256102875335, 1656107875000] -> [0xC7, 0xD0, 0x90, 0x75, 0x24, 0x01, 0x00, 0x00, 0xB8, 0xBA, 0xB8, 0x97, 0x81, 0x01, 0x00, 0x00]
10471047

10481048
[[payloads_payload_representation_on_host_applications]]
10491049
==== Payload Representation on Host Applications

0 commit comments

Comments
 (0)