Cleaning up whitespace (tabs and spaces only)

Author: mdxs

ble_legacy_dfu_controller.py

@@ -128,7 +128,7 @@ def start(self, verbose=False):
 
         # Send 'RECEIVE FIRMWARE IMAGE' command to set DFU in firmware receive state. 
         self._dfu_send_command(Procedures.RECEIVE_FIRMWARE_IMAGE)
-        
+
         # Send bin_array contents as as series of packets (burst mode).
         # Each segment is pkt_payload_size bytes long.
         # For every pkt_receipt_interval sends, wait for notification.
@@ -151,7 +151,7 @@ def start(self, verbose=False):
                 duration = time.time() - time_start
                 print "\nUpload complete in {} minutes and {} seconds".format(int(duration / 60), int(duration % 60))
                 if verbose: print "segments sent: {}".format(segment_count)
-                
+
                 print "Waiting for DFU complete notification"
                 # Wait for DFU complete notification
                 self._wait_and_parse_notify()
@@ -193,26 +193,26 @@ def check_DFU_mode(self):
 
         self.ble_conn.sendline(cmd)
 
-        # Skip two rows     
+        # Skip two rows
         try:
             res = self.ble_conn.expect('handle:.*', timeout=10)
-            # res = self.ble_conn.expect('handle:', timeout=10) 
+            # res = self.ble_conn.expect('handle:', timeout=10)
         except pexpect.TIMEOUT, e:
             print "State timeout"
         except:
             pass
 
         return self.ble_conn.after.find("value: 08 00")!=-1
-        
+
     def switch_to_dfu_mode(self):
         (_, bl_value_handle, bl_cccd_handle) = self._get_handles(self.UUID_CONTROL_POINT)
 
-        #Enable notifications 
+        # Enable notifications
         cmd = 'char-write-req 0x%02x %02x' % (bl_cccd_handle, 1)
         if verbose: print cmd
         self.ble_conn.sendline(cmd)
 
-        #Reset the board in DFU mode. After reset the board will be disconnected
+        # Reset the board in DFU mode. After reset the board will be disconnected
         cmd = 'char-write-req 0x%02x 0104' % (bl_value_handle)
         if verbose: print cmd
         self.ble_conn.sendline(cmd)
@@ -222,7 +222,7 @@ def switch_to_dfu_mode(self):
         #print  "Send 'START DFU' + Application Command"
         #self._dfu_state_set(0x0104)
 
-        #Reconnect the board.
+        # Reconnect the board.
         ret = self.scan_and_connect()
         if verbose: print "Connected " + str(ret)
 
@@ -287,4 +287,4 @@ def _dfu_send_init(self):
         init_bin_array = array('B', open(self.datfile_path, 'rb').read())
 
         # Transmit Init info
-        self._dfu_send_data(init_bin_array)
+        self._dfu_send_data(init_bin_array)

ble_secure_dfu_controller.py

@@ -98,7 +98,7 @@ def start(self):
         self._dfu_send_init()
 
         self._dfu_send_image()
- 
+
     # --------------------------------------------------------------------------
     #  Check if the peripheral is running in bootloader (DFU) or application mode
     #  Returns True if the peripheral is in DFU mode
@@ -162,7 +162,7 @@ def _dfu_parse_notify(self, notify):
                 crc32 = bytes_to_uint32_le(notify[7:11])
 
                 return (dfu_procedure, dfu_result, offset, crc32)
-            
+
             elif(dfu_procedure == Procedures.SELECT and dfu_result == Results.SUCCESS):
                 max_size = bytes_to_uint32_le(notify[3:7])
                 offset = bytes_to_uint32_le(notify[7:11])
@@ -207,7 +207,7 @@ def _dfu_send_init(self):
         # Select command
         self._dfu_send_command(Procedures.SELECT, [Procedures.PARAM_COMMAND]);
         (proc, res, max_size, offset, crc32) = self._wait_and_parse_notify()
-        
+
         if offset != init_size or crc32 != init_crc:
             if offset == 0 or offset > init_size:
                 # Create command
@@ -224,7 +224,7 @@ def _dfu_send_init(self):
 
                 if (segment_count % self.pkt_receipt_interval) == 0:
                     (proc, res, offset, crc32) = self._wait_and_parse_notify()
-                    
+
                     if res != Results.SUCCESS:
                         raise Exception("bad notification status: {}".format(Results.to_string(res)))
 
@@ -298,13 +298,13 @@ def _dfu_send_object(self, offset, obj_max_size):
                     except e:
                         # Likely no notification received, need to re-transmit object
                         return 0
