From d5e1f0fdaa594aa7099c44bca485bd1b07ac1c0c Mon Sep 17 00:00:00 2001 From: Silvan Fuhrer Date: Tue, 7 Mar 2023 11:06:48 +0100 Subject: [PATCH] uorb_graph: remove handling for actuator_controls topic Signed-off-by: Silvan Fuhrer --- Tools/uorb_graph/create.py | 20 +------------------- platforms/common/uORB/uORB.h | 1 - 2 files changed, 1 insertion(+), 20 deletions(-) diff --git a/Tools/uorb_graph/create.py b/Tools/uorb_graph/create.py index a97669b961..cd213c9385 100755 --- a/Tools/uorb_graph/create.py +++ b/Tools/uorb_graph/create.py @@ -110,10 +110,6 @@ class PubSub(object): log.debug(" ####:{}: {}, {}".format( self._name, route_group, topic_group)) - # # TODO: handle this case... but not sure where, yet - # if match == 'ORB_ID_VEHICLE_ATTITUDE_CONTROLS': # special case - # match = orb_id+orb_id_vehicle_attitude_controls_topic - # match has the form: '[ORB_ID(]' if route_group: if route_group == 'ORB_ID': @@ -232,9 +228,6 @@ class Graph(object): self._topic_blacklist = set(kwargs.get('topic_blacklist',set())) - self._orb_id_vehicle_attitude_controls_topic = 'actuator_controls_0' - self._orb_id_vehicle_attitude_controls_re = re.compile(r'\#define\s+ORB_ID_VEHICLE_ATTITUDE_CONTROLS\s+([^,)]+)') - self._warnings = [] # list of all ambiguous scan sites self._current_scope = [] # stack with current module (they can be nested) @@ -510,18 +503,7 @@ class Graph(object): elif current_scope.name == 'uorb_tests': # skip this return elif current_scope.name == 'uorb': - - # search and validate the ORB_ID_VEHICLE_ATTITUDE_CONTROLS define - matches = self._orb_id_vehicle_attitude_controls_re.findall(content) - for match in matches: - if match != 'ORB_ID('+self._orb_id_vehicle_attitude_controls_topic: - # if we land here, you need to change _orb_id_vehicle_attitude_controls_topic - raise Exception( - 'The extracted define for ORB_ID_VEHICLE_ATTITUDE_CONTROLS ' - 'is '+match+' but expected ORB_ID('+ - self._orb_id_vehicle_attitude_controls_topic) - - return # skip uorb module for the rest + return # skip this line_number = 0 for full_line in content.splitlines(): diff --git a/platforms/common/uORB/uORB.h b/platforms/common/uORB/uORB.h index c96f3c08d4..7fdbb699d1 100644 --- a/platforms/common/uORB/uORB.h +++ b/platforms/common/uORB/uORB.h @@ -251,7 +251,6 @@ void orb_print_message_internal(const struct orb_metadata *meta, const void *dat __END_DECLS /* Diverse uORB header defines */ //XXX: move to better location -#define ORB_ID_VEHICLE_ATTITUDE_CONTROLS ORB_ID(actuator_controls_0) typedef uint8_t arming_state_t; typedef uint8_t main_state_t; typedef uint8_t hil_state_t;