vincent/PyCNC
1
0
Fork 0
mirror of https://github.com/sinseman44/PyCNC.git synced 2026-07-16 08:37:09 +00:00
Code Issues Projects Releases Wiki Activity

split pulses per mm parameter for each axis

Browse Source
This commit is contained in:
Nikolay Khabarov
2017-05-27 03:53:30 +03:00
parent 0de4f3dc00
commit 665ba2ad1e
8 changed files with 47 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/test_coordinates.py
+2 -2
View File
@@ -53,11 +53,11 @@ class TestCoordinates(unittest.TestCase):
# round works in another way then Python's round.
# This round() rounds digits with specified step.
c = Coordinates(1.5, -1.4, 3.05)
r = c.round(1)
r = c.round(1, 1, 1)
self.assertEqual(r.x, 2.0)
self.assertEqual(r.y, -1.0)
self.assertEqual(r.z, 3.0)
r = c.round(0.25)
r = c.round(0.25, 0.25, 0.25)
self.assertEqual(r.x, 1.5)
self.assertEqual(r.y, -1.5)
self.assertEqual(r.z, 3.0)
tests/test_pulses.py
+10 -10
View File
@@ -22,7 +22,7 @@ class TestPulses(unittest.TestCase):
def test_step(self):
# Check if PulseGenerator returns correctly single step movement.
g = PulseGeneratorLinear(Coordinates(1.0 / STEPPER_PULSES_PER_MM, 0, 0),
g = PulseGeneratorLinear(Coordinates(1.0 / STEPPER_PULSES_PER_MM_X, 0, 0),
self.v)
i = 0
for px, py, pz in g:
@@ -32,9 +32,9 @@ class TestPulses(unittest.TestCase):
self.assertEqual(pz, None)
self.assertEqual(i, 1)
g = PulseGeneratorLinear(Coordinates(
1.0 / STEPPER_PULSES_PER_MM,
1.0 / STEPPER_PULSES_PER_MM,
1.0 / STEPPER_PULSES_PER_MM),
1.0 / STEPPER_PULSES_PER_MM_X,
1.0 / STEPPER_PULSES_PER_MM_Y,
1.0 / STEPPER_PULSES_PER_MM_Z),
self.v)
i = 0
for px, py, pz in g:
@@ -68,7 +68,7 @@ class TestPulses(unittest.TestCase):
self.assertNotEqual(py, None)
self.assertEqual(pz, None)
i += 1
self.assertEqual(m.find_max() * STEPPER_PULSES_PER_MM, i)
self.assertEqual(m.find_max() * STEPPER_PULSES_PER_MM_Y, i)
def test_pulses_count_and_timings(self):
# Check if number of pulses is equal to specified distance.
@@ -89,9 +89,9 @@ class TestPulses(unittest.TestCase):
self.assertEqual(min(v), max(v))
self.assertLess(t, min(v))
t = max(v)
self.assertEqual(m.x * STEPPER_PULSES_PER_MM, ix)
self.assertEqual(m.y * STEPPER_PULSES_PER_MM, iy)
self.assertEqual(m.z * STEPPER_PULSES_PER_MM, iz)
self.assertEqual(m.x * STEPPER_PULSES_PER_MM_X, ix)
self.assertEqual(m.y * STEPPER_PULSES_PER_MM_Y, iy)
self.assertEqual(m.z * STEPPER_PULSES_PER_MM_Z, iz)
self.assertLessEqual(t, g.total_time_s())
def test_acceleration_velocity(self):
@@ -104,12 +104,12 @@ class TestPulses(unittest.TestCase):
for px, py, pz in g:
if i == 2:
at = px - lx
if i == TABLE_SIZE_X_MM * STEPPER_PULSES_PER_MM / 2:
if i == TABLE_SIZE_X_MM * STEPPER_PULSES_PER_MM_X / 2:
lt = px - lx
bt = px - lx
lx = px
i += 1
self.assertEqual(round(60.0 / lt / STEPPER_PULSES_PER_MM), round(self.v))
self.assertEqual(round(60.0 / lt / STEPPER_PULSES_PER_MM_X), round(self.v))
self.assertGreater(at, lt)
self.assertGreater(bt, lt)