diff --git a/sufst-controller/evoScann-p.cpp b/sufst-controller/evoScann-p.cpp index 5d35bf068fa8865d1467c1dae777b622be815d4c..ee201cb20941b37708d1bfc1c1d0421251ea69ef 100644 --- a/sufst-controller/evoScann-p.cpp +++ b/sufst-controller/evoScann-p.cpp @@ -3,6 +3,8 @@ // #include "evoScann-p.h" +#include "daq.h" +#include "sd.h" void evoScannMux0(CanMsgTemplate *canMsg); void evoScannMux1(CanMsgTemplate *canMsg); @@ -12,12 +14,22 @@ void (*evoScannFunc_ptrs[3])(CanMsgTemplate *) = {evoScannMux0, evoScannMux1, ev void evoScannMux0(CanMsgTemplate *canMsg) { + DaqEvoScannPressureFormat daqEvoScannPressureFormat; + #if EVO_SCANN_SEN_1_ENABLED uint16_t sen1Raw = (canMsg->data[1] << 8) | canMsg->data[2]; int sen1 = (sen1Raw + 60000); // Serial.print("S1 "); // 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 #if EVO_SCANN_SEN_2_ENABLED @@ -26,6 +38,14 @@ void evoScannMux0(CanMsgTemplate *canMsg) // Serial.print("S2 "); // 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 #if EVO_SCANN_SEN_3_ENABLED