Added support for trip computer reset

PSAVanCanBridge.vcxproj

@@ -208,6 +208,7 @@
     <ClInclude Include="src\Van\Structs\VanDashboardMileageStructs.h" />
     <ClInclude Include="src\Van\Structs\VanDashboardStructs.h" />
     <ClInclude Include="src\Van\Structs\VanDisplayPopupMessage.h" />
+    <ClInclude Include="src\Van\Structs\VanDisplayStatusStructs.h" />
     <ClInclude Include="src\Van\Structs\VanDisplayStructsV1.h" />
     <ClInclude Include="src\Van\Structs\VanDisplayStructsV2.h" />
     <ClInclude Include="src\Van\Structs\VanInstrumentClusterV1Structs.h" />
@@ -221,6 +222,7 @@
     <ClInclude Include="src\Van\VanHandlerContainer.h" />
     <ClInclude Include="src\Van\VanMessageSender.h" />
     <ClInclude Include="src\Van\VanWriterContainer.h" />
+    <ClInclude Include="src\Van\Writers\VanDisplayStatus.h" />
     <ClInclude Include="src\Van\Writers\VanMessageWriterBase.h" />
     <ClInclude Include="src\Van\Writers\VanQueryAirCon.h" />
     <ClInclude Include="src\Van\Writers\VanQueryParkingAid.h" />

PSAVanCanBridge.vcxproj.filters

@@ -370,6 +370,12 @@
     <ClInclude Include="src\Helpers\VinFlashStorage.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="src\Van\Writers\VanDisplayStatus.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\Van\Structs\VanDisplayStatusStructs.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="src\SerialPort\BluetoothSerialAbs.cpp">

src/Helpers/VanIgnitionDataToBridgeToCan.h

@@ -24,5 +24,6 @@ struct VanIgnitionDataToBridgeToCan
     uint8_t InteriorRearRightDistanceInCm = 0xFF;
     uint8_t HaveDataFromParkingAid = 0;
     uint8_t LowBeamOn = 0;
+    uint8_t TripButtonPressed = 0;
 };
 #endif

src/Van/AbstractVanMessageSender.h

@@ -1,4 +1,4 @@
-#pragma once
+#pragma once
 
 #ifndef _AbstractVanMessageSender_h
     #define _AbstractVanMessageSender_h
@@ -93,6 +93,12 @@ class AbstractVanMessageSender {
     /// <param name="index0"> Zero based index of data to be set </param>
     /// <param name="value"> Value to be set </param>
     virtual void set_value_in_channel(uint8_t channelId, uint8_t index0, uint8_t value) = 0;
+
+    /// <summary>
+    /// Disables a previously used channel
+    /// </summary>
+    /// <param name="channelId"> Channel identifier (0-14)</param>
+    virtual void disable_channel(uint8_t channelId);
 };
 
 #endif

src/Van/Handlers/VanCarStatusWithTripComputerHandler.h

@@ -57,6 +57,8 @@ class VanCarStatusWithTripComputerHandler : public AbstractVanMessageHandler {
         dataToBridge.FuelConsumption = SwapHiByteAndLoByte(packet.data.FuelConsumption.data);
         dataToBridge.FuelLeftToPump = SwapHiByteAndLoByte(packet.data.FuelLeftToPumpInKm.data);
 
+        ignitionDataToBridge.TripButtonPressed = packet.data.Field10.TripButton;
+
         //canTripInfoHandler->SetTripData(
         //    dataToBridge.Rpm,
         //    dataToBridge.Speed,

src/Van/Structs/VanCarStatusWithTripComputerStructs.h

@@ -85,6 +85,11 @@ class VanCarStatusPacketSender
     {
         return vanMessageSender->set_channel_for_reply_request_message(channelId, VAN_ID_CARSTATUS, 29, 1);
     }
+
+    void Disable(uint8_t channelId)
+    {
+        vanMessageSender->disable_channel(channelId);
+    }
 };
 #pragma endregion
 

