diff --git a/src/hoverboard-esc-serial-comm.cpp b/src/hoverboard-esc-serial-comm.cpp index e5fa96e..0df9b9c 100644 --- a/src/hoverboard-esc-serial-comm.cpp +++ b/src/hoverboard-esc-serial-comm.cpp @@ -1,7 +1,6 @@ #include "hoverboard-esc-serial-comm.h" - ESCSerialComm::ESCSerialComm(HardwareSerial &_serialRef) { //constructor serialRef=&_serialRef; wheelcircumference=0.5278; //8.4cm radius -> 0.084m*2*Pi @@ -193,20 +192,22 @@ void ESCSerialComm::updateMotorparams(unsigned long loopmillis) { } -int sort_desc(const void *cmp1, const void *cmp2) //compare function for qsort + +int _sort_desc(const void *cmp1, const void *cmp2) //compare function for qsort { float a = *((float *)cmp1); float b = *((float *)cmp2); return a > b ? -1 : (a < b ? 1 : 0); } -float filterMedian(int16_t* values) { + +float ESCSerialComm::filterMedian(int16_t* values) { float copied_values[CURRENT_FILTER_SIZE]; for(int i=0;i - -int sort_desc(const void *cmp1, const void *cmp2); -float filterMedian(int16_t* values); +int _sort_desc(const void *cmp1, const void *cmp2); #define SERIAL_CONTROL_BAUD 115200 // [-] Baud rate for HoverSerial (used to communicate with the hoverboard) #define START_FRAME 0xABCD // [-] Start frme definition for reliable serial communication @@ -105,7 +103,9 @@ class ESCSerialComm float getMaxcurR(); unsigned long getFeedbackInterval(); //get time from last received feedback - unsigned long getTripTime(unsigned long loopmillis) ; + unsigned long getTripTime(unsigned long loopmillis); + + bool getControllerConnected(); void resetStatistics(); @@ -156,6 +156,9 @@ class ESCSerialComm void SendSerial(int16_t uSpeedLeft, int16_t uSpeedRight); bool ReceiveSerial(); + + + float filterMedian(int16_t* values); }; #endif