Added send and receive buffer clearing timeouts for CDC command

interface

Author: Ultrawipf

Firmware/FFBoard/Inc/CDCcomm.h

@@ -18,6 +18,7 @@ class CDCcomm {
 	static uint16_t cdcSend(std::string* reply,uint8_t itf);
 	static void cdcFinished(uint8_t itf = 0);
 	static uint32_t remainingData(uint8_t itf = 0);
+	static void clearRemainingBuffer(uint8_t itf = 0);
 
 private:
 	static bool usb_busy_retry;

Firmware/FFBoard/Inc/CommandInterface.h

@@ -74,6 +74,7 @@ class CDC_CommandInterface : public StringCommandInterface,public cpp_freertos::
 
 private:
 	bool enableBroadcastFromOtherInterfaces = true;
+	uint32_t lastSendTime = 0;
 	const uint32_t parserTimeout = 2000;
 	//cpp_freertos::BinarySemaphore sendSem;
 	std::vector<CommandResult> resultsBuffer;

Firmware/FFBoard/Src/CDCcomm.cpp

@@ -38,10 +38,20 @@ void CDCcomm::cdcFinished(uint8_t itf){
 	}
 }
 
+/**
+ * Checks if data is remaining in a buffer to be sent
+ */
 uint32_t CDCcomm::remainingData(uint8_t itf){
 	return CDCcomm::remainingStrs[itf].size();
 }
 
+/**
+ * Clears a buffer
+ */
+void CDCcomm::clearRemainingBuffer(uint8_t itf){
+	CDCcomm::remainingStrs[itf].clear();
+}
+
 /**
  * Sends a string via CDC
  * If not everything can be sent it will be buffered for later in a new string

Firmware/FFBoard/Src/CmdParser.cpp

@@ -35,7 +35,9 @@ bool CmdParser::add(char* Buf, uint32_t *Len){
 
 		}
 	}
-
+	if(clearBufferTimeout && HAL_GetTick() - lastAddTime > clearBufferTimeout ){
+		this->buffer.clear();
+	}
 	lastAddTime = HAL_GetTick();
 	this->buffer.append((char*)Buf,*Len);
 	return flag;
@@ -51,6 +53,9 @@ void CmdParser::setClearBufferTimeout(uint32_t timeout){
 }
 
 int32_t CmdParser::bufferCapacity(){
+	if(lastAddTime > clearBufferTimeout){
+		return bufferMaxCapacity;
+	}
 	return std::max<int32_t>(bufferMaxCapacity - buffer.size(),0);
 }
 

Firmware/FFBoard/Src/CommandInterface.cpp

@@ -250,19 +250,16 @@ void CDC_CommandInterface::Run(){
 
 
 void CDC_CommandInterface::sendReplies(const std::vector<CommandResult>& results,CommandInterface* originalInterface){
-//	if( (!enableBroadcastFromOtherInterfaces && originalInterface != this) ){
-//		return;
-//	}
-//
-//	replystr.reserve(100);
-//	StringCommandInterface::formatReply(replystr,results, originalInterface != this && originalInterface != nullptr);
-//	if(!replystr.empty())
-//		CDCcomm::cdcSend(&replystr, 0);
+
+	if(HAL_GetTick() - lastSendTime > parserTimeout){
+		resultsBuffer.clear(); // Empty buffer because we were not able to reply in time to prevent the full buffer from blocking future commands
+		//CDCcomm::clearRemainingBuffer(0);
+	}
 
 	if( (!enableBroadcastFromOtherInterfaces && originalInterface != this) ){
 		return;
 	}
-
+	lastSendTime = HAL_GetTick();
 	resultsBuffer.assign(results.begin(), results.end());
 	resultsBuffer.shrink_to_fit();
 	nextFormat = originalInterface != this && originalInterface != nullptr;
@@ -273,6 +270,9 @@ void CDC_CommandInterface::sendReplies(const std::vector<CommandResult>& results
  * Ready to send if there is no data in the backup buffer of the cdc port
  */
 bool CDC_CommandInterface::readyToSend(){
+	if(HAL_GetTick() - lastSendTime > parserTimeout && CDCcomm::remainingData(0) == 0){
+		return true;
+	}
 	return CDCcomm::remainingData(0) == 0 && resultsBuffer.empty();
 }