From e038da3b682132169590970c97e64dce6fd948cc Mon Sep 17 00:00:00 2001
From: Jason Young <jyoung8607@gmail.com>
Date: Tue, 1 Oct 2019 15:03:44 -0400
Subject: [PATCH 1/3] Add fields and states required for robust Volkswagen
 safety compliance.

* Add generic (manufacturer-independent) cruise-control button events in support of enhanced steering wheel or third stalk ACC control.
* Add generic (manufacturer-independent) gearshift position definitions for Eco and Manumatic.
* Add preEntry Event state, in support of generic (manufacturer-independent) strict safety model compliance. This is intended for later use in controlsd, to display NO_ENTRY alerts without attempting engagement.
* Update Volkswagen safety model ID from "vw" to "volkswagen" to be consistent with the existing community port.
---
 car.capnp | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/car.capnp b/car.capnp
index f162171db..f04b5917e 100644
--- a/car.capnp
+++ b/car.capnp
@@ -19,6 +19,7 @@ struct CarEvent @0x9b1657f34caf3ad3 {
   immediateDisable @6 :Bool;
   preEnable @7 :Bool;
   permanent @8 :Bool;
+  preEntry @9: Bool;
 
   enum EventName @0xbaa8c5d505f727de {
     # TODO: copy from error list
@@ -163,6 +164,8 @@ struct CarState {
     sport @5;
     low @6;
     brake @7;
+    eco @8;
+    manumatic @9;
   }
 
 
@@ -181,6 +184,11 @@ struct CarState {
       altButton1 @6;
       altButton2 @7;
       altButton3 @8;
+      setCruise @9;
+      resumeCruise @10;
+      gapAdjustCruise @11;
+      increaseCruise @12;
+      decreaseCruise @13;
     }
   }
 }
@@ -408,7 +416,7 @@ struct CarParams {
     gmPassive @12;
     mazda @13;
     nissan @14;
-    vw @15;
+    volkswagen @15;
   }
 
   enum SteerControlType {

From 0d72d54480f1631dfe233b9477ffa0151f7c6a13 Mon Sep 17 00:00:00 2001
From: Jason Young <jyoung8607@gmail.com>
Date: Wed, 2 Oct 2019 15:39:02 -0400
Subject: [PATCH 2/3] Remove the separate increase and decrease buttons.

A different approach has been discussed and agreed to.
---
 car.capnp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/car.capnp b/car.capnp
index f04b5917e..df53a1939 100644
--- a/car.capnp
+++ b/car.capnp
@@ -187,8 +187,6 @@ struct CarState {
       setCruise @9;
       resumeCruise @10;
       gapAdjustCruise @11;
-      increaseCruise @12;
-      decreaseCruise @13;
     }
   }
 }

From 15c4ecee38e28b6091d117394cf30265da6654d6 Mon Sep 17 00:00:00 2001
From: Jason Young <jyoung8607@gmail.com>
Date: Thu, 3 Oct 2019 18:32:16 -0400
Subject: [PATCH 3/3] Per conversation with Riccardo, pulling the preEntry
 thing until later.

---
 car.capnp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/car.capnp b/car.capnp
index 0807f371b..0c0d33d31 100644
--- a/car.capnp
+++ b/car.capnp
@@ -19,7 +19,6 @@ struct CarEvent @0x9b1657f34caf3ad3 {
   immediateDisable @6 :Bool;
   preEnable @7 :Bool;
   permanent @8 :Bool;
-  preEntry @9: Bool;
 
   enum EventName @0xbaa8c5d505f727de {
     # TODO: copy from error list