USB Frames buffer add

.settings/language.settings.xml

@@ -4,7 +4,7 @@
 		<extension point="org.eclipse.cdt.core.LanguageSettingsProvider">
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
-			<provider class="com.atollic.truestudio.mbs.GCCSpecsDetectorAtollicArm" console="false" env-hash="-614481975" id="com.atollic.truestudio.mbs.provider" keep-relative-paths="false" name="Atollic ARM Tools Language Settings" parameter="${COMMAND} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="com.atollic.truestudio.mbs.GCCSpecsDetectorAtollicArm" console="false" env-hash="1766661236" id="com.atollic.truestudio.mbs.provider" keep-relative-paths="false" name="Atollic ARM Tools Language Settings" parameter="${COMMAND} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>

Src/main.c

@@ -151,6 +151,7 @@ int main(void)
   /* Infinite loop */
   /* USER CODE BEGIN WHILE */
 	while (1) {
+		slcanFlushUSBBuffer();
 		slCanCheckCommand();
 		if (canRxFlags.flags.byte != 0) {
 			slcanReciveCanFrame(hcan.pRxMsg);

Src/slcan/slcan.c

@@ -78,19 +78,52 @@ extern UART_HandleTypeDef huart2;
   * @retval None
   */
 extern USBD_HandleTypeDef hUsbDeviceFS;
+
+
+// frame buffer
+#define FRAME_BUFFER_SIZE 1024
+uint8_t frameBuffer[FRAME_BUFFER_SIZE];
+uint32_t dataToSend = 0;
+
+int slcanFlushUSBBuffer()
+{
+	if (dataToSend != 0)
+	{
+		if (CDC_Transmit_FS(frameBuffer, dataToSend) == USBD_OK)
+		{
+			dataToSend = 0;
+			return 0;
+		}
+	}
+	return -1;
+}
+
+static int addToUSBBuffer(uint8_t * pointer, uint8_t len)
+{
+	if ((dataToSend + len) >= FRAME_BUFFER_SIZE)
+		return -1; // buffer overflow
+
+	memcpy(&frameBuffer[dataToSend], pointer, len);
+	dataToSend += len;
+	return 0;
+}
+
+
+
 static void slcanOutputFlush(void)
 {
 
 
 	if (hUsbDeviceFS.dev_state != USBD_STATE_CONFIGURED) // use auxiliary uart only if usb not connected
 		HAL_UART_Transmit(&huart2,sl_frame,sl_frame_len,100); //ll todo figure out time
 	else {
-		while (CDC_Transmit_FS(sl_frame, sl_frame_len) != USBD_OK);
-		while (((USBD_CDC_HandleTypeDef*)hUsbDeviceFS.pClassData)->TxState)
-		{
-			volatile i;
-			i++;
-		}
+		addToUSBBuffer(sl_frame, sl_frame_len);
+//		while (CDC_Transmit_FS(sl_frame, sl_frame_len) != USBD_OK);
+//		while (((USBD_CDC_HandleTypeDef*)hUsbDeviceFS.pClassData)->TxState)
+//		{
+//			volatile i;
+//			i++;
+//		}
 	}
 	sl_frame_len = 0;
 }

Src/slcan/slcan.h

@@ -15,7 +15,7 @@
 
 
 #define VERSION_FIRMWARE_MAJOR 2
-#define VERSION_FIRMWARE_MINOR 1
+#define VERSION_FIRMWARE_MINOR 2
 
 #define VERSION_HARDWARE_MAJOR 1
 #define VERSION_HARDWARE_MINOR 1
@@ -32,6 +32,7 @@
 
 //ex TZ12020506
 
+int slcanFlushUSBBuffer();
 uint8_t slcanReciveCanFrame(CanRxMsgTypeDef *pRxMsg);
 int slCanProccesInput(uint8_t ch);
 void slCanCheckCommand();