Updated for Mk2

This commit is contained in:
shrkey
2016-02-28 21:46:00 +00:00
parent 6c9d55a309
commit ffeabbe0d8

View File

@@ -174,11 +174,11 @@ class dw_DCMotor:
modepin = in1 = in2 = 0 modepin = in1 = in2 = 0
if (num == 0): if (num == 0):
in2 = 8 #phase in2 = 0 #phase
in1 = 9 #enable in1 = 1 #enable
elif (num == 1): elif (num == 1):
in2 = 10 #phase in2 = 2 #phase
in1 = 11 #enable in1 = 3 #enable
elif (num == 2): elif (num == 2):
in2 = 7 #phase in2 = 7 #phase
in1 = 6 #enable in1 = 6 #enable
@@ -186,11 +186,11 @@ class dw_DCMotor:
in2 = 5 #phase in2 = 5 #phase
in1 = 4 #enable in1 = 4 #enable
elif (num == 4): elif (num == 4):
in2 = 0 #phase in2 = 8 #phase
in1 = 1 #enable in1 = 9 #enable
elif (num == 5): elif (num == 5):
in2 = 2 #phase in2 = 10 #phase
in1 = 3 #enable in1 = 11 #enable
else: else:
raise NameError('MotorHAT Motor must be between 1 and 6 inclusive') raise NameError('MotorHAT Motor must be between 1 and 6 inclusive')
@@ -249,16 +249,9 @@ class dw_MotorCONTROL:
self._pwm.setPWMFreq(self._frequency) self._pwm.setPWMFreq(self._frequency)
# Just gonna default to high for now # Just gonna default to high for now
GPIO.setmode(GPIO.BCM) GPIO.setmode(GPIO.BCM)
GPIO.setwarnings(False) GPIO.setwarnings(False)
GPIO.setup(17, GPIO.OUT) GPIO.setup(17, GPIO.OUT)
GPIO.setup(27, GPIO.OUT)
GPIO.setup(22, GPIO.OUT)
GPIO.output(17, GPIO.HIGH) GPIO.output(17, GPIO.HIGH)
GPIO.output(27, GPIO.HIGH)
GPIO.output(22, GPIO.HIGH)
self.motors = [ dw_DCMotor(self, m) for m in range(6) ] self.motors = [ dw_DCMotor(self, m) for m in range(6) ]