Merge panda subtree

commaai · Sep 21, 2018 · 1dd61c9 · 1dd61c9
1 parent c38d9ce
commit 1dd61c9
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/panda/VERSION b/panda/VERSION
@@ -1 +1 @@
-v1.1.4
+v1.1.5
diff --git a/panda/board/safety/safety_gm.h b/panda/board/safety/safety_gm.h
@@ -8,7 +8,7 @@
 //      brake rising edge
 //      brake > 0mph
 
-const int GM_MAX_STEER = 255;
+const int GM_MAX_STEER = 300;
 const int GM_MAX_RT_DELTA = 128;          // max delta torque allowed for real time checks
 const int32_t GM_RT_INTERVAL = 250000;    // 250ms between real time checks
 const int GM_MAX_RATE_UP = 7;

diff --git a/panda/tests/safety/test_gm.py b/panda/tests/safety/test_gm.py
@@ -5,7 +5,7 @@
 
 MAX_RATE_UP = 7
 MAX_RATE_DOWN = 17
-MAX_STEER = 255
+MAX_STEER = 300
 MAX_BRAKE = 350
 MAX_GAS = 3072
 MAX_REGEN = 1404