futuresens/hardlink
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update reading from link start

Browse Source
This commit is contained in:
yurii 2025-06-09 19:21:52 +01:00
parent b200eb3b91
commit 140c9a44cc
1 changed files with 38 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
lockserver/lockserver.go
View File

@ -154,7 +154,7 @@ func (lock *OmniLockServer) BuildCommand(encoderAddr, lockId string, checkIn, ch
formattedLockId := fmt.Sprintf("%04d", idInt) formattedLockId := fmt.Sprintf("%04d", idInt)
// Format date/time parts // Format date/time parts
dt := checkOut.Format("15:04") // DT = HH:mm dt := checkOut.Format("15:04") // DT = HH:mm
ga := checkIn.Format("060102") // GA = ddMMyy ga := checkIn.Format("060102") // GA = ddMMyy
gd := checkOut.Format("060102") // GD = ddMMyy gd := checkOut.Format("060102") // GD = ddMMyy
ti := checkIn.Format("150405") // TI = HHmmss ti := checkIn.Format("150405") // TI = HHmmss
@ -181,14 +181,16 @@ func (lock *OmniLockServer) BuildCommand(encoderAddr, lockId string, checkIn, ch
func (lock *OmniLockServer) LockSequence(conn net.Conn) error { func (lock *OmniLockServer) LockSequence(conn net.Conn) error {
const funcName = "OmniLockServer.LockSequence" const funcName = "OmniLockServer.LockSequence"
// Start the link with the lock server // Start the link with the lock server
raw, err := lock.linkStart(conn) regs, err := lock.linkStart(conn)
if err != nil { if err != nil {
return fmt.Errorf("[%s] linkStart failed: %v", funcName, err) return fmt.Errorf("[%s] linkStart failed: %v", funcName, err)
} }
log.Infof("Link start response: %s", raw) for _, reg := range regs {
log.Printf("Received: %q", reg)
}
// Request encoding from the lock server // Request encoding from the lock server
raw, err = lock.requestEncoding(conn) raw, err := lock.requestEncoding(conn)
if err != nil { if err != nil {
return fmt.Errorf("[%s] requestEncoding failed: %v", funcName, err) return fmt.Errorf("[%s] requestEncoding failed: %v", funcName, err)
} }
@ -197,17 +199,43 @@ func (lock *OmniLockServer) LockSequence(conn net.Conn) error {
return nil return nil
} }
func (lock *OmniLockServer) linkStart(conn net.Conn) (string, error) { func (lock *OmniLockServer) linkStart(conn net.Conn) ([]string, error) {
const funcName = "OmniLockServer.linkStart" const funcName = "OmniLockServer.linkStart"
// Send the link start command // Send the link start command
payload := fmt.Sprintf("LS|DA%s|TI%s|", time.Now().Format("060102"), time.Now().Format("150405")) payload := fmt.Sprintf("LS|DA%s|TI%s|",
time.Now().Format("060102"),
time.Now().Format("150405"),
)
command := append([]byte{0x02}, append([]byte(payload), 0x03)...) command := append([]byte{0x02}, append([]byte(payload), 0x03)...)
raw, err := sendAndReceive(conn, command) log.Printf("Sending command: %q", command)
_, err := conn.Write(command)
if err != nil { if err != nil {
return "", fmt.Errorf("failed to send Link Start command: %v", err) return nil, fmt.Errorf("failed to send command: %v", err)
} }
return raw, nil
conn.SetReadDeadline(time.Now().Add(10 * time.Second))
reader := bufio.NewReader(conn)
var registers []string
for {
reg, err := reader.ReadString(0x03)
if err != nil {
if netErr, ok := err.(net.Error); ok && netErr.Timeout() {
break // timeout -> assume no more registers
}
return nil, fmt.Errorf("error reading register: %v", err)
}
registers = append(registers, reg)
// stop when you see the final register type, e.g. "LA|…|<ETX>"
if strings.HasPrefix(reg, "\x02LA|") {
break
}
}
return registers, nil
} }
func (lock *OmniLockServer) requestEncoding(conn net.Conn) (string, error) { func (lock *OmniLockServer) requestEncoding(conn net.Conn) (string, error) {