Commit bf8802c0 authored 2 years ago by Harald Martini

Merge branch 'develop' of...

Merge branch 'develop' of https://citnet.tech.ec.europa.eu/CITnet/stash/scm/vecto/hm_vecto-dev into develop

parents 473ced7d 5fac0f17

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.4.xsd 1 addition, 1 deletion

...ctoCore/Resources/XSD/VectoDeclarationDefinitions.2.4.xsd
VectoCore/VectoCoreTest/Integration/Declaration/HeavyLorry/HeavyLorrySimulation.cs 113 additions, 0 deletions

...ntegration/Declaration/HeavyLorry/HeavyLorrySimulation.cs
VectoCore/VectoCoreTest/Integration/Hybrid/ParallelHybridTest.cs 12 additions, 4 deletions

...re/VectoCoreTest/Integration/Hybrid/ParallelHybridTest.cs
VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2.5/Electric components/GenericBattery_10kWh_658V.vbat 0 additions, 0 deletions

...5_P2.5/Electric components/GenericBattery_10kWh_658V.vbat
VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2.5/Electric components/GenericBattery_10kWh_658V.vbatr 0 additions, 0 deletions

..._P2.5/Electric components/GenericBattery_10kWh_658V.vbatr
VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2.5/Electric components/GenericBattery_10kWh_658V.vbatv 0 additions, 0 deletions

..._P2.5/Electric components/GenericBattery_10kWh_658V.vbatv
VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2.5/Electric components/GenericDrag_140kW_936Nm.vemd 0 additions, 0 deletions

...up5_P2.5/Electric components/GenericDrag_140kW_936Nm.vemd
VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2.5/Electric components/GenericDrag_30kW_50Nm.vemd 0 additions, 0 deletions

...roup5_P2.5/Electric components/GenericDrag_30kW_50Nm.vemd
VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2.5/Electric components/GenericEMotor_140kW_936Nm.vem 0 additions, 0 deletions

...p5_P2.5/Electric components/GenericEMotor_140kW_936Nm.vem
VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2.5/Electric components/GenericEMotor_140kW_936Nm.vemp 0 additions, 0 deletions

...5_P2.5/Electric components/GenericEMotor_140kW_936Nm.vemp
VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2.5/Electric components/GenericEMotor_30kW_50Nm.vem 0 additions, 0 deletions

...oup5_P2.5/Electric components/GenericEMotor_30kW_50Nm.vem
VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2.5/Electric components/GenericEMotor_30kW_50Nm.vemp 0 additions, 0 deletions

...up5_P2.5/Electric components/GenericEMotor_30kW_50Nm.vemp
VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2.5/Electric components/GenericMap_140kW_936Nm.vemo 0 additions, 0 deletions

...oup5_P2.5/Electric components/GenericMap_140kW_936Nm.vemo
VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2.5/Electric components/GenericMap_30kW_50Nm.vemo 0 additions, 0 deletions

...Group5_P2.5/Electric components/GenericMap_30kW_50Nm.vemo
VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2.5/Electric components/Hybrid_Parameters.vhctl 0 additions, 0 deletions

...V/Group5_P2.5/Electric components/Hybrid_Parameters.vhctl
VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2.5/Electric components/MaxCurrent.vimax 0 additions, 0 deletions

...ON/P_HEV/Group5_P2.5/Electric components/MaxCurrent.vimax
VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2.5/Vehicle/Group5_HEV.vveh 2 additions, 2 deletions

...dmDeclMode/JSON/P_HEV/Group5_P2.5/Vehicle/Group5_HEV.vveh
VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2.5/Vehicle/Group5_HEV_2.vveh 2 additions, 2 deletions

...DeclMode/JSON/P_HEV/Group5_P2.5/Vehicle/Group5_HEV_2.vveh
VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/ElectricMotor/2x125kW 485Nm/GenericBattery_243kWh_750V.vbat 0 additions, 0 deletions

...ectricMotor/2x125kW 485Nm/GenericBattery_243kWh_750V.vbat
VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P2/ElectricMotor/2x125kW 485Nm/GenericDrag_125kW_485Nm.vemd 0 additions, 0 deletions

.../ElectricMotor/2x125kW 485Nm/GenericDrag_125kW_485Nm.vemd

with 130 additions and 9 deletions

Please register or to comment