-                    
+
                     if res != Results.SUCCESS:
                         raise Exception("bad notification status: {}".format(Results.to_string(res)))
 
                     if crc32 != crc32_unsigned(self.bin_array[0:offset]):
                         # Something went wrong, need to re-transmit this object
-                        return 0 
+                        return 0
 
                     print_progress(offset, self.image_size, prefix = 'Progress:', suffix = 'Complete', barLength = 50)
 
@@ -320,4 +320,4 @@ def _dfu_send_object(self, offset, obj_max_size):
         self._wait_and_parse_notify()
 
         # If everything executed correctly, return amount of bytes transfered
-        return obj_max_size
+        return obj_max_size

dfu.py

@@ -16,16 +16,16 @@
 
 from ble_secure_dfu_controller import BleDfuControllerSecure
 from ble_legacy_dfu_controller import BleDfuControllerLegacy
-        
+
 def main():
 
-    init_msg =  """ 
+    init_msg =  """
     ================================
     ==                            ==
     ==         DFU Server         ==
     ==                            ==
-    ================================ 
-    		"""
+    ================================
+    """
 
     # print "DFU Server start"
     print init_msg
@@ -107,8 +107,8 @@ def main():
             unpacker = Unpacker()
             #print options.zipfile
             try:
-            	hexfile, datfile = unpacker.unpack_zipfile(options.zipfile)	
-            except Exception, e:        
+                hexfile, datfile = unpacker.unpack_zipfile(options.zipfile)	
+            except Exception, e:
                 print "ERR"
                 print e
                 pass
@@ -158,7 +158,7 @@ def main():
 
         ble_dfu.start()
 
-        # Disconnect from peer device if not done already and clean up. 
+        # Disconnect from peer device if not done already and clean up.
         ble_dfu.disconnect()
 
     except Exception, e:
@@ -186,4 +186,3 @@ def main():
     sys.dont_write_bytecode = True
 
     main()
-

gen_dat.c

@@ -27,7 +27,7 @@ static dfu_init_t dfu_init = {
     .device_type    = 0xffff,
     .device_rev     = 0xffff,
     .app_version    = 0xffffffff,
-    .softdevice_1   = 0x0001,  
+    .softdevice_1   = 0x0001,
     .softdevice_2   = 0xfffe,  // Any softdevice
     .crc            = 0x0000,
 };
@@ -119,7 +119,7 @@ int main(int argc, char* argv[])
     /* Compute CRC-16. */
     dfu_init.crc = crc16_compute(bindata, binsize, 0);
 
-    /* 
+    /*
      *  Write INIT file
      */
      printf("Writing .dat file, size: %d\n", sizeof(dfu_init_t));
@@ -132,4 +132,4 @@ int main(int argc, char* argv[])
     fclose(binfile);
 
     return 0;
-}
+}

nrf_ble_dfu_controller.py

@@ -57,7 +57,7 @@ def _wait_and_parse_notify(self):
 
     def __init__(self, target_mac, firmware_path, datfile_path):
         self.target_mac = target_mac
-        
+
         self.firmware_path = firmware_path
         self.datfile_path = datfile_path
 
@@ -263,4 +263,4 @@ def _enable_notifications(self, cccd_handle):
         try:
             res = self.ble_conn.expect('Characteristic value was written successfully.*', timeout=10)
         except pexpect.TIMEOUT, e:
-            print "State timeout"
+            print "State timeout"

scan.py

@@ -107,7 +107,7 @@ def scan(self):
 
     #scanner = Scan("DfuTarg")  # specific advertisement name
     scanner = Scan(None)      # any advertising name
-    
+
     scanner.scan()
 
     print "scan complete"

unpacker.py

@@ -43,7 +43,7 @@ def unpack_zipfile(self, file):
 
         # print "DAT file: " + datfile
         # print "BIN file: " + binfile
-        
+
         return binfile, datfile
 
    #--------------------------------------------------------------------------
@@ -52,5 +52,3 @@ def unpack_zipfile(self, file):
    def delete(self):
        # delete self.unzip_dir and its contents
        shutil.rmtree(self.unzip_dir)
-
-

util.py

@@ -67,4 +67,4 @@ def print_progress(iteration, total, prefix = '', suffix = '', decimals = 1, bar
     sys.stdout.write('\r%s |%s| %s%s %s (%d of %d bytes)' % (prefix, bar, percents, '%', suffix, iteration, total)),
     if iteration == total:
         sys.stdout.write('\n')
-    sys.stdout.flush()
+    sys.stdout.flush()