Skip to content

Commit

Permalink
Merge pull request #11 from dls-controls/fix_converter_!
Browse files Browse the repository at this point in the history
the old generating script should use python2
  • Loading branch information
UrszulaNeuman committed Jan 19, 2024
2 parents fce1642 + ecfd50f commit 2383a77
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 2 deletions.
2 changes: 1 addition & 1 deletion converter/motionarea.py
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ def make_new_motion(self):

# use _execute_script with python2
self._execute_script(
gen, brick_folder, pypath, str(plc_file), python2=False
gen, brick_folder, pypath, str(plc_file), python2=True
)

# collect objects from pipe
Expand Down
9 changes: 9 additions & 0 deletions converter/shim/controllertype.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
class ControllerType():
"""
Defines the types of controller supported
"""

#: Geobrick controller
brick = "ControllerType.brick"
#: VME PMAC Controller
pmac = "ControllerType.pmac"
2 changes: 1 addition & 1 deletion converter/shim/globals.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# from typing import Callable, Optional

from pmac_motorhome.constants import ControllerType
from converter.shim.controllertype import ControllerType
from pmac_motorhome.sequences import (
home_home,
home_hsw,
Expand Down

0 comments on commit 2383a77

Please sign in to comment.