src/Van/Structs/VanDisplayStatusStructs.h

@@ -0,0 +1,71 @@
+// VanDisplayStatusStructs.h
+#pragma once
+
+#ifndef _VanDisplayStatusStructs_h
+    #define _VanDisplayStatusStructs_h
+
+#include "../../Helpers/Serializer.h"
+#include "../AbstractVanMessageSender.h"
+
+// VANID: 5E4
+const uint16_t VAN_ID_DISPLAY_STATUS = 0x5E4;
+
+// Read left to right in documentation
+typedef struct VanDisplayStatusStruct {
+    uint8_t Byte0;
+    uint8_t Byte1;
+};
+
+typedef union VanDisplayStatusPacket {
+    VanDisplayStatusStruct data;
+    uint8_t VanDisplayStatusPacket[sizeof(VanDisplayStatusStruct)];
+};
+
+
+#pragma region Sender class
+class VanDisplayStatusPacketSender
+{
+    AbstractVanMessageSender * vanMessageSender;
+
+public:
+    VanDisplayStatusPacketSender(AbstractVanMessageSender * object)
+    {
+        vanMessageSender = object;
+    }
+
+    void SendReady(uint8_t channelId)
+    {
+        VanDisplayStatusPacket packet;
+        memset(&packet, 0, sizeof(packet));
+
+        packet.data.Byte0 = 0x20;
+        packet.data.Byte1 = 0x1E;
+
+        unsigned char *serializedPacket = Serialize<VanDisplayStatusPacket>(packet);
+        vanMessageSender->set_channel_for_transmit_message(channelId, VAN_ID_DISPLAY_STATUS, serializedPacket, sizeof(packet), 1);
+        memset(&packet, 0, 0);
+        delete[] serializedPacket;
+    }
+
+    void SendTripReset(uint8_t channelId)
+    {
+        VanDisplayStatusPacket packet;
+        memset(&packet, 0, sizeof(packet));
+
+        packet.data.Byte0 = 0xA0;
+        packet.data.Byte1 = 0x1E;
+
+        unsigned char *serializedPacket = Serialize<VanDisplayStatusPacket>(packet);
+        vanMessageSender->set_channel_for_transmit_message(channelId, VAN_ID_DISPLAY_STATUS, serializedPacket, sizeof(packet), 1);
+        memset(&packet, 0, 0);
+        delete[] serializedPacket;
+    }
+
+    void Disable(uint8_t channelId)
+    {
+        vanMessageSender->disable_channel(channelId);
+    }
+};
+#pragma endregion
+
+#endif

src/Van/VanMessageSender.h

@@ -1,4 +1,4 @@
-#pragma once
+#pragma once
 
 #ifndef _VanMessageSender_h
     #define _VanMessageSender_h
@@ -113,6 +113,11 @@ class VanMessageSender : public AbstractVanMessageSender {
     {
         VAN->set_value_in_channel(channelId, index0, value);
     }
+
+    void disable_channel(uint8_t channelId) override
+    {
+        VAN->disable_channel(channelId);
+    }
 };
 
 #endif

src/Van/VanWriterContainer.h

@@ -10,20 +10,25 @@
 #include "Writers/VanQueryTripComputer.h"
 #include "Writers/VanQueryAirCon.h"
 #include "Writers/VanQueryParkingAid.h"
