Skip to content

Instantly share code, notes, and snippets.

@ammarnajjar
Created June 2, 2016 09:04
Show Gist options
  • Save ammarnajjar/99c84d31216600d97ce28879e4ac3580 to your computer and use it in GitHub Desktop.
Save ammarnajjar/99c84d31216600d97ce28879e4ac3580 to your computer and use it in GitHub Desktop.
Patch applied to comment out the handling of lost arbitation error in ros_industrial/ros_canopen.
From 07e4e29efe01b4dd47db88f4f547057445bc2574 Mon Sep 17 00:00:00 2001
From: Ammar Najjar <anajjar@iat.uni-bremen.de>
Date: Thu, 2 Jun 2016 11:00:47 +0200
Subject: [PATCH] comment lost arbitation error handling
---
socketcan_interface/include/socketcan_interface/socketcan.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/socketcan_interface/include/socketcan_interface/socketcan.h b/socketcan_interface/include/socketcan_interface/socketcan.h
index 4deba8e..4f1ea44 100644
--- a/socketcan_interface/include/socketcan_interface/socketcan.h
+++ b/socketcan_interface/include/socketcan_interface/socketcan.h
@@ -51,7 +51,7 @@ public:
}
can_err_mask_t err_mask =
( CAN_ERR_TX_TIMEOUT /* TX timeout (by netdevice driver) */
- | CAN_ERR_LOSTARB /* lost arbitration / data[0] */
+ // | CAN_ERR_LOSTARB /* lost arbitration / data[0] */
| CAN_ERR_CRTL /* controller problems / data[1] */
| CAN_ERR_PROT /* protocol violations / data[2..3] */
| CAN_ERR_TRX /* transceiver status / data[4] */
--
1.9.1
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment