bros ok match bros

commaai · Jun 10, 2018 · be22522 · be22522
1 parent 55da0b6
commit be22522
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/board/drivers/can.h b/board/drivers/can.h
@@ -488,9 +488,13 @@ void bitbang_gmlan(CAN_FIFOMailBox_TypeDef *to_bang) {
      0,0,1,     // 1st byte 2-0
 
      // start CRC
-     0,1,0,0,0,0,1,1,0,0,0,0,0,
+     /*0,1,0,0,0,0,1,1,0,0,0,0,0,
      1, // bitstuff
-     0,0, // CRC field
+     0,0, // CRC field*/
+
+     // CRC from real message
+     1,1,1,0,1,1,1,0,1,0,1,0,0,1,1,1,
+
      1,  // CRC delimiter
 
      1,  // ACK

diff --git a/tests/gmbitbang/rigol.py b/tests/gmbitbang/rigol.py
@@ -18,7 +18,16 @@
 rawdata = scope.read_raw()
 data = np.frombuffer(rawdata, 'B')
 print data.shape
-plt.plot(data)
+
+s1 = data[0:600]
+s2 = data[600:]
+s1i = np.argmax(s1 > 100)
+s2i = np.argmax(s2 > 100)
+s1 = s1[s1i:]
+s2 = s2[s2i:]
+
+plt.plot(s1)
+plt.plot(s2)
 plt.show()
 #data = (data - 130.0 - voltoffset/voltscale*25) / 25 * voltscale