From ff6f444a38d8901cbf9fd5f844639f3a5c5be597 Mon Sep 17 00:00:00 2001 From: razvanm Date: Wed, 11 Jul 2007 00:42:54 +0000 Subject: [PATCH] Rename the TOSBoot to tosboot. Enhanced UI in tos-deluge (more explicit messages for -p, progress-bar for -i and messages explaining what should happen). Script for testing more than one mote. --- apps/tests/deluge/Blink/BlinkC.nc | 2 +- apps/tests/deluge/Blink/burn | 41 +++-- apps/tests/deluge/Blink/burn-net | 95 +++++++++++ support/make/bnp.extra | 2 +- tools/tinyos/misc/tos-deluge | 149 ++++++++++-------- tos/lib/net/Deluge/DelugeP.nc | 3 - tos/lib/{TOSBoot => tosboot}/Deluge.h | 0 tos/lib/{TOSBoot => tosboot}/Exec.nc | 0 tos/lib/{TOSBoot => tosboot}/ExtFlash.nc | 0 tos/lib/{TOSBoot => tosboot}/Hardware.nc | 0 tos/lib/{TOSBoot => tosboot}/Leds.nc | 0 tos/lib/{TOSBoot => tosboot}/Makefile | 0 tos/lib/{TOSBoot => tosboot}/ProgFlash.nc | 0 tos/lib/{TOSBoot => tosboot}/TOSBoot.h | 0 tos/lib/{TOSBoot => tosboot}/TOSBoot.nc | 0 tos/lib/{TOSBoot => tosboot}/TOSBootM.nc | 0 tos/lib/{TOSBoot => tosboot}/Voltage.nc | 0 .../{TOSBoot => tosboot}/at45db/ExtFlashC.nc | 0 tos/lib/{TOSBoot => tosboot}/avr/HardwareC.nc | 0 .../avr/InternalFlashC.nc | 0 .../{TOSBoot => tosboot}/avr/ProgFlashM.nc | 0 tos/lib/{TOSBoot => tosboot}/avr/boot.h | 0 tos/lib/{TOSBoot => tosboot}/crc.h | 0 tos/lib/{TOSBoot => tosboot}/lib/ExecC.nc | 0 tos/lib/{TOSBoot => tosboot}/lib/LedsC.nc | 0 tos/lib/{TOSBoot => tosboot}/micaz/ExecC.nc | 0 .../micaz/InternalFlash.h | 0 tos/lib/{TOSBoot => tosboot}/micaz/PluginC.nc | 0 .../micaz/TOSBoot_platform.h | 0 .../{TOSBoot => tosboot}/micaz/VoltageC.nc | 0 .../{TOSBoot => tosboot}/micaz/avrhardware.h | 0 tos/lib/{TOSBoot => tosboot}/micaz/hardware.h | 0 .../{TOSBoot => tosboot}/msp430/HPLUSART0M.nc | 0 .../msp430/HPLUSARTControl.nc | 0 .../{TOSBoot => tosboot}/msp430/HardwareC.nc | 0 .../msp430/InternalFlashC.nc | 0 .../{TOSBoot => tosboot}/msp430/ProgFlashM.nc | 0 .../{TOSBoot => tosboot}/msp430/VoltageC.nc | 0 .../{TOSBoot => tosboot}/stm25p/ExtFlashC.nc | 0 .../{TOSBoot => tosboot}/stm25p/ExtFlashM.nc | 0 .../telosb/InternalFlash.h | 0 .../telosb/InternalFlash.nc | 0 .../{TOSBoot => tosboot}/telosb/PluginC.nc | 0 .../{TOSBoot => tosboot}/telosb/PowerOffM.nc | 0 .../telosb/TOSBoot_platform.h | 0 .../{TOSBoot => tosboot}/telosb/hardware.h | 0 46 files changed, 214 insertions(+), 78 deletions(-) create mode 100755 apps/tests/deluge/Blink/burn-net rename tos/lib/{TOSBoot => tosboot}/Deluge.h (100%) rename tos/lib/{TOSBoot => tosboot}/Exec.nc (100%) rename tos/lib/{TOSBoot => tosboot}/ExtFlash.nc (100%) rename tos/lib/{TOSBoot => tosboot}/Hardware.nc (100%) rename tos/lib/{TOSBoot => tosboot}/Leds.nc (100%) rename tos/lib/{TOSBoot => tosboot}/Makefile (100%) rename tos/lib/{TOSBoot => tosboot}/ProgFlash.nc (100%) rename tos/lib/{TOSBoot => tosboot}/TOSBoot.h (100%) rename tos/lib/{TOSBoot => tosboot}/TOSBoot.nc (100%) rename tos/lib/{TOSBoot => tosboot}/TOSBootM.nc (100%) rename tos/lib/{TOSBoot => tosboot}/Voltage.nc (100%) rename tos/lib/{TOSBoot => tosboot}/at45db/ExtFlashC.nc (100%) rename tos/lib/{TOSBoot => tosboot}/avr/HardwareC.nc (100%) rename tos/lib/{TOSBoot => tosboot}/avr/InternalFlashC.nc (100%) rename tos/lib/{TOSBoot => tosboot}/avr/ProgFlashM.nc (100%) rename tos/lib/{TOSBoot => tosboot}/avr/boot.h (100%) rename tos/lib/{TOSBoot => tosboot}/crc.h (100%) rename tos/lib/{TOSBoot => tosboot}/lib/ExecC.nc (100%) rename tos/lib/{TOSBoot => tosboot}/lib/LedsC.nc (100%) rename tos/lib/{TOSBoot => tosboot}/micaz/ExecC.nc (100%) rename tos/lib/{TOSBoot => tosboot}/micaz/InternalFlash.h (100%) rename tos/lib/{TOSBoot => tosboot}/micaz/PluginC.nc (100%) rename tos/lib/{TOSBoot => tosboot}/micaz/TOSBoot_platform.h (100%) rename tos/lib/{TOSBoot => tosboot}/micaz/VoltageC.nc (100%) rename tos/lib/{TOSBoot => tosboot}/micaz/avrhardware.h (100%) rename tos/lib/{TOSBoot => tosboot}/micaz/hardware.h (100%) rename tos/lib/{TOSBoot => tosboot}/msp430/HPLUSART0M.nc (100%) rename tos/lib/{TOSBoot => tosboot}/msp430/HPLUSARTControl.nc (100%) rename tos/lib/{TOSBoot => tosboot}/msp430/HardwareC.nc (100%) rename tos/lib/{TOSBoot => tosboot}/msp430/InternalFlashC.nc (100%) rename tos/lib/{TOSBoot => tosboot}/msp430/ProgFlashM.nc (100%) rename tos/lib/{TOSBoot => tosboot}/msp430/VoltageC.nc (100%) rename tos/lib/{TOSBoot => tosboot}/stm25p/ExtFlashC.nc (100%) rename tos/lib/{TOSBoot => tosboot}/stm25p/ExtFlashM.nc (100%) rename tos/lib/{TOSBoot => tosboot}/telosb/InternalFlash.h (100%) rename tos/lib/{TOSBoot => tosboot}/telosb/InternalFlash.nc (100%) rename tos/lib/{TOSBoot => tosboot}/telosb/PluginC.nc (100%) rename tos/lib/{TOSBoot => tosboot}/telosb/PowerOffM.nc (100%) rename tos/lib/{TOSBoot => tosboot}/telosb/TOSBoot_platform.h (100%) rename tos/lib/{TOSBoot => tosboot}/telosb/hardware.h (100%) diff --git a/apps/tests/deluge/Blink/BlinkC.nc b/apps/tests/deluge/Blink/BlinkC.nc index d51432c8..09b36ecb 100644 --- a/apps/tests/deluge/Blink/BlinkC.nc +++ b/apps/tests/deluge/Blink/BlinkC.nc @@ -56,7 +56,7 @@ implementation { dbg("BlinkC", "Timer 0 fired @ %s.\n", sim_time_string()); #ifndef BLINK_REVERSE - call Leds.led1Toggle(); + call Leds.led0Toggle(); #else call Leds.led2Toggle(); #endif diff --git a/apps/tests/deluge/Blink/burn b/apps/tests/deluge/Blink/burn index 6b41342d..6c67b9f1 100755 --- a/apps/tests/deluge/Blink/burn +++ b/apps/tests/deluge/Blink/burn @@ -24,20 +24,43 @@ PLATFORM=$2 make clean -echo ==================== Compile and load Blink ==================== +echo ============================ Compile and load Blink ============================ if [ $PLATFORM == 'micaz' ] then - CFLAGS=-DDELUGE_BASESTATION make $PLATFORM install mib510,$PORT + CFLAGS=-DDELUGE_BASESTATION make ${PLATFORM} install mib510,${PORT} elif [ $PLATFORM == 'telosb' ] then - CFLAGS=-DDELUGE_BASESTATION make $PLATFORM install bsl,$PORT + CFLAGS=-DDELUGE_BASESTATION make ${PLATFORM} install bsl,${PORT} fi -echo ==================== Compile a new Blink ==================== -CFLAGS=-DBLINK_REVERSE\ -DDELUGE_BASESTATION make $PLATFORM +echo ' +-------------------------------------------------------+' +echo ' | |' +echo ' | At this point the first led (red) should be blinking. |' +echo ' | |' +echo ' | Press ENTER to continue... |' +echo ' | |' +echo ' +-------------------------------------------------------+' +read -echo ==================== Upload the image ==================== -${TOS_DELUGE} $PORT $PLATFORM -i 0 build/$PLATFORM/tos_image.xml +echo ============================= Compile a new Blink ============================== +CFLAGS=-DBLINK_REVERSE\ -DDELUGE_BASESTATION make ${PLATFORM} -echo ==================== Reboot ==================== -${TOS_DELUGE} $PORT $PLATFORM -r 0 +echo =============================== Upload the image =============================== +${TOS_DELUGE} ${PORT} ${PLATFORM} -i 0 build/${PLATFORM}/tos_image.xml + +echo ' +----------------------------------------------------------------+' +echo ' | |' +echo ' | After pressing enter the following things will take place: |' +echo ' | - mote will be rebooted |' +echo ' | - all the leds will blink for some time as the |' +echo ' | reprogramming by tosboot takes place. |' +echo ' | - a fading of the leds will indicate the exiting from tosboot. |' +echo ' | - the mote should start blinking the 3rd led (blue/yellow). |' +echo ' | |' +echo ' | Press ENTER to continue... |' +echo ' | |' +echo ' +----------------------------------------------------------------+' +read + +echo =========================== Reboot the base station ============================ +${TOS_DELUGE} ${PORT} ${PLATFORM} -b 0 diff --git a/apps/tests/deluge/Blink/burn-net b/apps/tests/deluge/Blink/burn-net new file mode 100755 index 00000000..8f6b436c --- /dev/null +++ b/apps/tests/deluge/Blink/burn-net @@ -0,0 +1,95 @@ +#!/bin/bash + +TOS_DELUGE=`type -p tos-deluge` +if [[ ! -x ${TOS_DELUGE} ]] ; then + TOS_DELUGE=../../../../tools/tinyos/misc/tos-deluge +fi + +echo ${TOS_DELUGE} + +if [ $# -ne 2 ]; then + echo "Usage: $0 " + echo " \"micaz\", \"telosb\"" + echo " how many motes will be used in the test" + exit 2 +fi + +PLATFORM=$1 +NO_MOTES=$2 + +if [ ${PLATFORM} != 'micaz' -a ${PLATFORM} != 'telosb' ]; then + echo "\"$2\" is not a supported platform" + exit 2 +fi + +echo ================================ Compile Blink ================================= +make clean +CFLAGS=-DDELUGE_BASESTATION make ${PLATFORM} +ID=0 + +function burn_one() { + ID=`expr $ID + 1` + echo -n ">>> Please plug mote $ID and type the port to continue: " + read PORT + + if [ ${PLATFORM} == 'micaz' ] + then + CFLAGS=-DDELUGE_BASESTATION make ${PLATFORM} reinstall,$ID mib510,${PORT} + elif [ ${PLATFORM} == 'telosb' ] + then + CFLAGS=-DDELUGE_BASESTATION make ${PLATFORM} reinstall,$ID bsl,${PORT} + fi + +} + +while [[ ${NO_MOTES} > 0 ]] +do + burn_one + NO_MOTES=`expr ${NO_MOTES} - 1` +done + +echo ' +------------------------------------------------------------------------+' +echo ' | |' +echo ' | At this point the first led (red) of all the motes should be blinking. |' +echo ' | |' +echo ' | Press ENTER to continue... |' +echo ' | |' +echo ' +------------------------------------------------------------------------+' +read + +echo ============================= Compile a new Blink ============================== +CFLAGS=-DBLINK_REVERSE\ -DDELUGE_BASESTATION make ${PLATFORM} + +echo ========= Upload the new image to the external flash of the last mote ========== +${TOS_DELUGE} ${PORT} ${PLATFORM} -i 0 build/${PLATFORM}/tos_image.xml + +echo ' +-----------------------------------------+' +echo ' | |' +echo ' | Press ENTER to start the dissemination. |' +echo ' | |' +echo ' +-----------------------------------------+' +read + +echo ============================= Start dissemination ============================== +${TOS_DELUGE} ${PORT} ${PLATFORM} -d 0 + +echo ' +--------------------------------------------------+' +echo ' | |' +echo ' | Press ENTER when the second led (green) from all |' +echo ' | the motes except the last one stops blinking. |' +echo ' | |' +echo ' +--------------------------------------------------+' +read + +echo ===================== Trigger the reboot in the new image ====================== +${TOS_DELUGE} ${PORT} ${PLATFORM} -r 0 + +echo ' +-------------------------------------------------------------+' +echo ' | |' +echo ' | All the motes except the last one should reboot, reprogram |' +echo ' | the internal flash with the new image and start running it. |' +echo ' | The end result should be that the last led (blue/yellow) |' +echo ' | from all the motes except the last one is blinking. |' +echo ' | |' +echo ' +-------------------------------------------------------------+' + diff --git a/support/make/bnp.extra b/support/make/bnp.extra index 5f7ef420..fbd40f48 100644 --- a/support/make/bnp.extra +++ b/support/make/bnp.extra @@ -3,7 +3,7 @@ DELUGE_DIR ?= $(TOSDIR)/lib/net/Deluge DELUGE_EXTRA ?= $(DELUGE_DIR)/extra -TOSBOOT_DIR ?= $(TOSDIR)/lib/TOSBoot/build +TOSBOOT_DIR ?= $(TOSDIR)/lib/tosboot/build ifeq ($(TINYOS_NP),BNP) diff --git a/tools/tinyos/misc/tos-deluge b/tools/tinyos/misc/tos-deluge index 5a3c1bb6..ae1bb1aa 100755 --- a/tools/tinyos/misc/tos-deluge +++ b/tools/tinyos/misc/tos-deluge @@ -31,7 +31,7 @@ # "./tos-deluge" ############################################################################### -import sys, os, stat, struct, subprocess +import sys, os, stat, struct, subprocess, time import tinyos from datetime import datetime import os.path @@ -186,6 +186,16 @@ def op_read(s, img_num, offset, length): return r +# Checks for valid CRC and image timestamp +def verifyMetaData(r): + if r != None: + if crc16(r[6:8]) == toInt(r[8:10]) and r[84:88] != [0xFF, 0xFF, 0xFF, 0xFF]: + return True + else: + print "WARNING: Invalid image format detected" + + return False + # Returns the metadata (first 16 bytes of the image) plus the "ident" # (DELUGE_IDENT_SIZE bytes after CRC) def getMetaData(s, img_num): @@ -197,30 +207,24 @@ def getMetaData(s, img_num): temp = op_read(s, img_num, DELUGE_IDENT_OFFSET, DELUGE_IDENT_SIZE) if temp != None: r.extend(temp) - else: - r = None - - # Checks for valid CRC and image timestamp - if r != None: - if crc16(r[6:8]) == toInt(r[8:10]) and r[84:88] != [0xFF, 0xFF, 0xFF, 0xFF]: return r - - print "ERROR: Unable to retrieve image information" + + print "ERROR: Unable to retrieve image information over serial" return None # Prints status of the image in the external flash def op_ping(s, img_num): metadata = getMetaData(s, img_num) if not metadata == None: - print "Connected to Deluge node." - # Prints out image status - print "--------------------------------------------------" - print "Stored image %d" % img_num - print toStatusStr(2, metadata) - print "--------------------------------------------------" - return True + if verifyMetaData(metadata) == True: + print "Connected to Deluge node." + # Prints out image status + print "--------------------------------------------------" + print "Stored image %d" % img_num + print toStatusStr(2, metadata) + print "--------------------------------------------------" + return True - print "No proper Deluge image found!" return False # Erases an image volume @@ -244,9 +248,19 @@ def op_write(s, img_num, binary_stream): sreqpkt = SerialReqPacket((MSG_WRITE, img_num, 0, 0, [])) local_crc = 0 # Running CRC length = len(binary_stream) + 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.len = SERIAL_DATA_LENGTH @@ -260,6 +274,7 @@ def op_write(s, img_num, binary_stream): # Sends over serial to the mote if s.write_packet(SERIAL_AMGROUP, SERIAL_AMID, sreqpkt.payload()) == False: + print print "ERROR: Unable to send the last serial packet (file offset: %d)" % sreqpkt.offset return False @@ -267,13 +282,17 @@ def op_write(s, img_num, binary_stream): packet = s.read_packet(SERIAL_AMGROUP, SERIAL_AMID) sreplypkt = SerialReplyPacket(packet[1]) if sreplypkt.error != ERROR_SUCCESS: + print print "ERROR: Unable to write to the flash volume (file offset: %d)" % sreqpkt.offset return False local_crc = s.crc16(local_crc, sreqpkt.data) # Computes running CRC length -= sreqpkt.len sreqpkt.offset += sreqpkt.len - + + print '\r' + ' ' * 52, + 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 # Injects an image (specified by tos_image_xml) to an image volume @@ -291,19 +310,20 @@ def op_inject(s, img_num, tos_image_xml): return False # Gets status information of stored image - metadata = getMetaData(s, img_num) - print "Connected to Deluge nodes." - print "--------------------------------------------------" - print "Stored image %d" % img_num version = 0 + metadata = getMetaData(s, img_num) if not metadata == None: - version = toInt(metadata[4:6]) + 1 # Increments the version - print toStatusStr(2, metadata) + print "Connected to Deluge nodes." + if verifyMetaData(metadata) == True: + print "--------------------------------------------------" + print "Stored image %d" % img_num + print toStatusStr(2, metadata) + version = toInt(metadata[4:6]) + 1 # Increments the version else: - print " No proper Deluge image found!" - print "--------------------------------------------------" + return False # Creates binary image from the TOS image XML + print "--------------------------------------------------" p = subprocess.Popen([PATH_PY_BUILD_IMAGE, "-v", str(version), "-i", str(img_num), tos_image_xml], stdout=subprocess.PIPE, stderr=subprocess.PIPE) print p.stderr.read(), print "--------------------------------------------------" @@ -311,33 +331,34 @@ def op_inject(s, img_num, tos_image_xml): # Writes the new binary image if op_erase(s, img_num): if op_write(s, img_num, p.stdout.read()): + print "--------------------------------------------------" metadata = getMetaData(s, img_num) - if not metadata == None: - print "Replace image with:" - print toStatusStr(2, metadata) - print "--------------------------------------------------" - - return True + if not metadata == None: + if verifyMetaData(metadata) == True: + print "Replace image with:" + print toStatusStr(2, metadata) + print "--------------------------------------------------" + return True return False # Requests the base station to reprogram itself def op_reprog_bs(s, img_num): - if getMetaData(s, img_num) == None: - print "ERROR: No proper Deluge image found!" - else: - sreqpkt = SerialReqPacket((MSG_REPROG_BS, img_num, 0, 0, [])) - success = s.write_packet(SERIAL_AMGROUP, SERIAL_AMID, sreqpkt.payload()) - if success == True: - packet = s.read_packet(SERIAL_AMGROUP, SERIAL_AMID) - sreplypkt = SerialReplyPacket(packet[1]) - if sreplypkt.error == ERROR_SUCCESS: - return True - else: - print "ERROR: Unable to reprogram the base station" - return False - - print "ERROR: Unable to send the command" + metadata = getMetaData(s, img_num) + if not metadata == None: + if verifyMetaData(metadata) == True: + sreqpkt = SerialReqPacket((MSG_REPROG_BS, img_num, 0, 0, [])) + success = s.write_packet(SERIAL_AMGROUP, SERIAL_AMID, sreqpkt.payload()) + if success == True: + packet = s.read_packet(SERIAL_AMGROUP, SERIAL_AMID) + sreplypkt = SerialReplyPacket(packet[1]) + if sreplypkt.error == ERROR_SUCCESS: + return True + else: + print "ERROR: Unable to reprogram the base station" + + print "ERROR: Unable to send the command" + return False # Requests the network to reprogram with the specified image number @@ -357,28 +378,28 @@ def op_reprog(s, img_num): # Requests the mote to disseminate an image def op_diss(s, img_num): - if getMetaData(s, img_num) == None: - print "ERROR: No proper Deluge image found!" - else: - sreqpkt = SerialReqPacket((MSG_DISS, img_num, 0, 0, [])) - success = s.write_packet(SERIAL_AMGROUP, SERIAL_AMID, sreqpkt.payload()) - if success == True: - packet = s.read_packet(SERIAL_AMGROUP, SERIAL_AMID) - sreplypkt = SerialReplyPacket(packet[1]) - if sreplypkt.error == ERROR_SUCCESS: - return True - else: - print "ERROR: Unable to start the command dissemination" - return False + metadata = getMetaData(s, img_num) + if not metadata == None: + if verifyMetaData(metadata) == True: + sreqpkt = SerialReqPacket((MSG_DISS, img_num, 0, 0, [])) + success = s.write_packet(SERIAL_AMGROUP, SERIAL_AMID, sreqpkt.payload()) + if success == True: + packet = s.read_packet(SERIAL_AMGROUP, SERIAL_AMID) + sreplypkt = SerialReplyPacket(packet[1]) + if sreplypkt.error == ERROR_SUCCESS: + return True + else: + print "ERROR: Unable to start the command dissemination" + + print "ERROR: Unable to send the command" - print "ERROR: Unable to send the command" return False - + # Resets image versioning information def op_reset(s, img_num): sreqpkt = SerialReqPacket((MSG_WRITE, img_num, 4, 2, [0, 0])) if s.write_packet(SERIAL_AMGROUP, SERIAL_AMID, sreqpkt.payload()) == False: - print "ERROR: Unable to send the last serial packet (file offset: %d)" % sreqpkt.offset + print "ERROR: Unable to send the command" return False # Waiting for confirmation @@ -389,7 +410,7 @@ def op_reset(s, img_num): return False return True - + def print_usage(): print "Usage: %s <-p|-i|-r|-d|-e|-s> image_number [options]" % sys.argv[0] print " \n Either the platform name or the baud rate value" diff --git a/tos/lib/net/Deluge/DelugeP.nc b/tos/lib/net/Deluge/DelugeP.nc index 8adcf1d6..d7312f12 100644 --- a/tos/lib/net/Deluge/DelugeP.nc +++ b/tos/lib/net/Deluge/DelugeP.nc @@ -68,7 +68,6 @@ implementation DelugeDissemination delugeDis; call ObjectTransfer.stop(); - call Leds.led0Toggle(); delugeDis.uid = imgDesc->uid; delugeDis.vNum = imgDesc->vNum; @@ -87,8 +86,6 @@ implementation { DelugeDissemination delugeDis; - call Leds.led2Toggle(); - delugeDis.uid = 0; delugeDis.vNum = 0; delugeDis.imgNum = new_img_num; diff --git a/tos/lib/TOSBoot/Deluge.h b/tos/lib/tosboot/Deluge.h similarity index 100% rename from tos/lib/TOSBoot/Deluge.h rename to tos/lib/tosboot/Deluge.h diff --git a/tos/lib/TOSBoot/Exec.nc b/tos/lib/tosboot/Exec.nc similarity index 100% rename from tos/lib/TOSBoot/Exec.nc rename to tos/lib/tosboot/Exec.nc diff --git a/tos/lib/TOSBoot/ExtFlash.nc b/tos/lib/tosboot/ExtFlash.nc similarity index 100% rename from tos/lib/TOSBoot/ExtFlash.nc rename to tos/lib/tosboot/ExtFlash.nc diff --git a/tos/lib/TOSBoot/Hardware.nc b/tos/lib/tosboot/Hardware.nc similarity index 100% rename from tos/lib/TOSBoot/Hardware.nc rename to tos/lib/tosboot/Hardware.nc diff --git a/tos/lib/TOSBoot/Leds.nc b/tos/lib/tosboot/Leds.nc similarity index 100% rename from tos/lib/TOSBoot/Leds.nc rename to tos/lib/tosboot/Leds.nc diff --git a/tos/lib/TOSBoot/Makefile b/tos/lib/tosboot/Makefile similarity index 100% rename from tos/lib/TOSBoot/Makefile rename to tos/lib/tosboot/Makefile diff --git a/tos/lib/TOSBoot/ProgFlash.nc b/tos/lib/tosboot/ProgFlash.nc similarity index 100% rename from tos/lib/TOSBoot/ProgFlash.nc rename to tos/lib/tosboot/ProgFlash.nc diff --git a/tos/lib/TOSBoot/TOSBoot.h b/tos/lib/tosboot/TOSBoot.h similarity index 100% rename from tos/lib/TOSBoot/TOSBoot.h rename to tos/lib/tosboot/TOSBoot.h diff --git a/tos/lib/TOSBoot/TOSBoot.nc b/tos/lib/tosboot/TOSBoot.nc similarity index 100% rename from tos/lib/TOSBoot/TOSBoot.nc rename to tos/lib/tosboot/TOSBoot.nc diff --git a/tos/lib/TOSBoot/TOSBootM.nc b/tos/lib/tosboot/TOSBootM.nc similarity index 100% rename from tos/lib/TOSBoot/TOSBootM.nc rename to tos/lib/tosboot/TOSBootM.nc diff --git a/tos/lib/TOSBoot/Voltage.nc b/tos/lib/tosboot/Voltage.nc similarity index 100% rename from tos/lib/TOSBoot/Voltage.nc rename to tos/lib/tosboot/Voltage.nc diff --git a/tos/lib/TOSBoot/at45db/ExtFlashC.nc b/tos/lib/tosboot/at45db/ExtFlashC.nc similarity index 100% rename from tos/lib/TOSBoot/at45db/ExtFlashC.nc rename to tos/lib/tosboot/at45db/ExtFlashC.nc diff --git a/tos/lib/TOSBoot/avr/HardwareC.nc b/tos/lib/tosboot/avr/HardwareC.nc similarity index 100% rename from tos/lib/TOSBoot/avr/HardwareC.nc rename to tos/lib/tosboot/avr/HardwareC.nc diff --git a/tos/lib/TOSBoot/avr/InternalFlashC.nc b/tos/lib/tosboot/avr/InternalFlashC.nc similarity index 100% rename from tos/lib/TOSBoot/avr/InternalFlashC.nc rename to tos/lib/tosboot/avr/InternalFlashC.nc diff --git a/tos/lib/TOSBoot/avr/ProgFlashM.nc b/tos/lib/tosboot/avr/ProgFlashM.nc similarity index 100% rename from tos/lib/TOSBoot/avr/ProgFlashM.nc rename to tos/lib/tosboot/avr/ProgFlashM.nc diff --git a/tos/lib/TOSBoot/avr/boot.h b/tos/lib/tosboot/avr/boot.h similarity index 100% rename from tos/lib/TOSBoot/avr/boot.h rename to tos/lib/tosboot/avr/boot.h diff --git a/tos/lib/TOSBoot/crc.h b/tos/lib/tosboot/crc.h similarity index 100% rename from tos/lib/TOSBoot/crc.h rename to tos/lib/tosboot/crc.h diff --git a/tos/lib/TOSBoot/lib/ExecC.nc b/tos/lib/tosboot/lib/ExecC.nc similarity index 100% rename from tos/lib/TOSBoot/lib/ExecC.nc rename to tos/lib/tosboot/lib/ExecC.nc diff --git a/tos/lib/TOSBoot/lib/LedsC.nc b/tos/lib/tosboot/lib/LedsC.nc similarity index 100% rename from tos/lib/TOSBoot/lib/LedsC.nc rename to tos/lib/tosboot/lib/LedsC.nc diff --git a/tos/lib/TOSBoot/micaz/ExecC.nc b/tos/lib/tosboot/micaz/ExecC.nc similarity index 100% rename from tos/lib/TOSBoot/micaz/ExecC.nc rename to tos/lib/tosboot/micaz/ExecC.nc diff --git a/tos/lib/TOSBoot/micaz/InternalFlash.h b/tos/lib/tosboot/micaz/InternalFlash.h similarity index 100% rename from tos/lib/TOSBoot/micaz/InternalFlash.h rename to tos/lib/tosboot/micaz/InternalFlash.h diff --git a/tos/lib/TOSBoot/micaz/PluginC.nc b/tos/lib/tosboot/micaz/PluginC.nc similarity index 100% rename from tos/lib/TOSBoot/micaz/PluginC.nc rename to tos/lib/tosboot/micaz/PluginC.nc diff --git a/tos/lib/TOSBoot/micaz/TOSBoot_platform.h b/tos/lib/tosboot/micaz/TOSBoot_platform.h similarity index 100% rename from tos/lib/TOSBoot/micaz/TOSBoot_platform.h rename to tos/lib/tosboot/micaz/TOSBoot_platform.h diff --git a/tos/lib/TOSBoot/micaz/VoltageC.nc b/tos/lib/tosboot/micaz/VoltageC.nc similarity index 100% rename from tos/lib/TOSBoot/micaz/VoltageC.nc rename to tos/lib/tosboot/micaz/VoltageC.nc diff --git a/tos/lib/TOSBoot/micaz/avrhardware.h b/tos/lib/tosboot/micaz/avrhardware.h similarity index 100% rename from tos/lib/TOSBoot/micaz/avrhardware.h rename to tos/lib/tosboot/micaz/avrhardware.h diff --git a/tos/lib/TOSBoot/micaz/hardware.h b/tos/lib/tosboot/micaz/hardware.h similarity index 100% rename from tos/lib/TOSBoot/micaz/hardware.h rename to tos/lib/tosboot/micaz/hardware.h diff --git a/tos/lib/TOSBoot/msp430/HPLUSART0M.nc b/tos/lib/tosboot/msp430/HPLUSART0M.nc similarity index 100% rename from tos/lib/TOSBoot/msp430/HPLUSART0M.nc rename to tos/lib/tosboot/msp430/HPLUSART0M.nc diff --git a/tos/lib/TOSBoot/msp430/HPLUSARTControl.nc b/tos/lib/tosboot/msp430/HPLUSARTControl.nc similarity index 100% rename from tos/lib/TOSBoot/msp430/HPLUSARTControl.nc rename to tos/lib/tosboot/msp430/HPLUSARTControl.nc diff --git a/tos/lib/TOSBoot/msp430/HardwareC.nc b/tos/lib/tosboot/msp430/HardwareC.nc similarity index 100% rename from tos/lib/TOSBoot/msp430/HardwareC.nc rename to tos/lib/tosboot/msp430/HardwareC.nc diff --git a/tos/lib/TOSBoot/msp430/InternalFlashC.nc b/tos/lib/tosboot/msp430/InternalFlashC.nc similarity index 100% rename from tos/lib/TOSBoot/msp430/InternalFlashC.nc rename to tos/lib/tosboot/msp430/InternalFlashC.nc diff --git a/tos/lib/TOSBoot/msp430/ProgFlashM.nc b/tos/lib/tosboot/msp430/ProgFlashM.nc similarity index 100% rename from tos/lib/TOSBoot/msp430/ProgFlashM.nc rename to tos/lib/tosboot/msp430/ProgFlashM.nc diff --git a/tos/lib/TOSBoot/msp430/VoltageC.nc b/tos/lib/tosboot/msp430/VoltageC.nc similarity index 100% rename from tos/lib/TOSBoot/msp430/VoltageC.nc rename to tos/lib/tosboot/msp430/VoltageC.nc diff --git a/tos/lib/TOSBoot/stm25p/ExtFlashC.nc b/tos/lib/tosboot/stm25p/ExtFlashC.nc similarity index 100% rename from tos/lib/TOSBoot/stm25p/ExtFlashC.nc rename to tos/lib/tosboot/stm25p/ExtFlashC.nc diff --git a/tos/lib/TOSBoot/stm25p/ExtFlashM.nc b/tos/lib/tosboot/stm25p/ExtFlashM.nc similarity index 100% rename from tos/lib/TOSBoot/stm25p/ExtFlashM.nc rename to tos/lib/tosboot/stm25p/ExtFlashM.nc diff --git a/tos/lib/TOSBoot/telosb/InternalFlash.h b/tos/lib/tosboot/telosb/InternalFlash.h similarity index 100% rename from tos/lib/TOSBoot/telosb/InternalFlash.h rename to tos/lib/tosboot/telosb/InternalFlash.h diff --git a/tos/lib/TOSBoot/telosb/InternalFlash.nc b/tos/lib/tosboot/telosb/InternalFlash.nc similarity index 100% rename from tos/lib/TOSBoot/telosb/InternalFlash.nc rename to tos/lib/tosboot/telosb/InternalFlash.nc diff --git a/tos/lib/TOSBoot/telosb/PluginC.nc b/tos/lib/tosboot/telosb/PluginC.nc similarity index 100% rename from tos/lib/TOSBoot/telosb/PluginC.nc rename to tos/lib/tosboot/telosb/PluginC.nc diff --git a/tos/lib/TOSBoot/telosb/PowerOffM.nc b/tos/lib/tosboot/telosb/PowerOffM.nc similarity index 100% rename from tos/lib/TOSBoot/telosb/PowerOffM.nc rename to tos/lib/tosboot/telosb/PowerOffM.nc diff --git a/tos/lib/TOSBoot/telosb/TOSBoot_platform.h b/tos/lib/tosboot/telosb/TOSBoot_platform.h similarity index 100% rename from tos/lib/TOSBoot/telosb/TOSBoot_platform.h rename to tos/lib/tosboot/telosb/TOSBoot_platform.h diff --git a/tos/lib/TOSBoot/telosb/hardware.h b/tos/lib/tosboot/telosb/hardware.h similarity index 100% rename from tos/lib/TOSBoot/telosb/hardware.h rename to tos/lib/tosboot/telosb/hardware.h -- 2.39.2