From b7d9348246d500b46b4f0a6ef05bac1e03d921ce Mon Sep 17 00:00:00 2001 From: aestene Date: Sat, 14 Oct 2023 13:07:08 +0200 Subject: [PATCH 1/2] Add support for docking and localization --- src/isar_robot/config/settings.env | 2 +- src/isar_robot/robotinterface.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/isar_robot/config/settings.env b/src/isar_robot/config/settings.env index 67aa25b9..57f02904 100644 --- a/src/isar_robot/config/settings.env +++ b/src/isar_robot/config/settings.env @@ -1,2 +1,2 @@ -CAPABILITIES = '["take_thermal_image", "take_image", "take_video", "take_thermal_video", "drive_to_pose", "record_audio"]' +CAPABILITIES = '["take_thermal_image", "take_image", "take_video", "take_thermal_video", "drive_to_pose", "record_audio", "localize", "docking_procedure"]' ROBOT_MODEL = Robot diff --git a/src/isar_robot/robotinterface.py b/src/isar_robot/robotinterface.py index f94d83c2..1579631d 100644 --- a/src/isar_robot/robotinterface.py +++ b/src/isar_robot/robotinterface.py @@ -28,7 +28,7 @@ class Robot(RobotInterface): def __init__(self) -> None: - self.logger: Logger = logging.getLogger("robot") + self.logger: Logger = logging.getLogger("isar_robot") def initiate_mission(self, mission: Mission) -> None: time.sleep(STEP_DURATION_IN_SECONDS) @@ -37,6 +37,7 @@ def mission_status(self) -> MissionStatus: return MissionStatus.Successful def initiate_step(self, step: Step) -> None: + self.logger.info(f"Initiated step of type {step.__class__.__name__}") time.sleep(STEP_DURATION_IN_SECONDS) def step_status(self) -> StepStatus: From df7b4d738dbe125c0fb3c110e406bc4f6ef2f7e0 Mon Sep 17 00:00:00 2001 From: aestene Date: Sat, 14 Oct 2023 13:16:16 +0200 Subject: [PATCH 2/2] Update python versions to 3.10 and higher --- .github/workflows/pythonpackage.yml | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pythonpackage.yml b/.github/workflows/pythonpackage.yml index 55abf813..9505ee34 100644 --- a/.github/workflows/pythonpackage.yml +++ b/.github/workflows/pythonpackage.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: ["3.8", "3.9", "3.10"] + python-version: ["3.10", "3.11", "3.12"] steps: - uses: actions/checkout@v3 diff --git a/setup.py b/setup.py index 34698d99..f3ab2bb7 100644 --- a/setup.py +++ b/setup.py @@ -37,6 +37,6 @@ "pre-commit", ] }, - python_requires=">=3.8", + python_requires=">=3.10", tests_require=["pytest"], )