workingHEADmaster

2 files changed, 17 insertions, 203 deletions

diff --git a/Makefile b/Makefile
index f258e30..5f21816 100644
--- a/Makefile
+++ b/Makefile
@@ -132,13 +132,6 @@ ${PROG}:${OBJS}
 	$(CC) $(CPPFLAGS) $(ASFLAGS) -c -o $@ $<
 
 
-flash: ${PROG}.hex
-	${OOCD} -f ${OOCD_CFG} \
-		-c "init" -c "reset init" \
-		-c "flash write_image erase $<" \
-		-c "reset" \
-		-c "shutdown"
-
 ds:
 	$(OOCD) -f $(OOCD_CFG)
 
@@ -156,6 +149,23 @@ reset:
 %.zip: %.hex
 	${NRFUTIL} dfu genpkg  --dev-revision ${DEV_REVISION} --dev-type ${DEV_TYPE} --application-version ${APP_VERSION} --sd-req ${SD_REQ} --application $< $@
 
+flash: ${PROG}.hex
+	${OOCD} -f ${OOCD_CFG} \
+		-c "init" -c "reset init" \
+		-c "flash write_image erase $<" \
+		-c "reset" \
+		-c "shutdown"
+
+
+
+flash_softdevice: ${SOFTDEVICE}
+	${OOCD} -f ${OOCD_CFG} \
+		-c "init" -c "reset init" \
+		-c "nrf51 mass_erase"  \
+		-c "flash write_image erase $<" \
+		-c "reset" \
+		-c "shutdown"
+
 
 dfu: ${PROG}.zip
 	nrfdfu -b ${BDADDR} -p ${PROG}.zip
