LIN monitor rx fix

uCAN-LIN · Nov 6, 2018 · 061c653 · 061c653
1 parent d228458
commit 061c653
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 9 deletions.
diff --git a/embedded/Src/lin_slcan.h b/embedded/Src/lin_slcan.h
@@ -13,5 +13,4 @@ uint8_t addLinMasterRow(uint8_t* line);
 void lin_slcan_rx(l_u8 rx_byte);
 void lin_slcan_rx_timeout_handler();
 void lin_slcan_skip_header_reception(uint8_t pid);
-void lin_slcan_reset(void);
 #endif /* LIN_SLCAN_H_ */
diff --git a/embedded/Src/slcan.c b/embedded/Src/slcan.c
@@ -163,14 +163,10 @@ static uint8_t transmitStd(uint8_t* line) {
     if (lin_data)
     {
     	open_lin_master_data_tx_data(&slot);
-    	/* reset data reception state machine */
-    	open_lin_hw_reset();
-    	lin_slcan_reset();
-    } else
-    {
-    	/* set data reception state machine */
-    	lin_slcan_skip_header_reception(slot.pid);
     }
+    /* set data recepcion state machine */
+	lin_slcan_skip_header_reception(slot.pid);
+
     return 1;
 }
 
@@ -246,6 +242,8 @@ void slCanCheckCommand()
 				result = terminator;
                 lin_type = LIN_SLAVE;
                 slcan_state = SLCAN_STATE_OPEN;
+            	open_lin_hw_reset();
+            	lin_slcan_reset();
             }
             break;
 

diff --git a/embedded/Src/slcan.h b/embedded/Src/slcan.h
@@ -10,7 +10,7 @@
 #include "open_lin_hw.h"
 
 #define VERSION_FIRMWARE_MAJOR 0
-#define VERSION_FIRMWARE_MINOR 1
+#define VERSION_FIRMWARE_MINOR 2
 
 #define VERSION_HARDWARE_MAJOR 0
 #define VERSION_HARDWARE_MINOR 1