From bb2587664aa8c252dd08cb37c1725c1ec496af1f Mon Sep 17 00:00:00 2001
From: Vehicle Researcher <user@comma.ai>
Date: Sat, 28 Apr 2018 09:40:29 +0000
Subject: [PATCH] Squashed 'panda/' changes from 2253dd3..9cffa74

9cffa74 bump version
988fbf5 disable autobaud by default

git-subtree-dir: panda
git-subtree-split: 9cffa74e04a9c46d728162834b80df818dde0375
---
 VERSION             | 2 +-
 board/drivers/can.h | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/VERSION b/VERSION
index 992977ad20..9cb4db99be 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-v1.1.0
\ No newline at end of file
+v1.1.1
\ No newline at end of file
diff --git a/board/drivers/can.h b/board/drivers/can.h
index dccb2b5c92..839e46392b 100644
--- a/board/drivers/can.h
+++ b/board/drivers/can.h
@@ -86,7 +86,7 @@ int can_err_cnt = 0;
   uint8_t can_num_lookup[] = {0,1,2,-1};
   int8_t can_forwarding[] = {-1,-1,-1,-1};
   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
 #else
   CAN_TypeDef *cans[] = {CAN1, CAN2};
@@ -94,7 +94,7 @@ int can_err_cnt = 0;
   uint8_t can_num_lookup[] = {1,0};
   int8_t can_forwarding[] = {-1,-1};
   uint32_t can_speed[] = {5000, 5000};
-  bool can_autobaud_enabled[] = {true, true};
+  bool can_autobaud_enabled[] = {false, false};
   #define CAN_MAX 2
 #endif