From 365eae335132ddb9a4faac582d336919c843ec1f Mon Sep 17 00:00:00 2001 From: shrkey Date: Sun, 18 Sep 2016 21:05:41 +0100 Subject: [PATCH 1/6] removed debug prints --- darkwater_640/darkwater_640.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/darkwater_640/darkwater_640.py b/darkwater_640/darkwater_640.py index f63892e..368c50c 100644 --- a/darkwater_640/darkwater_640.py +++ b/darkwater_640/darkwater_640.py @@ -173,8 +173,6 @@ class dw_Stepper: s_per_s /= self.MICROSTEPS steps *= self.MICROSTEPS - print s_per_s, " sec per step" - for s in range(steps): lateststep = self.oneStep(direction, stepstyle) time.sleep(s_per_s) From 7ab733ae2c8160ad929d4c043e4177ec7a9b78b7 Mon Sep 17 00:00:00 2001 From: shrkey Date: Sun, 18 Sep 2016 21:07:39 +0100 Subject: [PATCH 2/6] more debug stuff --- darkwater_640/darkwater_640.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/darkwater_640/darkwater_640.py b/darkwater_640/darkwater_640.py index 368c50c..f928c42 100644 --- a/darkwater_640/darkwater_640.py +++ b/darkwater_640/darkwater_640.py @@ -301,7 +301,7 @@ class dw_Servo: def setAngle(self, angle): pulse = self.servo_zero + ( (self.servo_zero - self.servo_min ) * angle / 80 ) - print "angle=%s pulse=%s" % (angle, pulse) + #print "angle=%s pulse=%s" % (angle, pulse) #self.setPWMmS( pulse ) def setPWM(self, value): From 9283b94bcbf777e9c04d09ca93aa965f53585915 Mon Sep 17 00:00:00 2001 From: shrkey Date: Sun, 18 Sep 2016 21:12:16 +0100 Subject: [PATCH 3/6] quick import test --- darkwater_640/darkwater_640.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/darkwater_640/darkwater_640.py b/darkwater_640/darkwater_640.py index f928c42..4368a47 100644 --- a/darkwater_640/darkwater_640.py +++ b/darkwater_640/darkwater_640.py @@ -1,7 +1,7 @@ #!/usr/bin/python import RPi.GPIO as GPIO -from PCA9685 import PCA9685 +from .PCA9685 import PCA9685 import time import math From d6d81fba914123737bcf82f3fd483bf857bf3ab0 Mon Sep 17 00:00:00 2001 From: shrkey Date: Sun, 18 Sep 2016 21:16:57 +0100 Subject: [PATCH 4/6] change print statements --- darkwater_640/PCA9685.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/darkwater_640/PCA9685.py b/darkwater_640/PCA9685.py index 7924d17..7af884a 100644 --- a/darkwater_640/PCA9685.py +++ b/darkwater_640/PCA9685.py @@ -108,11 +108,11 @@ class PCA9685(object): prescaleval /= float(freq_hz) prescaleval -= 1.0 if (self.debug): - print "Setting PWM frequency to %d Hz" % freq_hz - print "Estimated pre-scale: %d" % prescaleval + print("Setting PWM frequency to %d Hz" % freq_hz) + print("Estimated pre-scale: %d" % prescaleval) prescale = math.floor(prescaleval * correctionFactor + 0.5) if (self.debug): - print "Final pre-scale: %d" % prescale + print("Final pre-scale: %d" % prescale) oldmode = self.i2c.readU8(self.__MODE1); newmode = (oldmode & 0x7F) | 0x10 # sleep @@ -129,8 +129,8 @@ class PCA9685(object): prescaleval /= float(freq_hz) prescaleval -= 1.0 if (self.debug): - print "Setting PWM frequency to %d Hz" % freq_hz - print "Estimated pre-scale: %d" % prescaleval + print("Setting PWM frequency to %d Hz" % freq_hz) + print("Estimated pre-scale: %d" % prescaleval) prescale = math.ceil(prescaleval * correctionFactor + 0.5) if (self.debug): print "Final pre-scale: %d" % prescale @@ -147,8 +147,8 @@ class PCA9685(object): prescale = self.i2c.readU8(self.__PRESCALE) calcfreq = 25000000.0 / 4096.0 / ( float(prescale) + 1 ) if (self.debug): - print "Got pre-scale: %d" % prescale - print "Calculated Frequency: %d" % calcfreq + print("Got pre-scale: %d" % prescale) + print("Calculated Frequency: %d" % calcfreq) return calcfreq From c3a7b3204bdf48233b699f96ddc3b0133197399f Mon Sep 17 00:00:00 2001 From: shrkey Date: Sun, 18 Sep 2016 21:19:18 +0100 Subject: [PATCH 5/6] missed a print --- darkwater_640/PCA9685.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/darkwater_640/PCA9685.py b/darkwater_640/PCA9685.py index 7af884a..f982701 100644 --- a/darkwater_640/PCA9685.py +++ b/darkwater_640/PCA9685.py @@ -133,7 +133,7 @@ class PCA9685(object): print("Estimated pre-scale: %d" % prescaleval) prescale = math.ceil(prescaleval * correctionFactor + 0.5) if (self.debug): - print "Final pre-scale: %d" % prescale + print("Final pre-scale: %d" % prescale) oldmode = self.i2c.readU8(self.__MODE1); newmode = (oldmode & 0x7F) | 0x10 # sleep From 7c9cfce771dc23a1d1b7da3dac6a8db16013b96f Mon Sep 17 00:00:00 2001 From: shrkey Date: Sun, 25 Sep 2016 23:41:01 +0100 Subject: [PATCH 6/6] changed function name for stepper speed --- darkwater_640/darkwater_640.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/darkwater_640/darkwater_640.py b/darkwater_640/darkwater_640.py index 4368a47..ffda102 100644 --- a/darkwater_640/darkwater_640.py +++ b/darkwater_640/darkwater_640.py @@ -71,7 +71,7 @@ class dw_Stepper: def off(self): self.run(dw_Controller.STOP, 0) - def setSpeed(self, rpm): + def setMotorSpeed(self, rpm): self.sec_per_step = 60.0 / (self.revsteps * rpm) self.steppingcounter = 0