Merge branch 'feature/VECTO-1240-hybrid-powertrain' of...
Merge branch 'feature/VECTO-1240-hybrid-powertrain' of https://citnet.tech.ec.europa.eu/CITnet/stash/scm/vecto/mq_vecto-dev into feature/VECTO-1240-hybrid-powertrain # Conflicts: # VectoCore/VectoCoreTest/FileIO/JsonReadHybridTest.cs
No related branches found
No related tags found
Showing
- Documentation/User Manual/3-simulation-models/Electric_Storage.md 2 additions, 4 deletions...ation/User Manual/3-simulation-models/Electric_Storage.md
- Documentation/User Manual/5-input-and-output-files/VBATx.md 19 additions, 0 deletionsDocumentation/User Manual/5-input-and-output-files/VBATx.md
- VECTO/File Browser/FileBrowserModule.vb 1 addition, 0 deletionsVECTO/File Browser/FileBrowserModule.vb
- VECTO/GUI/BatteryForm.Designer.vb 167 additions, 64 deletionsVECTO/GUI/BatteryForm.Designer.vb
- VECTO/GUI/BatteryForm.vb 25 additions, 3 deletionsVECTO/GUI/BatteryForm.vb
- VECTO/GUI/MainForm.vb 2 additions, 0 deletionsVECTO/GUI/MainForm.vb
- VECTO/Input Files/Battery.vb 21 additions, 6 deletionsVECTO/Input Files/Battery.vb
- VECTO/Input Files/SuperCap.vb 17 additions, 0 deletionsVECTO/Input Files/SuperCap.vb
- VECTO/Input Files/Vehicle.vb 1 addition, 1 deletionVECTO/Input Files/Vehicle.vb
- VectoCommon/VectoCommon/InputData/DeclarationInputData.cs 7 additions, 1 deletionVectoCommon/VectoCommon/InputData/DeclarationInputData.cs
- VectoCommon/VectoCommon/InputData/EngineeringInputData.cs 0 additions, 2 deletionsVectoCommon/VectoCommon/InputData/EngineeringInputData.cs
- VectoCore/VectoCore/InputData/FileIO/JSON/JSONBattery.cs 22 additions, 2 deletionsVectoCore/VectoCore/InputData/FileIO/JSON/JSONBattery.cs
- VectoCore/VectoCore/InputData/Reader/ComponentData/BatteryMaxCurrentReader.cs 48 additions, 0 deletions...InputData/Reader/ComponentData/BatteryMaxCurrentReader.cs
- VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs 3 additions, 1 deletion...utData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs
- VectoCore/VectoCore/Models/SimulationComponent/Data/Battery/BatteryData.cs 72 additions, 12 deletions...re/Models/SimulationComponent/Data/Battery/BatteryData.cs
- VectoCore/VectoCore/Models/SimulationComponent/Impl/Battery.cs 9 additions, 6 deletions...Core/VectoCore/Models/SimulationComponent/Impl/Battery.cs
- VectoCore/VectoCore/Models/SimulationComponent/Impl/SuperCap.cs 12 additions, 4 deletions...ore/VectoCore/Models/SimulationComponent/Impl/SuperCap.cs
- VectoCore/VectoCore/OutputData/FileIO/JSONFileWriter.cs 3 additions, 2 deletionsVectoCore/VectoCore/OutputData/FileIO/JSONFileWriter.cs
- VectoCore/VectoCore/VectoCore.csproj 1 addition, 0 deletionsVectoCore/VectoCore/VectoCore.csproj
- VectoCore/VectoCoreTest/FileIO/JsonReadHybridTest.cs 6 additions, 2 deletionsVectoCore/VectoCoreTest/FileIO/JsonReadHybridTest.cs
Loading
Please register or sign in to comment