From 6ea0963f4b8e366bb9fd564eb9ec650f51e48aa6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20G=C3=B6ttgens?= <tgoettgens@gmail.com>
Date: Wed, 28 Dec 2022 16:03:34 +0100
Subject: [PATCH] fix master too

---
 src/modules/ExternalNotificationModule.cpp | 12 ++++++++++++
 src/modules/ExternalNotificationModule.h   |  2 ++
 2 files changed, 14 insertions(+)

diff --git a/src/modules/ExternalNotificationModule.cpp b/src/modules/ExternalNotificationModule.cpp
index 6c31fdabc..be3e6cd8b 100644
--- a/src/modules/ExternalNotificationModule.cpp
+++ b/src/modules/ExternalNotificationModule.cpp
@@ -37,7 +37,11 @@ int32_t ExternalNotificationModule::runOnce()
     if (!moduleConfig.external_notification.enabled) {
         return INT32_MAX; // we don't need this thread here...
     } else {
+#ifndef ARCH_PORTDUINO
         if ((nagCycleCutoff < millis()) && !rtttl::isPlaying()) {
+#else
+        if (nagCycleCutoff < millis()) {
+#endif
             nagCycleCutoff = UINT32_MAX;
             DEBUG_MSG("Turning off external notification: ");
             for (int i = 0; i < 2; i++) {
@@ -71,6 +75,7 @@ int32_t ExternalNotificationModule::runOnce()
         }
 
         // now let the PWM buzzer play
+#ifndef ARCH_PORTDUINO
         if (moduleConfig.external_notification.use_pwm) {
             if (rtttl::isPlaying()) {
                 rtttl::play();
@@ -79,6 +84,7 @@ int32_t ExternalNotificationModule::runOnce()
                 rtttl::begin(config.device.buzzer_gpio, pwmRingtone);
             }
         }
+#endif        
         return 25;
     }
 }
@@ -129,7 +135,9 @@ bool ExternalNotificationModule::getExternal(uint8_t index)
 }
 
 void ExternalNotificationModule::stopNow() {
+#ifndef ARCH_PORTDUINO    
     rtttl::stop();
+#endif    
     nagCycleCutoff = 1; // small value
     setIntervalFromNow(0);
 }
@@ -240,7 +248,9 @@ ProcessMessage ExternalNotificationModule::handleReceived(const MeshPacket &mp)
                     if (!moduleConfig.external_notification.use_pwm) {
                         setExternalOn(2);
                     } else {
+#ifndef ARCH_PORTDUINO
                         rtttl::begin(config.device.buzzer_gpio, pwmRingtone);
+#endif
                     }
                     if (moduleConfig.external_notification.nag_timeout) {
                         nagCycleCutoff = millis() + moduleConfig.external_notification.nag_timeout * 1000;
@@ -276,7 +286,9 @@ ProcessMessage ExternalNotificationModule::handleReceived(const MeshPacket &mp)
                     if (!moduleConfig.external_notification.use_pwm) {
                         setExternalOn(2);
                     } else {
+#ifndef ARCH_PORTDUINO
                         rtttl::begin(config.device.buzzer_gpio, pwmRingtone);
+#endif
                     }
                     if (moduleConfig.external_notification.nag_timeout) {
                         nagCycleCutoff = millis() + moduleConfig.external_notification.nag_timeout * 1000;
diff --git a/src/modules/ExternalNotificationModule.h b/src/modules/ExternalNotificationModule.h
index 04de235cf..258078357 100644
--- a/src/modules/ExternalNotificationModule.h
+++ b/src/modules/ExternalNotificationModule.h
@@ -3,7 +3,9 @@
 #include "SinglePortModule.h"
 #include "concurrency/OSThread.h"
 #include "configuration.h"
+#ifndef ARCH_PORTDUINO
 #include <NonBlockingRtttl.h>
+#endif
 #include <Arduino.h>
 #include <functional>