diff --git a/docker/dockerfile-suave b/docker/dockerfile-suave index 68a1320..1b06dac 100644 --- a/docker/dockerfile-suave +++ b/docker/dockerfile-suave @@ -72,7 +72,7 @@ WORKDIR $HOME # Install ArduSub RUN git clone https://github.com/ArduPilot/ardupilot.git WORKDIR $HOME/ardupilot -RUN git checkout 94ba4ece5f9ccdf632b95938f8e644a622f5ee75 +RUN git checkout e9f46b9 RUN git submodule update --init --recursive RUN rm $HOME/ardupilot/Tools/environment_install/install-prereqs-ubuntu.sh RUN wget -P $HOME/ardupilot/Tools/environment_install/ https://raw.githubusercontent.com/ArduPilot/ardupilot/c623ae8b82db4d7e195f4b757e2ae5d049f941e5/Tools/environment_install/install-prereqs-ubuntu.sh diff --git a/suave/suave/task_bridge.py b/suave/suave/task_bridge.py index f32d0b2..ea44870 100644 --- a/suave/suave/task_bridge.py +++ b/suave/suave/task_bridge.py @@ -41,7 +41,11 @@ def task_request(self, req, forward_request): function_names = self.task_functions_dict[req.task_name] success = True for function in function_names: - success = forward_request(function) and success + forward_request_result = forward_request(function) + if type(forward_request_result) is bool: + success = forward_request(function) and success + else: + success = False response.success = success except Exception as e: self.get_logger().error(