sadmen
/
openpilot_comma
mirror of https://github.com/commaai/openpilot.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge panda subtree

Browse Source
pull/236/head
Vehicle Researcher 7 years ago
parent 9a9ff839a9 bb2587664a
commit e41761eb1b
2 changed files with 3 additions and 3 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      panda/VERSION
  2. 4
      panda/board/drivers/can.h

2
panda/VERSION
Unescape View File

@ -1 +1 @@
v1.1.0 v1.1.1

4
panda/board/drivers/can.h
Unescape View File

@ -86,7 +86,7 @@ int can_err_cnt = 0;
uint8_t can_num_lookup[] = {0,1,2,-1}; uint8_t can_num_lookup[] = {0,1,2,-1};
int8_t can_forwarding[] = {-1,-1,-1,-1}; int8_t can_forwarding[] = {-1,-1,-1,-1};
uint32_t can_speed[] = {5000, 5000, 5000, 333}; uint32_t can_speed[] = {5000, 5000, 5000, 333};
bool can_autobaud_enabled[] = {true, true, true, false}; bool can_autobaud_enabled[] = {false, false, false, false};
#define CAN_MAX 3 #define CAN_MAX 3
#else #else
CAN_TypeDef *cans[] = {CAN1, CAN2}; CAN_TypeDef *cans[] = {CAN1, CAN2};
@ -94,7 +94,7 @@ int can_err_cnt = 0;
uint8_t can_num_lookup[] = {1,0}; uint8_t can_num_lookup[] = {1,0};
int8_t can_forwarding[] = {-1,-1}; int8_t can_forwarding[] = {-1,-1};
uint32_t can_speed[] = {5000, 5000}; uint32_t can_speed[] = {5000, 5000};
bool can_autobaud_enabled[] = {true, true}; bool can_autobaud_enabled[] = {false, false};
#define CAN_MAX 2 #define CAN_MAX 2
#endif #endif

Write Preview
Loading…
Cancel
Save