h3n3/darkwater_python_640
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rejig

Browse Source
This commit is contained in:
shrkey
2016-09-13 23:16:38 +01:00
parent 78eea1026a
commit ab26bc2885
1 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
darkwater_640/darkwater_640.py
View File

@@ -25,27 +25,27 @@ class dw_Stepper:
self.currentstep = 0 self.currentstep = 0
if (num == 0): if (num == 0):
ain2 = 2 #phase ain1 = 2 #phase
ain1 = 3 #enable ain2 = 3 #enable
bin2 = 4 #phase bin1 = 4 #phase
bin1 = 5 #enable bin2 = 5 #enable
elif (num == 1): elif (num == 1):
ain2 = 6 #phase ain1 = 6 #phase
ain1 = 7 #enable ain2 = 7 #enable
bin2 = 8 #phase bin1 = 8 #phase
bin1 = 9 #enable bin2 = 9 #enable
elif (num == 2): elif (num == 2):
ain2 = 10 #phase ain1 = 10 #phase
ain1 = 11 #enable ain2 = 11 #enable
bin2 = 12 #phase bin1 = 12 #phase
bin1 = 13 #enable bin2 = 13 #enable
else: else:
raise NameError('MotorHAT Stepper must be between 1 and 3 inclusive') raise NameError('MotorHAT Stepper must be between 1 and 3 inclusive')
self.PHpinA = ain2 self.ain1 = ain1
self.ENpinA = ain1 self.ain2 = ain2
self.PHpinB = bin2 self.bin1 = bin1
self.ENpinB = bin1 self.bin2 = bin2
# switch off both drivers # switch off both drivers
self.run(dw_Controller.RELEASE, 0) self.run(dw_Controller.RELEASE, 0)
@@ -60,10 +60,10 @@ class dw_Stepper:
self.MC.setPin(self.PHpin, 1) self.MC.setPin(self.PHpin, 1)
self.MC._pwm.set_pwm(self.ENpin, 0, speed*16) self.MC._pwm.set_pwm(self.ENpin, 0, speed*16)
if (command == dw_Controller.RELEASE): if (command == dw_Controller.RELEASE):
self.MC.setPin(self.PHpinA, 0) self.MC.setPin(self.ain1, 0)
self.MC.setPin(self.ENpinA, 0) self.MC.setPin(self.ain2, 0)
self.MC.setPin(self.PHpinB, 0) self.MC.setPin(self.bin1, 0)
self.MC.setPin(self.ENpinB, 0) self.MC.setPin(self.bin2, 0)
def off(self): def off(self):
self.run(dw_Controller.RELEASE, 0) self.run(dw_Controller.RELEASE, 0)
@@ -165,10 +165,10 @@ class dw_Stepper:
coils = step2coils[self.currentstep/(self.MICROSTEPS/2)] coils = step2coils[self.currentstep/(self.MICROSTEPS/2)]
#print "coils state = " + str(coils) #print "coils state = " + str(coils)
self.MC.setPin(self.PHpinA, coils[0]) #ain2 self.MC.setPin(self.ain1, coils[0]) #ain2
self.MC.setPin(self.ENpinB, coils[1]) #bin1 self.MC.setPin(self.bin1, coils[1]) #bin1
self.MC.setPin(self.ENpinA, coils[2]) #ain1 self.MC.setPin(self.ain2, coils[2]) #ain1
self.MC.setPin(self.PHpinB, coils[3]) #bin2 self.MC.setPin(self.bin2, coils[3]) #bin2
#self.PHpinA = ain2 #self.PHpinA = ain2
# self.ENpinA = ain1 # self.ENpinA = ain1