Mirrors/knx
1
0
Fork 0
mirror of https://github.com/thelsing/knx.git synced 2024-10-20 20:07:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix build

Browse Source
This commit is contained in:
Thomas Kunze 2020-11-18 18:39:35 +01:00
parent 9dd7aeb353
commit 24c27815cf
4 changed files with 24 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/knx/application_program_object.h
View File

@ -3,12 +3,6 @@
#include "table_object.h" #include "table_object.h"
#include "bits.h" #include "bits.h"
enum ParameterFloatEncodings
{
Float_Enc_DPT9 = 0, // 2 Byte. See Chapter 3.7.2 section 3.10 (Datapoint Types 2-Octet Float Value)
Float_Enc_IEEE754Single = 1, // 4 Byte. C++ float
Float_Enc_IEEE754Double = 2, // 8 Byte. C++ double
};
class ApplicationProgramObject : public TableObject class ApplicationProgramObject : public TableObject
{ {
public: public:

9
src/knx/bits.h
View File

@ -91,4 +91,11 @@ void sixBytesFromUInt64(uint64_t num, uint8_t* toByteArray);
uint64_t sixBytesToUInt64(uint8_t* data); uint64_t sixBytesToUInt64(uint8_t* data);
uint16_t crc16Ccitt(uint8_t* input, uint16_t length); uint16_t crc16Ccitt(uint8_t* input, uint16_t length);
uint16_t crc16Dnp(uint8_t* input, uint16_t length); uint16_t crc16Dnp(uint8_t* input, uint16_t length);
enum ParameterFloatEncodings
{
Float_Enc_DPT9 = 0, // 2 Byte. See Chapter 3.7.2 section 3.10 (Datapoint Types 2-Octet Float Value)
Float_Enc_IEEE754Single = 1, // 4 Byte. C++ float
Float_Enc_IEEE754Double = 2, // 8 Byte. C++ double
};

8
src/knx_facade.cpp
View File

@ -15,9 +15,13 @@
#endif #endif
#elif defined(ARDUINO_ARCH_ESP8266) #elif defined(ARDUINO_ARCH_ESP8266)
// predefined global instance for IP only // predefined global instance for TP or IP or TP/IP coupler
#if MASK_VERSION == 0x57B0 #if MASK_VERSION == 0x07B0
KnxFacade<EspPlatform, Bau07B0> knx;
#elif MASK_VERSION == 0x57B0
KnxFacade<EspPlatform, Bau57B0> knx; KnxFacade<EspPlatform, Bau57B0> knx;
#elif MASK_VERSION == 0x091A
KnxFacade<EspPlatform, Bau091A> knx;
#else #else
#error Mask version not supported on ARDUINO_ARCH_ESP8266 #error Mask version not supported on ARDUINO_ARCH_ESP8266
#endif #endif

31
src/knx_facade.h
View File

@ -2,43 +2,32 @@
#include "knx/bits.h" #include "knx/bits.h"
#include "knx/config.h" #include "knx/config.h"
#include "knx/bau07B0.h"
#include "knx/bau091A.h"
#include "knx/bau27B0.h"
#include "knx/bau2920.h"
#include "knx/bau57B0.h"
#ifdef ARDUINO_ARCH_SAMD #ifdef ARDUINO_ARCH_SAMD
#include "samd_platform.h" #include "samd_platform.h"
#include "knx/bau07B0.h"
#include "knx/bau27B0.h"
#include "knx/bau2920.h"
void buttonUp(); void buttonUp();
#elif defined(ARDUINO_ARCH_ESP8266) #elif defined(ARDUINO_ARCH_ESP8266)
#include "esp_platform.h" #include "esp_platform.h"
#include "knx/bau57B0.h"
void buttonUp(); void buttonUp();
#elif defined(ARDUINO_ARCH_ESP32) #elif defined(ARDUINO_ARCH_ESP32)
#define LED_BUILTIN 13 #define LED_BUILTIN 13
#include "esp32_platform.h" #include "esp32_platform.h"
#include "knx/bau07B0.h"
#include "knx/bau57B0.h"
#include "knx/bau091A.h"
void buttonUp(); void buttonUp();
#elif defined(ARDUINO_ARCH_STM32) #elif defined(ARDUINO_ARCH_STM32)
#include "stm32_platform.h" #include "stm32_platform.h"
#include "knx/bau07B0.h"
void buttonUp(); void buttonUp();
#elif __linux__ #elif __linux__
#define LED_BUILTIN 0 #define LED_BUILTIN 0
#include "linux_platform.h" #include "linux_platform.h"
#include "knx/bau57B0.h"
#include "knx/bau27B0.h"
#include "knx/bau07B0.h"
#include "knx/bau091A.h"
#include "knx/bau2920.h"
void buttonUp(); void buttonUp();
#else #else
#define LED_BUILTIN 5 // see GPIO_PinConfig gpioPinConfigs[] #define LED_BUILTIN 5 // see GPIO_PinConfig gpioPinConfigs[]
#include "cc1310_platform.h" #include "cc1310_platform.h"
#include "knx/bau27B0.h"
#include "knx/bau07B0.h"
#include "knx/bau2920.h"
extern void buttonUp(); extern void buttonUp();
#endif #endif
@ -352,13 +341,13 @@ template <class P, class B> class KnxFacade : private SaveRestore
#error "Mask version not supported on ARDUINO_ARCH_SAMD" #error "Mask version not supported on ARDUINO_ARCH_SAMD"
#endif #endif
#elif defined(ARDUINO_ARCH_ESP8266) #elif defined(ARDUINO_ARCH_ESP8266)
// predefined global instance for IP only // predefined global instance for TP or IP or TP/IP coupler
#if MASK_VERSION == 0x57B0 #if MASK_VERSION == 0x07B0
extern KnxFacade<EspPlatform, Bau07B0> knx;
#elif MASK_VERSION == 0x57B0
extern KnxFacade<EspPlatform, Bau57B0> knx; extern KnxFacade<EspPlatform, Bau57B0> knx;
#elif MASK_VERSION == 0x27B0
extern KnxFacade<SamdPlatform, Bau27B0> knx;
#elif MASK_VERSION == 0x091A #elif MASK_VERSION == 0x091A
extern KnxFacade<SamdPlatform, Bau2920> knx; extern KnxFacade<EspPlatform, Bau091A> knx;
#else #else
#error "Mask version not supported on ARDUINO_ARCH_ESP8266" #error "Mask version not supported on ARDUINO_ARCH_ESP8266"
#endif #endif