Merge branch 'master' of git.card10.badge.events.ccc.de:card10/firmware into micropython

23f42a94 · Anne Jan Brouwer · 69b99f4a · 3ae54c3c · 23f42a94 · 23f42a94
Verified Commit 23f42a94 authored Jun 06, 2019 by Anne Jan Brouwer 💬
--- a/Hello_World/build_image
+++ b/Hello_World/build_image
@@ -2,4 +2,4 @@ make clean
 make APP=1
 make build/max32665.bin
 cp build/max32665.bin card10.bin
-python ../bootloader/crc_patch.py card10.bin
+../bootloader/crc_patch.py card10.bin
--- a/Hello_World_FreeRTOS/build_image
+++ b/Hello_World_FreeRTOS/build_image
@@ -2,4 +2,4 @@ make clean
 make APP=1
 make build/max32665.bin
 cp build/max32665.bin card10.bin
-python ../bootloader/crc_patch.py card10.bin
+../bootloader/crc_patch.py card10.bin
--- a/ble/build_image
+++ b/ble/build_image
@@ -2,4 +2,4 @@ make clean
 make APP=1
 make build/max32665.bin
 cp build/max32665.bin card10.bin
-python ../bootloader/crc_patch.py card10.bin
+../bootloader/crc_patch.py card10.bin
--- a/bmatest/build_image
+++ b/bmatest/build_image
@@ -2,4 +2,4 @@ make clean
 make APP=1
 make build/max32665.bin
 cp build/max32665.bin card10.bin
-python ../bootloader/crc_patch.py card10.bin
+../bootloader/crc_patch.py card10.bin
--- a/bmetest/build_image
+++ b/bmetest/build_image
@@ -2,4 +2,4 @@ make clean
 make APP=1
 make build/max32665.bin
 cp build/max32665.bin card10.bin
-python ../bootloader/crc_patch.py card10.bin
+../bootloader/crc_patch.py card10.bin
--- a/bootloader/crc_patch.py
+++ b/bootloader/crc_patch.py
+#!/usr/bin/env python3
 import sys
 import crc16

 crc = 0

-data = open(sys.argv[1]).read()
+data = open(sys.argv[1], 'rb').read()
 crc = crc16.crc16xmodem(data)
 print(crc)

-padded = data + chr(crc >> 8) + chr(crc & 0xFF)
+padded = data + bytes([crc >> 8, crc & 0xFF])

 crc = 0
 crc = crc16.crc16xmodem(padded)
 print(crc)

-open(sys.argv[1], 'w').write(padded)
+open(sys.argv[1], 'wb').write(padded)
--- a/ecgtest/build_image
+++ b/ecgtest/build_image
@@ -2,4 +2,4 @@ make clean
 make APP=1
 make build/max32665.bin
 cp build/max32665.bin card10.bin
-python ../bootloader/crc_patch.py card10.bin
+../bootloader/crc_patch.py card10.bin
--- a/imutest/build_image
+++ b/imutest/build_image
@@ -2,4 +2,4 @@ make clean
 make APP=1
 make build/max32665.bin
 cp build/max32665.bin card10.bin
-python ../bootloader/crc_patch.py card10.bin
+../bootloader/crc_patch.py card10.bin
--- a/ips/build_image
+++ b/ips/build_image
@@ -2,4 +2,4 @@ make clean
 make APP=1
 make build/max32665.bin
 cp build/max32665.bin card10.bin
-python ../bootloader/crc_patch.py card10.bin
+../bootloader/crc_patch.py card10.bin