Fix ESP32 Matter support

This commit is contained in:
Theo Arends 2023-06-26 12:38:29 +02:00
parent d9a66547aa
commit 0930bbddf5
3 changed files with 27 additions and 29 deletions

View File

@ -778,5 +778,31 @@
#endif // FIRMWARE_TASMOTA32
/*********************************************************************************************\
* Post-process compile options for Matter
\*********************************************************************************************/
#ifdef USE_MATTER_DEVICE
#undef USE_DISCOVERY
#define USE_DISCOVERY
// Enable all the crypto required by Matter
#undef USE_BERRY_CRYPTO_EC_P256
#define USE_BERRY_CRYPTO_EC_P256
#undef USE_BERRY_CRYPTO_HMAC_SHA256
#define USE_BERRY_CRYPTO_HMAC_SHA256
#undef USE_BERRY_CRYPTO_HKDF_SHA256
#define USE_BERRY_CRYPTO_HKDF_SHA256
#undef USE_BERRY_CRYPTO_AES_CCM
#define USE_BERRY_CRYPTO_AES_CCM
#undef USE_BERRY_CRYPTO_AES_CTR
#define USE_BERRY_CRYPTO_AES_CTR
#undef USE_BERRY_CRYPTO_PBKDF2_HMAC_SHA256
#define USE_BERRY_CRYPTO_PBKDF2_HMAC_SHA256
#undef USE_BERRY_CRYPTO_SPAKE2P_MATTER
#define USE_BERRY_CRYPTO_SPAKE2P_MATTER
#endif // USE_MATTER_DEVICE
#endif // ESP32
#endif // _TASMOTA_CONFIGURATIONS_ESP32_H_

View File

@ -285,7 +285,7 @@ String EthernetMacAddress(void);
#ifndef MQTT_CLEAN_SESSION
#define MQTT_CLEAN_SESSION 1 // 0 = No clean session, 1 = Clean session (default)
#endif
#ifndef MQTT_DISABLE_SSERIALRECEIVED
#ifndef MQTT_DISABLE_SSERIALRECEIVED
#define MQTT_DISABLE_SSERIALRECEIVED 0 // 1 = Disable sserialreceived mqtt messages, 0 = Enable sserialreceived mqtt messages (default)
#endif
#ifndef MQTT_LWT_OFFLINE

View File

@ -1292,34 +1292,6 @@
#define USE_TLS // flag indicates we need to include TLS code
#endif
/*********************************************************************************************\
* Post-process compile options for Matter
\*********************************************************************************************/
#ifdef ESP32
#ifdef USE_MATTER_DEVICE
#undef USE_DISCOVERY
#define USE_DISCOVERY
// Enable all the crypto required by Matter
#undef USE_BERRY_CRYPTO_EC_P256
#define USE_BERRY_CRYPTO_EC_P256
#undef USE_BERRY_CRYPTO_HMAC_SHA256
#define USE_BERRY_CRYPTO_HMAC_SHA256
#undef USE_BERRY_CRYPTO_HKDF_SHA256
#define USE_BERRY_CRYPTO_HKDF_SHA256
#undef USE_BERRY_CRYPTO_AES_CCM
#define USE_BERRY_CRYPTO_AES_CCM
#undef USE_BERRY_CRYPTO_AES_CTR
#define USE_BERRY_CRYPTO_AES_CTR
#undef USE_BERRY_CRYPTO_PBKDF2_HMAC_SHA256
#define USE_BERRY_CRYPTO_PBKDF2_HMAC_SHA256
#undef USE_BERRY_CRYPTO_SPAKE2P_MATTER
#define USE_BERRY_CRYPTO_SPAKE2P_MATTER
#endif // USE_MATTER_DEVICE
#endif
/*********************************************************************************************\
* Post-process stack size adjustment
\*********************************************************************************************/