Mirrors/knx
1
0
Fork 0
mirror of https://github.com/thelsing/knx.git synced 2025-06-13 01:15:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

Adding std::function support for SAMD (#113)

Browse Source
This commit is contained in:
rueckix 2020-12-09 19:45:13 +01:00 committed by GitHub
parent f3751b6ccd
commit 8405d1f47d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/knx/bits.h
View File

@ -98,4 +98,12 @@ enum ParameterFloatEncodings
Float_Enc_DPT9 = 0, // 2 Byte. See Chapter 3.7.2 section 3.10 (Datapoint Types 2-Octet Float Value) 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_IEEE754Single = 1, // 4 Byte. C++ float
Float_Enc_IEEE754Double = 2, // 8 Byte. C++ double Float_Enc_IEEE754Double = 2, // 8 Byte. C++ double
}; };
#if defined(ARDUINO_ARCH_SAMD)
// temporary undef until framework-arduino-samd > 1.8.9 is released. See https://github.com/arduino/ArduinoCore-samd/pull/399 for a PR should will probably address this
#undef max
#undef min
// end of temporary undef
#endif

2
src/knx/group_object.h
View File

@ -20,7 +20,7 @@ enum ComFlag
class GroupObject; class GroupObject;
#ifndef HAS_FUNCTIONAL #ifndef HAS_FUNCTIONAL
# if defined(__linux__) || defined(ARDUINO_ARCH_ESP32) || defined(ARDUINO_ARCH_STM32) # if defined(__linux__) || defined(ARDUINO_ARCH_ESP32) || defined(ARDUINO_ARCH_STM32) || defined (ARDUINO_ARCH_SAMD)
# define HAS_FUNCTIONAL 1 # define HAS_FUNCTIONAL 1
# else # else
# define HAS_FUNCTIONAL 0 # define HAS_FUNCTIONAL 0