asc file reader and small log enhancements (#3)

This commit is contained in:
tompzf
2025-12-09 18:37:22 +01:00
committed by GitHub
parent 2fb043b2be
commit f74e494a43
19 changed files with 168 additions and 110 deletions

View File

@@ -6,25 +6,18 @@
#ifndef SIGNAL_NAMES_H
#define SIGNAL_NAMES_H
#ifdef __has_include
#if __has_include("../interfaces/signal_identifier.h")
#include "../interfaces/signal_identifier.h"
#else
namespace doors
{
// Data Dispatch Service signal names to dbc variable names C-type RX/TX vss name space
static std::string dsLeftDoorIsOpen01 = "CAN_Input_L1.Door01LeftIsOpen"; ///< bool RX Vehicle.Chassis.Door.Axle01.Left
static std::string dsRightDoorIsOpen01 = "CAN_Input_R1.Door01RightIs"; ///< bool RX Vehicle.Chassis.Door.Axle01.Right
static std::string dsLeftDoorIsOpen02 = "CAN_Input_L2.Door02LeftIsOpen"; ///< bool RX Vehicle.Chassis.Door.Axle02.Left
static std::string dsRightDoorIsOpen02 = "CAN_Input_R2.Door02RightIsOpen"; ///< bool RX Vehicle.Chassis.Door.Axle02.Right
static std::string dsLeftLatch01 = "CAN_Output.LockDoor01Left" ; ///< bool TX Vehicle.Chassis.TX.Door.Axle01.Left
static std::string dsRightLatch01 = "CAN_Output.LockDoor01Right"; ///< bool TX Vehicle.Chassis.TX.Door.Axle01.Right
static std::string dsLeftLatch02 = "CAN_Output.LockDoor02Left" ; ///< bool TX Vehicle.Chassis.TX.Door.Axle02.Left
static std::string dsRightLatch02 = "CAN_Output.LockDoor02Right"; ///< bool TX Vehicle.Chassis.TX.Door.Axle02.Right
static std::string dsLeftDoorIsOpen01 = "CAN_Input_L1.Door01LeftIsOpen"; ///< bool RX Vehicle.Chassis.Door.Axle01.Left
static std::string dsRightDoorIsOpen01 = "CAN_Input_R1.Door01RightIsOpen"; ///< bool RX Vehicle.Chassis.Door.Axle01.Right
static std::string dsLeftDoorIsOpen02 = "CAN_Input_L2.Door02LeftIsOpen"; ///< bool RX Vehicle.Chassis.Door.Axle02.Left
static std::string dsRightDoorIsOpen02 = "CAN_Input_R2.Door02RightIsOpen"; ///< bool RX Vehicle.Chassis.Door.Axle02.Right
static std::string dsLeftLatch01 = "CAN_Output.LockDoor01Left"; ///< bool TX Vehicle.Chassis.TX.Door.Axle01.Left
static std::string dsRightLatch01 = "CAN_Output.LockDoor01Right"; ///< bool TX Vehicle.Chassis.TX.Door.Axle01.Right
static std::string dsLeftLatch02 = "CAN_Output.LockDoor02Left"; ///< bool TX Vehicle.Chassis.TX.Door.Axle02.Left
static std::string dsRightLatch02 = "CAN_Output.LockDoor02Right"; ///< bool TX Vehicle.Chassis.TX.Door.Axle02.Left
} // doors
#endif
#endif
#endif // SIGNAL_NAMES_H

View File

@@ -1,6 +1,6 @@
date 08/28/25 19:10:31
base hex timestamps absolute
Begin Triggerblock 08/28/25 19:10:31
Begin TriggerBlock 08/28/25 19:10:31
0.000000 Start of measurement
0.021165 1 1 Rx d 1 02
0.031165 1 2 Rx d 1 08

View File

@@ -12,10 +12,10 @@ This file was generated by the DBC utility from:
namespace Doors2ExampleFMU
{
// Data Dispatch Service signal names to dbc variable names C-type RX/TX vss name space
static std::string dsDoor01LeftIsOpen = "CAN_Input_L1.Door01LeftIsOpen";
static std::string dsDoor01LeftIsOpen = "CAN_Input_L1.Door01LeftIsOpen";
static std::string dsDoor01RightIsOpen = "CAN_Input_R1.Door01RightIsOpen";
static std::string dsLockDoor01Right = "CAN_Output.LockDoor01Right";
static std::string dsLockDoor01Left = "CAN_Output.LockDoor01Left";
static std::string dsLockDoor01Left = "CAN_Output.LockDoor01Left";
static std::string dsLockDoor01Right = "CAN_Output.LockDoor01Right";
} // Doors2ExampleFMU

View File

@@ -12,15 +12,15 @@ This file was generated by the DBC utility from:
namespace Doors4ExampleFMU
{
// Data Dispatch Service signal names to dbc variable names C-type RX/TX vss name space
static std::string dsDoor01LeftIsOpen = "CAN_Input_L1.Door01LeftIsOpen";
static std::string dsDoor01LeftIsOpen = "CAN_Input_L1.Door01LeftIsOpen";
static std::string dsDoor01RightIsOpen = "CAN_Input_R1.Door01RightIsOpen";
static std::string dsDoor02LeftIsOpen = "CAN_Input_L2.Door02LeftIsOpen";
static std::string dsDoor02LeftIsOpen = "CAN_Input_L2.Door02LeftIsOpen";
static std::string dsDoor02RightIsOpen = "CAN_Input_R2.Door02RightIsOpen";
static std::string dsLockDoor02Right = "CAN_Output.LockDoor02Right";
static std::string dsLockDoor02Left = "CAN_Output.LockDoor02Left";
static std::string dsLockDoor01Right = "CAN_Output.LockDoor01Right";
static std::string dsLockDoor01Left = "CAN_Output.LockDoor01Left";
static std::string dsLockDoor01Left = "CAN_Output.LockDoor01Left";
static std::string dsLockDoor01Right = "CAN_Output.LockDoor01Right";
static std::string dsLockDoor02Left = "CAN_Output.LockDoor02Left";
static std::string dsLockDoor02Right = "CAN_Output.LockDoor02Right";
} // Doors4ExampleFMU
#endif // __DBC_GENERATED__SIGNALIDENTIFIER_H__20250906_145542_578__

View File

@@ -134,7 +134,7 @@ bool CConsole::PrepareDataConsumers()
basicService->RegisterOnSignalChangeOfVehicleSpeed(dynamic_cast<vss::Vehicle::SpeedService::IVSS_SetSpeed_Event*> (this));
}
// Request the basic service for opening the drunk.
// Request the basic service for opening the trunk.
m_pTrunkSvc = sdv::core::GetObject("Vehicle.Body.Trunk_Service").GetInterface<vss::Vehicle::Body::TrunkService::IVSS_SetOpen>();
if (m_pTrunkSvc)
PrintText(g_sComplexServcie1, "Basic Service available");

View File

@@ -1,6 +1,6 @@
date 08/28/25 19:10:31
base hex timestamps absolute
Begin Triggerblock 08/28/25 19:10:31
Begin TriggerBlock 08/28/25 19:10:31
0.000000 Start of measurement
0.201165 1 0 Rx d 8 00 00 00 00 00 00 00 32
0.401499 1 0 Rx d 8 00 00 00 00 00 00 00 66

View File

@@ -1,6 +1,6 @@
date 08/28/25 19:10:31
base hex timestamps absolute
Begin Triggerblock 08/28/25 19:10:31
Begin TriggerBlock 08/28/25 19:10:31
0.000000 Start of measurement
0.201165 1 0 Rx d 8 00 00 00 00 00 CC 00 32
0.401499 1 0 Rx d 8 00 00 00 00 01 98 00 66