Mirrors/knx
1
0
Fork 0
mirror of https://github.com/thelsing/knx.git synced 2025-10-26 10:26:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix conflicts with STM32 DADDR, knx DADDR rename DEVADDR

Browse Source
This commit is contained in:
etrinh 2020-04-02 18:25:52 +02:00
parent 34df27ee87
commit ced8aa0a31
4 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/knx/rf_physical_layer.h
View File

@ -59,7 +59,7 @@ extern void delayMicroseconds (unsigned int howLong);
#define PKTLEN 0x06 // Packet length #define PKTLEN 0x06 // Packet length
#define PKTCTRL1 0x07 // Packet automation control #define PKTCTRL1 0x07 // Packet automation control
#define PKTCTRL0 0x08 // 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 CHANNR 0x0A // Channel number
#define FSCTRL1 0x0B // Frequency synthesizer control #define FSCTRL1 0x0B // Frequency synthesizer control
#define FSCTRL0 0x0C // Frequency synthesizer control #define FSCTRL0 0x0C // Frequency synthesizer control

2
src/knx_facade.cpp
View File

@ -24,6 +24,8 @@
KnxFacade<Esp32Platform, Bau57B0> knx; KnxFacade<Esp32Platform, Bau57B0> knx;
#elif ARDUINO_ARCH_STM32 #elif ARDUINO_ARCH_STM32
KnxFacade<Stm32Platform, Bau57B0> knx; KnxFacade<Stm32Platform, Bau57B0> knx;
// no predefined global instance
#define ICACHE_RAM_ATTR
#elif __linux__ #elif __linux__
// no predefined global instance // no predefined global instance
#define ICACHE_RAM_ATTR #define ICACHE_RAM_ATTR

1
src/stm32_platform.cpp
View File

@ -19,7 +19,6 @@ Stm32Platform::~Stm32Platform()
void Stm32Platform::restart() void Stm32Platform::restart()
{ {
println("restart");
NVIC_SystemReset(); NVIC_SystemReset();
} }

3
src/stm32_platform.h
View File

@ -1,11 +1,8 @@
#ifdef ARDUINO_ARCH_STM32 #ifdef ARDUINO_ARCH_STM32
#include "arduino_platform.h" #include "arduino_platform.h"
class Stm32Platform : public ArduinoPlatform class Stm32Platform : public ArduinoPlatform
{ {
using ArduinoPlatform::_mulitcastAddr;
using ArduinoPlatform::_mulitcastPort;
public: public:
Stm32Platform(); Stm32Platform();
Stm32Platform( HardwareSerial* s); Stm32Platform( HardwareSerial* s);