From b4370a02c36c0efe78f7fa6fc348596490e75f3a Mon Sep 17 00:00:00 2001
From: nrs1g15 <nrs1g15@soton.ac.uk>
Date: Thu, 25 Jul 2019 00:05:06 +0100
Subject: [PATCH] Re-enabled sd card saving
---
sufst-controller/ecuCan.cpp | 26 +++++++++++++-------------
sufst-controller/sufst-controller.ino | 4 ++--
2 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/sufst-controller/ecuCan.cpp b/sufst-controller/ecuCan.cpp
index ab764d4..3d2acff 100644
--- a/sufst-controller/ecuCan.cpp
+++ b/sufst-controller/ecuCan.cpp
@@ -73,12 +73,12 @@ void ecuCanMsg0x2000(CanMsgTemplate *canMsg)
uint16_t waterTempC = canMsg->data16[2];
uint16_t airTempC = canMsg->data16[3];
-// ecuOpenloggerSave(canMsg, 0);
-// ecuOpenloggerSave(canMsg, 1);
-// ecuOpenloggerSave(canMsg, 2);
+ ecuOpenloggerSave(canMsg, 0);
+ ecuOpenloggerSave(canMsg, 1);
+ ecuOpenloggerSave(canMsg, 2);
- dashEcuSetRpm(rpm);
- dashEcuSetWaterTemp(waterTempC);
+ dashEcuSetRpm(rpm);
+ dashEcuSetWaterTemp(waterTempC);
}
void ecuCanMsg0x2001(CanMsgTemplate *canMsg)
@@ -101,7 +101,7 @@ void ecuCanMsg0x2001(CanMsgTemplate *canMsg)
uint16_t speedKphx10 = canMsg->data16[2];
uint16_t oilPressKpa = canMsg->data16[3];
-// ecuOpenloggerSave(canMsg, 1);
+ ecuOpenloggerSave(canMsg, 1);
}
void ecuCanMsg0x2002(CanMsgTemplate *canMsg)
@@ -124,7 +124,7 @@ void ecuCanMsg0x2002(CanMsgTemplate *canMsg)
uint16_t batteryVx10 = canMsg->data16[2];
uint16_t fuelComsumLpHrx10 = canMsg->data16[3];
-// ecuOpenloggerSave(canMsg, 2);
+ ecuOpenloggerSave(canMsg, 2);
// Serial.println((float)(batteryVx10 / 10.0));
}
@@ -149,7 +149,7 @@ void ecuCanMsg0x2003(CanMsgTemplate *canMsg)
uint16_t injectionTimeMsx100 = canMsg->data16[2];
uint16_t fuelComsumLp100kMx10 = canMsg->data16[3];
-// ecuOpenloggerSave(canMsg, 1);
+ ecuOpenloggerSave(canMsg, 1);
}
void ecuCanMsg0x2004(CanMsgTemplate *canMsg)
@@ -172,7 +172,7 @@ void ecuCanMsg0x2004(CanMsgTemplate *canMsg)
uint16_t ana3mV = canMsg->data16[2];
uint16_t camAdvanceDegx10 = canMsg->data16[3];
-// ecuOpenloggerSave(canMsg, 3);
+ ecuOpenloggerSave(canMsg, 3);
}
void ecuCanMsg0x2005(CanMsgTemplate *canMsg)
@@ -195,7 +195,7 @@ void ecuCanMsg0x2005(CanMsgTemplate *canMsg)
uint16_t crankErrorsNr = canMsg->data16[2];
uint16_t camErrorsNr = canMsg->data16[3];
-// ecuOpenloggerSave(canMsg, 0);
+ ecuOpenloggerSave(canMsg, 0);
}
void ecuCanMsg0x2006(CanMsgTemplate *canMsg)
@@ -239,9 +239,9 @@ void ecuCanMsg0x2007(CanMsgTemplate *canMsg)
uint16_t lambdaPidAdjPercx10 = canMsg->data16[2];
uint16_t ecuSwitchesBitField = canMsg->data16[3];
//
-// ecuOpenloggerSave(canMsg, 0);
-// ecuOpenloggerSave(canMsg, 1);
-// ecuOpenloggerSave(canMsg, 2);
+ ecuOpenloggerSave(canMsg, 0);
+ ecuOpenloggerSave(canMsg, 1);
+ ecuOpenloggerSave(canMsg, 2);
}
void ecuCanMsg0x2008(CanMsgTemplate *canMsg)
diff --git a/sufst-controller/sufst-controller.ino b/sufst-controller/sufst-controller.ino
index 53ba526..999c3bd 100644
--- a/sufst-controller/sufst-controller.ino
+++ b/sufst-controller/sufst-controller.ino
@@ -40,8 +40,8 @@ void loop()
*/
//wdt_reset();
- //openloggerProcess();
- //arduinoProcessSerial();
+ openloggerProcess();
+ arduinoProcessSerial();
canProcessRx();
dashControllerProcess();
//canProcessTx();
--
GitLab