Merge remote-tracking branch 'origin/dev' into ft_https

This commit is contained in:
proddy
2021-05-02 22:17:06 +02:00
12 changed files with 109 additions and 16 deletions

View File

@@ -349,6 +349,7 @@ class EMSdevice {
static constexpr uint8_t EMS_DEVICE_FLAG_RC300 = 8;
static constexpr uint8_t EMS_DEVICE_FLAG_RC100 = 9;
static constexpr uint8_t EMS_DEVICE_FLAG_JUNKERS = 10;
static constexpr uint8_t EMS_DEVICE_FLAG_CRF = 11; // CRF200 only monitor
void reserve_device_values(uint8_t elements) {
devicevalues_.reserve(elements);