Merge pull request #38 from pennam/part_update

UNO R4 WiFi new partition table

Author: pennam

combine.py

@@ -11,15 +11,17 @@
 
 # 0x000000 bootloader
 # 0x008000 partitions
-# 0x00E000 boot_app
-# 0x010000 app
-# 0x330000 spiffs
-# 0x3C0000 certs
+# 0x009000 fws
+# 0x00E000 boot_app/otadata
+# 0x010000 certs
+# 0x050000 app0
+# 0x1E0000 app1
+# 0x370000 spiffs
+# 0x3F0000 nvs
+# 0x3F5000 coredump
 
-# calculate the output binary size, app offset 
-outputSize = 0x3C0000 + len(certsData)
-if (outputSize % 1024):
-	outputSize += 1024 - (outputSize % 1024)
+# calculate the output binary size included nvs
+outputSize = 0x3F5000
 
 # allocate and init to 0xff
 outputData = bytearray(b'\xff') * outputSize
@@ -32,23 +34,37 @@
 	outputData[0x8000 + i] = partitionData[i]
 
 for i in range(0, len(bootApp)):
-        outputData[0xE000 + i] = bootApp[i]
+    outputData[0xE000 + i] = bootApp[i]
+
+for i in range(0, len(certsData)):
+    outputData[0x10000 + i] = certsData[i]
 
 for i in range(0, len(appData)):
-        outputData[0x10000 + i] = appData[i]
+    outputData[0x50000 + i] = appData[i]
 
 for i in range(0, len(spiffsData)):
-        outputData[0x330000 + i] = spiffsData[i]
+    outputData[0x370000 + i] = spiffsData[i]
 
-for i in range(0, len(certsData)):
-	outputData[0x3C0000 + i] = certsData[i]
+outputFilename = "UNOR4USBBridge/build/esp32-patched.esp32.arduino_unor4wifi_usb_bridge/S3-ALL.bin"
 
+# write out
+with open(outputFilename,"w+b") as f:
+	f.seek(0)
+	f.write(outputData)
+	f.close
 
-outputFilename = "UNOR4USBBridge/build/esp32-patched.esp32.arduino_unor4wifi_usb_bridge/S3.bin"
-if (len(sys.argv) > 1):
-	outputFilename = sys.argv[1]
+outputFilename = "UNOR4USBBridge/build/esp32-patched.esp32.arduino_unor4wifi_usb_bridge/S3-BOOT-APP.bin"
 
 # write out
 with open(outputFilename,"w+b") as f:
 	f.seek(0)
-	f.write(outputData)
+	f.write(outputData[:0x1E0000])
+	f.close
+
+outputFilename = "UNOR4USBBridge/build/esp32-patched.esp32.arduino_unor4wifi_usb_bridge/S3-APP.bin"
+
+# write out
+with open(outputFilename,"w+b") as f:
+	f.seek(0)
+	f.write(outputData[0xE000:0x1E0000])
+	f.close