mirror of
https://github.com/jwetzell/artnet-go.git
synced 2026-09-07 22:49:01 +00:00
align method receiver variable name
This commit is contained in:
+25
-25
@@ -28,51 +28,51 @@ type ArtDataRequest struct {
|
||||
spare [22]byte
|
||||
}
|
||||
|
||||
func (ap *ArtDataRequest) GetOpCode() uint16 {
|
||||
return ap.OpCode
|
||||
func (adr *ArtDataRequest) GetOpCode() uint16 {
|
||||
return adr.OpCode
|
||||
}
|
||||
|
||||
func (ap *ArtDataRequest) GetProtVer() uint16 {
|
||||
return uint16(ap.ProtVerHi)<<8 + uint16(ap.ProtVerLo)
|
||||
func (adr *ArtDataRequest) GetProtVer() uint16 {
|
||||
return uint16(adr.ProtVerHi)<<8 + uint16(adr.ProtVerLo)
|
||||
}
|
||||
|
||||
func (ap *ArtDataRequest) GetID() [8]uint8 {
|
||||
return ap.ID
|
||||
func (adr *ArtDataRequest) GetID() [8]uint8 {
|
||||
return adr.ID
|
||||
}
|
||||
|
||||
func (ap *ArtDataRequest) UnmarshalBinary(data []byte) error {
|
||||
func (adr *ArtDataRequest) UnmarshalBinary(data []byte) error {
|
||||
|
||||
if len(data) < 40 {
|
||||
return errors.New("ArtDataRequest packet must be at least 40 bytes long")
|
||||
}
|
||||
|
||||
copy(ap.ID[:], data[0:8])
|
||||
copy(adr.ID[:], data[0:8])
|
||||
|
||||
if !slices.Equal(ArtNetID[:], ap.ID[:]) {
|
||||
if !slices.Equal(ArtNetID[:], adr.ID[:]) {
|
||||
return errors.New("ID does not match Art-Net ID")
|
||||
}
|
||||
|
||||
ap.OpCode = binary.LittleEndian.Uint16(data[8:10])
|
||||
ap.ProtVerHi = data[10]
|
||||
ap.ProtVerLo = data[11]
|
||||
adr.OpCode = binary.LittleEndian.Uint16(data[8:10])
|
||||
adr.ProtVerHi = data[10]
|
||||
adr.ProtVerLo = data[11]
|
||||
|
||||
offset := 12
|
||||
ap.EstaMan = binary.LittleEndian.Uint16(data[offset : offset+2])
|
||||
ap.Oem = binary.LittleEndian.Uint16(data[offset+2 : offset+4])
|
||||
ap.Request = binary.LittleEndian.Uint16(data[offset+4 : offset+6])
|
||||
copy(ap.spare[:], data[offset+6:offset+28])
|
||||
adr.EstaMan = binary.LittleEndian.Uint16(data[offset : offset+2])
|
||||
adr.Oem = binary.LittleEndian.Uint16(data[offset+2 : offset+4])
|
||||
adr.Request = binary.LittleEndian.Uint16(data[offset+4 : offset+6])
|
||||
copy(adr.spare[:], data[offset+6:offset+28])
|
||||
return nil
|
||||
}
|
||||
|
||||
func (ap *ArtDataRequest) MarshalBinary() ([]byte, error) {
|
||||
func (adr *ArtDataRequest) MarshalBinary() ([]byte, error) {
|
||||
data := make([]byte, 8+32)
|
||||
copy(data[0:8], ap.ID[:])
|
||||
binary.LittleEndian.PutUint16(data[8:10], ap.OpCode)
|
||||
data[10] = ap.ProtVerHi
|
||||
data[11] = ap.ProtVerLo
|
||||
binary.LittleEndian.PutUint16(data[12:14], ap.EstaMan)
|
||||
binary.LittleEndian.PutUint16(data[14:16], ap.Oem)
|
||||
binary.LittleEndian.PutUint16(data[16:18], ap.Request)
|
||||
copy(data[18:40], ap.spare[:])
|
||||
copy(data[0:8], adr.ID[:])
|
||||
binary.LittleEndian.PutUint16(data[8:10], adr.OpCode)
|
||||
data[10] = adr.ProtVerHi
|
||||
data[11] = adr.ProtVerLo
|
||||
binary.LittleEndian.PutUint16(data[12:14], adr.EstaMan)
|
||||
binary.LittleEndian.PutUint16(data[14:16], adr.Oem)
|
||||
binary.LittleEndian.PutUint16(data[16:18], adr.Request)
|
||||
copy(data[18:40], adr.spare[:])
|
||||
return data, nil
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user