X-Git-Url: https://oss.titaniummirror.com/gitweb/?a=blobdiff_plain;f=tools%2Ftinyos%2Fmisc%2Ftos-deluge;h=21d7727f96a61142d82f6678bfc70ce06d4b7274;hb=b7e372c3aa2f1da307407397da3b032df4ac4d49;hp=a6c99785b13590f02b0c2215703c0b847508f125;hpb=62b84950912c1c033c401fb0b2a1efaceec78280;p=tinyos-2.x.git diff --git a/tools/tinyos/misc/tos-deluge b/tools/tinyos/misc/tos-deluge index a6c99785..21d7727f 100755 --- a/tools/tinyos/misc/tos-deluge +++ b/tools/tinyos/misc/tos-deluge @@ -23,21 +23,22 @@ # @author Razvan Musaloiu-E. # @author Chieh-Jan Mike Liang -import sys, stat, struct, subprocess, time -import tos +import sys, stat, struct, subprocess, time, os.path +try: + import tos +except ImportError: + import posix + sys.path = [os.path.join(posix.environ['TOSROOT'], 'support', 'sdk', 'python')] + sys.path + import tos from datetime import datetime -import os.path # Path to the python script that builds Deluge image from XML PATH_PY_BUILD_IMAGE = os.path.join(os.path.dirname(sys.argv[0]), 'tos-build-deluge-image') # TinyOS serial communication parameters -FM_AMID = 0xAB -DM_AMID = 0xAC +FM_AMID = 0x53 +DM_AMID = 0x54 SERIAL_DATA_LENGTH = 28 - 1 - 1 - 2 - 2 -BAUDRATES = {'micaz': 57600, - 'telosb': 115200, - 'iris': 57600} # Commands for FlashManager FM_CMD_ERASE = 0 @@ -69,7 +70,7 @@ class FMReqPacket(tos.Packet): tos.Packet.__init__(self, [('cmd', 'int', 1), ('imgNum', 'int', 1), - ('offset', 'int', 2), + ('offset', 'int', 4), ('length', 'int', 2), ('data', 'blob', None)], packet) @@ -125,12 +126,12 @@ def crc16(data): else: crc = crc << 1 crc = crc & 0xffff - + return crc def handleResponse(success, msg): if success == True: - packet = am.read(timeout=1) + packet = am.read(timeout=2) while packet and packet.type == 100: print "".join([chr(i) for i in packet.data]) packet = am.read() @@ -143,14 +144,14 @@ def handleResponse(success, msg): else: print msg, reply return False - + print "ERROR: Unable to send the command" return False -def ident(): +def ident(timeout=None): sreqpkt = FMReqPacket((FM_CMD_IDENT, 0, 0, 0, [])) - if am.write(sreqpkt, FM_AMID): - packet = am.read() + if am.write(sreqpkt, FM_AMID, timeout=timeout): + packet = am.read(timeout=timeout) reply = SerialReplyPacket(packet.data) if reply.error == ERROR_SUCCESS: return ShortIdent(reply.data) @@ -158,12 +159,12 @@ def ident(): def read(imgNum, offset, length): r = [] - + sreqpkt = FMReqPacket((FM_CMD_READ, imgNum, offset, length, [])) while True: if sreqpkt.length > SERIAL_DATA_LENGTH: sreqpkt.length = SERIAL_DATA_LENGTH - + if am.write(sreqpkt, FM_AMID): packet = am.read() reply = SerialReplyPacket(packet.data) @@ -175,7 +176,7 @@ def read(imgNum, offset, length): else: r = None break - + sreqpkt.offset += sreqpkt.length if sreqpkt.offset >= (offset + length): break @@ -184,9 +185,23 @@ def read(imgNum, offset, length): return r def erase(imgNum): + # Note: the normal erase doesn't work properly on AT45DB. A + # workaround is to do the normal erase (to make happy STM25P) + # and then overwrite the metadata (to make happy AT45DB). + sreqpkt = FMReqPacket((FM_CMD_ERASE, imgNum, 0, 0, [])) success = am.write(sreqpkt, FM_AMID) - return handleResponse(success, "ERROR: Unable to erase the flash volume") + result = handleResponse(success, "ERROR: Unable to erase the flash volume") + if result: return True; + + print 'Attempt the workaround for AT45DB...' + sreqpkt = FMReqPacket((FM_CMD_WRITE, imgNum, 0, 0, [])) + sreqpkt.data = [0xFF] * DELUGE_IDENT_SIZE + sreqpkt.length = DELUGE_IDENT_SIZE + success = am.write(sreqpkt, FM_AMID) + result = handleResponse(success, "ERROR: Unable to erase the flash volume") + if not result: return False; + return sync(imgNum) def sync(imgNum): sreqpkt = FMReqPacket((FM_CMD_SYNC, imgNum, 0, 0, [])) @@ -199,29 +214,29 @@ def write(imgNum, data): total_length = length # For progress bar next_tick = 100 # For progress bar start_time = time.time() - + print "[0% 25% 50% 75% 100%]\r[", - + sreqpkt.offset = 0 while length > 0: if ((length * 100) / total_length) < next_tick: next_tick = next_tick - 2 sys.stdout.write('-') sys.stdout.flush() - + # Calculates the payload size for the current packet if length >= SERIAL_DATA_LENGTH: sreqpkt.length = SERIAL_DATA_LENGTH else: sreqpkt.length = length sreqpkt.data = data[sreqpkt.offset:sreqpkt.offset+sreqpkt.length] - + # Sends over serial to the mote if not am.write(sreqpkt, FM_AMID): print print "ERROR: Unable to send the last serial packet (file offset: %d)" % sreqpkt.offset return False - + # Waiting for confirmation packet = am.read() reply = SerialReplyPacket(packet.data) @@ -229,7 +244,7 @@ def write(imgNum, data): print print "ERROR: Unable to write to the flash volume (file offset: %d)" % sreqpkt.offset return False - + length -= sreqpkt.length sreqpkt.offset += sreqpkt.length @@ -237,7 +252,7 @@ def write(imgNum, data): elasped_time = time.time() - start_time print "\r%s bytes in %.2f seconds (%.4f bytes/s)" % (total_length, elasped_time, int(total_length) / (elasped_time)) return True - + # Checks for valid CRC and timestamp def verifyIdent(i): if i != None: @@ -286,7 +301,7 @@ def inject(imgNum, tos_image_xml): except: print "ERROR: Unable to find the image building utility, \"%s\"" % PATH_PY_BUILD_IMAGE return False - + # Gets status information of stored image i = getIdent(imgNum) if ident: @@ -306,7 +321,7 @@ def inject(imgNum, tos_image_xml): (out, err) = p.communicate(None) print err, print "--------------------------------------------------" - + # Writes the new binary image image = [struct.unpack("B", c)[0] for c in out] if len(image) > 0 and erase(imgNum): @@ -316,7 +331,7 @@ def inject(imgNum, tos_image_xml): print "Replace image with:" print formatIdent(getIdent(imgNum)) print "--------------------------------------------------" - + return False def ping(imgNum): @@ -331,7 +346,7 @@ def ping(imgNum): print formatIdent(i) print "--------------------------------------------------" return True - + print "--------------------------------------------------" return False @@ -366,8 +381,10 @@ def localstop(): return handleResponse(success, "ERROR: Unable to initiate the local stop") def print_usage(): - print "Usage: %s <-p|-i|-r|-d|-e|-s> image_number [options]" % sys.argv[0] - print " Either the platform name (micaz or telosv) or a baudrate value" + print "Usage: %s <-p|-i|-r|-d|-e|-s> image_number [options]" % sys.argv[0] + print " can be:" + print " serial@PORT:SPEED Serial ports" + print " network@HOST:PORT MIB600" print " -p --ping Provide status of the image in the external flash" print " -i --inject Inject a compiled TinyOS application" print " [options]: tos_image.xml file path" @@ -386,63 +403,55 @@ def checkImgNum(): global imgNum # Checks for valid image number format try: - imgNum = int(sys.argv[4]) + imgNum = int(sys.argv[3]) except: print "ERROR: Image number is not valid" sys.exit(-1) return imgNum # ======== MAIN ======== # -if len(sys.argv) >= 4: +if len(sys.argv) >= 3: + + am = tos.AM() - if sys.argv[2] in BAUDRATES: - baudrate = BAUDRATES[sys.argv[2]] - else: - try: - baudrate = int(sys.argv[2]) - except: - print "ERROR: Wrong baudrate" - sys.exit(-1) - - # Initializes serial port communication try: - s = tos.Serial(sys.argv[1], baudrate, flush=True, debug=False) - am = tos.AM(s) - except: - print "ERROR: Unable to initialize serial port connection to", sys.argv[1] + print "Checking if node is a Deluge T2 base station ..." + ident(timeout=1) + except tos.Timeout: + print "ERROR: Timeout. Is the node a Deluge T2 base station?" sys.exit(-1) - if sys.argv[3] in ["-p", "--ping"]: + if sys.argv[2] in ["-p", "--ping"]: checkImgNum() print "Pinging node ..." - ping(imgNum) - elif sys.argv[3] in ["-i", "--inject"] and len(sys.argv) == 6: + ping(imgNum) + elif sys.argv[2] in ["-i", "--inject"] and len(sys.argv) == 5: checkImgNum() print "Pinging node ..." - inject(imgNum, sys.argv[5]) - elif sys.argv[3] in ["-e", "--erase"]: + inject(imgNum, sys.argv[4]) + elif sys.argv[2] in ["-e", "--erase"]: checkImgNum() if erase(imgNum): print "Image number %d erased" % imgNum - elif sys.argv[3] in ["-b", "--boot"]: + elif sys.argv[2] in ["-b", "--boot"]: if boot(): print "Command sent" - elif sys.argv[3] in ["-r", "--reprogram"]: + elif sys.argv[2] in ["-r", "--reprogram"]: checkImgNum() if reprogram(imgNum): print "Command sent" - elif sys.argv[3] in ["-d", "--disseminate"]: + elif sys.argv[2] in ["-d", "--disseminate"]: checkImgNum() if disseminate(imgNum): print "Command sent" - elif sys.argv[3] in ["-dr", "--disseminate-and-reboot"]: + elif sys.argv[2] in ["-dr", "--disseminate-and-reboot"]: checkImgNum() if disseminateAndReboot(imgNum): print "Command sent" - elif sys.argv[3] in ["-s", "--stop"]: + elif sys.argv[2] in ["-s", "--stop"]: if stop(): print "Command sent" - elif sys.argv[3] in ["-ls", "--local-stop"]: + elif sys.argv[2] in ["-ls", "--local-stop"]: if localstop(): print "Command sent" else: