diff --git a/ioc/motors/masterMacs1.substitutions b/ioc/motors/masterMacs1.substitutions index 94692f9..1edc4c8 100755 --- a/ioc/motors/masterMacs1.substitutions +++ b/ioc/motors/masterMacs1.substitutions @@ -2,8 +2,8 @@ file $(SINQDBPATH) { pattern { AXIS, M, EGU, DIR, MRES, ENABLEMOVWATCHDOG, LIMITSOFFSET, CANSETSPEED } -{ 1, "lin1", mm, Pos, 0.001, 1, 1.0, 1 } -{ 2, "rot1", deg, Pos, 0.001, 1, 1.0, 1 } +{ 1, "ax1", mm, Pos, 0.001, 1, 1.0, 1 } +{ 2, "ax2", deg, Pos, 0.001, 1, 1.0, 1 } #{ 3, "doesnotexist1", mm, Pos, 0.001, 1, 1.0, 1 } #{ 4, "doesnotexist2", mm, Pos, 0.001, 1, 1.0, 1 } } diff --git a/ioc/motors/turboPmac1.substitutions b/ioc/motors/turboPmac1.substitutions index d8022d1..4cb5d64 100755 --- a/ioc/motors/turboPmac1.substitutions +++ b/ioc/motors/turboPmac1.substitutions @@ -2,6 +2,6 @@ file $(SINQDBPATH) { pattern { AXIS, M, EGU, DIR, MRES, ENABLEMOVWATCHDOG, LIMITSOFFSET, CANSETSPEED, RDBD } -{ 1, "lin1", mm, Pos, 0.01, 1, 1.0, 1, 2e-3 } -{ 5, "rot1", degree, Pos, 0.5, 1, 1.0, 0, 1e-3 } +{ 1, "ax1", mm, Pos, 0.01, 1, 1.0, 1, 2e-3 } +{ 5, "ax5", deg, Pos, 0.5, 1, 1.0, 0, 1e-3 } } diff --git a/tests/sinqMotor/masterMacs/lin1/__init__.py b/tests/sinqMotor/masterMacs/lin1/__init__.py deleted file mode 100755 index e69de29..0000000 diff --git a/tests/sinqMotor/masterMacs/lin1/conftest.py b/tests/sinqMotor/masterMacs/lin1/conftest.py deleted file mode 100755 index d991d90..0000000 --- a/tests/sinqMotor/masterMacs/lin1/conftest.py +++ /dev/null @@ -1,9 +0,0 @@ -# This module defines fixtures which are shared for all tests of motor "lin1". - -import pytest -from common import MasterMACS - - -@pytest.fixture(autouse=True) -def motor(): - return MasterMACS('masterMacs1', 'lin1') diff --git a/tests/sinqMotor/masterMacs/lin1/test_common.py b/tests/sinqMotor/masterMacs/lin1/test_common.py deleted file mode 100755 index 72ef491..0000000 --- a/tests/sinqMotor/masterMacs/lin1/test_common.py +++ /dev/null @@ -1,33 +0,0 @@ -# Run a selection of common tests - -from tests.move import * -from tests.sinqMotor.limits import * -from tests.sinqMotor.masterMacs.reset import reset - - -def test_reset(motor): - reset(motor, 4) - reset(motor, 2) - - -def test_move_to_low_limit_switch(motor): - reset(motor, 1) - move_to_low_limit_switch(motor) - - -def test_move_to_high_limit_switch(motor): - reset(motor, 1) - move_to_high_limit_switch(motor) - - -def test_move_while_move(motor): - reset(motor, 1) - move_while_move(motor, -60, -20) - - -def test_stop(motor): - reset(motor, 1) - stop(motor, 18) - -# def test_reread_limits_from_hw(motor): -# reread_limits_from_hw(motor) diff --git a/tests/sinqMotor/turboPmac/lin1/__init__.py b/tests/sinqMotor/turboPmac/lin1/__init__.py deleted file mode 100755 index e69de29..0000000 diff --git a/tests/sinqMotor/turboPmac/lin1/conftest.py b/tests/sinqMotor/turboPmac/lin1/conftest.py deleted file mode 100755 index 1771615..0000000 --- a/tests/sinqMotor/turboPmac/lin1/conftest.py +++ /dev/null @@ -1,9 +0,0 @@ -# This module defines fixtures which are shared for all tests of motor "lin1". - -import pytest -from common import TurboPMAC - - -@pytest.fixture(autouse=True) -def motor(): - return TurboPMAC('turboPmac1', 'lin1') diff --git a/tests/sinqMotor/turboPmac/lin1/test_common.py b/tests/sinqMotor/turboPmac/lin1/test_common.py deleted file mode 100755 index 6a94a06..0000000 --- a/tests/sinqMotor/turboPmac/lin1/test_common.py +++ /dev/null @@ -1,33 +0,0 @@ -# Run a selection of common tests - -from tests.move import * -from tests.sinqMotor.limits import * -from tests.sinqMotor.turboPmac.reset import reset - - -def test_stop_reset_enable_move_sequence(motor): - reset(motor, 5) - reset(motor, 0) - - -def test_move_to_low_limit_switch(motor): - reset(motor, -30) - move_to_low_limit_switch(motor) - - -def test_move_to_high_limit_switch(motor): - reset(motor, -30) - move_to_high_limit_switch(motor) - - -def test_move_while_move(motor): - reset(motor, -30) - move_while_move(motor, -60, -20) - - -def test_stop(motor): - reset(motor, -30) - stop(motor, -60) - -# def test_reread_limits_from_hw(motor): -# reread_limits_from_hw(motor) diff --git a/tests/sinqMotor/turboPmac/rot1/__init__.py b/tests/sinqMotor/turboPmac/rot1/__init__.py deleted file mode 100755 index e69de29..0000000 diff --git a/tests/sinqMotor/turboPmac/rot1/conftest.py b/tests/sinqMotor/turboPmac/rot1/conftest.py deleted file mode 100755 index 23868aa..0000000 --- a/tests/sinqMotor/turboPmac/rot1/conftest.py +++ /dev/null @@ -1,9 +0,0 @@ -# This module defines fixtures which are shared for all tests of motor "rot1". - -import pytest -from common import TurboPMAC - - -@pytest.fixture(autouse=True) -def motor(): - return TurboPMAC('turboPmac1', 'rot1') diff --git a/tests/sinqMotor/turboPmac/rot1/test_common.py b/tests/sinqMotor/turboPmac/rot1/test_common.py deleted file mode 100755 index 9b38594..0000000 --- a/tests/sinqMotor/turboPmac/rot1/test_common.py +++ /dev/null @@ -1,40 +0,0 @@ -# Run a selection of common tests - -from tests.move import * -from tests.sinqMotor.limits import * -from tests.sinqMotor.common import * -from tests.sinqMotor.turboPmac.reset import reset - - -def test_stop_reset_enable_move_sequence(motor): - stop_reset_enable_move_sequence(motor, 5) - stop_reset_enable_move_sequence(motor, 0) - - -def test_move_to_low_limit_switch(motor): - reset(motor) - move_to_low_limit_switch(motor) - - -def test_move_to_high_limit_switch(motor): - reset(motor) - move_to_high_limit_switch(motor) - - -def test_move_while_move(motor): - reset(motor) - move_while_move(motor, 1000, -1000) - - -def test_stop(motor): - reset(motor) - stop(motor, 3000) - - -def test_stop_then_move(motor): - reset(motor) - stop_then_move(motor, 0) - - -# def test_reread_limits_from_hw(motor): -# reread_limits_from_hw(motor)