diff --git a/src/bridge.h b/src/bridge.h index 81f4ca4..a43fe12 100644 --- a/src/bridge.h +++ b/src/bridge.h @@ -275,7 +275,7 @@ class BridgeClassUpdater { BridgeClassUpdater() = delete; // prevents instantiation }; -BridgeClass Bridge(Serial1); +inline BridgeClass Bridge(Serial1); inline void updateEntryPoint(void *, void *, void *){ while (true) { @@ -291,7 +291,7 @@ static void safeUpdate(){ } // leave as is -void __loopHook(void){ +void __attribute__((weak)) __loopHook(void){ k_yield(); safeUpdate(); } diff --git a/src/hci.h b/src/hci.h index b313f8e..a992e8b 100644 --- a/src/hci.h +++ b/src/hci.h @@ -149,7 +149,7 @@ template class BridgeHCI { extern BridgeClass Bridge; namespace RouterBridge { - BridgeHCI<> HCI(Bridge); + inline BridgeHCI<> HCI(Bridge); } // Make available in global namespace for backward compatibility diff --git a/src/monitor.h b/src/monitor.h index 02b9d16..94fc551 100644 --- a/src/monitor.h +++ b/src/monitor.h @@ -156,6 +156,7 @@ class BridgeMonitor: public Stream { }; extern BridgeClass Bridge; -BridgeMonitor<> Monitor(Bridge); + +inline BridgeMonitor<> Monitor(Bridge); #endif // BRIDGE_MONITOR_H \ No newline at end of file