Renaming bin2base64.py to bin2json.py in order to directly create a json object containing the base64 encoded binary because otherwise the URL becomes to long for curl to process

Author: aentinger

extras/tools/README.md

@@ -25,13 +25,13 @@ This tool can be used to extend (actually prefix) a binary generated with e.g. t
 0000030   0000 0000 7485 0000 0000 0000 0000 0000
 ```
 
-`bin2base64.py`
-===============
-This tool converts the binary file into base64 encoding which is necessary for feeding it to the server.
+`bin2json.py`
+=============
+This tool converts the binary file into base64 encoded JSON which is necessary for feeding it to the server.
 
 ### How-To-Use
 ```bash
-./bin2base64.py sketch-ota.bin sketch-ota.base64
+./bin2json.py sketch-ota.bin sketch-ota.json
 ```
 
 `ota-upload.sh`
@@ -40,5 +40,5 @@ This tool allows to upload a OTA binary to a device via a Arduino cloud server.
 
 ### How-To-Use
 ```bash
-./ota-upload.sh CLIENT_ID CLIENT_SECRET DEVICE_ID sketch-ota.base64
+./ota-upload.sh CLIENT_ID CLIENT_SECRET DEVICE_ID sketch-ota.json
 ```

extras/tools/bin2base64.py renamed to extras/tools/bin2json.py

@@ -1,24 +1,25 @@
 #!/usr/bin/python3
 
 import sys
+import json
 import base64
 
 if len(sys.argv) != 3:
-    print ("Usage: bin2base64.py sketch-ota.bin sketch-ota.base64")
+    print ("Usage: bin2json.py sketch-ota.bin sketch-ota.json")
     sys.exit()
 
 ifile = sys.argv[1]
 ofile = sys.argv[2]
 
 # Read the binary file
 in_file = open(ifile, "rb")
-bin_data = bytearray(in_file.read())
+bin_data = in_file.read()
 in_file.close()
 
 # Perform the base64 conversion
 base64_data = base64.b64encode(bin_data)
 
 # Write to outfile
-out_file = open(ofile, "wb")
-out_file.write(base64_data)
+out_file = open(ofile, "w")
+json.dump({'binary' : base64_data.decode("ascii")}, out_file)
 out_file.close()

extras/tools/ota-upload.sh

@@ -23,12 +23,11 @@ fi
 
 printf "Uploading to device ... "
 access_token_val=$(<access_token)
-base64_binary=$(<"$4")
 curl --silent --location --request PUT 'https://api-dev.arduino.cc/iot/v2/devices/'"$3"'/ota' \
   --header 'Content-Type: application/json' \
   --header 'Authorization: Bearer '"$access_token_val" \
   --header 'Content-Type: text/plain' \
-  --data-raw '{"binary":"base64encodedbinary"}'
+  -d @"$4"
 echo "OK"
 
 printf "Cleaning up ... "