From 5b4ec88f118041ce2569d42498b9c1b8cf083660 Mon Sep 17 00:00:00 2001 From: Jacob Walser Date: Thu, 23 Mar 2017 00:13:38 -0400 Subject: [PATCH] Sub: Remove one layer of abstraction for ServoRelayEvents.update_events call --- ArduSub/ArduSub.cpp | 2 +- ArduSub/Sub.h | 1 - ArduSub/events.cpp | 6 ------ 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/ArduSub/ArduSub.cpp b/ArduSub/ArduSub.cpp index cf8f23ad64..cc6cf3eb25 100644 --- a/ArduSub/ArduSub.cpp +++ b/ArduSub/ArduSub.cpp @@ -362,7 +362,7 @@ void Sub::three_hz_loop() fence_check(); #endif // AC_FENCE_ENABLED - update_events(); + ServoRelayEvents.update_events(); } // one_hz_loop - runs at 1Hz diff --git a/ArduSub/Sub.h b/ArduSub/Sub.h index 1ae5020a73..8c624ee2c5 100644 --- a/ArduSub/Sub.h +++ b/ArduSub/Sub.h @@ -635,7 +635,6 @@ private: void failsafe_terrain_check(); void failsafe_terrain_set_status(bool data_ok); void failsafe_terrain_on_event(); - void update_events(); void failsafe_enable(); void failsafe_disable(); void fence_check(); diff --git a/ArduSub/events.cpp b/ArduSub/events.cpp index 943413447b..8dbc0f31c3 100644 --- a/ArduSub/events.cpp +++ b/ArduSub/events.cpp @@ -294,9 +294,3 @@ bool Sub::should_disarm_on_failsafe() break; } } - -void Sub::update_events() -{ - ServoRelayEvents.update_events(); -} -