jwetzell/artnet-go
1
0
Fork 0
mirror of https://github.com/jwetzell/artnet-go.git synced 2026-09-11 16:29:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix endianness

Browse Source
This commit is contained in:
Joel Wetzell
2026-05-30 07:18:23 -05:00
parent 79ecda6f87
commit 11739370c4
4 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
command.go
+4 -4
View File
@@ -55,9 +55,9 @@ func (ac *ArtCommand) UnmarshalBinary(data []byte) error {
ac.ProtVerLo = data[11] ac.ProtVerLo = data[11]
offset := 12 offset := 12
ac.EstaMan = binary.LittleEndian.Uint16(data[offset : offset+2]) ac.EstaMan = binary.BigEndian.Uint16(data[offset : offset+2])
dataLength := int(binary.LittleEndian.Uint16(data[offset+2 : offset+4])) dataLength := int(binary.BigEndian.Uint16(data[offset+2 : offset+4]))
if len(data[offset+4:]) < dataLength { if len(data[offset+4:]) < dataLength {
return errors.New("[]byte length not long enough to contain data length specified in packet") return errors.New("[]byte length not long enough to contain data length specified in packet")
@@ -73,12 +73,12 @@ func (ac *ArtCommand) MarshalBinary() ([]byte, error) {
binary.LittleEndian.PutUint16(data[8:10], ac.OpCode) binary.LittleEndian.PutUint16(data[8:10], ac.OpCode)
data[10] = ac.ProtVerHi data[10] = ac.ProtVerHi
data[11] = ac.ProtVerLo data[11] = ac.ProtVerLo
binary.LittleEndian.PutUint16(data[12:14], ac.EstaMan) binary.BigEndian.PutUint16(data[12:14], ac.EstaMan)
dataLength := uint16(len(ac.Data)) dataLength := uint16(len(ac.Data))
if dataLength > 512 { if dataLength > 512 {
return nil, errors.New("data length must be less than or equal to 512 bytes") return nil, errors.New("data length must be less than or equal to 512 bytes")
} }
binary.LittleEndian.PutUint16(data[14:16], dataLength) binary.BigEndian.PutUint16(data[14:16], dataLength)
data = append(data, ac.Data...) data = append(data, ac.Data...)
return data, nil return data, nil
} }
datarequest.go
+6 -6
View File
@@ -57,9 +57,9 @@ func (adr *ArtDataRequest) UnmarshalBinary(data []byte) error {
adr.ProtVerLo = data[11] adr.ProtVerLo = data[11]
offset := 12 offset := 12
adr.EstaMan = binary.LittleEndian.Uint16(data[offset : offset+2]) adr.EstaMan = binary.BigEndian.Uint16(data[offset : offset+2])
adr.Oem = binary.LittleEndian.Uint16(data[offset+2 : offset+4]) adr.Oem = binary.BigEndian.Uint16(data[offset+2 : offset+4])
adr.Request = binary.LittleEndian.Uint16(data[offset+4 : offset+6]) adr.Request = binary.BigEndian.Uint16(data[offset+4 : offset+6])
copy(adr.spare[:], data[offset+6:offset+28]) copy(adr.spare[:], data[offset+6:offset+28])
return nil return nil
} }
@@ -70,9 +70,9 @@ func (adr *ArtDataRequest) MarshalBinary() ([]byte, error) {
binary.LittleEndian.PutUint16(data[8:10], adr.OpCode) binary.LittleEndian.PutUint16(data[8:10], adr.OpCode)
data[10] = adr.ProtVerHi data[10] = adr.ProtVerHi
data[11] = adr.ProtVerLo data[11] = adr.ProtVerLo
binary.LittleEndian.PutUint16(data[12:14], adr.EstaMan) binary.BigEndian.PutUint16(data[12:14], adr.EstaMan)
binary.LittleEndian.PutUint16(data[14:16], adr.Oem) binary.BigEndian.PutUint16(data[14:16], adr.Oem)
binary.LittleEndian.PutUint16(data[16:18], adr.Request) binary.BigEndian.PutUint16(data[16:18], adr.Request)
copy(data[18:40], adr.spare[:]) copy(data[18:40], adr.spare[:])
return data, nil return data, nil
} }
diagdata.go
+2 -2
View File
@@ -65,7 +65,7 @@ func (add *ArtDiagData) UnmarshalBinary(data []byte) error {
add.DiagPriority = DiagPriority(data[offset+1]) add.DiagPriority = DiagPriority(data[offset+1])
add.LogicalPort = data[offset+2] add.LogicalPort = data[offset+2]
add.filler3 = data[offset+3] add.filler3 = data[offset+3]
dataLength := binary.LittleEndian.Uint16(data[offset+4 : offset+6]) dataLength := binary.BigEndian.Uint16(data[offset+4 : offset+6])
if len(data[offset+6:]) < int(dataLength) { if len(data[offset+6:]) < int(dataLength) {
return errors.New("[]byte length not long enough to contain data length specified in packet") return errors.New("[]byte length not long enough to contain data length specified in packet")
@@ -89,7 +89,7 @@ func (add *ArtDiagData) MarshalBinary() ([]byte, error) {
if dataLength > 512 { if dataLength > 512 {
return nil, errors.New("data length must be less than or equal to 512 bytes") return nil, errors.New("data length must be less than or equal to 512 bytes")
} }
binary.LittleEndian.PutUint16(data[16:18], dataLength) binary.BigEndian.PutUint16(data[16:18], dataLength)
data = append(data, add.Data...) data = append(data, add.Data...)
return data, nil return data, nil
} }
nzs.go
+2 -2
View File
@@ -56,7 +56,7 @@ func (an *ArtNzs) UnmarshalBinary(data []byte) error {
an.SubUni = data[offset+2] an.SubUni = data[offset+2]
an.Net = data[offset+3] an.Net = data[offset+3]
dataLength := int(binary.LittleEndian.Uint16(data[offset+4 : offset+6])) dataLength := int(binary.BigEndian.Uint16(data[offset+4 : offset+6]))
if len(data[offset+6:]) < dataLength { if len(data[offset+6:]) < dataLength {
return errors.New("[]byte length not long enough to contain data length specified in packet") return errors.New("[]byte length not long enough to contain data length specified in packet")
@@ -80,7 +80,7 @@ func (an *ArtNzs) MarshalBinary() ([]byte, error) {
if dataLength > 512 { if dataLength > 512 {
return nil, errors.New("data length must be less than or equal to 512 bytes") return nil, errors.New("data length must be less than or equal to 512 bytes")
} }
binary.LittleEndian.PutUint16(data[16:18], dataLength) binary.BigEndian.PutUint16(data[16:18], dataLength)
copy(data[18:], an.Data) copy(data[18:], an.Data)
return data, nil return data, nil
} }