mirror of
				https://github.com/thelsing/knx.git
				synced 2025-10-26 10:26:25 +01:00 
			
		
		
		
	Fix conflicts with STM32 DADDR, knx DADDR rename DEVADDR
This commit is contained in:
		
							parent
							
								
									34df27ee87
								
							
						
					
					
						commit
						ced8aa0a31
					
				| @ -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
 | ||||
|  | ||||
| @ -24,6 +24,8 @@ | ||||
|     KnxFacade<Esp32Platform, Bau57B0> knx; | ||||
| #elif ARDUINO_ARCH_STM32 | ||||
|     KnxFacade<Stm32Platform, Bau57B0> knx; | ||||
|     // no predefined global instance
 | ||||
|     #define ICACHE_RAM_ATTR | ||||
| #elif __linux__ | ||||
|     // no predefined global instance
 | ||||
|     #define ICACHE_RAM_ATTR | ||||
|  | ||||
| @ -19,7 +19,6 @@ Stm32Platform::~Stm32Platform() | ||||
| 
 | ||||
| void Stm32Platform::restart() | ||||
| { | ||||
|     println("restart"); | ||||
|     NVIC_SystemReset(); | ||||
| } | ||||
| 
 | ||||
|  | ||||
| @ -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); | ||||
|  | ||||
		Loading…
	
		Reference in New Issue
	
	Block a user