From 018c057996b304dd5d2528f6ee008706f104244a Mon Sep 17 00:00:00 2001 From: Mikal Hart Date: Sun, 13 Oct 2019 16:51:38 -0500 Subject: [PATCH] tidy up (weak) attribute stuff and workaround AVR compiler issue (#18) --- src/IridiumSBD.cpp | 13 +++++++++---- src/IridiumSBD.h | 1 - 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/IridiumSBD.cpp b/src/IridiumSBD.cpp index 6b9ed81..7b2176e 100644 --- a/src/IridiumSBD.cpp +++ b/src/IridiumSBD.cpp @@ -25,9 +25,14 @@ 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)) { } + +bool ISBDCallback() __attribute__((weak)); +void ISBDConsoleCallback(IridiumSBD *device, char c) __attribute__((weak)); +void ISBDDiagsCallback(IridiumSBD *device, char c) __attribute__((weak)); + +bool ISBDCallback() { return true; } +void ISBDConsoleCallback(IridiumSBD *device, char c) { } +void ISBDDiagsCallback(IridiumSBD *device, char c) { } // Power on the RockBLOCK or return from sleep int IridiumSBD::begin() @@ -277,7 +282,7 @@ int IridiumSBD::internalBegin() } // The usual initialization sequence - FlashString strings[3] = { F("ATE1\r"), F("AT&D0\r"), F("AT&K0\r") }; + const char *strings[3] = { "ATE1\r", "AT&D0\r", "AT&K0\r" }; for (int i=0; i<3; ++i) { send(strings[i]); diff --git a/src/IridiumSBD.h b/src/IridiumSBD.h index 8e8ad2b..be7c017 100644 --- a/src/IridiumSBD.h +++ b/src/IridiumSBD.h @@ -158,4 +158,3 @@ class IridiumSBD int filteredavailable(); int filteredread(); }; -