Skip to content
Snippets Groups Projects
Commit b53b9402 authored by nrs1g15's avatar nrs1g15
Browse files

Added sd saving to sen 1 and sen 2

parent 860f544c
No related branches found
No related tags found
No related merge requests found
...@@ -3,6 +3,8 @@ ...@@ -3,6 +3,8 @@
// //
#include "evoScann-p.h" #include "evoScann-p.h"
#include "daq.h"
#include "sd.h"
void evoScannMux0(CanMsgTemplate *canMsg); void evoScannMux0(CanMsgTemplate *canMsg);
void evoScannMux1(CanMsgTemplate *canMsg); void evoScannMux1(CanMsgTemplate *canMsg);
...@@ -12,12 +14,22 @@ void (*evoScannFunc_ptrs[3])(CanMsgTemplate *) = {evoScannMux0, evoScannMux1, ev ...@@ -12,12 +14,22 @@ void (*evoScannFunc_ptrs[3])(CanMsgTemplate *) = {evoScannMux0, evoScannMux1, ev
void evoScannMux0(CanMsgTemplate *canMsg) void evoScannMux0(CanMsgTemplate *canMsg)
{ {
DaqEvoScannPressureFormat daqEvoScannPressureFormat;
#if EVO_SCANN_SEN_1_ENABLED #if EVO_SCANN_SEN_1_ENABLED
uint16_t sen1Raw = (canMsg->data[1] << 8) | canMsg->data[2]; uint16_t sen1Raw = (canMsg->data[1] << 8) | canMsg->data[2];
int sen1 = (sen1Raw + 60000); int sen1 = (sen1Raw + 60000);
// Serial.print("S1 "); // Serial.print("S1 ");
// Serial.println(sen1); // Serial.println(sen1);
daqEvoScannPressureFormat.startTag = daqEvoScannPressSensToTag[0];
daqEvoScannPressureFormat.timestamp = canMsg->timestamp;
daqEvoScannPressureFormat.data = sen1;
daqEvoScannPressureFormat.endTag = daqEvoScannPressSensToTag[0];
sdWrite(&daqEvoScannPressureFormat, sizeof(DaqEvoScannPressureFormat));
#endif // EVO_SCANN_SEN_1_ENABLED #endif // EVO_SCANN_SEN_1_ENABLED
#if EVO_SCANN_SEN_2_ENABLED #if EVO_SCANN_SEN_2_ENABLED
...@@ -26,6 +38,14 @@ void evoScannMux0(CanMsgTemplate *canMsg) ...@@ -26,6 +38,14 @@ void evoScannMux0(CanMsgTemplate *canMsg)
// Serial.print("S2 "); // Serial.print("S2 ");
// Serial.println(sen2); // Serial.println(sen2);
daqEvoScannPressureFormat.startTag = daqEvoScannPressSensToTag[1];
daqEvoScannPressureFormat.timestamp = canMsg->timestamp;
daqEvoScannPressureFormat.data = sen2;
daqEvoScannPressureFormat.endTag = daqEvoScannPressSensToTag[1];
sdWrite(&daqEvoScannPressureFormat, sizeof(DaqEvoScannPressureFormat));
#endif // EVO_SCANN_SEN_2_ENABLED #endif // EVO_SCANN_SEN_2_ENABLED
#if EVO_SCANN_SEN_3_ENABLED #if EVO_SCANN_SEN_3_ENABLED
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment