change version

# Conflicts:
#	640imutest.py

640steppertest.py

@@ -1,16 +0,0 @@
-import time
-from darkwater_640.darkwater_640 import dw_Controller, dw_Servo, dw_Motor
-
-dw = dw_Controller( addr=0x60 )
-s1 = dw.getStepper(1)
-m3 = dw.getMotor(3)
-
-s1.off()
-m3.off()
-time.sleep(1)
-
-m3.setMotorSpeed(-255)
-s1.oneStep( dw_Controller.FORWARD, dw_Controller.SINGLE);
-
-s1.off()
-m3.off()

MANIFEST

@@ -0,0 +1,15 @@
+# file GENERATED by distutils, do NOT edit
+setup.py
+darkwater_640\GPIO.py
+darkwater_640\I2C.py
+darkwater_640\PCA9685.py
+darkwater_640\Platform.py
+darkwater_640\SPI.py
+darkwater_640\__init__.py
+darkwater_640\darkwater_640.py
+darkwater_640\mpu9250.py
+darkwater_640\smbus.py
+examples\640imutest.py
+examples\640motortest.py
+examples\640servotest.py
+examples\640steppertest.py

MANIFEST.in

@@ -0,0 +1 @@
+recursive-include examples *

darkwater_640/__init__.py

@@ -1 +1,2 @@
 from .darkwater_640 import dw_Motor, dw_Servo, dw_Stepper, dw_Controller
+from .mpu9250 import MPU9250

darkwater_640/darkwater_640.py

@@ -63,10 +63,10 @@ class dw_Stepper:
                         return
                 
                 if (command == dw_Controller.STOP):
-                        self.MC.setPin(self.ain1, 1)
+                        self.MC.setPin(self.ain1, 0)
-                        self.MC.setPin(self.ain2, 1)
+                        self.MC.setPin(self.ain2, 0)
-                        self.MC.setPin(self.bin1, 1)
+                        self.MC.setPin(self.bin1, 0)
-                        self.MC.setPin(self.bin2, 1)
+                        self.MC.setPin(self.bin2, 0)
 
         def off(self):
                 self.run(dw_Controller.STOP, 0)
@@ -223,7 +223,7 @@ class dw_Motor:
 
         def setMotorSpeed(self, value):
                 # Check for PWM values
-                if(value > 1000) and (value < 1500):
+                if(value >= 1000) and (value < 1500):
                         self.run(dw_Controller.REVERSE, round(translate(value,1500,1000, 0, 255)))
                 if(value > 1500) and (value <= 2000):
                         self.run(dw_Controller.FORWARD, round(translate(value, 1500, 2000, 0, 255)))

examples/640imutest.py

@@ -29,12 +29,12 @@ 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()
 
 if imu.testConnection():
-    print "Connection established: True"
+    print("Connection established: True")
 else: 
     sys.exit("Connection established: False")
 
@@ -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]),
+	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("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])
+	print("Mag:", "{:+7.3f}".format(m9m[0]), "{:+7.3f}".format(m9m[1]), "{:+7.3f}".format(m9m[2]) )
 
 	time.sleep(0.5)

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)

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)

examples/640steppertest.py

@@ -0,0 +1,33 @@
+import time
+from darkwater_640 import dw_Controller, dw_Stepper
+
+dw = dw_Controller( addr=0x60 )
+s1 = dw.getStepper(1)
+s2 = dw.getStepper(2)
+s3 = dw.getStepper(3)
+
+s1.off()
+s2.off()
+s3.off()
+
+s1.setMotorSpeed(200)
+s2.setMotorSpeed(200)
+s3.setMotorSpeed(200)
+
+print("1 Forward")
+s1.step( 400, dw_Controller.FORWARD, dw_Controller.DOUBLE )
+print("2 Forward")
+s2.step( 400, dw_Controller.FORWARD, dw_Controller.DOUBLE )
+print("3 Forward")
+s3.step( 400, dw_Controller.FORWARD, dw_Controller.DOUBLE )
+
+print("1 Reverse")
+s1.step( 400, dw_Controller.REVERSE, dw_Controller.DOUBLE )
+print("2 Reverse")
+s2.step( 400, dw_Controller.REVERSE, dw_Controller.DOUBLE )
+print("3 Reverse")
+s3.step( 400, dw_Controller.REVERSE, dw_Controller.DOUBLE )
+
+s1.off()
+s2.off()
+s3.off()

setup.py

@@ -0,0 +1,11 @@
+from distutils.core import setup
+
+setup(name              = 'darkwater_640',
+      version           = '1.0.2',
+      author            = 'Team Dark Water',
+      author_email      = 'team@darkwater.io',
+      description       = 'Library for Dark Water 640 board',
+      license           = 'MIT',
+      url               = 'https://github.com/darkwaterfoundation/darkwater_python_640',
+      packages          = ['darkwater_640']
+      )