Missed for Previous Commit

2026-06-06 17:17:42 +02:00
parent f89ea3cbe3
commit 35ce1476d8
3 changed files with 92 additions and 51 deletions
@@ -20,6 +20,9 @@ const (
 	otaDistQueryInterval   = 500 * time.Millisecond
 	otaDistQueryTimeout    = 2 * time.Second
 	otaDistEmitMinInterval = 150 * time.Millisecond
+	// Pace host chunks so the master UART RX ring is not overrun (~20 frames/block).
+	otaHostChunkPace = 3 * time.Millisecond
+	otaBlockMaxRetries = 3
 )

 const (
@@ -189,52 +192,83 @@ func runOTAOnPortUnlocked(sp *serialPort, firmware []byte, onProgress otaProgres

 	var seq uint32
 	for offset := 0; offset < imageSize; {
-		bytesInBlock := 0
-		for bytesInBlock < otaFlashBlockSize && offset < imageSize {
-			n := otaHostChunkSize
-			room := otaFlashBlockSize - bytesInBlock
-			if n > room {
-				n = room
-			}
-			if offset+n > imageSize {
-				n = imageSize - offset
-			}
-			chunk := firmware[offset : offset+n]
+		blockStart := offset
+		blockStartSeq := seq

-			if err := writeUartMessage(sp, &pb.UartMessage{
-				Type: pb.MessageType_OTA_PAYLOAD,
-				Payload: &pb.UartMessage_OtaPayload{
-					OtaPayload: &pb.OtaPayload{Seq: seq, Data: chunk},
-				},
-			}); err != nil {
-				notify("error", "", 0, err.Error())
-				return err
-			}
-			seq++
-			offset += n
-			bytesInBlock += n
+		sendBlock := func() (fullBlock bool, err error) {
+			bytesInBlock := 0
+			for bytesInBlock < otaFlashBlockSize && offset < imageSize {
+				n := otaHostChunkSize
+				room := otaFlashBlockSize - bytesInBlock
+				if n > room {
+					n = room
+				}
+				if offset+n > imageSize {
+					n = imageSize - offset
+				}
+				chunk := firmware[offset : offset+n]

-			pct := offset * 100 / imageSize
-			if pct > 99 {
-				pct = 99
+				if err := writeUartMessage(sp, &pb.UartMessage{
+					Type: pb.MessageType_OTA_PAYLOAD,
+					Payload: &pb.UartMessage_OtaPayload{
+						OtaPayload: &pb.OtaPayload{Seq: seq, Data: chunk},
+					},
+				}); err != nil {
+					return false, err
+				}
+				time.Sleep(otaHostChunkPace)
+				seq++
+				offset += n
+				bytesInBlock += n
+
+				pct := offset * 100 / imageSize
+				if pct > 99 {
+					pct = 99
+				}
+				notify("uploading", otaStepMaster, pct,
+					fmt.Sprintf("Master: %d / %d bytes", offset, imageSize))
 			}
-			notify("uploading", otaStepMaster, pct, fmt.Sprintf("Master: %d / %d bytes", offset, imageSize))
+			return bytesInBlock == otaFlashBlockSize, nil
 		}

-		if bytesInBlock == otaFlashBlockSize {
-			st, err := waitOtaStatus(sp, otaStBlockAck, otaDefaultTimeout, nil)
-			if err != nil {
-				notify("error", "", 0, err.Error())
-				return err
-			}
-			pct := offset * 100 / imageSize
-			if pct > 99 {
-				pct = 99
-			}
-			notify("uploading", otaStepMaster, pct,
-				fmt.Sprintf("Master: Block geschrieben (%d bytes)", st.GetBytesWritten()),
-				OTAProgress{Bytes: st.GetBytesWritten()})
+		fullBlock, err := sendBlock()
+		if err != nil {
+			notify("error", "", 0, err.Error())
+			return err
 		}
+
+		if !fullBlock {
+			continue
+		}
+
+		var st *pb.OtaStatusPayload
+		var ackErr error
+		for attempt := 0; attempt < otaBlockMaxRetries; attempt++ {
+			if attempt > 0 {
+				offset = blockStart
+				seq = blockStartSeq
+				if _, err := sendBlock(); err != nil {
+					notify("error", "", 0, err.Error())
+					return err
+				}
+			}
+			st, ackErr = waitOtaStatus(sp, otaStBlockAck, otaDefaultTimeout, nil)
+			if ackErr == nil {
+				break
+			}
+		}
+		if ackErr != nil {
+			notify("error", "", 0, ackErr.Error())
+			return ackErr
+		}
+
+		pct := offset * 100 / imageSize
+		if pct > 99 {
+			pct = 99
+		}
+		notify("uploading", otaStepMaster, pct,
+			fmt.Sprintf("Master: Block geschrieben (%d bytes)", st.GetBytesWritten()),
+			OTAProgress{Bytes: st.GetBytesWritten()})
 	}

 	masterPct = 100