diff --git a/dfu.py b/dfu.py
deleted file mode 100755
index cce6321..0000000
--- a/dfu.py
+++ /dev/null
@@ -1,196 +0,0 @@
-#!/usr/bin/env python
-
-import os
-import pexpect
-import optparse
-import time
-import sys
-from intelhex import IntelHex
-
-# DFU Opcodes
-class Commands:
-    START_DFU = 1
-    INITIALIZE_DFU = 2
-    RECEIVE_FIRMWARE_IMAGE = 3
-    VALIDATE_FIRMWARE_IMAGE = 4
-    ACTIVATE_FIRMWARE_AND_RESET = 5
-    SYSTEM_RESET = 6 
-
-def convert_uint32_to_array(value):
-    """ Convert a number into an array of 4 bytes (LSB). """
-    return [
-        (value >> 0 & 0xFF), 
-        (value >> 8 & 0xFF), 
-        (value >> 16 & 0xFF), 
-        (value >> 24 & 0xFF)
-    ] 
-
-def convert_uint16_to_array(value):
-    """ Convert a number into an array of 2 bytes (LSB). """
-    return [
-        (value >> 0 & 0xFF), 
-        (value >> 8 & 0xFF)
-    ] 
-
-def convert_array_to_hex_string(arr):
-    hex_str = ""
-    for val in arr:
-        if val > 255:
-            raise Exception("Value is greater than it is possible to represent with one byte")
-        hex_str += "%02x" % val
-    return hex_str 
-
-
-class BleDfuUploader(object):
-
-    ctrlpt_handle = 0x10
-    ctrlpt_cccd_handle = 0x11
-    data_handle = 0x0E
-
-    def __init__(self, target_mac, hexfile_path):
-        self.hexfile_path = hexfile_path
-        self.ble_conn = pexpect.spawn("gatttool -b '%s' -t random --interactive" % target_mac)
-        self.ble_conn.logfile = sys.stdout
-
-    # Connect to peer device.
-    def scan_and_connect(self):
-        try:
-            self.ble_conn.expect('\[LE\]>', timeout=10)
-        except pexpect.TIMEOUT, e:
-            print "timeout"
-        
-        self.ble_conn.sendline('connect')
-
-        try:
-            res = self.ble_conn.expect('Connection successful', timeout=10)
-        except pexpect.TIMEOUT, e:
-            print "timeout"
-
-        time.sleep(1)
-    
-    def _dfu_state_set(self, opcode):
-        self.ble_conn.sendline('char-write-req 0x%02x %02x' % (self.ctrlpt_handle, opcode))        
-
-        # Verify that command was successfully written
-        try:
-            res = self.ble_conn.expect('Characteristic value was written successfully', timeout=10)
-        except pexpect.TIMEOUT, e:
-            print "timeout"
-
-    def _dfu_data_send(self, data_arr):
-        hex_str = convert_array_to_hex_string(data_arr)
-        self.ble_conn.sendline('char-write-req 0x%02x %s' % (self.data_handle, hex_str))        
-        
-        # Verify that data was successfully written
-        try:
-            res = self.ble_conn.expect('Characteristic value was written successfully', timeout=10)
-        except pexpect.TIMEOUT, e:
-            print "timeout"
-
-    def _dfu_enable_cccd(self):
-        cccd_enable_value_array_lsb = convert_uint16_to_array(0x0001)
-        cccd_enable_value_hex_string = convert_array_to_hex_string(cccd_enable_value_array_lsb) 
-        self.ble_conn.sendline('char-write-req 0x%02x %s' % (self.ctrlpt_cccd_handle, cccd_enable_value_hex_string))        
-
-        # Verify that CCCD was successfully written
-        try:
-            res = self.ble_conn.expect('Characteristic value was written successfully', timeout=10)
-        except pexpect.TIMEOUT, e:
-            print "timeout"
-
-    # Transmit the hex image to peer device.
-    def dfu_send_image(self):
-
-        # Open the hex file to be sent
-        ih = IntelHex(self.hexfile_path)
-        bin_array = ih.tobinarray()
-        
-        hex_size = len(bin_array)
-        print "Hex file size: ", hex_size
-        
-        # Enable Notifications - Setting the DFU Control Point CCCD to 0x0001
-        self._dfu_enable_cccd()
-
-        # Sending 'START DFU' Command
-        self._dfu_state_set(Commands.START_DFU)
-
-        # Transmit image size
-        hex_size_array_lsb = convert_uint32_to_array(len(bin_array))
-        self._dfu_data_send(hex_size_array_lsb)
-        print "Sending hex file size"
-      
-        # Send 'RECEIVE FIRMWARE IMAGE' command to set DFU in firmware receive state. 
-        self._dfu_state_set(Commands.RECEIVE_FIRMWARE_IMAGE)
-        
-        # Send hex file data packets
-        chunk = 1
-        for i in range(0, hex_size, 20):
-            data_to_send = bin_array[i:i + 20]
-            self._dfu_data_send(data_to_send)
-
-            print "Chunk #", chunk                                                      
-            chunk += 1
-     
-        # Send Validate Command
-        self._dfu_state_set(Commands.VALIDATE_FIRMWARE_IMAGE)
-
-        # Wait a bit for copy on the peer to be finished
-        time.sleep(1)
-        
-        # Send Activate and Reset Command
-        self._dfu_state_set(Commands.ACTIVATE_FIRMWARE_AND_RESET)
-
-    # Disconnect from peer device if not done already and clean up. 
-    def disconnect(self):
-        self.ble_conn.sendline('exit')
-        self.ble_conn.close()
-
-
-if __name__ == '__main__':
-    try:
-        parser = optparse.OptionParser(usage='%prog -f <hex_file> -a <dfu_target_address>\n\nExample:\n\tdfu.py -f blinky.hex -a cd:e3:4a:47:1c:e4',
-                                       version='0.1')
-
-        parser.add_option('-a', '--address',
-                  action='store',
-                  dest="address",
-                  type="string",
-                  default=None,
-                  help='DFU target address. (Can be found by running "hcitool lescan")'
-                  )
-        parser.add_option('-f', '--file',
-                  action='store',
-                  dest="hex_file",
-                  type="string",
-                  default=None,
-                  help='Hex file to be uploaded.'
-                  )
-
-        options, args = parser.parse_args()
-
-    except Exception, e:
-        print e
-        print "For help use --help"
-        sys.exit(2)
-
-    if (not options.hex_file) or (not options.address):
-        parser.print_help()
-        exit(2)
-
-    if not os.path.isfile(options.hex_file):
-        print "Error: Hex file not found!"
-        exit(2) 
-
-    ble_dfu = BleDfuUploader(options.address.upper(), options.hex_file)
-    
-    # Connect to peer device.
-    ble_dfu.scan_and_connect()
-    
-    # Transmit the hex image to peer device.
-    ble_dfu.dfu_send_image()
-    
-    # wait a second to be able to recieve the disconnect event from peer device.
-    time.sleep(1)
-    
-    # Disconnect from peer device if not done already and clean up. 
-    ble_dfu.disconnect()