Skip to content

Commit 807af2e

Browse files
committed
fix: cleanup unused variables
1 parent 61eb800 commit 807af2e

File tree

2 files changed

+5
-20
lines changed

2 files changed

+5
-20
lines changed

rcp/components/home/coordbar.py

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ class CoordBar(BoxLayout, SavingDispatcher):
3737

3838
speed = NumericProperty(0)
3939
spindleMode = BooleanProperty(False)
40-
stepsPerRev = NumericProperty(4096)
4140
stepsPerMM = NumericProperty(1000)
4241
offsets = ListProperty([0 for item in range(100)])
4342
syncButtonColor = ListProperty([0.3, 0.3, 0.3, 1])
@@ -136,11 +135,6 @@ def set_sync_ratio(self, *args, **kv):
136135
self.device['scales'][self.inputIndex]['syncRatioNum'] = final_ratio.numerator
137136
self.device['scales'][self.inputIndex]['syncRatioDen'] = final_ratio.denominator
138137

139-
def on_spindleMode(self, instance, value):
140-
# when operating in spindle mode we set the numerator to 360 and the denominator to steps per rev
141-
if self.spindleMode is True:
142-
self.ratioNum = 360
143-
144138
def on_syncRatioNum(self, instance, value):
145139
if self.app.home is None:
146140
return
@@ -160,11 +154,11 @@ def update_scaledPosition(self, instance=None, value=None):
160154

161155
if self.scaledPosition > self.ratioNum:
162156
self.scaledPosition -= self.ratioNum
163-
self.position -= self.stepsPerRev
157+
self.position -= self.ratioDen
164158

165159
if self.scaledPosition < 0:
166160
self.scaledPosition += self.ratioNum
167-
self.position += self.stepsPerRev
161+
self.position += self.ratioDen
168162

169163
self.formattedPosition = self.app.formats.angle_speed_format.format(self.speed)
170164
self.formattedSpeed = self.app.formats.position_format.format(self.scaledPosition)
@@ -205,17 +199,14 @@ def speed_task(self, *args, **kv):
205199
if self.stepsPerMM == 0 and not self.spindleMode:
206200
return
207201

208-
if self.stepsPerRev == 0 and self.spindleMode:
209-
return
210-
211202
current_time = time.time()
212203
steps_per_second = self.app.fast_data_values.get('scaleSpeed', [0] * SCALES_COUNT)[self.inputIndex]
213204
self.speed_history.append(steps_per_second)
214205
avg_steps_per_second = (sum(self.speed_history) / len(self.speed_history))
215206

216207
# Calculate Revs/Min for spindleMode
217208
if self.spindleMode:
218-
self.speed = (avg_steps_per_second / self.stepsPerRev) * 60
209+
self.speed = (avg_steps_per_second / self.ratioDen) * 60
219210

220211
# Calculate feeds
221212
if not self.spindleMode:

rcp/components/setup/scale_screen.kv

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,22 +25,16 @@
2525
value: root.scale.axisName
2626
on_value: root.scale.axisName = self.value
2727
NumberItem:
28-
name: "Ratio Numerator"
28+
name: "Ratio Numerator" if not root.scale.spindleMode else "Degrees per revolution (default 360)"
2929
value: root.scale.ratioNum
3030
integer: True
3131
on_value: root.scale.ratioNum = int(self.value)
3232
NumberItem:
33-
name: "Ratio Denominator"
33+
name: "Ratio Denominator" if not root.scale.spindleMode else "Steps per revolution"
3434
value: root.scale.ratioDen
3535
integer: True
3636
help_file: "scales.rst"
3737
on_value: root.scale.ratioDen = int(self.value)
38-
NumberItem:
39-
name: "Steps Per Revolution"
40-
value: root.scale.stepsPerRev
41-
integer: True
42-
help_file: "scales.rst"
43-
on_value: root.scale.stepsPerRev = int(self.value)
4438
NumberItem:
4539
name: "Sync Ratio Numerator"
4640
value: root.scale.syncRatioNum

0 commit comments

Comments
 (0)