From ced8aa0a31224368c93e850173608dfc974a2350 Mon Sep 17 00:00:00 2001 From: etrinh Date: Thu, 2 Apr 2020 18:25:52 +0200 Subject: [PATCH] Fix conflicts with STM32 DADDR, knx DADDR rename DEVADDR --- src/knx/rf_physical_layer.h | 2 +- src/knx_facade.cpp | 2 ++ src/stm32_platform.cpp | 1 - src/stm32_platform.h | 3 --- 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/knx/rf_physical_layer.h b/src/knx/rf_physical_layer.h index 19392e8..01a3c44 100644 --- a/src/knx/rf_physical_layer.h +++ b/src/knx/rf_physical_layer.h @@ -59,7 +59,7 @@ extern void delayMicroseconds (unsigned int howLong); #define PKTLEN 0x06 // Packet length #define PKTCTRL1 0x07 // Packet automation control #define PKTCTRL0 0x08 // Packet automation control -#define DADDR 0x09 // Device address +#define DEVADDR 0x09 // Device address #define CHANNR 0x0A // Channel number #define FSCTRL1 0x0B // Frequency synthesizer control #define FSCTRL0 0x0C // Frequency synthesizer control diff --git a/src/knx_facade.cpp b/src/knx_facade.cpp index e79ccec..ba5e766 100644 --- a/src/knx_facade.cpp +++ b/src/knx_facade.cpp @@ -24,6 +24,8 @@ KnxFacade knx; #elif ARDUINO_ARCH_STM32 KnxFacade knx; + // no predefined global instance + #define ICACHE_RAM_ATTR #elif __linux__ // no predefined global instance #define ICACHE_RAM_ATTR diff --git a/src/stm32_platform.cpp b/src/stm32_platform.cpp index b9db3c7..4d2d92c 100644 --- a/src/stm32_platform.cpp +++ b/src/stm32_platform.cpp @@ -19,7 +19,6 @@ Stm32Platform::~Stm32Platform() void Stm32Platform::restart() { - println("restart"); NVIC_SystemReset(); } diff --git a/src/stm32_platform.h b/src/stm32_platform.h index 17062f3..d8c6faa 100644 --- a/src/stm32_platform.h +++ b/src/stm32_platform.h @@ -1,11 +1,8 @@ #ifdef ARDUINO_ARCH_STM32 #include "arduino_platform.h" - class Stm32Platform : public ArduinoPlatform { - using ArduinoPlatform::_mulitcastAddr; - using ArduinoPlatform::_mulitcastPort; public: Stm32Platform(); Stm32Platform( HardwareSerial* s);