diff --git a/Directory.Build.props b/Directory.Build.props
index b9e9577cd23a3b9c1b1deb133a629690cec45fed..1c6bee655b6959f864f99d9336793857ca01dbd2 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -8,7 +8,7 @@
<!--<DefineConstants>CERTIFICATION_RELEASE</DefineConstants>-->
<!-- Global VECTO Version -->
- <MainProductVersion>0.7.8</MainProductVersion>
+ <MainProductVersion>0.7.9</MainProductVersion>
<VersionSuffix>DEV</VersionSuffix>
<!-- The following settings are used as default values for ALL projects -->
diff --git a/Documentation/User Manual Source/Release Notes Vecto3.x.pptx b/Documentation/User Manual Source/Release Notes Vecto3.x.pptx
index d0a0e0aea336c18e477643c8ee6bfd639fae05a4..b353c90b841e708cb028650dcd7849b73e8c9db1 100644
Binary files a/Documentation/User Manual Source/Release Notes Vecto3.x.pptx and b/Documentation/User Manual Source/Release Notes Vecto3.x.pptx differ
diff --git a/Documentation/User Manual/1-user-interface/A_index.md b/Documentation/User Manual/1-user-interface/A_index.md
index 37f1ab1516006ed88b0c9535746b3bd19523e936..97c90b5d43927fb4a756d6b50ccb5d3c41cb0036 100644
--- a/Documentation/User Manual/1-user-interface/A_index.md
+++ b/Documentation/User Manual/1-user-interface/A_index.md
@@ -6,12 +6,16 @@ When VECTO starts the [Main Form](#main-form) is loaded. Closing this form will
- [Main Form](#main-form)
- [Settings](#settings)
- [Job Editor](#job-editor)
-- [Vehicle Editor](#vehicle-editor-general-tab)
-- [Vehicle Editor](#vehicle-editor-powertrain-tab)
-- [Vehicle Editor](#vehicle-editor-electric-components-tab)
-- [Vehicle Editor](#vehicle-editor-torque-limits-tab)
-- [Vehicle Editor](#vehicle-editor-adas-tab)
-- [Vehicle Editor](#vehicle-editor-pto-tab)
+- [Vehicle Editor - General](#vehicle-editor-general-tab)
+- [Vehicle Editor - Powertrain](#vehicle-editor-powertrain-tab)
+- [Vehicle Editor - Electric Machine](#vehicle-editor-electric-machine-tab)
+- [Vehicle Editor - REESS](#vehicle-editor-reess-tab)
+- [Vehicle Editor - IEPC](#vehicle-editor-iepc-tab)
+- [Vehicle Editor - IHPC](#vehicle-editor-ihpc-tab)
+- [Vehicle Editor - GenSet](#vehicle-editor-genset-tab)
+- [Vehicle Editor - Torque Limits](#vehicle-editor-torque-limits-tab)
+- [Vehicle Editor - ADAS](#vehicle-editor-adas-tab)
+- [Vehicle Editor - PTO](#vehicle-editor-pto-tab)
- [Aux Dialog](#auxiliary-dialog)
- [BusAux Dialog](#busauxiliary-dialog)
- [Engine Editor](#engine-editor)
diff --git a/Documentation/User Manual/1-user-interface/F_VEH-Editor.md b/Documentation/User Manual/1-user-interface/F_VEH-Editor.md
index dedaa0870e0891e3d6dee554da2b8b40b51d0d40..dbafd237a94e0b898b39f1b01c46576cef5ae021 100644
--- a/Documentation/User Manual/1-user-interface/F_VEH-Editor.md
+++ b/Documentation/User Manual/1-user-interface/F_VEH-Editor.md
@@ -220,7 +220,7 @@ In case that the gearbox' maximum torque is lower than the engine's maximum torq
Next, the maximum available torque for the electric machine can be reduced at the vehicle level, both for propulsion and recuperation. The input file is the same as the maximum drive and maximum recuperation curve (see [Electric Motor Max Torque File](#electric-motor-max-torque-file-.vemp))
-Last, the overall propulsion of the vehicle (i.e., HEV Px, electric motor plus combustion engine) can be limited. The "Propulsion Torque Limit" curve limits the maximum effective torque at the gearbox input shaft over the input speed. This curve is added to the combustion engine's maximum torque curve (only positive values are allowed!). For details on the file format see [Vehicle Boosting Limits](#vehcle-boosing-limits-.vemp). The propulsion torque limit has to be provided from 0 rpm to the maximum speed of the combustion engine. In case of P3 or P4 configuration, the torque at the gearbox input shaft is calculated assuming that the electric motor does not contribute to propelling the vehicle, considering the increased losses in the transmission components inbetween. For P2.5 powertrain configurations no special calculations are necessary as this architecture is internally anyhow modelled as P2 architecture.
+Last, the overall propulsion of the vehicle (i.e., HEV Px, electric motor plus combustion engine) can be limited. The "Propulsion Torque Limit" curve limits the maximum effective torque at the gearbox input shaft over the input speed. This curve is added to the combustion engine's maximum torque curve (only positive values are allowed!). For details on the file format see [Vehicle Boosting Limits](#vehicle-boosting-limits-.vtqp). The propulsion torque limit has to be provided from 0 rpm to the maximum speed of the combustion engine. In case of P3 or P4 configuration, the torque at the gearbox input shaft is calculated assuming that the electric motor does not contribute to propelling the vehicle, considering the increased losses in the transmission components inbetween. For P2.5 powertrain configurations no special calculations are necessary as this architecture is internally anyhow modelled as P2 architecture.
## Vehicle Editor -- ADAS Tab
diff --git a/Documentation/User Manual/1-user-interface/H1_HybridStrategyParams-Editor.md b/Documentation/User Manual/1-user-interface/H1_HybridStrategyParams-Editor.md
index b3cff88c75d41593b7b57fb3c70672ed67cb0aea..c8e7aeb3cff86ed3a7954eb409455f973054fad5 100644
--- a/Documentation/User Manual/1-user-interface/H1_HybridStrategyParams-Editor.md
+++ b/Documentation/User Manual/1-user-interface/H1_HybridStrategyParams-Editor.md
@@ -6,7 +6,7 @@
### Description
-The [Hybrid Strategy Parameters File (.vhctl)](#hybrid-strategy-parameters-file-.vhctl) defines all parameters used by the [Hybrid Control Strategy](#hybrid-control-strategy) to evaluate the best option for splitting the demanded torque between electric motor and combustion engine.
+The [Hybrid Strategy Parameters File (.vhctl)](#hybrid-strategy-parameters-file-.vhctl) defines all parameters used by the [Parallel Hybrid Control Strategy](#parallel-hybrid-control-strategy)/[Serial Hybrid Control Strategy](#serial-hybrid-control-strategy) to evaluate the best option for splitting the demanded torque between electric motor and combustion engine.
### Strategy Parameters
diff --git a/Documentation/User Manual/1-user-interface/H_GBX-Editor.md b/Documentation/User Manual/1-user-interface/H_GBX-Editor.md
index 5ddaec22fbced1dd77948bdb1931908adac51547..639d3487ee6f6207ce2669c06399cf22335215ae 100644
--- a/Documentation/User Manual/1-user-interface/H_GBX-Editor.md
+++ b/Documentation/User Manual/1-user-interface/H_GBX-Editor.md
@@ -71,7 +71,7 @@ Automated Manual Transmission - Hybrid Electric vehicle
: Gearshift is handled by the hybrid controller. Shift lines (calculated in the same way as for conventional vehicles) are used as upper and lower boundary for allowed ICE operating points.
Automated Manual Transmission - Pure Electric vehicle
-: Efficiency shift based strategy. The calculation of gearshift lines and the gearshift rules are [described here](#FFOOO)
+: Efficiency shift based strategy. The calculation of gearshift lines and the gearshift rules are [described here](#pev-gear-shift-model)
Automatic Transmission - Conventional vehicle
: Efficiency shift. The calculation of gearshift lines and the gearshift rules are [described here](#shift-strategy-apt-gearshift-rules)
@@ -80,7 +80,7 @@ Automatic Transmission - Hybrid Electric vehicle
: Gearshift is handled by the hybrid controller. Shift lines (calculated in the same way as for conventional vehicles) are used as upper and lower boundary for allowed ICE operating points.
Automatic Transmission (APT-N) - Pure Electric vehicle
-: Efficiency shift based strategy. The calculation of gearshift lines and the gearshift rules are [described here](#FFOOO)
+: Efficiency shift based strategy. The calculation of gearshift lines and the gearshift rules are [described here](#pev-gear-shift-model)
<div class="engineering">
diff --git a/Documentation/User Manual/1-user-interface/L_ElectricMotor.md b/Documentation/User Manual/1-user-interface/L_ElectricMotor.md
index 7e0b88e4c37561618ab23854a0748e03f466e2cc..77cf5a81526c6c2cb3bfaeb5347ac36c21237f81 100644
--- a/Documentation/User Manual/1-user-interface/L_ElectricMotor.md
+++ b/Documentation/User Manual/1-user-interface/L_ElectricMotor.md
@@ -47,7 +47,7 @@ Max. Drive and Max. Generation Torque Curve
: Torque over engine speed the electric motor can apply on its output shaft. (see [Electric Motor Max Torque File (.vemp)](#electric-motor-max-torque-file-.vemp)). The max drive and max generation torque have to be provided for two different voltage levels.
Electric Power Consumption Map
-: Defines the electric power that is required to provide a certain mechanical power (torque and angular speed) at the motor's shaft. This map is used to calculate the electric power demand. The electric power consumption map shall cover a torque range exceeding the max. drive and max. generation torque and shall cover the speed range from 0 up to the maximum speed. (see [Electric Motor Map (.vemo)](#electric-motor-map-.vemo)). The power map has to be provided for two different voltage levels.
+: Defines the electric power that is required to provide a certain mechanical power (torque and angular speed) at the motor's shaft. This map is used to calculate the electric power demand. The electric power consumption map shall cover a torque range exceeding the max. drive and max. generation torque and shall cover the speed range from 0 up to the maximum speed. (see [Electric Motor Map (.vemo)](#electric-motor-power-map-.vemo)). The power map has to be provided for two different voltage levels.
Voltage Level Low/High
: Applicable voltage level for the electric power consumption map and max drive/generation torque curve
diff --git a/Documentation/User Manual/1-user-interface/N_IEPC.md b/Documentation/User Manual/1-user-interface/N_IEPC.md
index 72de151a220e69b76de1af6cc313c27aeeb38dd1..13932980c6b4032bb4c13e275ef9da1f6d568705 100644
--- a/Documentation/User Manual/1-user-interface/N_IEPC.md
+++ b/Documentation/User Manual/1-user-interface/N_IEPC.md
@@ -54,7 +54,7 @@ Max. Drive and Max. Generation Torque Curve
: Torque over engine speed the electric motor can apply on its output shaft. (see [IEPC Max Torque File (.vemp)](#iepc-max-torque-file-.viepcp)). The max drive and max generation torque have to be provided for two different voltage levels.
Electric Power Consumption Map
-: Defines the electric power that is required to provide a certain mechanical power (torque and angular speed) at the motor's shaft. This map is used to calculate the electric power demand. The electric power consumption map shall cover a torque range exceeding the max. drive and max. generation torque and shall cover the speed range from 0 up to the maximum speed. (see [IEPC Map (.viepco)](#iepc-map-.viepco)). The power map has to be provided for two different voltage levels and all gears.
+: Defines the electric power that is required to provide a certain mechanical power (torque and angular speed) at the motor's shaft. This map is used to calculate the electric power demand. The electric power consumption map shall cover a torque range exceeding the max. drive and max. generation torque and shall cover the speed range from 0 up to the maximum speed. (see [IEPC Map (.viepco)](#iepc-power-map-.viepco)). The power map has to be provided for two different voltage levels and all gears.
Voltage Level Low/High
: Applicable voltage level for the electric power consumption map and max drive/generation torque curve
diff --git a/Documentation/User Manual/1-user-interface/O_IHPC.md b/Documentation/User Manual/1-user-interface/O_IHPC.md
index e7969a7d5eced477216bccb97df2854a85a34b4f..b4724e77a7b6df357c0deee4539721fadb680cbf 100644
--- a/Documentation/User Manual/1-user-interface/O_IHPC.md
+++ b/Documentation/User Manual/1-user-interface/O_IHPC.md
@@ -51,7 +51,7 @@ Max. Drive and Max. Generation Torque Curve
: Torque over engine speed the electric motor can apply on its output shaft. (see [Electric Motor Max Torque File (.vemp)](#electric-motor-max-torque-file-.vemp)). The max drive and max generation torque have to be provided for two different voltage levels.
Electric Power Consumption Map
-: Defines the electric power that is required to provide a certain mechanical power (torque and angular speed) at the motor's shaft. This map is used to calculate the electric power demand. The electric power consumption map shall cover a torque range exceeding the max. drive and max. generation torque and shall cover the speed range from 0 up to the maximum speed. (see [Electric Motor Map (.viepco)](#electric-motor-map-.vemo)). The power map has to be provided for two different voltage levels and all gears.
+: Defines the electric power that is required to provide a certain mechanical power (torque and angular speed) at the motor's shaft. This map is used to calculate the electric power demand. The electric power consumption map shall cover a torque range exceeding the max. drive and max. generation torque and shall cover the speed range from 0 up to the maximum speed. (see [Electric Motor Map (.viepco)](#electric-motor-power-map-.vemo)). The power map has to be provided for two different voltage levels and all gears.
Voltage Level Low/High
: Applicable voltage level for the electric power consumption map and max drive/generation torque curve
diff --git a/Documentation/User Manual/3-simulation-models/Electric_Motor.md b/Documentation/User Manual/3-simulation-models/Electric_Motor.md
index d96d45d86eed7c371fecb7b0f928b43c19071cff..221d374fc7703564f1df6293679d201bd0f90eef 100644
--- a/Documentation/User Manual/3-simulation-models/Electric_Motor.md
+++ b/Documentation/User Manual/3-simulation-models/Electric_Motor.md
@@ -12,7 +12,7 @@ The electric motor is modeled by basically 4 map files:
- Engine speed for overload torque ($n_\textrm{T,ovl}$)
- Maximum overload time ($t_\textrm{ovl}$)
-The first two curves are read from a .vemp file (see [Electric Motor Max Torque File (.vemp)](#electric-motor-max-torque-file-.vemp)). The drag curve is provided in a .vemd file (see [Electric Motor Drag Curve File (.vemd)](#electric-motor-drag-curve-file-.vemd)) and the electric power map in a .vemo file (see [Electric Motor Map (.vemo)](#electric-motor-map-.vemo)).
+The first two curves are read from a .vemp file (see [Electric Motor Max Torque File (.vemp)](#electric-motor-max-torque-file-.vemp)). The drag curve is provided in a .vemd file (see [Electric Motor Drag Curve File (.vemd)](#electric-motor-drag-curve-file-.vemd)) and the electric power map in a .vemo file (see [Electric Motor Map (.vemo)](#electric-motor-power-map-.vemo)).
During the simulation the maximum drive torque, maximum generation torque, and electric power map is interpolated for both voltage levels and the actual value used is interpolated between both voltage levels with the current internal voltage of the REESS.
diff --git a/Documentation/User Manual/3-simulation-models/Engine_FC_Correction.md b/Documentation/User Manual/3-simulation-models/Engine_FC_Correction.md
index a9282f9bd3ef258accf62d489213799876d05723..2735062bda4541975ecda6bdfb7b0aad3676e25e 100644
--- a/Documentation/User Manual/3-simulation-models/Engine_FC_Correction.md
+++ b/Documentation/User Manual/3-simulation-models/Engine_FC_Correction.md
@@ -143,9 +143,9 @@ $$
$\textbf{\textrm{FC\_WHR}} = - (\textrm{E\_WHR\_mech} + \textrm{E\_WHR\_el\_mech}) \cdot k_\textrm{engline}$
-#### Hybrid Vehicles: REESS SoC Correction
+#### Parallel Hybrid Vehicles: REESS SoC Correction
-If the REESS Soc at the end of the simulation is higher than the initial SoC the correction is done according to:
+If the REESS Soc at the end of the simulation is different than the initial SoC the correction is done according to:
$$
\textbf{\textrm{FC\_SoC}} = -\frac{\Delta\textrm{E\_REESS} \cdot k_\textrm{engline}}{\eta_{\textrm{EM}_\textrm{chg}} \cdot \eta_{\textrm{REESS}_\textrm{chg}}}
@@ -164,6 +164,24 @@ $\eta_{\textrm{REESS}_\textrm{chg}} = \frac{\textrm{E\_REESS\_INT\_CHG}}{\textrm
$\eta_{\textrm{REESS}_\textrm{dischg}} = \frac{\textrm{E\_REESS\_INT\_DISCHG}}{\textrm{E\_REEES\_T\_DISCHG}}$
+#### Serial Hybrid Vehicles: REESS SoC Correction
+
+If the REESS Soc at the end of the simulation is different than the initial SoC the correction is done according to:
+
+$FC_\textrm{gen,charging} = \sum{FC_\textrm{mod,final}\cdot dt}$
+
+$E_\textrm{gen,el} = \sum{P_\textrm{em,el}\cdot dt}$
+
+If the GenSet was on during the cycle, the SoC correction is done according to:
+
+$\textrm{FC\_SOC} = \Delta\textrm{E\_REESS} \cdot \frac{FC_\textrm{gen,charging}}{E_\textrm{gen,el}}$
+
+If the GenSet was never on during the cycle, the SoC correction is done according to:
+
+$\textrm{FC\_SOC} = \Delta\textrm{E\_REESS} \cdot \frac{FC_\textrm{gen,optimal}}{E_\textrm{gen,el,optimal}}$
+
+where $FC_\textrm{gen,optimal}$ and $E_\textrm{gen,el,optimal}$ are the fuel consumption and generated electric power in the optimal operating point of the GenSet
+
### Corrected Total Fuel Consumption
The final fuel consumption after all corrections are applied is calcualted as follows:
diff --git a/Documentation/User Manual/3-simulation-models/GearShift.md b/Documentation/User Manual/3-simulation-models/GearShift.md
index 192a4c5009b4fcf7c497a8f12b5990925e5e26e9..626bcc4c29fa3bb6ba71ee6142b021f185b86de7 100644
--- a/Documentation/User Manual/3-simulation-models/GearShift.md
+++ b/Documentation/User Manual/3-simulation-models/GearShift.md
@@ -24,7 +24,28 @@ $a_{demand} = a_{act} * a_{red}$ for $(n_{act} > n_{T98h})$
$a_{red} = 1+ (\textrm{AccelerationFactorNP98h} - 1) / (n_{P98h} - n_{T98h}) * (n - n_{T98h})$ for $(n_{act} > n_{T98h})$
+## PEV Gear Shift Model
+The gear shift lines for pure electric vehicles is different than for conventional vehicles and HEV as the shape of maximum torque curve is typically very different.
+The figure below depicts a typical maximum torque curve (orange) and maximum power curve (blue) for an electric motor. The downshift and upshift lines are plotted with a dot-dashed green line.
+**Basics:**
+
+ * Downshift for operation point left of green dot-dashed downshift lines
+ * Upshift for operation point right of green dot-dashed upshift line
+ * EffShift method applied for operation point between downshift and upshift lines (refer to user manual)
+
+**Driving:**
+
+ * Maximum downshift speed always located at n_P80low (where 80% of max power is available)
+ * For EM in de-rating n_P80low is calculated from the de-rated power curve
+
+**Braking:**
+
+ * EffShift is suppressed for operation point within red shaded area (2% below max recuperation power)
+ * New gear after downshift is selected so that operation point is closest to and above n_brake_target_norm (or only closest to n_brake_target_norm in case no operation point with higher speed exists)
+
+
+
diff --git a/Documentation/User Manual/3-simulation-models/HybridControlStrategy.md b/Documentation/User Manual/3-simulation-models/ParallelHybridControlStrategy.md
similarity index 99%
rename from Documentation/User Manual/3-simulation-models/HybridControlStrategy.md
rename to Documentation/User Manual/3-simulation-models/ParallelHybridControlStrategy.md
index 8a289e85e06fcaaeb9919464bcff77c1678cf02f..36fb74baea9f6cf0b361dd60b9714bdf81555f00 100644
--- a/Documentation/User Manual/3-simulation-models/HybridControlStrategy.md
+++ b/Documentation/User Manual/3-simulation-models/ParallelHybridControlStrategy.md
@@ -1,4 +1,4 @@
-## Hybrid Control Strategy
+## Parallel Hybrid Control Strategy
The basic principle of the hybrid control strategy is to evaluate different options of operating modes, i.e., different splits of the demanded torque at the wheels among the electric motor and the combustion engine. For every option a cost function is calculated, taking onto account the required electric energy and the fuel consumption. Out of the examined operating modes the best option, i.e, the option with the lowest cost value is selected.
diff --git a/Documentation/User Manual/3-simulation-models/SerialHybridControlStrategy.md b/Documentation/User Manual/3-simulation-models/SerialHybridControlStrategy.md
new file mode 100644
index 0000000000000000000000000000000000000000..dcf5fcc23ac22de29d0e6088d2cab07a0e011a63
--- /dev/null
+++ b/Documentation/User Manual/3-simulation-models/SerialHybridControlStrategy.md
@@ -0,0 +1,17 @@
+## Serial Hybrid Control Strategy
+
+The basic principle of the serial hybrid strategy is to operate the GenSet in three different states, depending on the power demand of the drivetrain and the REESS' state of charge. So the serial hybrid strategy operates as a three-point controller with a hysteresis.
+
+The following picture illustrates the basic idea. If the SoC is above the target SoC, the GenSet is off and the vehicle drives solely from the battery. When the SoC gets lower and reaches the SoC_min threshold, the GenSet is switched on. As long as the SoC is between SoC_min and SoC_target, the GenSet operates in the optimal operating point. When the upper threshold SoC_target is reached, the GenSet is switched off. In case the power demand from the drivetrain is higher than what the GenSet can provide in the optimal point and the SoC falls below the lower threshold SoC_min, the GenSet operates either in the maximum power operating point (if the drivetrain power demand is higher than the power generated in the optimal point) or in the optimal point.
+
+
+
+The statemachine for the serial hybrid control strategy is depicted here:
+
+
+
+**Note:** The SoC boundaries (SoC_target and SoC_min) shall be narrower than the batteries SoC limits so that on the one hand the vehicle can still recuperate even in case the REESS is charging and reaching the target SoC and on the other hand that there is a buffer available if the drivetrain power demand is high and the GenSet needs some time to ramp up to the maximal power operating point.
+
+### GenSet Pre-Processing
+
+The optimal and maximal GenSet operating points are calculated in a pre-processing step. The fuel consumption and generated electric power is calculated for 400 different operating points: from ICE idle speed up to the maximum speed (minimum of ICE and electric motor), and from 0 mechanical power up to the maximum mechanical power of the ICE. Out of this set of operating points the one with the highest electrical power and the operating point with the best fuel efficiency is selected. This is done for the GenSet operating in de-rating or not.
\ No newline at end of file
diff --git a/Documentation/User Manual/5-input-and-output-files/VEMx.md b/Documentation/User Manual/5-input-and-output-files/VEMx.md
index 558e193d7f980dbb7a66c84190108bfb0443f0b1..082c9785e33a987d0005526f0e1a72d24e8e3884 100644
--- a/Documentation/User Manual/5-input-and-output-files/VEMx.md
+++ b/Documentation/User Manual/5-input-and-output-files/VEMx.md
@@ -36,7 +36,7 @@ n [rpm] , T_drag [Nm]
~~~
-## Electric Motor Map (.vemo)
+## Electric Motor Power Map (.vemo)
This file is used to interpolate the electric power required for a certain mechanical power at the eletric motor's shaft. The file uses the [VECTO CSV format](#csv).
diff --git a/Documentation/User Manual/files.txt b/Documentation/User Manual/files.txt
index c1599e07eeb224587db1858b7f1d3434296b428b..0f124838b1720dbc1e488bc934c7bb924bf4f489 100644
--- a/Documentation/User Manual/files.txt
+++ b/Documentation/User Manual/files.txt
@@ -51,7 +51,8 @@
3-simulation-models/IEPC.md
3-simulation-models/IHPC.md
3-simulation-models/Electric_Storage.md
-3-simulation-models/HybridControlStrategy.md
+3-simulation-models/ParallelHybridControlStrategy.md
+3-simulation-models/SerialHybridControlStrategy.md
5-input-and-output-files/input-output.md
5-input-and-output-files/XML_Job-File_DeclarationMode.md
5-input-and-output-files/XML_DeclarationReport.md
diff --git a/Documentation/User Manual/pics/PEV_Gearshift.png b/Documentation/User Manual/pics/PEV_Gearshift.png
new file mode 100644
index 0000000000000000000000000000000000000000..1d53b5f42ba7819fd8a06d4a8f678e2cbe8437d7
Binary files /dev/null and b/Documentation/User Manual/pics/PEV_Gearshift.png differ
diff --git a/Documentation/User Manual/pics/SerialHybrid_SoCBoundaries.png b/Documentation/User Manual/pics/SerialHybrid_SoCBoundaries.png
new file mode 100644
index 0000000000000000000000000000000000000000..54400d29165440784f62341f2796dd24cee41730
Binary files /dev/null and b/Documentation/User Manual/pics/SerialHybrid_SoCBoundaries.png differ
diff --git a/Documentation/User Manual/pics/SerialHybrid_Statemachine.png b/Documentation/User Manual/pics/SerialHybrid_Statemachine.png
new file mode 100644
index 0000000000000000000000000000000000000000..3d7699052898a236cce1cd4bba50e60f3443f386
Binary files /dev/null and b/Documentation/User Manual/pics/SerialHybrid_Statemachine.png differ
diff --git a/VECTO/GUI/HybridStrategyParamsForm.vb b/VECTO/GUI/HybridStrategyParamsForm.vb
index 84a77e72d1eb3cf6a7f46dff1d2a2213309c3524..471ac649dea59195b22e023b6eb866602f0df587 100644
--- a/VECTO/GUI/HybridStrategyParamsForm.vb
+++ b/VECTO/GUI/HybridStrategyParamsForm.vb
@@ -133,6 +133,7 @@ Public Class HybridStrategyParamsForm
pnCostFactorSoCExponent.Enabled = True
pnGenset.Enabled = False
Case VectoSimulationJobType.SerialHybridVehicle
+ case VectoSimulationJobType.IEPC_S
pnEquivFactor.Enabled = False
pnEquivFactorCharge.Enabled = False
pnMinSoC.Enabled = True
@@ -193,6 +194,7 @@ Public Class HybridStrategyParamsForm
tbCostFactorSoCExponent.Text = If(Double.IsNaN(strategyParams.CostFactorSOCExpponent), 5, strategyParams.CostFactorSOCExpponent).ToGUIFormat()
Case VectoSimulationJobType.SerialHybridVehicle
+ Case VectoSimulationJobType.IEPC_S
tbMinSoC.Text = (strategyParams.MinSoC * 100).ToGUIFormat()
tbTargetSoC.Text = (strategyParams.TargetSoC * 100).ToGUIFormat()
diff --git a/VECTO/GUI/IEPCForm.vb b/VECTO/GUI/IEPCForm.vb
index eedc20a6ea900fd04323ae9a5015ee8e1a0ae22d..813e992f2995855e3bf3d079c36c53e12e88a300 100644
--- a/VECTO/GUI/IEPCForm.vb
+++ b/VECTO/GUI/IEPCForm.vb
@@ -709,6 +709,10 @@ Public Class IEPCForm
Private Sub cbDesignTypeWheelMotor_CheckedChanged(sender As Object, e As EventArgs) Handles cbDesignTypeWheelMotor.CheckedChanged
tbNumberOfDesignTypeWheelMotor.Enabled = cbDesignTypeWheelMotor.Checked
+ cbDifferentialIncluded.Enabled = Not cbDesignTypeWheelMotor.Checked
+ if (cbDesignTypeWheelMotor.Checked) then
+ cbDifferentialIncluded.Checked = False
+ end if
If tbNumberOfDesignTypeWheelMotor.Enabled = False Then _
tbNumberOfDesignTypeWheelMotor.Text = "0"
Change()