+#include "Writers/VanDisplayStatus.h"
 #include "../Helpers/VanIgnitionDataToBridgeToCan.h"
 
 class VanWriterContainer {
     AbstractVanMessageSender* vanInterface;
     VanQueryTripComputer* tripComputerQuery;
     VanQueryAirCon* acQuery;
     VanQueryParkingAid* parkingAidQuery;
+    VanDisplayStatus* displayStatus;
+
+    uint8_t _sendTripDataQuery = 0;
 
     public:
 
     VanWriterContainer(AbstractVanMessageSender* VANInterface) {
         vanInterface = VANInterface;
 
         tripComputerQuery = new VanQueryTripComputer(vanInterface);
+        displayStatus = new VanDisplayStatus(vanInterface);
 
         if (QUERY_AC_STATUS)
         {
@@ -38,8 +43,22 @@ class VanWriterContainer {
 
     void Process(VanIgnitionDataToBridgeToCan ignitionData, unsigned long currentTime)
     {
-        tripComputerQuery->SetData(ignitionData.Ignition);
-        tripComputerQuery->Process(currentTime);
+        if (_sendTripDataQuery == 1)
+        {
+            displayStatus->Stop();
+
+            tripComputerQuery->SetData(ignitionData.Ignition);
+            tripComputerQuery->Process(currentTime);
+            _sendTripDataQuery = 0;
+        }
+        else
+        {
+            tripComputerQuery->Stop();
+
+            displayStatus->SetData(ignitionData.TripButtonPressed, currentTime);
+            displayStatus->Process(currentTime);
+            _sendTripDataQuery = 1;
+        }
 
         if (QUERY_AC_STATUS)
         {

src/Van/Writers/VanDisplayStatus.h

@@ -0,0 +1,70 @@
+// VanDisplayStatus.h
+#pragma once
+
+#ifndef _VanDisplayStatus_h
+    #define _VanDisplayStatus_h
+
+#include "VanMessageWriterBase.h"
+#include "../AbstractVanMessageSender.h"
+#include "../../Van/Structs/VanDisplayStatusStructs.h"
+
+class VanDisplayStatus : public VanMessageWriterBase
+{
+    const static uint16_t SEND_STATUS_INTERVAL = 420;
+    const static uint8_t  SEND_STATUS_CHANNEL = 0;
+
+    uint8_t _tripButtonState = 0;
+    uint8_t _resetTrip = 0;
+    uint8_t _resetSent = 0;
+    unsigned long _tripButtonPressedTime = 0;
+
+    VanDisplayStatusPacketSender* displayStatusSender;
+
+    virtual void InternalProcess() override
+    {
+        if (_resetTrip == 1 && _resetSent == 0)
+        {
+            displayStatusSender->SendTripReset(SEND_STATUS_CHANNEL);
+            _resetTrip = 0;
+            _resetSent = 1;
+        }
+        else
+        {
+            displayStatusSender->SendReady(SEND_STATUS_CHANNEL);
+        }
+    }
+
+    public:
+    VanDisplayStatus(AbstractVanMessageSender* vanMessageSender) : VanMessageWriterBase(vanMessageSender, SEND_STATUS_INTERVAL)
+    {
+        displayStatusSender = new VanDisplayStatusPacketSender(vanMessageSender);
+        displayStatusSender->SendReady(SEND_STATUS_CHANNEL);
+    }
+
+    void SetData(uint8_t tripButton, unsigned long currentTime)
+    {
+        if (tripButton == 1 && _tripButtonState == 0)
+        {
+            _tripButtonState = 1;
+            _tripButtonPressedTime = currentTime;
+        }
+        if (tripButton == 0 && _tripButtonState == 1)
+        {
+            _tripButtonState = 0;
+            _resetSent = 0;
+            _resetTrip = 0;
+        }
+        if (tripButton == 1 && _tripButtonState == 1 && currentTime - _tripButtonPressedTime > 2000)
+        {
+            _resetTrip = 1;
+        }
+    }
+
+    void Stop()
+    {
+        displayStatusSender->Disable(SEND_STATUS_CHANNEL);
+    }
+
+};
+
+#endif

src/Van/Writers/VanQueryTripComputer.h

@@ -37,6 +37,10 @@ class VanQueryTripComputer : public VanMessageWriterBase
         _ignition = ignition;
     }
 
+    void Stop()
+    {
+        carStatusSender->Disable(TRIP_COMPUTER_CHANNEL);
+    }
 };
 
 #endif