From dbf5d7f6d38f9e30f861a83200c24575b3935078 Mon Sep 17 00:00:00 2001
From: rusefillc <sdfsdfqsf2334234234>
Date: Sun, 19 Dec 2021 13:23:37 -0500
Subject: [PATCH] BMW CAN

---
 firmware/controllers/can/can_bmw.h    | 43 +++++++++++++++++++++++++++
 firmware/controllers/can/can_dash.cpp | 16 +---------
 2 files changed, 44 insertions(+), 15 deletions(-)
 create mode 100644 firmware/controllers/can/can_bmw.h

diff --git a/firmware/controllers/can/can_bmw.h b/firmware/controllers/can/can_bmw.h
new file mode 100644
index 0000000000..97765ea235
--- /dev/null
+++ b/firmware/controllers/can/can_bmw.h
@@ -0,0 +1,43 @@
+/*
+ * can_bmw.h
+ *
+ *  Created on: Dec 19, 2021
+ * @author Andrey Belomutskiy, (c) 2012-2021
+ */
+
+#pragma once
+
+/**
+ * e46 data is from http://forums.bimmerforums.com/forum/showthread.php?1887229
+ *
+ * Same for Mini Cooper? http://vehicle-reverse-engineering.wikia.com/wiki/MINI
+ *
+ * All the below packets are using 500kb/s
+ *
+ * for verbose use "set debug_mode 26" command in console
+ *
+ */
+#define CAN_BMW_E46_SPEED             0x153
+#define CAN_BMW_E46_RPM               0x316
+#define CAN_BMW_E46_DME2              0x329
+#define CAN_BMW_E46_CLUSTER_STATUS    0x613
+#define CAN_BMW_E46_CLUSTER_STATUS_2  0x615
+
+#define CAN_BMW_E90_TORQUE_BRAKE      0x0A8
+// 10ms period
+#define CAN_BMW_E90_TORQUE_2          0x0A9
+// 10ms period
+#define CAN_BMW_E90_RPM_THROTTLE      0x0AA
+// 20ms period
+#define CAN_BMW_E90_TORQUE_DEMAND     0x0B6
+
+#define CAN_BMW_E90_STEERING_WHEEL    0x0C4
+#define CAN_BMW_E90_WHEEL_SPEEDS      0x0CE
+// Terminal Status, 100ms period
+#define CAN_BMW_E90_IGNITION_KEY      0x130
+
+#define CAN_BMW_E90_BRAKING           0x19E
+// Engine data
+#define CAN_BMW_E90_COOLANT           0x1D0
+
+//#define CAN_BMW_E90_HAND_BRAKE        0x34F
diff --git a/firmware/controllers/can/can_dash.cpp b/firmware/controllers/can/can_dash.cpp
index cc01d87b0b..caa63ea377 100644
--- a/firmware/controllers/can/can_dash.cpp
+++ b/firmware/controllers/can/can_dash.cpp
@@ -12,25 +12,11 @@
 #if EFI_CAN_SUPPORT
 #include "can_dash.h"
 #include "can_msg_tx.h"
+#include "can_bmw.h"
 
 #include "rtc_helper.h"
 #include "fuel_math.h"
 // CAN Bus ID for broadcast
-/**
- * e46 data is from http://forums.bimmerforums.com/forum/showthread.php?1887229
- *
- * Same for Mini Cooper? http://vehicle-reverse-engineering.wikia.com/wiki/MINI
- *
- * All the below packets are using 500kb/s
- *
- * for verbose use "set debug_mode 26" command in console
- *
- */
-#define CAN_BMW_E46_SPEED             0x153
-#define CAN_BMW_E46_RPM               0x316
-#define CAN_BMW_E46_DME2              0x329
-#define CAN_BMW_E46_CLUSTER_STATUS    0x613
-#define CAN_BMW_E46_CLUSTER_STATUS_2  0x615
 #define CAN_FIAT_MOTOR_INFO           0x561
 #define CAN_MAZDA_RX_RPM_SPEED        0x201
 #define CAN_MAZDA_RX_STEERING_WARNING 0x300