Add some more documentation. And the zhop feature.

[cura.git] / Cura / avr_isp / stk500v2.py

diff --git a/Cura/avr_isp/stk500v2.py b/Cura/avr_isp/stk500v2.py
index 6cd551edf89d0d8de55d3f07a8d81e8ba75c7ea6..975dd30b933d8d89630bdd9dbe8ac078dd39afff 100644 (file)
--- a/Cura/avr_isp/stk500v2.py
+++ b/Cura/avr_isp/stk500v2.py
@@ -1,3 +1,7 @@
+"""
+STK500v2 protocol implementation for programming AVR chips.
+The STK500v2 protocol is used by the ArduinoMega2560 and a few other Arduino platforms to load firmware.
+"""
 __copyright__ = "Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License"
 import os, struct, sys, time
 
@@ -14,7 +18,7 @@ class Stk500v2(ispBase.IspBase):
                self.progressCallback = None
        
        def connect(self, port = 'COM22', speed = 115200):
-               if self.serial != None:
+               if self.serial is not None:
                        self.close()
                try:
                        self.serial = Serial(str(port), speed, timeout=1, writeTimeout=10000)
@@ -29,7 +33,7 @@ class Stk500v2(ispBase.IspBase):
                time.sleep(0.1)
                self.serial.setDTR(0)
                time.sleep(0.2)
-               
+
                self.sendMessage([1])
                if self.sendMessage([0x10, 0xc8, 0x64, 0x19, 0x20, 0x00, 0x53, 0x03, 0xac, 0x53, 0x00, 0x00]) != [0x10, 0x00]:
                        self.close()
@@ -37,14 +41,14 @@ class Stk500v2(ispBase.IspBase):
                self.serial.timeout = 5
 
        def close(self):
-               if self.serial != None:
+               if self.serial is not None:
                        self.serial.close()
                        self.serial = None
 
        #Leave ISP does not reset the serial port, only resets the device, and returns the serial port after disconnecting it from the programming interface.
        #       This allows you to use the serial port without opening it again.
        def leaveISP(self):
-               if self.serial != None:
+               if self.serial is not None:
                        if self.sendMessage([0x11]) != [0x11, 0x00]:
                                raise ispBase.IspError("Failed to leave programming mode")
                        ret = self.serial
@@ -53,7 +57,7 @@ class Stk500v2(ispBase.IspBase):
                return None
        
        def isConnected(self):
-               return self.serial != None
+               return self.serial is not None
        
        def sendISP(self, data):
                recv = self.sendMessage([0x1D, 4, 4, 0, data[0], data[1], data[2], data[3]])
@@ -145,23 +149,39 @@ class Stk500v2(ispBase.IspBase):
                                else:
                                        return data
 
+def portList():
+       ret = []
+       import _winreg
+       key=_winreg.OpenKey(_winreg.HKEY_LOCAL_MACHINE,"HARDWARE\\DEVICEMAP\\SERIALCOMM")
+       i=0
+       while True:
+               try:
+                       values = _winreg.EnumValue(key, i)
+               except:
+                       return ret
+               if 'USBSER' in values[0]:
+                       ret.append(values[1])
+               i+=1
+       return ret
 
-def main():
+def runProgrammer(port, filename):
        programmer = Stk500v2()
+       programmer.connect(port = port)
+       programmer.programChip(intelHex.readHex(filename))
+       programmer.close()
+
+def main():
+       import threading
        if sys.argv[1] == 'AUTO':
-               import _winreg
-               key=_winreg.OpenKey(_winreg.HKEY_LOCAL_MACHINE,"HARDWARE\\DEVICEMAP\\SERIALCOMM")
-               i=0
-               while True:
-                       values = _winreg.EnumValue(key, i)
-                       if 'USBSER' in values[0]:
-                               programmer.connect(port = values[1])
-                               break
-                       i+=1
+               print portList()
+               for port in portList():
+                       threading.Thread(target=runProgrammer, args=(port,sys.argv[2])).start()
+                       time.sleep(5)
        else:
+               programmer = Stk500v2()
                programmer.connect(port = sys.argv[1])
-       programmer.programChip(intelHex.readHex(sys.argv[2]))
-       sys.exit(1)
+               programmer.programChip(intelHex.readHex(sys.argv[2]))
+               sys.exit(1)
 
 if __name__ == '__main__':
        main()