Skip to content

Commit 27657d7

Browse files
committed
combine.py: tab to spaces
1 parent 5ff1aab commit 27657d7

File tree

1 file changed

+13
-13
lines changed

1 file changed

+13
-13
lines changed

combine.py

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,17 @@
2121
# calculate the output binary size, app offset
2222
outputSize = 0x30000 + len(appData)
2323
if (outputSize % 1024):
24-
outputSize += 1024 - (outputSize % 1024)
24+
outputSize += 1024 - (outputSize % 1024)
2525

2626
# allocate and init to 0xff
2727
outputData = bytearray(b'\xff') * 0x200000
2828

2929
# copy data: bootloader, partitions, phy, certs, app
3030
for i in range(0, len(booloaderData)):
31-
outputData[0x1000 + i] = booloaderData[i]
31+
outputData[0x1000 + i] = booloaderData[i]
3232

3333
for i in range(0, len(partitionData)):
34-
outputData[0x8000 + i] = partitionData[i]
34+
outputData[0x8000 + i] = partitionData[i]
3535

3636
for i in range(0, len(phyData)):
3737
outputData[0x9000 + i] = phyData[i]
@@ -43,7 +43,7 @@
4343
outputData[0xA000 + len(certsData)] = 0
4444

4545
for i in range(0, len(appData)):
46-
outputData[0x30000 + i] = appData[i]
46+
outputData[0x30000 + i] = appData[i]
4747

4848
# add empty spiffs
4949
for i in range(0, len(spiffsData)):
@@ -52,28 +52,28 @@
5252

5353
baseFilename = "NINA_W102"
5454
if (len(sys.argv) > 1):
55-
baseFilename = sys.argv[1]
55+
baseFilename = sys.argv[1]
5656

5757
outputFilename = baseFilename + ".bin"
5858
# write out
5959
with open(outputFilename,"w+b") as f:
60-
f.seek(0)
61-
f.write(outputData[:outputSize])
60+
f.seek(0)
61+
f.write(outputData[:outputSize])
6262

6363
outputFilename = baseFilename + "_BOOT_APP.bin"
6464
# write out
6565
with open(outputFilename,"w+b") as f:
66-
f.seek(0)
67-
f.write(outputData[:outputSize])
66+
f.seek(0)
67+
f.write(outputData[:outputSize])
6868

6969
outputFilename = baseFilename + "_APP.bin"
7070
# write out
7171
with open(outputFilename,"w+b") as f:
72-
f.seek(0)
73-
f.write(outputData[0x30000:outputSize])
72+
f.seek(0)
73+
f.write(outputData[0x30000:outputSize])
7474

7575
outputFilename = baseFilename + "_ALL.bin"
7676
# write out
7777
with open(outputFilename,"w+b") as f:
78-
f.seek(0)
79-
f.write(outputData)
78+
f.seek(0)
79+
f.write(outputData)

0 commit comments

Comments
 (0)