diff --git a/examples/640imutest.py b/examples/640imutest.py index 72381b2..9bca77e 100644 --- a/examples/640imutest.py +++ b/examples/640imutest.py @@ -29,7 +29,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. import spidev import time import sys -from darkwater_640.mpu9250 import MPU9250 +from darkwater_640 import MPU9250 imu = MPU9250() @@ -58,8 +58,8 @@ while True: m9a, m9g, m9m = imu.getMotion9() - print("Acc:", "{:+7.3f}".format(m9a[0]), "{:+7.3f}".format(m9a[1]), "{:+7.3f}".format(m9a[2]), end=" ") - print(" Gyr:", "{:+8.3f}".format(m9g[0]), "{:+8.3f}".format(m9g[1]), "{:+8.3f}".format(m9g[2]), end=" ") - print(" Mag:", "{:+7.3f}".format(m9m[0]), "{:+7.3f}".format(m9m[1]), "{:+7.3f}".format(m9m[2]) ) + print("Acc:", "{:+7.3f}".format(m9a[0]), "{:+7.3f}".format(m9a[1]), "{:+7.3f}".format(m9a[2]) ) + print("Gyr:", "{:+8.3f}".format(m9g[0]), "{:+8.3f}".format(m9g[1]), "{:+8.3f}".format(m9g[2]) ) + print("Mag:", "{:+7.3f}".format(m9m[0]), "{:+7.3f}".format(m9m[1]), "{:+7.3f}".format(m9m[2]) ) time.sleep(0.5) diff --git a/examples/640motortest.py b/examples/640motortest.py index c3d41ea..ae35f51 100644 --- a/examples/640motortest.py +++ b/examples/640motortest.py @@ -1,5 +1,5 @@ import time -from darkwater_640.darkwater_640 import dw_Controller, dw_Servo, dw_Motor +from darkwater_640 import dw_Controller, dw_Motor dw = dw_Controller( addr=0x60 ) m1 = dw.getMotor(1) diff --git a/examples/640servotest.py b/examples/640servotest.py index 3b715ef..9ead118 100644 --- a/examples/640servotest.py +++ b/examples/640servotest.py @@ -1,5 +1,5 @@ import time -from darkwater_640.darkwater_640 import dw_Controller, dw_Servo, dw_Motor +from darkwater_640 import dw_Controller, dw_Servo dw = dw_Controller( addr=0x60 ) s1 = dw.getServo(1) diff --git a/examples/640steppertest.py b/examples/640steppertest.py index 27c5c17..434ea61 100644 --- a/examples/640steppertest.py +++ b/examples/640steppertest.py @@ -1,16 +1,35 @@ import time -from darkwater_640.darkwater_640 import dw_Controller, dw_Servo, dw_Motor +from darkwater_640 import dw_Controller, dw_Stepper dw = dw_Controller( addr=0x60 ) s1 = dw.getStepper(1) -m3 = dw.getMotor(3) +s2 = dw.getStepper(2) +s3 = dw.getStepper(3) s1.off() -m3.off() -time.sleep(1) +s2.off() +s3.off() -m3.setMotorSpeed(-255) -s1.oneStep( dw_Controller.FORWARD, dw_Controller.SINGLE); +s1.setMotorSpeed(200) +s2.setMotorSpeed(200) +s3.setMotorSpeed(200) + +s1.step( 400, dw_Controller.FORWARD, dw_Controller.DOUBLE ) +s2.step( 400, dw_Controller.FORWARD, dw_Controller.DOUBLE ) +s3.step( 400, dw_Controller.FORWARD, dw_Controller.DOUBLE ) + +s1.step( 400, dw_Controller.REVERSE, dw_Controller.DOUBLE ) +s2.step( 400, dw_Controller.REVERSE, dw_Controller.DOUBLE ) +s3.step( 400, dw_Controller.REVERSE, dw_Controller.DOUBLE ) + +s1.step( 400, dw_Controller.FORWARD, dw_Controller.DOUBLE ) +s2.step( 400, dw_Controller.FORWARD, dw_Controller.DOUBLE ) +s3.step( 400, dw_Controller.FORWARD, dw_Controller.DOUBLE ) + +s1.step( 400, dw_Controller.REVERSE, dw_Controller.DOUBLE ) +s2.step( 400, dw_Controller.REVERSE, dw_Controller.DOUBLE ) +s3.step( 400, dw_Controller.REVERSE, dw_Controller.DOUBLE ) s1.off() -m3.off() \ No newline at end of file +s2.off() +s3.off() \ No newline at end of file diff --git a/setup.py b/setup.py index 1dfe4c5..2a4e428 100644 --- a/setup.py +++ b/setup.py @@ -1,7 +1,7 @@ from distutils.core import setup setup(name = 'darkwater_640', - version = '1.0.0', + version = '1.0.1', author = 'Team Dark Water', author_email = 'team@darkwater.io', description = 'Library for Dark Water 640 board',