Repackage CRSFSerial better for external inclusion

robomaniac · Jan 11, 2022 · 1b33aad · 1b33aad
1 parent 2bb941a
commit 1b33aad
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 6 deletions.
diff --git a/lib/CrsfSerial/CrsfSerial.cpp b/lib/CrsfSerial/CrsfSerial.cpp
@@ -1,5 +1,4 @@
 #include "CrsfSerial.h"
-#include <util.h>
 
 // static void hexdump(void *p, size_t len)
 // {
@@ -63,7 +62,7 @@ void CrsfSerial::handleSerialIn()
         _rxBuf[_rxBufPos++] = b;
         handleByteReceived();
 
-        if (_rxBufPos == COUNT_OF(_rxBuf))
+        if (_rxBufPos == (sizeof(_rxBuf)/sizeof(_rxBuf[0])))
         {
             // Packet buffer filled and no valid packet found, dump the whole thing
             _rxBufPos = 0;

diff --git a/lib/CrsfSerial/CrsfSerial.h b/lib/CrsfSerial/CrsfSerial.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <Arduino.h>
+#include <functional>
 #include <crc8.h>
 #include "crsf_protocol.h"
 

diff --git a/lib/common/util.h b/lib/common/util.h