Changed to 24:1 geared motor

Karpova-Lab · Apr 2, 2019 · c028eee · c028eee
1 parent 6ad5a74
commit c028eee
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/Treadmill.exe b/Treadmill.exe
diff --git a/src/interface.py b/src/interface.py
@@ -11,8 +11,8 @@
 # MAJOR version when you make incompatible API changes,
 # MINOR version when you add functionality in a backwards-compatible manner, and
 # PATCH version when you make backwards-compatible bug fixes.
-version = "1.4.0"
-versionDate = "03/14/2019"
+version = "1.4.1"
+versionDate = "03/22/2019"
 
 if sys.platform == 'darwin':
     def openFolder(path):

diff --git a/src/motor.py b/src/motor.py
@@ -30,9 +30,9 @@ def __init__(self,saveName,direction):
         # widgets
         self.connect = QPushButton('Connect '+saveName)
         self.flip_checkbox = QCheckBox('Flip Direction')
-        self.accel = label_and_spin('Acceleration',[.1,100],.01,.1)
+        self.accel = label_and_spin('Acceleration',[.1,100],.01,.25)
         self.decel = label_and_spin('Deceleration',[.1,100],.01,.5)
-        self.duty = label_and_spin('Duty Cycle',[0.1,1],.01,.13)
+        self.duty = label_and_spin('Duty Cycle',[0.15,1],.01,.15)
 
         self.update_btn = QPushButton('Send Parameters')
         self.update_btn.setStyleSheet("background-color: #00cc00;")
@@ -72,7 +72,7 @@ def __init__(self,saveName,direction):
         self.saveName = saveName
         self.dir = direction
         commutations = 8*3 # 8 poles * 3 phase
-        gearReduction = 4.9 # 4.9:1 gearbox
+        gearReduction = 24 # 24:1 gearbox
         wheelRadius = .75*2.54 # .75inches * 2.54"/cm
         self.conversion = 1/commutations*1/gearReduction *2*pi*wheelRadius # cm