removed early return on error when checking dispenser status in the start and final loops
This commit is contained in:
@@ -301,16 +301,14 @@ func (c *Client) DispenserStart(ctx context.Context) (string, error) {
|
||||
for {
|
||||
time.Sleep(delay * 2)
|
||||
if time.Now().After(deadline) {
|
||||
return stockStatus, fmt.Errorf("[%s] timeout waiting keycard at encoder position", funcName)
|
||||
return stockStatus, nil
|
||||
}
|
||||
|
||||
status, err = c.do(ctx, cmdStatus)
|
||||
if err != nil {
|
||||
return stockStatus, fmt.Errorf("[%s] re-check status: %w", funcName, err)
|
||||
}
|
||||
status, _ = c.do(ctx, cmdStatus)
|
||||
|
||||
stockStatus = stockTake(status)
|
||||
c.setStock(status)
|
||||
logStatus(status)
|
||||
|
||||
// error states first
|
||||
if isCardWellEmpty(status) {
|
||||
@@ -355,17 +353,14 @@ func (c *Client) DispenserFinal(ctx context.Context) (string, error) {
|
||||
return stockStatus, nil
|
||||
}
|
||||
|
||||
status, err = c.do(ctx, cmdStatus)
|
||||
if err != nil {
|
||||
return stockStatus, nil
|
||||
}
|
||||
status, _ = c.do(ctx, cmdStatus)
|
||||
|
||||
stockStatus = stockTake(status)
|
||||
c.setStock(status)
|
||||
logStatus(status)
|
||||
|
||||
if isCardWellEmpty(status) {
|
||||
return stockStatus, fmt.Errorf(stockStatus)
|
||||
return stockStatus, nil
|
||||
}
|
||||
|
||||
if isAtEncoderPosition(status) {
|
||||
|
||||
Reference in New Issue
Block a user