Browse Source

dataframe length as uint16

Juraj Ďuďák 8 months ago
parent
commit
81ace4870e
2 changed files with 10 additions and 10 deletions
  1. 4 4
      Modules/dataframe/src/dataframe.cpp
  2. 6 6
      Modules/dataframe/src/dataframe.h

+ 4 - 4
Modules/dataframe/src/dataframe.cpp

@@ -134,7 +134,7 @@ static uint8_t crc8x_fast(void const *mem, uint16_t len)
 }
 
 
-DataFrame::DataFrame(uint8_t *frame, uint8_t size, DataframeType_t type,
+DataFrame::DataFrame(uint8_t *frame, uint16_t size, DataframeType_t type,
                      DataframeCrc_t useCrc) {
   _frame = frame;
   _capacity = size;
@@ -171,7 +171,7 @@ void DataFrame::Init(void) {
   }
 }
 
-void DataFrame::FromArray(uint8_t *data, uint8_t size){
+void DataFrame::FromArray(uint8_t *data, uint16_t size){
 	memcpy(_frame, data, size);
 //	_frame = data;
 	_length = size;
@@ -215,7 +215,7 @@ bool DataFrame::AddUint32(uint32_t d) {
   return true;
 }
 
-bool DataFrame::AddArray(uint8_t *data, uint8_t length) {
+bool DataFrame::AddArray(uint8_t *data, uint16_t length) {
   if ((_length + length) >= _capacity) {
     _error = ERROR_OVERFLOW;
     return false;
@@ -331,7 +331,7 @@ void DataFrame::AddHeader(DataframeType_t type){
 	  _frame[_length++] = HEADER_CHAR2;
   }
 }
-uint8_t DataFrame::GetLength(void){
+uint16_t DataFrame::GetLength(void){
 	return _length;
 }
 

+ 6 - 6
Modules/dataframe/src/dataframe.h

@@ -60,8 +60,8 @@ class DataFrame {
 
 private:
   uint8_t *_frame;
-  uint8_t _length;
-  uint8_t _capacity;
+  uint16_t _length;
+  uint16_t _capacity;
   DataframeType_t _type;
   DataframeCrc_t _crcUse;
   DataframeError_t _error;
@@ -73,7 +73,7 @@ public:
    * @param frame pointer to existing byte array
    * @param size size of buffer `frame`
    */
-  DataFrame(uint8_t *frame, uint8_t size, DataframeType_t type, DataframeCrc_t);
+  DataFrame(uint8_t *frame, uint16_t size, DataframeType_t type, DataframeCrc_t);
   /**
    * @brief Initialize packet
    * - set the header of packet
@@ -101,7 +101,7 @@ public:
    */
   bool AddUint32(uint32_t);
 
-  bool AddArray(uint8_t *data, uint8_t length);
+  bool AddArray(uint8_t *data, uint16_t length);
 
   /**
    * @brief add one byte signed variable to data frame
@@ -153,11 +153,11 @@ public:
    */
   DataframeError_t getError(void);
 
-  uint8_t GetLength(void);
+  uint16_t GetLength(void);
 
   bool IsEmpty(void);
 
-  void FromArray(uint8_t *data, uint8_t size);
+  void FromArray(uint8_t *data, uint16_t size);
   void AddHeader(DataframeType_t type);
 
 };