From aad7f99016b33489b462d47f0c5e30848277bd69 Mon Sep 17 00:00:00 2001 From: Mikal Hart Date: Sat, 12 Oct 2019 22:56:27 -0500 Subject: [PATCH] Correct usage for (weak) attribute callback functions --- src/IridiumSBD.cpp | 9 +++++---- src/IridiumSBD.h | 4 ---- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/src/IridiumSBD.cpp b/src/IridiumSBD.cpp index 2e6225d..6b9ed81 100644 --- a/src/IridiumSBD.cpp +++ b/src/IridiumSBD.cpp @@ -25,6 +25,10 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include #include "IridiumSBD.h" +bool ISBDCallback() __attribute__((weak)) { return true; } +void ISBDConsoleCallback(IridiumSBD *device, char c) __attribute__((weak)) { } +void ISBDDiagsCallback(IridiumSBD *device, char c) __attribute__((weak)) { } + // Power on the RockBLOCK or return from sleep int IridiumSBD::begin() { @@ -613,10 +617,7 @@ bool IridiumSBD::cancelled() if (ringPin != -1 && digitalRead(ringPin) == LOW) // Active low per guide ringAsserted = true; - if (ISBDCallback != NULL) - return !ISBDCallback(); - - return false; + return !ISBDCallback(); } int IridiumSBD::doSBDIX(uint16_t &moCode, uint16_t &moMSN, uint16_t &mtCode, uint16_t &mtMSN, uint16_t &mtLen, uint16_t &mtRemaining) diff --git a/src/IridiumSBD.h b/src/IridiumSBD.h index b341e64..8e8ad2b 100644 --- a/src/IridiumSBD.h +++ b/src/IridiumSBD.h @@ -159,7 +159,3 @@ class IridiumSBD int filteredread(); }; -extern bool ISBDCallback() __attribute__((weak)); -extern void ISBDConsoleCallback(IridiumSBD *device, char c) __attribute__((weak)); -extern void ISBDDiagsCallback(IridiumSBD *device, char c) __attribute__((weak)); -