From 2f6089078731378dcf6b076db35f0d6afe53a988 Mon Sep 17 00:00:00 2001
From: Engjell Hyseni <engjell.hyseni@kit.edu>
Date: Thu, 16 Jan 2025 10:08:43 +0100
Subject: [PATCH] uncomitted changes ADE
---
source/devices/ethercat/head_board/armar7de/ErrorDecoder.cpp | 3 ++-
source/devices/ethercat/head_board/armar7de/Slave.cpp | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/source/devices/ethercat/head_board/armar7de/ErrorDecoder.cpp b/source/devices/ethercat/head_board/armar7de/ErrorDecoder.cpp
index e5d1bc05..c6d4aef4 100644
--- a/source/devices/ethercat/head_board/armar7de/ErrorDecoder.cpp
+++ b/source/devices/ethercat/head_board/armar7de/ErrorDecoder.cpp
@@ -160,7 +160,8 @@ namespace devices::ethercat::head_board::armar7de
AbsoluteEncoderStatus::ErrorPowerSupplyError |
AbsoluteEncoderStatus::ErrorSensorReadingError |
AbsoluteEncoderStatus::ErrorSignalAmplitudeTooHigh |
- AbsoluteEncoderStatus::ErrorSignalLost | AbsoluteEncoderStatus::ErrorSystemError))
+ AbsoluteEncoderStatus::ErrorSignalLost |
+ AbsoluteEncoderStatus::ErrorSystemError))
? true
: false;
}
diff --git a/source/devices/ethercat/head_board/armar7de/Slave.cpp b/source/devices/ethercat/head_board/armar7de/Slave.cpp
index 9c61e226..e85e7ab0 100644
--- a/source/devices/ethercat/head_board/armar7de/Slave.cpp
+++ b/source/devices/ethercat/head_board/armar7de/Slave.cpp
@@ -89,7 +89,7 @@ namespace devices::ethercat::head_board::armar7de
if (outputs->statusBits & 0x0400)
{
SLAVE_WARNING(getSlaveIdentifier(), "On-Board Temperature Error").deactivateSpam(1);
- hasError = true;
+ // hasError = true;
}
if (config->isExternalTemperatureSensorConnected && (outputs->statusBits & 0x0200))
--
GitLab