From 0c2aa4784704e5bb7cfecc9b4b312279c470bc9a Mon Sep 17 00:00:00 2001
From: mvgalen <marijnvangalen@gmail.com>
Date: Mon, 13 Jan 2025 21:57:27 +0100
Subject: [PATCH] Fix code formatting

---
 Software/src/battery/MEB-BATTERY.cpp          |  4 +--
 Software/src/communication/can/obd.cpp        | 34 ++++++++-----------
 .../webserver/advanced_battery_html.cpp       | 32 +++++++++--------
 3 files changed, 34 insertions(+), 36 deletions(-)

diff --git a/Software/src/battery/MEB-BATTERY.cpp b/Software/src/battery/MEB-BATTERY.cpp
index f1b65028..24b06113 100644
--- a/Software/src/battery/MEB-BATTERY.cpp
+++ b/Software/src/battery/MEB-BATTERY.cpp
@@ -546,7 +546,7 @@ void update_values_battery() {  //This function maps all the values fetched via
 
   datalayer.battery.status.voltage_dV = BMS_voltage * 2.5;  // *0.25*10
 
-  datalayer.battery.status.current_dA = (BMS_current - 16300); // 0.1 * 10
+  datalayer.battery.status.current_dA = (BMS_current - 16300);  // 0.1 * 10
 
   datalayer.battery.info.total_capacity_Wh =
       ((float)datalayer.battery.info.number_of_cells) * 3.6458 * ((float)BMS_capacity_ah) * 0.2;
@@ -1601,7 +1601,7 @@ void transmit_can_battery() {
         logging.printf("MEB Requesting HV\n");
       }
       MEB_503.data.u8[1] = 
-          0x30 | (datalayer.battery.status.bms_status == ACTIVE ? 0x00 : 0x80); // Disable precharing if ACTIVE
+          0x30 | (datalayer.battery.status.bms_status == ACTIVE ? 0x00 : 0x80);  // Disable precharing if ACTIVE
       MEB_503.data.u8[3] = BMS_TARGET_HV_ON;  //TODO, should we try AC_2 or DC charging?
       MEB_503.data.u8[5] = 0x82;              // Bordnetz Active
       MEB_503.data.u8[6] = 0xE0;              // Request emergency shutdown HV system == 0, false
diff --git a/Software/src/communication/can/obd.cpp b/Software/src/communication/can/obd.cpp
index 4acb3e81..34f3b83a 100644
--- a/Software/src/communication/can/obd.cpp
+++ b/Software/src/communication/can/obd.cpp
@@ -108,40 +108,36 @@ void handle_obd_frame(CAN_frame& rx_frame) {
   dump_can_frame(rx_frame, MSG_RX);
 }
 
-void transmit_obd_can_frame(unsigned int address, int interface){
-  static CAN_frame OBD_frame = {.FD = true,
-                        .ext_ID = false,
-                        .DLC = 8,
-                        .ID = 0x700,
-                        .data = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}};
+void transmit_obd_can_frame(unsigned int address, int interface) {
+  static CAN_frame OBD_frame;
   OBD_frame.ID = address;
   OBD_frame.ext_ID = address > 0x7FF;
   OBD_frame.DLC = 8;
-  OBD_frame.data.u8[0]=0x01;
-  OBD_frame.data.u8[1]=0x03;
-  OBD_frame.data.u8[2]=0xAA;
-  OBD_frame.data.u8[3]=0xAA;
-  OBD_frame.data.u8[4]=0xAA;
-  OBD_frame.data.u8[5]=0xAA;
-  OBD_frame.data.u8[6]=0xAA;
-  OBD_frame.data.u8[7]=0xAA;
+  OBD_frame.data.u8[0] = 0x01;
+  OBD_frame.data.u8[1] = 0x03;
+  OBD_frame.data.u8[2] = 0xAA;
+  OBD_frame.data.u8[3] = 0xAA;
+  OBD_frame.data.u8[4] = 0xAA;
+  OBD_frame.data.u8[5] = 0xAA;
+  OBD_frame.data.u8[6] = 0xAA;
+  OBD_frame.data.u8[7] = 0xAA;
   static int cnt = 0;
   switch (cnt) {
     case 2:
       transmit_can_frame(&OBD_frame, interface);  // DTC TP-ISO
       break;
     case 3:
-      OBD_frame.data.u8[1]=0x07;
+      OBD_frame.data.u8[1] = 0x07;
       transmit_can_frame(&OBD_frame, interface);  // DTC TP-ISO
       break;
     case 4:
-      OBD_frame.data.u8[1]=0x0A;
+      OBD_frame.data.u8[1] = 0x0A;
       transmit_can_frame(&OBD_frame, interface);  // DTC TP-ISO
       break;
     case 5:
-      OBD_frame.data.u8[0]=0x02;
-      OBD_frame.data.u8[1]=0x01;
-      OBD_frame.data.u8[2]=0x1C;
+      OBD_frame.data.u8[0] = 0x02;
+      OBD_frame.data.u8[1] = 0x01;
+      OBD_frame.data.u8[2] = 0x1C;
       transmit_can_frame(&OBD_frame, interface);  // DTC TP-ISO
       break;
     }
diff --git a/Software/src/devboard/webserver/advanced_battery_html.cpp b/Software/src/devboard/webserver/advanced_battery_html.cpp
index 2d702982..010dd033 100644
--- a/Software/src/devboard/webserver/advanced_battery_html.cpp
+++ b/Software/src/devboard/webserver/advanced_battery_html.cpp
@@ -966,21 +966,23 @@ String advanced_battery_processor(const String& var) {
     content +=
         datalayer_extended.meb.battery_heating ? "<h4>Battery heating: Active!</h4>" : "<h4>Battery heating: Off</h4>";
     const char* rt_enum[] = {"No", "Error level 1", "Error level 2", "Error level 3"};
-    content += "<h4>Overcurrent: " + String(rt_enum[datalayer_extended.meb.rt_overcurrent&0x03]) + "</h4>";
-    content += "<h4>CAN fault: " + String(rt_enum[datalayer_extended.meb.rt_CAN_fault&0x03]) + "</h4>";
-    content += "<h4>Overcharged: " + String(rt_enum[datalayer_extended.meb.rt_overcharge&0x03]) + "</h4>";
-    content += "<h4>SOC too high: " + String(rt_enum[datalayer_extended.meb.rt_SOC_high&0x03]) + "</h4>";
-    content += "<h4>SOC too low: " + String(rt_enum[datalayer_extended.meb.rt_SOC_low&0x03]) + "</h4>";
-    content += "<h4>SOC jumping: " + String(rt_enum[datalayer_extended.meb.rt_SOC_jumping&0x03]) + "</h4>";
-    content += "<h4>Temp difference: " + String(rt_enum[datalayer_extended.meb.rt_temp_difference&0x03]) + "</h4>";
-    content += "<h4>Cell overtemp: " + String(rt_enum[datalayer_extended.meb.rt_cell_overtemp&0x03]) + "</h4>";
-    content += "<h4>Cell undertemp: " + String(rt_enum[datalayer_extended.meb.rt_cell_undertemp&0x03]) + "</h4>";
-    content += "<h4>Battery overvoltage: " + String(rt_enum[datalayer_extended.meb.rt_battery_overvolt&0x03]) + "</h4>";
-    content += "<h4>Battery undervoltage: " + String(rt_enum[datalayer_extended.meb.rt_battery_undervol&0x03]) + "</h4>";
-    content += "<h4>Cell overvoltage: " + String(rt_enum[datalayer_extended.meb.rt_cell_overvolt&0x03]) + "</h4>";
-    content += "<h4>Cell undervoltage: " + String(rt_enum[datalayer_extended.meb.rt_cell_undervol&0x03]) + "</h4>";
-    content += "<h4>Cell imbalance: " + String(rt_enum[datalayer_extended.meb.rt_cell_imbalance&0x03]) + "</h4>";
-    content += "<h4>Battery unathorized: " + String(rt_enum[datalayer_extended.meb.rt_battery_unathorized&0x03]) + "</h4>";
+    content += "<h4>Overcurrent: " + String(rt_enum[datalayer_extended.meb.rt_overcurrent & 0x03]) + "</h4>";
+    content += "<h4>CAN fault: " + String(rt_enum[datalayer_extended.meb.rt_CAN_fault & 0x03]) + "</h4>";
+    content += "<h4>Overcharged: " + String(rt_enum[datalayer_extended.meb.rt_overcharge & 0x03]) + "</h4>";
+    content += "<h4>SOC too high: " + String(rt_enum[datalayer_extended.meb.rt_SOC_high & 0x03]) + "</h4>";
+    content += "<h4>SOC too low: " + String(rt_enum[datalayer_extended.meb.rt_SOC_low & 0x03]) + "</h4>";
+    content += "<h4>SOC jumping: " + String(rt_enum[datalayer_extended.meb.rt_SOC_jumping & 0x03]) + "</h4>";
+    content += "<h4>Temp difference: " + String(rt_enum[datalayer_extended.meb.rt_temp_difference & 0x03]) + "</h4>";
+    content += "<h4>Cell overtemp: " + String(rt_enum[datalayer_extended.meb.rt_cell_overtemp & 0x03]) + "</h4>";
+    content += "<h4>Cell undertemp: " + String(rt_enum[datalayer_extended.meb.rt_cell_undertemp & 0x03]) + "</h4>";
+    content +=
+        "<h4>Battery overvoltage: " + String(rt_enum[datalayer_extended.meb.rt_battery_overvolt & 0x03]) + "</h4>";
+    content +=
+        "<h4>Battery undervoltage: " + String(rt_enum[datalayer_extended.meb.rt_battery_undervol & 0x03]) + "</h4>";
+    content += "<h4>Cell overvoltage: " + String(rt_enum[datalayer_extended.meb.rt_cell_overvolt & 0x03]) + "</h4>";
+    content += "<h4>Cell undervoltage: " + String(rt_enum[datalayer_extended.meb.rt_cell_undervol & 0x03]) + "</h4>";
+    content += "<h4>Cell imbalance: " + String(rt_enum[datalayer_extended.meb.rt_cell_imbalance & 0x03]) + "</h4>";
+    content += "<h4>Battery unathorized: " + String(rt_enum[datalayer_extended.meb.rt_battery_unathorized & 0x03]) + "</h4>";
 #endif  //MEB_BATTERY
 
 #ifdef RENAULT_ZOE_GEN2_BATTERY