From bdc778c85c8ba8007835cba9ba23fe9f6d14be9d Mon Sep 17 00:00:00 2001 From: korolev Date: Fri, 7 Mar 2025 09:31:14 +0300 Subject: [PATCH] =?UTF-8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B0=20=D1=81=D1=82=D1=80=D1=83=D0=BA=D1=82=D1=83=D1=80?= =?UTF-8?q?=D0=B0=20=D0=B4=D0=B0=D0=BD=D0=BD=D1=8B=D1=85,=20=D1=85=D1=80?= =?UTF-8?q?=D0=B0=D0=BD=D1=8F=D1=89=D1=8F=D1=8F=20=D0=B8=D0=BD=D1=84=D0=BE?= =?UTF-8?q?=D1=80=D0=BC=D0=B0=D1=86=D0=B8=D1=8E=20=D0=BD=D0=B5=D0=BE=D0=B1?= =?UTF-8?q?=D1=85=D0=BE=D0=B4=D0=B8=D0=BC=D1=83=D1=8E=20=D0=B4=D0=BB=D1=8F?= =?UTF-8?q?=20=D1=80=D0=B0=D1=81=D1=87=D0=B5=D1=82=D0=B0=20=D1=80=D1=8F?= =?UTF-8?q?=D0=B4=D0=B0=20=D0=BF=D0=BE=D0=BA=D0=B0=D0=B7=D0=B0=D1=82=D0=B5?= =?UTF-8?q?=D0=BB=D0=B5=D0=B9,=20=D1=82=D0=B0=D0=BA=D0=B8=D1=85=20=D0=BA?= =?UTF-8?q?=D0=B0=D0=BA=20=D0=BC=D0=B0=D0=BD=D0=B5=D1=80=D0=B0=20=D0=B2?= =?UTF-8?q?=D0=BE=D0=B6=D0=B4=D0=B5=D0=BD=D0=B8=D1=8F=20(=D0=BA=D0=BE?= =?UTF-8?q?=D0=BB=D0=B8=D1=87=D0=B5=D1=81=D1=82=D0=B2=D0=BE=20=D1=80=D0=B5?= =?UTF-8?q?=D0=B7=D0=BA=D0=B8=D1=85=20=D1=83=D1=81=D0=BA=D0=BE=D1=80=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B9=20=D0=B8=20=D1=82=D0=BE=D1=80=D0=BC=D0=BE?= =?UTF-8?q?=D0=B6=D0=B5=D0=BD=D0=B8=D0=B9)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- EgtsProcessing.h | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/EgtsProcessing.h b/EgtsProcessing.h index 23baead..08e5520 100644 --- a/EgtsProcessing.h +++ b/EgtsProcessing.h @@ -21,6 +21,8 @@ #include "EraGlonassUveos_Dumper.h" #include "EgtsTelesataTypes.h" #include "GpioPinInterface.h" +#include "SerialPortFrameIO.h" +#include "CanMain.h" #define AURUS_CHECK_CONNECT 15000 @@ -341,6 +343,11 @@ typedef struct { } carEventPosition; + struct { + uint32_t trip_braking; + uint32_t trip_acceleration; + } state_get; + tStaticThreadBlock(512) T_processing_Network; // tStaticThreadBlock(1024) T_processing_ebu; tStaticThreadBlock(512) T_processing_input_command; @@ -400,7 +407,7 @@ typedef struct { uint32_t firmwareOffset; */ tDeviceTeledataStorageData *deviceTeledataStorageData; - + tCanMainAdditional *canMainAdditional; tDeviceStorage *store; bool rebootFirmware; @@ -419,10 +426,10 @@ typedef struct { uint8_t count_shot; uint8_t count_free; uint32_t timeAccelUpdate; - + tCanData *canData; uint32_t timeOutCheckNetworkStatus; - + uint32_t timeAbsSpeedOnSecond; } tEgtsProcessing; @@ -434,7 +441,9 @@ void EgtsProcessing_Init( tGpioPin *ignition, tGsmWithGnss *gsm, tRtcIO *rtcIO, - tLoggerToSerialPort *slog + tLoggerToSerialPort *slog, + tCanData *canData, + tCanMainAdditional *tCanMainAdditional ); char *sendLogHex(tEgtsProcessing *env, uint8_t *data, size_t size);