From 96eea4727e725bc6246849ec4a9b5302be346e7f Mon Sep 17 00:00:00 2001 From: Ulf Bjorkengren Date: Mon, 9 Sep 2024 14:18:12 +0200 Subject: [PATCH] Renamed CargoVehicle to Truck Signed-off-by: Ulf Bjorkengren --- .../{CargoVehicle => Truck}/ADAS/ADAS.vspec | 0 .../{CargoVehicle => Truck}/Body/Body.vspec | 0 .../Body/BrakeLights.vspec | 0 .../Body/ExteriorMirrors.vspec | 0 .../{CargoVehicle => Truck}/Body/Lights.vspec | 0 .../Body/SignalingLights.vspec | 0 .../Body/StaticLights.vspec | 0 .../Body/Windshield.vspec | 0 .../Body/WiperSystem.yaml | 0 .../{CargoVehicle => Truck}/Cabin/Cabin.vspec | 0 .../{CargoVehicle => Truck}/Cabin/HVAC.vspec | 0 .../Cabin/Infotainment.vspec | 0 .../Cabin/InteriorLights.vspec | 0 .../Cabin/Occupant.vspec | 0 .../Cabin/SingleConfigurableLight.vspec | 0 .../Cabin/SingleDoor.vspec | 0 .../Cabin/SingleHVACStation.vspec | 0 .../Cabin/SingleSeat.vspec | 0 .../Cargo/Boxtruck.vspec | 0 .../{CargoVehicle => Truck}/Cargo/Cargo.vspec | 0 .../{CargoVehicle => Truck}/Cargo/Pickup.vspec | 0 .../Cargo/TowTruck.vspec | 0 .../{CargoVehicle => Truck}/Cargo/Van.vspec | 0 .../Chassis/Accelerator.yaml | 0 .../{CargoVehicle => Truck}/Chassis/Axle.vspec | 0 .../{CargoVehicle => Truck}/Chassis/Brake.yaml | 0 .../Chassis/Chassis.vspec | 0 .../Chassis/ParkingBrake.yaml | 0 .../Chassis/SteeringWheel.yaml | 0 .../{CargoVehicle => Truck}/Chassis/Wheel.yaml | 0 .../{CargoVehicle => Truck}/DataTypes.yaml.old | 0 .../{CargoVehicle => Truck}/DataTypesv2.yaml | 0 .../{CargoVehicle => Truck}/Datatypes.yaml | 0 .../Exterior/Exterior.vspec | 0 .../Identifier/Identifier.vspec | 0 .../Powertrain/BatteryConditioning.yaml | 0 .../Powertrain/CombustionEngine.yaml | 0 .../Powertrain/ElectricEngine.vspec | 0 .../Powertrain/ElectricMotor.yaml | 0 .../Powertrain/EnergyManagement.yaml | 0 .../Powertrain/Engine.vspec | 0 .../Powertrain/EngineCoolant.yaml | 0 .../Powertrain/FuelSystem.yaml | 0 .../Powertrain/Powertrain.vspec | 0 .../Powertrain/TractionBattery.yaml | 0 .../Powertrain/Transmission.yaml | 0 .../TruckSignalSpecification.vspec} | 18 +++++++++--------- .../{CargoVehicle => Truck}/Variability.json | 0 .../Vehicle/Connectivity.vspec | 0 .../Vehicle/CurrentLocation.yaml | 0 .../Vehicle/GenericVehicle.yaml | 0 .../Vehicle/LowVoltageBattery.yaml | 0 .../Vehicle/Service.vspec | 0 .../Vehicle/Trailer.yaml | 0 .../Vehicle/Vehicle.vspec | 0 .../Vehicle/VehicleIdentification.yaml | 0 .../Vehicle/Version.yaml | 0 .../cv-truck-symlinks.sh | 0 .../himConfiguration.json | 0 .../include/ItemHeatingCooling.yaml | 0 .../include/LockableMovableItem.vspec | 0 .../include/MovableItem.yaml | 0 .../include/PowerOptimize.yaml | 0 spec/trees/himConfigurator.go | 2 +- 64 files changed, 10 insertions(+), 10 deletions(-) rename spec/trees/Vehicle/{CargoVehicle => Truck}/ADAS/ADAS.vspec (100%) rename spec/trees/Vehicle/{CargoVehicle => Truck}/Body/Body.vspec (100%) rename spec/trees/Vehicle/{CargoVehicle => Truck}/Body/BrakeLights.vspec (100%) rename spec/trees/Vehicle/{CargoVehicle => Truck}/Body/ExteriorMirrors.vspec (100%) rename spec/trees/Vehicle/{CargoVehicle => Truck}/Body/Lights.vspec (100%) rename spec/trees/Vehicle/{CargoVehicle => Truck}/Body/SignalingLights.vspec (100%) rename spec/trees/Vehicle/{CargoVehicle => Truck}/Body/StaticLights.vspec (100%) rename spec/trees/Vehicle/{CargoVehicle => Truck}/Body/Windshield.vspec (100%) rename spec/trees/Vehicle/{CargoVehicle => Truck}/Body/WiperSystem.yaml (100%) rename spec/trees/Vehicle/{CargoVehicle => Truck}/Cabin/Cabin.vspec (100%) rename spec/trees/Vehicle/{CargoVehicle => Truck}/Cabin/HVAC.vspec (100%) rename spec/trees/Vehicle/{CargoVehicle => Truck}/Cabin/Infotainment.vspec (100%) rename spec/trees/Vehicle/{CargoVehicle => Truck}/Cabin/InteriorLights.vspec (100%) rename spec/trees/Vehicle/{CargoVehicle => Truck}/Cabin/Occupant.vspec (100%) rename spec/trees/Vehicle/{CargoVehicle => Truck}/Cabin/SingleConfigurableLight.vspec (100%) rename spec/trees/Vehicle/{CargoVehicle => Truck}/Cabin/SingleDoor.vspec (100%) rename spec/trees/Vehicle/{CargoVehicle => Truck}/Cabin/SingleHVACStation.vspec (100%) rename spec/trees/Vehicle/{CargoVehicle => Truck}/Cabin/SingleSeat.vspec (100%) rename spec/trees/Vehicle/{CargoVehicle => Truck}/Cargo/Boxtruck.vspec (100%) rename spec/trees/Vehicle/{CargoVehicle => Truck}/Cargo/Cargo.vspec (100%) rename spec/trees/Vehicle/{CargoVehicle => Truck}/Cargo/Pickup.vspec (100%) rename spec/trees/Vehicle/{CargoVehicle => Truck}/Cargo/TowTruck.vspec (100%) rename spec/trees/Vehicle/{CargoVehicle => Truck}/Cargo/Van.vspec (100%) rename spec/trees/Vehicle/{CargoVehicle => Truck}/Chassis/Accelerator.yaml (100%) rename spec/trees/Vehicle/{CargoVehicle => Truck}/Chassis/Axle.vspec (100%) rename spec/trees/Vehicle/{CargoVehicle => Truck}/Chassis/Brake.yaml (100%) rename spec/trees/Vehicle/{CargoVehicle => Truck}/Chassis/Chassis.vspec (100%) rename spec/trees/Vehicle/{CargoVehicle => Truck}/Chassis/ParkingBrake.yaml (100%) rename spec/trees/Vehicle/{CargoVehicle => Truck}/Chassis/SteeringWheel.yaml (100%) rename spec/trees/Vehicle/{CargoVehicle => Truck}/Chassis/Wheel.yaml (100%) rename spec/trees/Vehicle/{CargoVehicle => Truck}/DataTypes.yaml.old (100%) rename spec/trees/Vehicle/{CargoVehicle => Truck}/DataTypesv2.yaml (100%) rename spec/trees/Vehicle/{CargoVehicle => Truck}/Datatypes.yaml (100%) rename spec/trees/Vehicle/{CargoVehicle => Truck}/Exterior/Exterior.vspec (100%) rename spec/trees/Vehicle/{CargoVehicle => Truck}/Identifier/Identifier.vspec (100%) rename spec/trees/Vehicle/{CargoVehicle => Truck}/Powertrain/BatteryConditioning.yaml (100%) rename spec/trees/Vehicle/{CargoVehicle => Truck}/Powertrain/CombustionEngine.yaml (100%) rename spec/trees/Vehicle/{CargoVehicle => Truck}/Powertrain/ElectricEngine.vspec (100%) rename spec/trees/Vehicle/{CargoVehicle => Truck}/Powertrain/ElectricMotor.yaml (100%) rename spec/trees/Vehicle/{CargoVehicle => Truck}/Powertrain/EnergyManagement.yaml (100%) rename spec/trees/Vehicle/{CargoVehicle => Truck}/Powertrain/Engine.vspec (100%) rename spec/trees/Vehicle/{CargoVehicle => Truck}/Powertrain/EngineCoolant.yaml (100%) rename spec/trees/Vehicle/{CargoVehicle => Truck}/Powertrain/FuelSystem.yaml (100%) rename spec/trees/Vehicle/{CargoVehicle => Truck}/Powertrain/Powertrain.vspec (100%) rename spec/trees/Vehicle/{CargoVehicle => Truck}/Powertrain/TractionBattery.yaml (100%) rename spec/trees/Vehicle/{CargoVehicle => Truck}/Powertrain/Transmission.yaml (100%) rename spec/trees/Vehicle/{CargoVehicle/CargoVehicleSignalSpecification.vspec => Truck/TruckSignalSpecification.vspec} (70%) rename spec/trees/Vehicle/{CargoVehicle => Truck}/Variability.json (100%) rename spec/trees/Vehicle/{CargoVehicle => Truck}/Vehicle/Connectivity.vspec (100%) rename spec/trees/Vehicle/{CargoVehicle => Truck}/Vehicle/CurrentLocation.yaml (100%) rename spec/trees/Vehicle/{CargoVehicle => Truck}/Vehicle/GenericVehicle.yaml (100%) rename spec/trees/Vehicle/{CargoVehicle => Truck}/Vehicle/LowVoltageBattery.yaml (100%) rename spec/trees/Vehicle/{CargoVehicle => Truck}/Vehicle/Service.vspec (100%) rename spec/trees/Vehicle/{CargoVehicle => Truck}/Vehicle/Trailer.yaml (100%) rename spec/trees/Vehicle/{CargoVehicle => Truck}/Vehicle/Vehicle.vspec (100%) rename spec/trees/Vehicle/{CargoVehicle => Truck}/Vehicle/VehicleIdentification.yaml (100%) rename spec/trees/Vehicle/{CargoVehicle => Truck}/Vehicle/Version.yaml (100%) rename spec/trees/Vehicle/{CargoVehicle => Truck}/cv-truck-symlinks.sh (100%) rename spec/trees/Vehicle/{CargoVehicle => Truck}/himConfiguration.json (100%) rename spec/trees/Vehicle/{CargoVehicle => Truck}/include/ItemHeatingCooling.yaml (100%) rename spec/trees/Vehicle/{CargoVehicle => Truck}/include/LockableMovableItem.vspec (100%) rename spec/trees/Vehicle/{CargoVehicle => Truck}/include/MovableItem.yaml (100%) rename spec/trees/Vehicle/{CargoVehicle => Truck}/include/PowerOptimize.yaml (100%) diff --git a/spec/trees/Vehicle/CargoVehicle/ADAS/ADAS.vspec b/spec/trees/Vehicle/Truck/ADAS/ADAS.vspec similarity index 100% rename from spec/trees/Vehicle/CargoVehicle/ADAS/ADAS.vspec rename to spec/trees/Vehicle/Truck/ADAS/ADAS.vspec diff --git a/spec/trees/Vehicle/CargoVehicle/Body/Body.vspec b/spec/trees/Vehicle/Truck/Body/Body.vspec similarity index 100% rename from spec/trees/Vehicle/CargoVehicle/Body/Body.vspec rename to spec/trees/Vehicle/Truck/Body/Body.vspec diff --git a/spec/trees/Vehicle/CargoVehicle/Body/BrakeLights.vspec b/spec/trees/Vehicle/Truck/Body/BrakeLights.vspec similarity index 100% rename from spec/trees/Vehicle/CargoVehicle/Body/BrakeLights.vspec rename to spec/trees/Vehicle/Truck/Body/BrakeLights.vspec diff --git a/spec/trees/Vehicle/CargoVehicle/Body/ExteriorMirrors.vspec b/spec/trees/Vehicle/Truck/Body/ExteriorMirrors.vspec similarity index 100% rename from spec/trees/Vehicle/CargoVehicle/Body/ExteriorMirrors.vspec rename to spec/trees/Vehicle/Truck/Body/ExteriorMirrors.vspec diff --git a/spec/trees/Vehicle/CargoVehicle/Body/Lights.vspec b/spec/trees/Vehicle/Truck/Body/Lights.vspec similarity index 100% rename from spec/trees/Vehicle/CargoVehicle/Body/Lights.vspec rename to spec/trees/Vehicle/Truck/Body/Lights.vspec diff --git a/spec/trees/Vehicle/CargoVehicle/Body/SignalingLights.vspec b/spec/trees/Vehicle/Truck/Body/SignalingLights.vspec similarity index 100% rename from spec/trees/Vehicle/CargoVehicle/Body/SignalingLights.vspec rename to spec/trees/Vehicle/Truck/Body/SignalingLights.vspec diff --git a/spec/trees/Vehicle/CargoVehicle/Body/StaticLights.vspec b/spec/trees/Vehicle/Truck/Body/StaticLights.vspec similarity index 100% rename from spec/trees/Vehicle/CargoVehicle/Body/StaticLights.vspec rename to spec/trees/Vehicle/Truck/Body/StaticLights.vspec diff --git a/spec/trees/Vehicle/CargoVehicle/Body/Windshield.vspec b/spec/trees/Vehicle/Truck/Body/Windshield.vspec similarity index 100% rename from spec/trees/Vehicle/CargoVehicle/Body/Windshield.vspec rename to spec/trees/Vehicle/Truck/Body/Windshield.vspec diff --git a/spec/trees/Vehicle/CargoVehicle/Body/WiperSystem.yaml b/spec/trees/Vehicle/Truck/Body/WiperSystem.yaml similarity index 100% rename from spec/trees/Vehicle/CargoVehicle/Body/WiperSystem.yaml rename to spec/trees/Vehicle/Truck/Body/WiperSystem.yaml diff --git a/spec/trees/Vehicle/CargoVehicle/Cabin/Cabin.vspec b/spec/trees/Vehicle/Truck/Cabin/Cabin.vspec similarity index 100% rename from spec/trees/Vehicle/CargoVehicle/Cabin/Cabin.vspec rename to spec/trees/Vehicle/Truck/Cabin/Cabin.vspec diff --git a/spec/trees/Vehicle/CargoVehicle/Cabin/HVAC.vspec b/spec/trees/Vehicle/Truck/Cabin/HVAC.vspec similarity index 100% rename from spec/trees/Vehicle/CargoVehicle/Cabin/HVAC.vspec rename to spec/trees/Vehicle/Truck/Cabin/HVAC.vspec diff --git a/spec/trees/Vehicle/CargoVehicle/Cabin/Infotainment.vspec b/spec/trees/Vehicle/Truck/Cabin/Infotainment.vspec similarity index 100% rename from spec/trees/Vehicle/CargoVehicle/Cabin/Infotainment.vspec rename to spec/trees/Vehicle/Truck/Cabin/Infotainment.vspec diff --git a/spec/trees/Vehicle/CargoVehicle/Cabin/InteriorLights.vspec b/spec/trees/Vehicle/Truck/Cabin/InteriorLights.vspec similarity index 100% rename from spec/trees/Vehicle/CargoVehicle/Cabin/InteriorLights.vspec rename to spec/trees/Vehicle/Truck/Cabin/InteriorLights.vspec diff --git a/spec/trees/Vehicle/CargoVehicle/Cabin/Occupant.vspec b/spec/trees/Vehicle/Truck/Cabin/Occupant.vspec similarity index 100% rename from spec/trees/Vehicle/CargoVehicle/Cabin/Occupant.vspec rename to spec/trees/Vehicle/Truck/Cabin/Occupant.vspec diff --git a/spec/trees/Vehicle/CargoVehicle/Cabin/SingleConfigurableLight.vspec b/spec/trees/Vehicle/Truck/Cabin/SingleConfigurableLight.vspec similarity index 100% rename from spec/trees/Vehicle/CargoVehicle/Cabin/SingleConfigurableLight.vspec rename to spec/trees/Vehicle/Truck/Cabin/SingleConfigurableLight.vspec diff --git a/spec/trees/Vehicle/CargoVehicle/Cabin/SingleDoor.vspec b/spec/trees/Vehicle/Truck/Cabin/SingleDoor.vspec similarity index 100% rename from spec/trees/Vehicle/CargoVehicle/Cabin/SingleDoor.vspec rename to spec/trees/Vehicle/Truck/Cabin/SingleDoor.vspec diff --git a/spec/trees/Vehicle/CargoVehicle/Cabin/SingleHVACStation.vspec b/spec/trees/Vehicle/Truck/Cabin/SingleHVACStation.vspec similarity index 100% rename from spec/trees/Vehicle/CargoVehicle/Cabin/SingleHVACStation.vspec rename to spec/trees/Vehicle/Truck/Cabin/SingleHVACStation.vspec diff --git a/spec/trees/Vehicle/CargoVehicle/Cabin/SingleSeat.vspec b/spec/trees/Vehicle/Truck/Cabin/SingleSeat.vspec similarity index 100% rename from spec/trees/Vehicle/CargoVehicle/Cabin/SingleSeat.vspec rename to spec/trees/Vehicle/Truck/Cabin/SingleSeat.vspec diff --git a/spec/trees/Vehicle/CargoVehicle/Cargo/Boxtruck.vspec b/spec/trees/Vehicle/Truck/Cargo/Boxtruck.vspec similarity index 100% rename from spec/trees/Vehicle/CargoVehicle/Cargo/Boxtruck.vspec rename to spec/trees/Vehicle/Truck/Cargo/Boxtruck.vspec diff --git a/spec/trees/Vehicle/CargoVehicle/Cargo/Cargo.vspec b/spec/trees/Vehicle/Truck/Cargo/Cargo.vspec similarity index 100% rename from spec/trees/Vehicle/CargoVehicle/Cargo/Cargo.vspec rename to spec/trees/Vehicle/Truck/Cargo/Cargo.vspec diff --git a/spec/trees/Vehicle/CargoVehicle/Cargo/Pickup.vspec b/spec/trees/Vehicle/Truck/Cargo/Pickup.vspec similarity index 100% rename from spec/trees/Vehicle/CargoVehicle/Cargo/Pickup.vspec rename to spec/trees/Vehicle/Truck/Cargo/Pickup.vspec diff --git a/spec/trees/Vehicle/CargoVehicle/Cargo/TowTruck.vspec b/spec/trees/Vehicle/Truck/Cargo/TowTruck.vspec similarity index 100% rename from spec/trees/Vehicle/CargoVehicle/Cargo/TowTruck.vspec rename to spec/trees/Vehicle/Truck/Cargo/TowTruck.vspec diff --git a/spec/trees/Vehicle/CargoVehicle/Cargo/Van.vspec b/spec/trees/Vehicle/Truck/Cargo/Van.vspec similarity index 100% rename from spec/trees/Vehicle/CargoVehicle/Cargo/Van.vspec rename to spec/trees/Vehicle/Truck/Cargo/Van.vspec diff --git a/spec/trees/Vehicle/CargoVehicle/Chassis/Accelerator.yaml b/spec/trees/Vehicle/Truck/Chassis/Accelerator.yaml similarity index 100% rename from spec/trees/Vehicle/CargoVehicle/Chassis/Accelerator.yaml rename to spec/trees/Vehicle/Truck/Chassis/Accelerator.yaml diff --git a/spec/trees/Vehicle/CargoVehicle/Chassis/Axle.vspec b/spec/trees/Vehicle/Truck/Chassis/Axle.vspec similarity index 100% rename from spec/trees/Vehicle/CargoVehicle/Chassis/Axle.vspec rename to spec/trees/Vehicle/Truck/Chassis/Axle.vspec diff --git a/spec/trees/Vehicle/CargoVehicle/Chassis/Brake.yaml b/spec/trees/Vehicle/Truck/Chassis/Brake.yaml similarity index 100% rename from spec/trees/Vehicle/CargoVehicle/Chassis/Brake.yaml rename to spec/trees/Vehicle/Truck/Chassis/Brake.yaml diff --git a/spec/trees/Vehicle/CargoVehicle/Chassis/Chassis.vspec b/spec/trees/Vehicle/Truck/Chassis/Chassis.vspec similarity index 100% rename from spec/trees/Vehicle/CargoVehicle/Chassis/Chassis.vspec rename to spec/trees/Vehicle/Truck/Chassis/Chassis.vspec diff --git a/spec/trees/Vehicle/CargoVehicle/Chassis/ParkingBrake.yaml b/spec/trees/Vehicle/Truck/Chassis/ParkingBrake.yaml similarity index 100% rename from spec/trees/Vehicle/CargoVehicle/Chassis/ParkingBrake.yaml rename to spec/trees/Vehicle/Truck/Chassis/ParkingBrake.yaml diff --git a/spec/trees/Vehicle/CargoVehicle/Chassis/SteeringWheel.yaml b/spec/trees/Vehicle/Truck/Chassis/SteeringWheel.yaml similarity index 100% rename from spec/trees/Vehicle/CargoVehicle/Chassis/SteeringWheel.yaml rename to spec/trees/Vehicle/Truck/Chassis/SteeringWheel.yaml diff --git a/spec/trees/Vehicle/CargoVehicle/Chassis/Wheel.yaml b/spec/trees/Vehicle/Truck/Chassis/Wheel.yaml similarity index 100% rename from spec/trees/Vehicle/CargoVehicle/Chassis/Wheel.yaml rename to spec/trees/Vehicle/Truck/Chassis/Wheel.yaml diff --git a/spec/trees/Vehicle/CargoVehicle/DataTypes.yaml.old b/spec/trees/Vehicle/Truck/DataTypes.yaml.old similarity index 100% rename from spec/trees/Vehicle/CargoVehicle/DataTypes.yaml.old rename to spec/trees/Vehicle/Truck/DataTypes.yaml.old diff --git a/spec/trees/Vehicle/CargoVehicle/DataTypesv2.yaml b/spec/trees/Vehicle/Truck/DataTypesv2.yaml similarity index 100% rename from spec/trees/Vehicle/CargoVehicle/DataTypesv2.yaml rename to spec/trees/Vehicle/Truck/DataTypesv2.yaml diff --git a/spec/trees/Vehicle/CargoVehicle/Datatypes.yaml b/spec/trees/Vehicle/Truck/Datatypes.yaml similarity index 100% rename from spec/trees/Vehicle/CargoVehicle/Datatypes.yaml rename to spec/trees/Vehicle/Truck/Datatypes.yaml diff --git a/spec/trees/Vehicle/CargoVehicle/Exterior/Exterior.vspec b/spec/trees/Vehicle/Truck/Exterior/Exterior.vspec similarity index 100% rename from spec/trees/Vehicle/CargoVehicle/Exterior/Exterior.vspec rename to spec/trees/Vehicle/Truck/Exterior/Exterior.vspec diff --git a/spec/trees/Vehicle/CargoVehicle/Identifier/Identifier.vspec b/spec/trees/Vehicle/Truck/Identifier/Identifier.vspec similarity index 100% rename from spec/trees/Vehicle/CargoVehicle/Identifier/Identifier.vspec rename to spec/trees/Vehicle/Truck/Identifier/Identifier.vspec diff --git a/spec/trees/Vehicle/CargoVehicle/Powertrain/BatteryConditioning.yaml b/spec/trees/Vehicle/Truck/Powertrain/BatteryConditioning.yaml similarity index 100% rename from spec/trees/Vehicle/CargoVehicle/Powertrain/BatteryConditioning.yaml rename to spec/trees/Vehicle/Truck/Powertrain/BatteryConditioning.yaml diff --git a/spec/trees/Vehicle/CargoVehicle/Powertrain/CombustionEngine.yaml b/spec/trees/Vehicle/Truck/Powertrain/CombustionEngine.yaml similarity index 100% rename from spec/trees/Vehicle/CargoVehicle/Powertrain/CombustionEngine.yaml rename to spec/trees/Vehicle/Truck/Powertrain/CombustionEngine.yaml diff --git a/spec/trees/Vehicle/CargoVehicle/Powertrain/ElectricEngine.vspec b/spec/trees/Vehicle/Truck/Powertrain/ElectricEngine.vspec similarity index 100% rename from spec/trees/Vehicle/CargoVehicle/Powertrain/ElectricEngine.vspec rename to spec/trees/Vehicle/Truck/Powertrain/ElectricEngine.vspec diff --git a/spec/trees/Vehicle/CargoVehicle/Powertrain/ElectricMotor.yaml b/spec/trees/Vehicle/Truck/Powertrain/ElectricMotor.yaml similarity index 100% rename from spec/trees/Vehicle/CargoVehicle/Powertrain/ElectricMotor.yaml rename to spec/trees/Vehicle/Truck/Powertrain/ElectricMotor.yaml diff --git a/spec/trees/Vehicle/CargoVehicle/Powertrain/EnergyManagement.yaml b/spec/trees/Vehicle/Truck/Powertrain/EnergyManagement.yaml similarity index 100% rename from spec/trees/Vehicle/CargoVehicle/Powertrain/EnergyManagement.yaml rename to spec/trees/Vehicle/Truck/Powertrain/EnergyManagement.yaml diff --git a/spec/trees/Vehicle/CargoVehicle/Powertrain/Engine.vspec b/spec/trees/Vehicle/Truck/Powertrain/Engine.vspec similarity index 100% rename from spec/trees/Vehicle/CargoVehicle/Powertrain/Engine.vspec rename to spec/trees/Vehicle/Truck/Powertrain/Engine.vspec diff --git a/spec/trees/Vehicle/CargoVehicle/Powertrain/EngineCoolant.yaml b/spec/trees/Vehicle/Truck/Powertrain/EngineCoolant.yaml similarity index 100% rename from spec/trees/Vehicle/CargoVehicle/Powertrain/EngineCoolant.yaml rename to spec/trees/Vehicle/Truck/Powertrain/EngineCoolant.yaml diff --git a/spec/trees/Vehicle/CargoVehicle/Powertrain/FuelSystem.yaml b/spec/trees/Vehicle/Truck/Powertrain/FuelSystem.yaml similarity index 100% rename from spec/trees/Vehicle/CargoVehicle/Powertrain/FuelSystem.yaml rename to spec/trees/Vehicle/Truck/Powertrain/FuelSystem.yaml diff --git a/spec/trees/Vehicle/CargoVehicle/Powertrain/Powertrain.vspec b/spec/trees/Vehicle/Truck/Powertrain/Powertrain.vspec similarity index 100% rename from spec/trees/Vehicle/CargoVehicle/Powertrain/Powertrain.vspec rename to spec/trees/Vehicle/Truck/Powertrain/Powertrain.vspec diff --git a/spec/trees/Vehicle/CargoVehicle/Powertrain/TractionBattery.yaml b/spec/trees/Vehicle/Truck/Powertrain/TractionBattery.yaml similarity index 100% rename from spec/trees/Vehicle/CargoVehicle/Powertrain/TractionBattery.yaml rename to spec/trees/Vehicle/Truck/Powertrain/TractionBattery.yaml diff --git a/spec/trees/Vehicle/CargoVehicle/Powertrain/Transmission.yaml b/spec/trees/Vehicle/Truck/Powertrain/Transmission.yaml similarity index 100% rename from spec/trees/Vehicle/CargoVehicle/Powertrain/Transmission.yaml rename to spec/trees/Vehicle/Truck/Powertrain/Transmission.yaml diff --git a/spec/trees/Vehicle/CargoVehicle/CargoVehicleSignalSpecification.vspec b/spec/trees/Vehicle/Truck/TruckSignalSpecification.vspec similarity index 70% rename from spec/trees/Vehicle/CargoVehicle/CargoVehicleSignalSpecification.vspec rename to spec/trees/Vehicle/Truck/TruckSignalSpecification.vspec index f328abf..59f5af4 100644 --- a/spec/trees/Vehicle/CargoVehicle/CargoVehicleSignalSpecification.vspec +++ b/spec/trees/Vehicle/Truck/TruckSignalSpecification.vspec @@ -18,23 +18,23 @@ # # The root branch for highlevel cargo vehicle signals and attributes. # -CV: +Truck: type: branch description: Root for cargo vehicle data. -#include Vehicle/Vehicle.vspec CV +#include Vehicle/Vehicle.vspec Truck -#include ADAS/ADAS.vspec CV +#include ADAS/ADAS.vspec Truck -#include Powertrain/Powertrain.vspec CV +#include Powertrain/Powertrain.vspec Truck -#include Body/Body.vspec CV +#include Body/Body.vspec Truck -#include Chassis/Chassis.vspec CV +#include Chassis/Chassis.vspec Truck -#include Cabin/Cabin.vspec CV +#include Cabin/Cabin.vspec Truck -#include Cargo/Cargo.vspec CV +#include Cargo/Cargo.vspec Truck -#include Exterior/Exterior.vspec CV +#include Exterior/Exterior.vspec Truck diff --git a/spec/trees/Vehicle/CargoVehicle/Variability.json b/spec/trees/Vehicle/Truck/Variability.json similarity index 100% rename from spec/trees/Vehicle/CargoVehicle/Variability.json rename to spec/trees/Vehicle/Truck/Variability.json diff --git a/spec/trees/Vehicle/CargoVehicle/Vehicle/Connectivity.vspec b/spec/trees/Vehicle/Truck/Vehicle/Connectivity.vspec similarity index 100% rename from spec/trees/Vehicle/CargoVehicle/Vehicle/Connectivity.vspec rename to spec/trees/Vehicle/Truck/Vehicle/Connectivity.vspec diff --git a/spec/trees/Vehicle/CargoVehicle/Vehicle/CurrentLocation.yaml b/spec/trees/Vehicle/Truck/Vehicle/CurrentLocation.yaml similarity index 100% rename from spec/trees/Vehicle/CargoVehicle/Vehicle/CurrentLocation.yaml rename to spec/trees/Vehicle/Truck/Vehicle/CurrentLocation.yaml diff --git a/spec/trees/Vehicle/CargoVehicle/Vehicle/GenericVehicle.yaml b/spec/trees/Vehicle/Truck/Vehicle/GenericVehicle.yaml similarity index 100% rename from spec/trees/Vehicle/CargoVehicle/Vehicle/GenericVehicle.yaml rename to spec/trees/Vehicle/Truck/Vehicle/GenericVehicle.yaml diff --git a/spec/trees/Vehicle/CargoVehicle/Vehicle/LowVoltageBattery.yaml b/spec/trees/Vehicle/Truck/Vehicle/LowVoltageBattery.yaml similarity index 100% rename from spec/trees/Vehicle/CargoVehicle/Vehicle/LowVoltageBattery.yaml rename to spec/trees/Vehicle/Truck/Vehicle/LowVoltageBattery.yaml diff --git a/spec/trees/Vehicle/CargoVehicle/Vehicle/Service.vspec b/spec/trees/Vehicle/Truck/Vehicle/Service.vspec similarity index 100% rename from spec/trees/Vehicle/CargoVehicle/Vehicle/Service.vspec rename to spec/trees/Vehicle/Truck/Vehicle/Service.vspec diff --git a/spec/trees/Vehicle/CargoVehicle/Vehicle/Trailer.yaml b/spec/trees/Vehicle/Truck/Vehicle/Trailer.yaml similarity index 100% rename from spec/trees/Vehicle/CargoVehicle/Vehicle/Trailer.yaml rename to spec/trees/Vehicle/Truck/Vehicle/Trailer.yaml diff --git a/spec/trees/Vehicle/CargoVehicle/Vehicle/Vehicle.vspec b/spec/trees/Vehicle/Truck/Vehicle/Vehicle.vspec similarity index 100% rename from spec/trees/Vehicle/CargoVehicle/Vehicle/Vehicle.vspec rename to spec/trees/Vehicle/Truck/Vehicle/Vehicle.vspec diff --git a/spec/trees/Vehicle/CargoVehicle/Vehicle/VehicleIdentification.yaml b/spec/trees/Vehicle/Truck/Vehicle/VehicleIdentification.yaml similarity index 100% rename from spec/trees/Vehicle/CargoVehicle/Vehicle/VehicleIdentification.yaml rename to spec/trees/Vehicle/Truck/Vehicle/VehicleIdentification.yaml diff --git a/spec/trees/Vehicle/CargoVehicle/Vehicle/Version.yaml b/spec/trees/Vehicle/Truck/Vehicle/Version.yaml similarity index 100% rename from spec/trees/Vehicle/CargoVehicle/Vehicle/Version.yaml rename to spec/trees/Vehicle/Truck/Vehicle/Version.yaml diff --git a/spec/trees/Vehicle/CargoVehicle/cv-truck-symlinks.sh b/spec/trees/Vehicle/Truck/cv-truck-symlinks.sh similarity index 100% rename from spec/trees/Vehicle/CargoVehicle/cv-truck-symlinks.sh rename to spec/trees/Vehicle/Truck/cv-truck-symlinks.sh diff --git a/spec/trees/Vehicle/CargoVehicle/himConfiguration.json b/spec/trees/Vehicle/Truck/himConfiguration.json similarity index 100% rename from spec/trees/Vehicle/CargoVehicle/himConfiguration.json rename to spec/trees/Vehicle/Truck/himConfiguration.json diff --git a/spec/trees/Vehicle/CargoVehicle/include/ItemHeatingCooling.yaml b/spec/trees/Vehicle/Truck/include/ItemHeatingCooling.yaml similarity index 100% rename from spec/trees/Vehicle/CargoVehicle/include/ItemHeatingCooling.yaml rename to spec/trees/Vehicle/Truck/include/ItemHeatingCooling.yaml diff --git a/spec/trees/Vehicle/CargoVehicle/include/LockableMovableItem.vspec b/spec/trees/Vehicle/Truck/include/LockableMovableItem.vspec similarity index 100% rename from spec/trees/Vehicle/CargoVehicle/include/LockableMovableItem.vspec rename to spec/trees/Vehicle/Truck/include/LockableMovableItem.vspec diff --git a/spec/trees/Vehicle/CargoVehicle/include/MovableItem.yaml b/spec/trees/Vehicle/Truck/include/MovableItem.yaml similarity index 100% rename from spec/trees/Vehicle/CargoVehicle/include/MovableItem.yaml rename to spec/trees/Vehicle/Truck/include/MovableItem.yaml diff --git a/spec/trees/Vehicle/CargoVehicle/include/PowerOptimize.yaml b/spec/trees/Vehicle/Truck/include/PowerOptimize.yaml similarity index 100% rename from spec/trees/Vehicle/CargoVehicle/include/PowerOptimize.yaml rename to spec/trees/Vehicle/Truck/include/PowerOptimize.yaml diff --git a/spec/trees/himConfigurator.go b/spec/trees/himConfigurator.go index c80dee1..5a0c8a6 100644 --- a/spec/trees/himConfigurator.go +++ b/spec/trees/himConfigurator.go @@ -1114,7 +1114,7 @@ func main() { makeCommand := parser.Selector("m", "makecommand", []string{"all", "yaml", "json", "csv", "binary"}, &argparse.Options{Required: false, Help: "Make command parameter must be either: all, yaml, csv, or binary", Default: "all"}) // configFileName := parser.String("p", "pathconfigfile", &argparse.Options{Required: false, Help: "path to configuration file", Default: "himConfiguration.json"}) - vspecDir := parser.String("v", "vspecdir", &argparse.Options{Required: false, Help: "path to vspec root directory", Default: "Vehicle/CargoVehicle/"}) + vspecDir := parser.String("v", "vspecdir", &argparse.Options{Required: false, Help: "path to vspec root directory", Default: "Vehicle/Truck/"}) sConf := parser.Flag("c", "saveconf", &argparse.Options{Required: false, Help: "Saves the configured vspec file with extension .conf", Default: false}) enumSubst := parser.Flag("e", "enumSubstitute", &argparse.Options{Required: false, Help: "Substitute enum links to Datatype tree with actual datatypes", Default: false}) err := parser.Parse(os.Args)