Browse Source

edit codestyle

Juraj Ďuďák 2 years ago
parent
commit
f158de0a56
3 changed files with 18 additions and 6 deletions
  1. 1 1
      Doxyfile
  2. 10 0
      Makefile
  3. 7 5
      src/dataframe.cpp

+ 1 - 1
Doxyfile

@@ -38,7 +38,7 @@ PROJECT_NAME           = DataFrame
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 1.1.0
+PROJECT_NUMBER         = 1.0.0
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a

+ 10 - 0
Makefile

@@ -0,0 +1,10 @@
+.PHONY: doxy,cs,csf
+
+doxy:
+	doxygen Doxyfile
+
+cs:
+	clang-format -n ./src/*
+
+csf:
+	clang-format -i ./src/*

+ 7 - 5
src/dataframe.cpp

@@ -35,8 +35,7 @@ Detailed description of class: DataFrame
     void main(){
         uint8_t data[24];
 
-        DataFrame packet(data_packet, sizeof(data_packet), TYPE_HEADER_1B,
-CRC_ON);
+        DataFrame packet(data_packet, sizeof(data_packet), TYPE_HEADER_1B, CRC_ON);
 
         packet.AddUint8(0xAB);
         packet.AddUint16(65874);
@@ -47,8 +46,9 @@ CRC_ON);
         packet.AddFloat(0.265);
         packet.AddFloat(-3.1415);
 
-        // resulted length is 23B (20B of data, 1B breamble, 1B lenfth byte,1B
-CRC) int data_length = packet.Commit(); if (packet.getError() == ERROR_NONE) {
+        // resulted length is 23B (20B of data, 1B preamble, 1B lenfth byte,1B CRC) 
+        int data_length = packet.Commit(); 
+        if (packet.getError() == ERROR_NONE) {
             // frame[1] contain packet length. The real value is 20
             uint8_t* frame = packet.GetFrame();
         }
@@ -222,6 +222,8 @@ uint8_t DataFrame::Commit(void) {
   return _length;
 }
 
-DataframeError_t DataFrame::getError(void) { return _error; }
+DataframeError_t DataFrame::getError(void) {
+	return _error;
+}
 
 uint8_t *DataFrame::GetFrame(void) { return _frame; }