[bug]修改联锁通信逻辑中的编码bug
This commit is contained in:
parent
a4b761f720
commit
42f299f553
@ -1 +1 @@
|
|||||||
Subproject commit aac1484a6f64cc43146cabd89784b92c933a0298
|
Subproject commit 189cabea725167f98c15d0971ee20d01b044ce05
|
29
third_party/message/interlock.go
vendored
29
third_party/message/interlock.go
vendored
@ -1,6 +1,9 @@
|
|||||||
package message
|
package message
|
||||||
|
|
||||||
import "fmt"
|
import (
|
||||||
|
"fmt"
|
||||||
|
"math"
|
||||||
|
)
|
||||||
|
|
||||||
// 消息包头解析
|
// 消息包头解析
|
||||||
type interlockMsgPkgHeader struct {
|
type interlockMsgPkgHeader struct {
|
||||||
@ -81,15 +84,25 @@ func (m *InterlockSendMsgPkg) SetSerialNumber(serialNumber uint8) {
|
|||||||
func (m *InterlockSendMsgPkg) Encode() []byte {
|
func (m *InterlockSendMsgPkg) Encode() []byte {
|
||||||
var data []byte
|
var data []byte
|
||||||
data = append(data, m.header.encode()...)
|
data = append(data, m.header.encode()...)
|
||||||
for index, length, cycles := 0, len(m.info), len(m.info)/boolsToByteArrLen; index < cycles; index++ {
|
bitLen := len(m.info)
|
||||||
startIndex := index * boolsToByteArrLen
|
byteLen := int(math.Ceil(float64(bitLen) / 8))
|
||||||
toByteArr := [8]bool{}
|
infoBytes := make([]byte, byteLen)
|
||||||
for i := 0; i < boolsToByteArrLen && startIndex < length; i++ {
|
for i, b := range m.info {
|
||||||
startIndex = startIndex + i
|
if b {
|
||||||
toByteArr[i] = m.info[startIndex+i]
|
infoBytes[i/8] = infoBytes[i/8] + (1 << (i % 8))
|
||||||
}
|
}
|
||||||
data = append(data, boolsToByte(toByteArr))
|
|
||||||
}
|
}
|
||||||
|
data = append(data, infoBytes...)
|
||||||
|
|
||||||
|
//for index, length, cycles := 0, len(m.info), len(m.info)/boolsToByteArrLen; index < cycles; index++ {
|
||||||
|
// startIndex := index * boolsToByteArrLen
|
||||||
|
// toByteArr := [8]bool{}
|
||||||
|
// for i := 0; i < boolsToByteArrLen && startIndex < length; i++ {
|
||||||
|
// startIndex = startIndex + i
|
||||||
|
// toByteArr[i] = m.info[startIndex+i]
|
||||||
|
// }
|
||||||
|
// data = append(data, boolsToByte(toByteArr))
|
||||||
|
//}
|
||||||
data = append(data, m.tail.encode()...)
|
data = append(data, m.tail.encode()...)
|
||||||
return data
|
return data
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user