added check if keycard at the encoder position before trying to encode key

This commit is contained in:
2026-03-18 16:02:43 +00:00
parent 163ac0e808
commit e1549dda2f
3 changed files with 63 additions and 29 deletions
+59 -28
View File
@@ -279,7 +279,9 @@ func (c *Client) DispenserStart(ctx context.Context) (string, error) {
return stockStatus, fmt.Errorf("[%s] check status: %w", funcName, err)
}
logStatus(status)
defer func() {
logStatus(status)
}()
stockStatus = stockTake(status)
c.setStock(status)
@@ -294,48 +296,77 @@ func (c *Client) DispenserStart(ctx context.Context) (string, error) {
return stockStatus, fmt.Errorf("[%s] to encoder: %w", funcName, err)
}
time.Sleep(delay)
status, err = c.CheckStatus(ctx)
if err != nil {
return stockStatus, fmt.Errorf("[%s] re-check status: %w", funcName, err)
}
logStatus(status)
stockStatus = stockTake(status)
c.setStock(status)
deadline := time.Now().Add(3 * time.Second)
return stockStatus, nil
for {
if time.Now().After(deadline) {
return stockStatus, fmt.Errorf("[%s] timeout waiting keycard at encoder position", funcName)
}
status, err = c.do(ctx, cmdStatus)
if err != nil {
return stockStatus, fmt.Errorf("[%s] re-check status: %w", funcName, err)
}
stockStatus = stockTake(status)
c.setStock(status)
// error states first
if isCardWellEmpty(status) {
return stockStatus, fmt.Errorf(stockStatus)
}
if isAtEncoderPosition(status) {
return stockStatus, nil
}
time.Sleep(100 * time.Millisecond)
}
}
func (c *Client) DispenserFinal(ctx context.Context) (string, error) {
const funcName = "DispenserFinal"
stockStatus := ""
var status []byte
if err := c.OutOfMouth(ctx); err != nil {
return stockStatus, fmt.Errorf("[%s] out of mouth: %w", funcName, err)
}
time.Sleep(delay)
status, err := c.CheckStatus(ctx)
if err != nil {
return stockStatus, fmt.Errorf("[%s] check status: %w", funcName, err)
}
logStatus(status)
stockStatus = stockTake(status)
c.setStock(status)
time.Sleep(200 * time.Millisecond)
time.Sleep(delay)
if err := c.ToEncoder(ctx); err != nil {
return stockStatus, fmt.Errorf("[%s] to encoder: %w", funcName, err)
}
time.Sleep(delay)
status, err = c.CheckStatus(ctx)
if err != nil {
return stockStatus, fmt.Errorf("[%s] re-check status: %w", funcName, err)
}
logStatus(status)
stockStatus = stockTake(status)
c.setStock(status)
defer func() {
logStatus(status)
}()
deadline := time.Now().Add(3 * time.Second)
for {
if time.Now().After(deadline) {
return stockStatus, nil
}
status, err := c.do(ctx, cmdStatus)
if err != nil {
return stockStatus, nil
}
stockStatus = stockTake(status)
c.setStock(status)
if isCardWellEmpty(status) {
return stockStatus, fmt.Errorf(stockStatus)
}
if isAtEncoderPosition(status) {
return stockStatus, nil
}
time.Sleep(100 * time.Millisecond)
}
return stockStatus, nil
}