From 75618d6ce7b74abfb756973d4b1b998538f1abbc Mon Sep 17 00:00:00 2001
From: Jason Young <46612682+jyoung8607@users.noreply.github.com>
Date: Tue, 12 Nov 2019 20:19:35 -0500
Subject: [PATCH] Fixes for various merge and refactoring fallout, typo fixes.
 (#878)

* Fixes for various merge and refactoring fallout, typo fixes.

* Tab->Spaces
---
 selfdrive/can/common.pxd                  | 4 +++-
 selfdrive/can/dbc_template.cc             | 2 +-
 selfdrive/can/parser.cc                   | 7 +++----
 selfdrive/car/volkswagen/carcontroller.py | 2 +-
 selfdrive/car/volkswagen/values.py        | 7 -------
 5 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/selfdrive/can/common.pxd b/selfdrive/can/common.pxd
index 54c6e444fdfcd8..d26f8da46f6057 100644
--- a/selfdrive/can/common.pxd
+++ b/selfdrive/can/common.pxd
@@ -17,7 +17,9 @@ cdef extern from "common.h":
     HONDA_COUNTER,
     TOYOTA_CHECKSUM,
     PEDAL_CHECKSUM,
-    PEDAL_COUNTER
+    PEDAL_COUNTER,
+    VOLKSWAGEN_CHECKSUM,
+    VOLKSWAGEN_COUNTER
 
   cdef struct Signal:
     const char* name
diff --git a/selfdrive/can/dbc_template.cc b/selfdrive/can/dbc_template.cc
index d916eeada06a43..f9540fcee9af16 100644
--- a/selfdrive/can/dbc_template.cc
+++ b/selfdrive/can/dbc_template.cc
@@ -25,7 +25,7 @@ const Signal sigs_{{address}}[] = {
       .type = SignalType::HONDA_COUNTER,
       {% elif checksum_type == "toyota" and sig.name == "CHECKSUM" %}
       .type = SignalType::TOYOTA_CHECKSUM,
-	    {% elif checksum_type == "volkswagen" and sig.name == "CHECKSUM" %}
+      {% elif checksum_type == "volkswagen" and sig.name == "CHECKSUM" %}
       .type = SignalType::VOLKSWAGEN_CHECKSUM,
       {% elif checksum_type == "volkswagen" and sig.name == "COUNTER" %}
       .type = SignalType::VOLKSWAGEN_COUNTER,
diff --git a/selfdrive/can/parser.cc b/selfdrive/can/parser.cc
index 4d2dc32e2af919..e204112e3c3847 100644
--- a/selfdrive/can/parser.cc
+++ b/selfdrive/can/parser.cc
@@ -55,7 +55,6 @@ bool MessageState::parse(uint64_t sec, uint16_t ts_, uint8_t * dat) {
       }
     } else if (sig.type == SignalType::VOLKSWAGEN_COUNTER) {
         if (!update_counter_generic(tmp, sig.b2)) {
-        INFO("0x%X CHECKSUM FAIL\n", address);
         return false;
       }
     } else if (sig.type == SignalType::PEDAL_CHECKSUM) {
@@ -84,7 +83,7 @@ bool MessageState::update_counter_generic(int64_t v, int cnt_size) {
   if (((old_counter+1) & ((1 << cnt_size) -1)) != v) {
     counter_fail += 1;
     if (counter_fail > 1) {
-      INFO("%X COUNTER FAIL %d -- %d vs %d\n", address, counter_fail, old_counter, (int)v);
+      INFO("0x%X COUNTER FAIL %d -- %d vs %d\n", address, counter_fail, old_counter, (int)v);
     }
     if (counter_fail >= MAX_BAD_COUNTER) {
       return false;
@@ -125,7 +124,7 @@ CANParser::CANParser(int abus, const std::string& dbc_name,
       }
     }
     if (!msg) {
-      fprintf(stderr, "CANParser: could not find message 0x%X in dnc %s\n", op.address, dbc_name.c_str());
+      fprintf(stderr, "CANParser: could not find message 0x%X in DBC %s\n", op.address, dbc_name.c_str());
       assert(false);
     }
 
@@ -193,7 +192,7 @@ void CANParser::UpdateValid(uint64_t sec) {
     const auto& state = kv.second;
     if (state.check_threshold > 0 && (sec - state.seen) > state.check_threshold) {
       if (state.seen > 0) {
-        DEBUG("%X TIMEOUT\n", state.address);
+        DEBUG("0x%X TIMEOUT\n", state.address);
       }
       can_valid = false;
     }
diff --git a/selfdrive/car/volkswagen/carcontroller.py b/selfdrive/car/volkswagen/carcontroller.py
index 4ec662dce4c6bf..c17b5f60a170ea 100644
--- a/selfdrive/car/volkswagen/carcontroller.py
+++ b/selfdrive/car/volkswagen/carcontroller.py
@@ -181,7 +181,7 @@ def update(self, enabled, CS, frame, actuators, visual_alert, audible_alert, lef
         idx = (CS.graMsgBusCounter + 1) % 16
         can_sends.append(volkswagencan.create_mqb_acc_buttons_control(self.packer_gw, canbus.extended, self.graButtonStatesToSend, CS, idx))
         self.graMsgSentCount += 1
-        if self.graMsgSentCount >= 16:
+        if self.graMsgSentCount >= P.GRA_VBP_COUNT:
           self.graButtonStatesToSend = None
           self.graMsgSentCount = 0
 
diff --git a/selfdrive/car/volkswagen/values.py b/selfdrive/car/volkswagen/values.py
index 6a1106076c384f..045e03ae33c89a 100644
--- a/selfdrive/car/volkswagen/values.py
+++ b/selfdrive/car/volkswagen/values.py
@@ -51,13 +51,6 @@ class CAR:
   }],
 }
 
-class ECU:
-  CAM = 0
-
-ECU_FINGERPRINT = {
-  ECU.CAM: [294, 919],                    # HCA_01 Heading Control Assist, LDW_02 Lane Departure Warning
-}
-
 DBC = {
   CAR.GOLF: dbc_dict('vw_mqb_2010', None),
 }