mohr/fsfw
1
0
Fork 0
forked from fsfw/fsfw
Code Pull Requests Activity

Merge remote-tracking branch 'upstream/mohr_serialize' into mueller_merge_mohr_serialize

Browse Source
This commit is contained in:
Robin Müller
2020-07-01 13:15:58 +02:00
parent 837fecf859 6553450b4b
commit 6802ff7d71
50 changed files with 705 additions and 791 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
power/PowerComponent.h
View File

@ -20,12 +20,21 @@ public:
float getMax();
ReturnValue_t serialize(uint8_t** buffer, size_t* size,
<<<<<<< HEAD
const size_t max_size, bool bigEndian) const;
size_t getSerializedSize() const;
ReturnValue_t deSerialize(const uint8_t** buffer, size_t* size,
bool bigEndian);
=======
size_t maxSize, Endianness streamEndianness) const override;
size_t getSerializedSize() const override;
ReturnValue_t deSerialize(const uint8_t** buffer, size_t* size,
Endianness streamEndianness) override;
>>>>>>> upstream/mohr_serialize
ReturnValue_t getParameter(uint8_t domainId, uint16_t parameterId,
ParameterWrapper *parameterWrapper,