Added CAN closing on VCOM closing

UsbCANConverter-UCCbasic · Apr 27, 2017 · bf37f1a · bf37f1a
1 parent 7040fcd
commit bf37f1a
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 3 deletions.
diff --git a/.settings/language.settings.xml b/.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="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">
+			<provider class="com.atollic.truestudio.mbs.GCCSpecsDetectorAtollicArm" console="false" env-hash="845081914" 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>

diff --git a/Src/slcan/slcan.c b/Src/slcan/slcan.c
@@ -85,6 +85,14 @@ extern USBD_HandleTypeDef hUsbDeviceFS;
 uint8_t frameBuffer[FRAME_BUFFER_SIZE];
 uint32_t dataToSend = 0;
 
+void slcanClose()
+{
+	HAL_NVIC_DisableIRQ(CEC_CAN_IRQn);
+	dataToSend = 0;
+//            	todo into slleep
+	state = STATE_CONFIG;
+}
+
 int slcanFlushUSBBuffer()
 {
 	if (dataToSend != 0)
@@ -352,6 +360,7 @@ void slCanCheckCommand()
 //            if (state != STATE_CONFIG)
             {
             	HAL_NVIC_DisableIRQ(CEC_CAN_IRQn);
+            	dataToSend = 0;
 //            	todo into slleep
                 state = STATE_CONFIG;
                 result = terminator;

diff --git a/Src/slcan/slcan.h b/Src/slcan/slcan.h
@@ -32,6 +32,7 @@
 
 //ex TZ12020506
 
+void slcanClose();
 int slcanFlushUSBBuffer();
 uint8_t slcanReciveCanFrame(CanRxMsgTypeDef *pRxMsg);
 int slCanProccesInput(uint8_t ch);

diff --git a/Src/usbd_cdc_if.c b/Src/usbd_cdc_if.c
@@ -178,6 +178,7 @@ static int8_t CDC_DeInit_FS(void)
   * @param  length: Number of data to be sent (in bytes)
   * @retval Result of the operation: USBD_OK if all operations are OK else USBD_FAIL
   */
+
 static int8_t CDC_Control_FS  (uint8_t cmd, uint8_t* pbuf, uint16_t length)
 { 
   /* USER CODE BEGIN 5 */
@@ -229,11 +230,11 @@ static int8_t CDC_Control_FS  (uint8_t cmd, uint8_t* pbuf, uint16_t length)
     break;
 
   case CDC_SET_CONTROL_LINE_STATE:
-
+	  slcanClose();//ll
     break;
 
   case CDC_SEND_BREAK:
- 
+
     break;    
 
   default: