From 649535d4c4b98069fb9fffeeab830cb147c2a540 Mon Sep 17 00:00:00 2001 From: Julius Lipp Date: Tue, 13 Apr 2021 20:58:42 +0200 Subject: [PATCH] reduce footprint, save 5 byte --- src/knx/application_program_object.cpp | 12 +++++++----- src/knx/application_program_object.h | 3 --- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/knx/application_program_object.cpp b/src/knx/application_program_object.cpp index f27d4d6..598d0fe 100644 --- a/src/knx/application_program_object.cpp +++ b/src/knx/application_program_object.cpp @@ -31,23 +31,25 @@ ApplicationProgramObject::ApplicationProgramObject(Memory& memory) uint8_t* ApplicationProgramObject::save(uint8_t* buffer) { - property(PID_PROG_VERSION)->read(_programVersion); - buffer = pushByteArray(_programVersion, 5, buffer); + uint8_t programVersion[5]; + property(PID_PROG_VERSION)->read(programVersion); + buffer = pushByteArray(programVersion, 5, buffer); return TableObject::save(buffer); } const uint8_t* ApplicationProgramObject::restore(const uint8_t* buffer) { - buffer = popByteArray(_programVersion, 5, buffer); - property(PID_PROG_VERSION)->write(_programVersion); + uint8_t programVersion[5]; + buffer = popByteArray(programVersion, 5, buffer); + property(PID_PROG_VERSION)->write(programVersion); return TableObject::restore(buffer); } uint16_t ApplicationProgramObject::saveSize() { - return sizeof(_programVersion) + TableObject::saveSize(); + return TableObject::saveSize() + 5; // sizeof(programVersion) } uint8_t * ApplicationProgramObject::data(uint32_t addr) diff --git a/src/knx/application_program_object.h b/src/knx/application_program_object.h index 7a8dfea..c989a1c 100644 --- a/src/knx/application_program_object.h +++ b/src/knx/application_program_object.h @@ -15,7 +15,4 @@ class ApplicationProgramObject : public TableObject uint16_t getWord(uint32_t addr); uint32_t getInt(uint32_t addr); double getFloat(uint32_t addr, ParameterFloatEncodings encoding); - - private: - uint8_t _programVersion[5] = { 0, 0, 0, 0, 0}; };