Cleanup for release

Author: Ultrawipf

Configurator

@@ -7,13 +7,12 @@
 
 #ifndef COMMANDHANDLER_H_
 #define COMMANDHANDLER_H_
-//#include <CmdParser.h>
+
 #include "ChoosableClass.h"
 #include <set>
 #include "mutex.hpp"
 #include "ClassIDs.h"
 #include <vector>
-//#include "CommandInterface.h"
 
 
 #define CMDFLAG_GET	 	0x01
@@ -136,7 +135,7 @@ class CommandHandler {
 	virtual std::string getHelpstring(); // Returns a help string if "help" command is sent
 	virtual std::string getCommandsHelpstring(); // Returns a list of the commands helpstrings
 	virtual std::string getCsvHelpstring(); // Returns a list of the commands helpstrings formatted for csv
-	//static void sendSerial(std::string cls,std::string cmd,std::string string,uint8_t prefix = 0xFF); //!< Send a command reply formatted sequence
+
 	static void logSerial(std::string string);	//!< Send a log formatted sequence
 
 	void broadcastCommandReply(CommandReply reply, uint32_t cmdId,CMDtype type);
@@ -223,11 +222,8 @@ class CommandHandler {
 		}
 	}
 
-	//uint16_t commandHandlerID = 1; // 0 reserved for system
-
-
 	std::vector<CmdHandlerCommanddef> registeredCommands;
-	//void registerCommand(std::string cmd,uint16_t cmdid, std::string help="");
+
 	// Helper to be used with class enums
 	template<typename ID>
 	void registerCommand(const char* cmd,const ID cmdid,const char* help=nullptr,uint32_t flags = 0){
@@ -247,10 +243,6 @@ class CommandHandler {
 	}
 
 
-//	std::string clsname;
-//	uint16_t clsid;
-//	uint8_t cmdHandlerInstance=0;
-
 	CmdHandlerInfo cmdHandlerInfo;
 
 };

Firmware/FFBoard/Inc/CommandHandler.h

@@ -14,7 +14,6 @@
 #define X_AXIS_ENABLE 1
 #define Y_AXIS_ENABLE 2
 #define Z_AXIS_ENABLE 4
-//#define DEG_TO_RAD ((float)((float)M_PI / 180.0))
 #define DIRECTION_ENABLE (1 << MAX_AXIS)
 
 #define EFFECT_STATE_INACTIVE 0

Firmware/FFBoard/Src/EffectsCalculator.cpp

@@ -237,20 +237,14 @@ uint8_t const * tud_hid_descriptor_report_cb(uint8_t itf){
 
 void tud_cdc_rx_cb(uint8_t itf){
 	pulseSysLed();
-//	uint8_t buf[64];
 	if(mainclass!=nullptr){
 		mainclass->cdcRcvReady(itf);
 	}
-//		uint32_t count = tud_cdc_n_read(itf,buf, std::min<uint32_t>(mainclass->cdcFree(),sizeof(buf)));
-//		mainclass->cdcRcv((char*)buf,&count);
-//	}
 }
 
 void tud_cdc_tx_complete_cb(uint8_t itf){
-	//if(mainclass!=nullptr)
-		//mainclass->cdcFinished(itf);
-	CDCcomm::cdcFinished(itf);
 
+	CDCcomm::cdcFinished(itf);
 }
 
 

Firmware/FFBoard/Src/global_callbacks.cpp

@@ -45,7 +45,7 @@ class FFBoardMain : public ChoosableClass, public CommandHandler{
 	virtual void update();
 	virtual void cdcRcv(char* Buf, uint32_t *Len);
 	virtual void cdcRcvReady(uint8_t itf);
-	//virtual void cdcFinished(uint8_t itf); // Cdc send transfer complete
+
 	virtual void usbSuspend(); // Called on usb disconnect and suspend
 	virtual void usbResume(); // Called on usb resume
 
@@ -64,7 +64,7 @@ class FFBoardMain : public ChoosableClass, public CommandHandler{
 
 protected:
 	std::unique_ptr<USBdevice> usbdev;
-	char cdcbuf[64];
+	static char cdcbuf[]; // cdc buffer
 };
 
 

Firmware/FFBoard/UserExtensions/Inc/FFBoardMain.h

@@ -14,6 +14,8 @@
 
 ClassIdentifier FFBoardMain::info ={.name = "Basic" ,.id=0};
 
+char FFBoardMain::cdcbuf[64];
+
 
 
 FFBoardMain::FFBoardMain() : CommandHandler(CMDCLSTR_MAIN,CMDCLSID_MAIN,0), commandThread(std::make_unique<FFBoardMainCommandThread>(this)){
@@ -25,15 +27,15 @@ const ClassIdentifier FFBoardMain::getInfo(){
 }
 
 /**
- * Called by the CDC serial port when data is received
+ * Called when data is received on the CDC port
  */
 void FFBoardMain::cdcRcv(char* Buf, uint32_t *Len){
 
 	cdcCmdInterface->addBuf(Buf, Len);
 }
 
 /**
- * Called by the CDC serial port when data is received
+ * Called by the CDC serial port when data is ready
  */
 void FFBoardMain::cdcRcvReady(uint8_t itf){