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

This commit is contained in:
2026-03-20 11:38:42 +00:00
parent e1549dda2f
commit 8f093159cd
4 changed files with 17 additions and 10 deletions
+12 -9
View File
@@ -296,9 +296,10 @@ func (c *Client) DispenserStart(ctx context.Context) (string, error) {
return stockStatus, fmt.Errorf("[%s] to encoder: %w", funcName, err)
}
deadline := time.Now().Add(3 * time.Second)
deadline := time.Now().Add(6 * time.Second)
for {
time.Sleep(delay * 2)
if time.Now().After(deadline) {
return stockStatus, fmt.Errorf("[%s] timeout waiting keycard at encoder position", funcName)
}
@@ -319,8 +320,6 @@ func (c *Client) DispenserStart(ctx context.Context) (string, error) {
if isAtEncoderPosition(status) {
return stockStatus, nil
}
time.Sleep(100 * time.Millisecond)
}
}
@@ -333,8 +332,13 @@ func (c *Client) DispenserFinal(ctx context.Context) (string, error) {
return stockStatus, fmt.Errorf("[%s] out of mouth: %w", funcName, err)
}
time.Sleep(200 * time.Millisecond)
time.Sleep(delay)
status, err := c.do(ctx, cmdStatus)
if err == nil && len(status) >= 4 {
c.setStock(status)
}
time.Sleep(delay)
if err := c.ToEncoder(ctx); err != nil {
return stockStatus, fmt.Errorf("[%s] to encoder: %w", funcName, err)
}
@@ -343,20 +347,22 @@ func (c *Client) DispenserFinal(ctx context.Context) (string, error) {
logStatus(status)
}()
deadline := time.Now().Add(3 * time.Second)
deadline := time.Now().Add(6 * time.Second)
for {
time.Sleep(delay * 2)
if time.Now().After(deadline) {
return stockStatus, nil
}
status, err := c.do(ctx, cmdStatus)
status, err = c.do(ctx, cmdStatus)
if err != nil {
return stockStatus, nil
}
stockStatus = stockTake(status)
c.setStock(status)
logStatus(status)
if isCardWellEmpty(status) {
return stockStatus, fmt.Errorf(stockStatus)
@@ -365,8 +371,5 @@ func (c *Client) DispenserFinal(ctx context.Context) (string, error) {
if isAtEncoderPosition(status) {
return stockStatus, nil
}
time.Sleep(100 * time.Millisecond)
}
}