fix

EMFluids · Oct 3, 2023 · cacd90e · cacd90e
1 parent ccc3daf
commit cacd90e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/nmxact/nmserial/serial_xport.go b/nmxact/nmserial/serial_xport.go
@@ -287,7 +287,7 @@ func (sx *SerialXport) Tx(bytes []byte) error {
 		 * carriage return (and possibly LF 2 bytes), */
 
 		/* all totaled, MTU-4 bytes bytes should work */
-		writeLen := util.Min(1024, totlen-written)
+		writeLen := util.Min(512, totlen-written)
 
  		writeBytes := base64Data[written : written+writeLen]
  		sx.txRaw(writeBytes)

diff --git a/nmxact/xact/image.go b/nmxact/xact/image.go
@@ -148,16 +148,16 @@ func findChunkLen(s sesn.Sesn, hash []byte, upgrade bool, data []byte,
 		// Encoded length is larger than MTU, we need to make chunk shorter
 		overflow := len(enc) - s.MtuOut()
 		chunklen -= overflow
+	}
 		//Ensure the chunk length is always aligned as bootloader expected
-		if chunklen > IMAGE_UPLOAD_CHUNK_ALIGNMENT {
-				remain_bytes := chunklen % IMAGE_UPLOAD_CHUNK_ALIGNMENT
-				if remain_bytes != 0 {
-					chunklen -= remain_bytes
-				}
-			}
-
-			return chunklen, nil
+	if chunklen > IMAGE_UPLOAD_CHUNK_ALIGNMENT {
+		remain_bytes := chunklen % IMAGE_UPLOAD_CHUNK_ALIGNMENT
+		if remain_bytes != 0 {
+			chunklen -= remain_bytes
 		}
+
+		return chunklen, nil
+	}
 
 	return chunklen, nil
 }