fix(dispenser): wait for delivery clearance before FC7

This commit is contained in:
2026-09-26 19:27:30 +01:00
parent cb5a09e710
commit 99c74f49b6
4 changed files with 557 additions and 26 deletions
+15 -6
View File
@@ -254,17 +254,23 @@ type serialTransport interface {
}
func writePacket(ctx context.Context, port serialTransport, packet []byte) error {
_, err := writePacketAttempt(ctx, port, packet)
return err
}
// writePacketAttempt distinguishes cancellation before Write from an ambiguous write.
func writePacketAttempt(ctx context.Context, port serialTransport, packet []byte) (bool, error) {
if err := ctx.Err(); err != nil {
return err
return false, err
}
n, err := port.Write(packet)
if err != nil {
return fmt.Errorf("write dispenser packet: %w", err)
return true, fmt.Errorf("write dispenser packet: %w", err)
}
if n != len(packet) {
return fmt.Errorf("write dispenser packet (%d/%d bytes): %w", n, len(packet), io.ErrShortWrite)
return true, fmt.Errorf("write dispenser packet (%d/%d bytes): %w", n, len(packet), io.ErrShortWrite)
}
return ctx.Err()
return true, ctx.Err()
}
func readExact(ctx context.Context, port serialTransport, data []byte) error {
@@ -410,7 +416,10 @@ func resetDispenser(ctx context.Context, port serialTransport) error {
return dispatchCommand(ctx, port, commandRS, delay)
}
func cardOutOfMouth(ctx context.Context, port serialTransport) error {
func cardOutOfMouth(ctx context.Context, port serialTransport) (bool, error) {
log.Println("Send card to out mouth position")
return dispatchCommand(ctx, port, commandFC0, delay)
if err := sendAndReadACK(ctx, port, createPacket(Address, commandFC0), delay); err != nil {
return false, err
}
return writePacketAttempt(ctx, port, append([]byte{ENQ}, Address...))
}