diff options
Diffstat (limited to 'Tools')
| -rwxr-xr-x[-rw-r--r--] | Tools/px_generate_xml.sh | 0 | ||||
| -rwxr-xr-x | Tools/px_mkfw.py | 5 | ||||
| -rwxr-xr-x[-rw-r--r--] | Tools/px_update_wiki.sh | 0 | ||||
| -rwxr-xr-x | Tools/px_uploader.py | 2 | ||||
| -rwxr-xr-x | Tools/upload.sh | 28 |
5 files changed, 34 insertions, 1 deletions
diff --git a/Tools/px_generate_xml.sh b/Tools/px_generate_xml.sh index 65f0c95da..65f0c95da 100644..100755 --- a/Tools/px_generate_xml.sh +++ b/Tools/px_generate_xml.sh diff --git a/Tools/px_mkfw.py b/Tools/px_mkfw.py index b598a65a1..c2da8a203 100755 --- a/Tools/px_mkfw.py +++ b/Tools/px_mkfw.py @@ -73,6 +73,7 @@ parser.add_argument("--version", action="store", help="set a version string") parser.add_argument("--summary", action="store", help="set a brief description") parser.add_argument("--description", action="store", help="set a longer description") parser.add_argument("--git_identity", action="store", help="the working directory to check for git identity") +parser.add_argument("--parameter_xml", action="store", help="the parameters.xml file") parser.add_argument("--image", action="store", help="the firmware image") args = parser.parse_args() @@ -101,6 +102,10 @@ if args.git_identity != None: p = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE).stdout desc['git_identity'] = str(p.read().strip()) p.close() +if args.parameter_xml != None: + f = open(args.parameter_xml, "rb") + bytes = f.read() + desc['parameter_xml'] = base64.b64encode(zlib.compress(bytes,9)).decode('utf-8') if args.image != None: f = open(args.image, "rb") bytes = f.read() diff --git a/Tools/px_update_wiki.sh b/Tools/px_update_wiki.sh index d66bb9e10..d66bb9e10 100644..100755 --- a/Tools/px_update_wiki.sh +++ b/Tools/px_update_wiki.sh diff --git a/Tools/px_uploader.py b/Tools/px_uploader.py index d4e461226..3a4540ac0 100755 --- a/Tools/px_uploader.py +++ b/Tools/px_uploader.py @@ -458,7 +458,7 @@ if os.path.exists("/usr/sbin/ModemManager"): # Load the firmware file fw = firmware(args.firmware) -print("Loaded firmware for %x,%x, waiting for the bootloader..." % (fw.property('board_id'), fw.property('board_revision'))) +print("Loaded firmware for %x,%x, size: %d bytes, waiting for the bootloader..." % (fw.property('board_id'), fw.property('board_revision'), fw.property('image_size'))) print("If the board does not respond within 1-2 seconds, unplug and re-plug the USB connector.") # Spin waiting for a device to show up diff --git a/Tools/upload.sh b/Tools/upload.sh new file mode 100755 index 000000000..c0dd65eba --- /dev/null +++ b/Tools/upload.sh @@ -0,0 +1,28 @@ +#!/bin/bash + +EXEDIR=`pwd` +BASEDIR=$(dirname $0) + +SYSTYPE=`uname -s` + +# +# Serial port defaults. +# +# XXX The uploader should be smarter than this. +# +if [ $SYSTYPE = "Darwin" ]; +then +SERIAL_PORTS="/dev/tty.usbmodemPX*,/dev/tty.usbmodem*" +fi + +if [ $SYSTYPE = "Linux" ]; +then +SERIAL_PORTS="/dev/serial/by-id/usb-3D_Robotics*" +fi + +if [ $SYSTYPE = "" ]; +then +SERIAL_PORTS="COM32,COM31,COM30,COM29,COM28,COM27,COM26,COM25,COM24,COM23,COM22,COM21,COM20,COM19,COM18,COM17,COM16,COM15,COM14,COM13,COM12,COM11,COM10,COM9,COM8,COM7,COM6,COM5,COM4,COM3,COM2,COM1,COM0" +fi + +python $BASEDIR/px_uploader.py --port $SERIAL_PORTS $1
\ No newline at end of file |