@@ -220,9 +220,15 @@ def __calibrate_x_axis(self):
220
220
break
221
221
222
222
elif ch == "a" :
223
- Turret .move_forward (self .sm_x , 5 )
223
+ if MOTOR_X_REVERSED :
224
+ Turret .move_backward (self .sm_x , 5 )
225
+ else :
226
+ Turret .move_forward (self .sm_x , 5 )
224
227
elif ch == "d" :
225
- Turret .move_backward (self .sm_x , 5 )
228
+ if MOTOR_X_REVERSED :
229
+ Turret .move_forward (self .sm_x , 5 )
230
+ else :
231
+ Turret .move_backward (self .sm_x , 5 )
226
232
elif ch == "\n " :
227
233
break
228
234
@@ -243,9 +249,15 @@ def __calibrate_y_axis(self):
243
249
break
244
250
245
251
if ch == "w" :
246
- Turret .move_backward (self .sm_y , 5 )
252
+ if MOTOR_Y_REVERSED :
253
+ Turret .move_forward (self .sm_y , 5 )
254
+ else :
255
+ Turret .move_backward (self .sm_y , 5 )
247
256
elif ch == "s" :
248
- Turret .move_forward (self .sm_y , 5 )
257
+ if MOTOR_Y_REVERSED :
258
+ Turret .move_backward (self .sm_y , 5 )
259
+ else :
260
+ Turret .move_forward (self .sm_y , 5 )
249
261
elif ch == "\n " :
250
262
break
251
263
@@ -278,18 +290,30 @@ def __move_axis(self, contour, frame):
278
290
# move x
279
291
if (target_steps_x - self .current_x_steps ) > 0 :
280
292
self .current_x_steps += 1
281
- t_x = threading .Thread (target = Turret .move_backward , args = (self .sm_x , 2 ,))
293
+ if MOTOR_X_REVERSED :
294
+ t_x = threading .Thread (target = Turret .move_forward , args = (self .sm_x , 2 ,))
295
+ else :
296
+ t_x = threading .Thread (target = Turret .move_backward , args = (self .sm_x , 2 ,))
282
297
elif (target_steps_x - self .current_x_steps ) < 0 :
283
298
self .current_x_steps -= 1
284
- t_x = threading .Thread (target = Turret .move_forward , args = (self .sm_x , 2 ,))
299
+ if MOTOR_X_REVERSED :
300
+ t_x = threading .Thread (target = Turret .move_backward , args = (self .sm_x , 2 ,))
301
+ else :
302
+ t_x = threading .Thread (target = Turret .move_forward , args = (self .sm_x , 2 ,))
285
303
286
304
# move y
287
305
if (target_steps_y - self .current_y_steps ) > 0 :
288
306
self .current_y_steps += 1
289
- t_y = threading .Thread (target = Turret .move_forward , args = (self .sm_y , 2 ,))
307
+ if MOTOR_Y_REVERSED :
308
+ t_y = threading .Thread (target = Turret .move_backward , args = (self .sm_y , 2 ,))
309
+ else :
310
+ t_y = threading .Thread (target = Turret .move_forward , args = (self .sm_y , 2 ,))
290
311
elif (target_steps_y - self .current_y_steps ) < 0 :
291
312
self .current_y_steps -= 1
292
- t_y = threading .Thread (target = Turret .move_backward , args = (self .sm_y , 2 ,))
313
+ if MOTOR_Y_REVERSED :
314
+ t_y = threading .Thread (target = Turret .move_forward , args = (self .sm_y , 2 ,))
315
+ else :
316
+ t_y = threading .Thread (target = Turret .move_backward , args = (self .sm_y , 2 ,))
293
317
294
318
# fire if necessary
295
319
if not self .friendly_mode :
@@ -322,13 +346,25 @@ def interactive(self):
322
346
break
323
347
324
348
if ch == "w" :
325
- Turret .move_backward (self .sm_y , 5 )
349
+ if MOTOR_Y_REVERSED :
350
+ Turret .move_forward (self .sm_y , 5 )
351
+ else :
352
+ Turret .move_backward (self .sm_y , 5 )
326
353
elif ch == "s" :
327
- Turret .move_forward (self .sm_y , 5 )
354
+ if MOTOR_Y_REVERSED :
355
+ Turret .move_backward (self .sm_y , 5 )
356
+ else :
357
+ Turret .move_forward (self .sm_y , 5 )
328
358
elif ch == "a" :
329
- Turret .move_forward (self .sm_x , 5 )
359
+ if MOTOR_X_REVERSED :
360
+ Turret .move_backward (self .sm_x , 5 )
361
+ else :
362
+ Turret .move_forward (self .sm_x , 5 )
330
363
elif ch == "d" :
331
- Turret .move_backward (self .sm_x , 5 )
364
+ if MOTOR_X_REVERSED :
365
+ Turret .move_forward (self .sm_x , 5 )
366
+ else :
367
+ Turret .move_backward (self .sm_x , 5 )
332
368
elif ch == "\n " :
333
369
Turret .fire ()
334
370
0 commit comments