Merge pull request #14 from UlfBj/main

Renamed CargoVehicle to Truck
COVESA · Sep 9, 2024 · 89ffcd8 · 89ffcd8
2 parents 85d55e0 + 96eea47
commit 89ffcd8
Show file tree

Hide file tree

Showing 64 changed files with 10 additions and 10 deletions.
diff --git a/...rees/Vehicle/CargoVehicle/ADAS/ADAS.vspec → spec/trees/Vehicle/Truck/ADAS/ADAS.vspec b/...rees/Vehicle/CargoVehicle/ADAS/ADAS.vspec → spec/trees/Vehicle/Truck/ADAS/ADAS.vspec
diff --git a/...rees/Vehicle/CargoVehicle/Body/Body.vspec → spec/trees/Vehicle/Truck/Body/Body.vspec b/...rees/Vehicle/CargoVehicle/Body/Body.vspec → spec/trees/Vehicle/Truck/Body/Body.vspec
diff --git a/...hicle/CargoVehicle/Body/BrakeLights.vspec → ...rees/Vehicle/Truck/Body/BrakeLights.vspec b/...hicle/CargoVehicle/Body/BrakeLights.vspec → ...rees/Vehicle/Truck/Body/BrakeLights.vspec
diff --git a/...e/CargoVehicle/Body/ExteriorMirrors.vspec → .../Vehicle/Truck/Body/ExteriorMirrors.vspec b/...e/CargoVehicle/Body/ExteriorMirrors.vspec → .../Vehicle/Truck/Body/ExteriorMirrors.vspec
diff --git a/...es/Vehicle/CargoVehicle/Body/Lights.vspec → spec/trees/Vehicle/Truck/Body/Lights.vspec b/...es/Vehicle/CargoVehicle/Body/Lights.vspec → spec/trees/Vehicle/Truck/Body/Lights.vspec
diff --git a/...e/CargoVehicle/Body/SignalingLights.vspec → .../Vehicle/Truck/Body/SignalingLights.vspec b/...e/CargoVehicle/Body/SignalingLights.vspec → .../Vehicle/Truck/Body/SignalingLights.vspec
diff --git a/...icle/CargoVehicle/Body/StaticLights.vspec → ...ees/Vehicle/Truck/Body/StaticLights.vspec b/...icle/CargoVehicle/Body/StaticLights.vspec → ...ees/Vehicle/Truck/Body/StaticLights.vspec
diff --git a/...ehicle/CargoVehicle/Body/Windshield.vspec → ...trees/Vehicle/Truck/Body/Windshield.vspec b/...ehicle/CargoVehicle/Body/Windshield.vspec → ...trees/Vehicle/Truck/Body/Windshield.vspec
diff --git a/...ehicle/CargoVehicle/Body/WiperSystem.yaml → ...trees/Vehicle/Truck/Body/WiperSystem.yaml b/...ehicle/CargoVehicle/Body/WiperSystem.yaml → ...trees/Vehicle/Truck/Body/WiperSystem.yaml
diff --git a/...es/Vehicle/CargoVehicle/Cabin/Cabin.vspec → spec/trees/Vehicle/Truck/Cabin/Cabin.vspec b/...es/Vehicle/CargoVehicle/Cabin/Cabin.vspec → spec/trees/Vehicle/Truck/Cabin/Cabin.vspec
diff --git a/...ees/Vehicle/CargoVehicle/Cabin/HVAC.vspec → spec/trees/Vehicle/Truck/Cabin/HVAC.vspec b/...ees/Vehicle/CargoVehicle/Cabin/HVAC.vspec → spec/trees/Vehicle/Truck/Cabin/HVAC.vspec
diff --git a/...cle/CargoVehicle/Cabin/Infotainment.vspec → ...es/Vehicle/Truck/Cabin/Infotainment.vspec b/...cle/CargoVehicle/Cabin/Infotainment.vspec → ...es/Vehicle/Truck/Cabin/Infotainment.vspec
diff --git a/...e/CargoVehicle/Cabin/InteriorLights.vspec → .../Vehicle/Truck/Cabin/InteriorLights.vspec b/...e/CargoVehicle/Cabin/InteriorLights.vspec → .../Vehicle/Truck/Cabin/InteriorLights.vspec
diff --git a/...Vehicle/CargoVehicle/Cabin/Occupant.vspec → .../trees/Vehicle/Truck/Cabin/Occupant.vspec b/...Vehicle/CargoVehicle/Cabin/Occupant.vspec → .../trees/Vehicle/Truck/Cabin/Occupant.vspec
diff --git a/...hicle/Cabin/SingleConfigurableLight.vspec → ...Truck/Cabin/SingleConfigurableLight.vspec b/...hicle/Cabin/SingleConfigurableLight.vspec → ...Truck/Cabin/SingleConfigurableLight.vspec
diff --git a/...hicle/CargoVehicle/Cabin/SingleDoor.vspec → ...rees/Vehicle/Truck/Cabin/SingleDoor.vspec b/...hicle/CargoVehicle/Cabin/SingleDoor.vspec → ...rees/Vehicle/Truck/Cabin/SingleDoor.vspec
diff --git a/...argoVehicle/Cabin/SingleHVACStation.vspec → ...hicle/Truck/Cabin/SingleHVACStation.vspec b/...argoVehicle/Cabin/SingleHVACStation.vspec → ...hicle/Truck/Cabin/SingleHVACStation.vspec
diff --git a/...hicle/CargoVehicle/Cabin/SingleSeat.vspec → ...rees/Vehicle/Truck/Cabin/SingleSeat.vspec b/...hicle/CargoVehicle/Cabin/SingleSeat.vspec → ...rees/Vehicle/Truck/Cabin/SingleSeat.vspec
diff --git a/...Vehicle/CargoVehicle/Cargo/Boxtruck.vspec → .../trees/Vehicle/Truck/Cargo/Boxtruck.vspec b/...Vehicle/CargoVehicle/Cargo/Boxtruck.vspec → .../trees/Vehicle/Truck/Cargo/Boxtruck.vspec
diff --git a/...es/Vehicle/CargoVehicle/Cargo/Cargo.vspec → spec/trees/Vehicle/Truck/Cargo/Cargo.vspec b/...es/Vehicle/CargoVehicle/Cargo/Cargo.vspec → spec/trees/Vehicle/Truck/Cargo/Cargo.vspec
diff --git a/...s/Vehicle/CargoVehicle/Cargo/Pickup.vspec → spec/trees/Vehicle/Truck/Cargo/Pickup.vspec b/...s/Vehicle/CargoVehicle/Cargo/Pickup.vspec → spec/trees/Vehicle/Truck/Cargo/Pickup.vspec
diff --git a/...Vehicle/CargoVehicle/Cargo/TowTruck.vspec → .../trees/Vehicle/Truck/Cargo/TowTruck.vspec b/...Vehicle/CargoVehicle/Cargo/TowTruck.vspec → .../trees/Vehicle/Truck/Cargo/TowTruck.vspec
diff --git a/...rees/Vehicle/CargoVehicle/Cargo/Van.vspec → spec/trees/Vehicle/Truck/Cargo/Van.vspec b/...rees/Vehicle/CargoVehicle/Cargo/Van.vspec → spec/trees/Vehicle/Truck/Cargo/Van.vspec
diff --git a/...cle/CargoVehicle/Chassis/Accelerator.yaml → ...es/Vehicle/Truck/Chassis/Accelerator.yaml b/...cle/CargoVehicle/Chassis/Accelerator.yaml → ...es/Vehicle/Truck/Chassis/Accelerator.yaml
diff --git a/...s/Vehicle/CargoVehicle/Chassis/Axle.vspec → spec/trees/Vehicle/Truck/Chassis/Axle.vspec b/...s/Vehicle/CargoVehicle/Chassis/Axle.vspec → spec/trees/Vehicle/Truck/Chassis/Axle.vspec
diff --git a/...s/Vehicle/CargoVehicle/Chassis/Brake.yaml → spec/trees/Vehicle/Truck/Chassis/Brake.yaml b/...s/Vehicle/CargoVehicle/Chassis/Brake.yaml → spec/trees/Vehicle/Truck/Chassis/Brake.yaml
diff --git a/...ehicle/CargoVehicle/Chassis/Chassis.vspec → ...trees/Vehicle/Truck/Chassis/Chassis.vspec b/...ehicle/CargoVehicle/Chassis/Chassis.vspec → ...trees/Vehicle/Truck/Chassis/Chassis.vspec
diff --git a/...le/CargoVehicle/Chassis/ParkingBrake.yaml → ...s/Vehicle/Truck/Chassis/ParkingBrake.yaml b/...le/CargoVehicle/Chassis/ParkingBrake.yaml → ...s/Vehicle/Truck/Chassis/ParkingBrake.yaml
diff --git a/...e/CargoVehicle/Chassis/SteeringWheel.yaml → .../Vehicle/Truck/Chassis/SteeringWheel.yaml b/...e/CargoVehicle/Chassis/SteeringWheel.yaml → .../Vehicle/Truck/Chassis/SteeringWheel.yaml
diff --git a/...s/Vehicle/CargoVehicle/Chassis/Wheel.yaml → spec/trees/Vehicle/Truck/Chassis/Wheel.yaml b/...s/Vehicle/CargoVehicle/Chassis/Wheel.yaml → spec/trees/Vehicle/Truck/Chassis/Wheel.yaml
diff --git a/...s/Vehicle/CargoVehicle/DataTypes.yaml.old → spec/trees/Vehicle/Truck/DataTypes.yaml.old b/...s/Vehicle/CargoVehicle/DataTypes.yaml.old → spec/trees/Vehicle/Truck/DataTypes.yaml.old
diff --git a/...ees/Vehicle/CargoVehicle/DataTypesv2.yaml → spec/trees/Vehicle/Truck/DataTypesv2.yaml b/...ees/Vehicle/CargoVehicle/DataTypesv2.yaml → spec/trees/Vehicle/Truck/DataTypesv2.yaml
diff --git a/...trees/Vehicle/CargoVehicle/Datatypes.yaml → spec/trees/Vehicle/Truck/Datatypes.yaml b/...trees/Vehicle/CargoVehicle/Datatypes.yaml → spec/trees/Vehicle/Truck/Datatypes.yaml
diff --git a/...icle/CargoVehicle/Exterior/Exterior.vspec → ...ees/Vehicle/Truck/Exterior/Exterior.vspec b/...icle/CargoVehicle/Exterior/Exterior.vspec → ...ees/Vehicle/Truck/Exterior/Exterior.vspec
diff --git a/.../CargoVehicle/Identifier/Identifier.vspec → ...Vehicle/Truck/Identifier/Identifier.vspec b/.../CargoVehicle/Identifier/Identifier.vspec → ...Vehicle/Truck/Identifier/Identifier.vspec
diff --git a/...hicle/Powertrain/BatteryConditioning.yaml → ...Truck/Powertrain/BatteryConditioning.yaml b/...hicle/Powertrain/BatteryConditioning.yaml → ...Truck/Powertrain/BatteryConditioning.yaml
diff --git a/...oVehicle/Powertrain/CombustionEngine.yaml → ...le/Truck/Powertrain/CombustionEngine.yaml b/...oVehicle/Powertrain/CombustionEngine.yaml → ...le/Truck/Powertrain/CombustionEngine.yaml
diff --git a/...goVehicle/Powertrain/ElectricEngine.vspec → ...cle/Truck/Powertrain/ElectricEngine.vspec b/...goVehicle/Powertrain/ElectricEngine.vspec → ...cle/Truck/Powertrain/ElectricEngine.vspec
diff --git a/...argoVehicle/Powertrain/ElectricMotor.yaml → ...hicle/Truck/Powertrain/ElectricMotor.yaml b/...argoVehicle/Powertrain/ElectricMotor.yaml → ...hicle/Truck/Powertrain/ElectricMotor.yaml
diff --git a/...oVehicle/Powertrain/EnergyManagement.yaml → ...le/Truck/Powertrain/EnergyManagement.yaml b/...oVehicle/Powertrain/EnergyManagement.yaml → ...le/Truck/Powertrain/EnergyManagement.yaml
diff --git a/...icle/CargoVehicle/Powertrain/Engine.vspec → ...ees/Vehicle/Truck/Powertrain/Engine.vspec b/...icle/CargoVehicle/Powertrain/Engine.vspec → ...ees/Vehicle/Truck/Powertrain/Engine.vspec
diff --git a/...argoVehicle/Powertrain/EngineCoolant.yaml → ...hicle/Truck/Powertrain/EngineCoolant.yaml b/...argoVehicle/Powertrain/EngineCoolant.yaml → ...hicle/Truck/Powertrain/EngineCoolant.yaml
diff --git a/...e/CargoVehicle/Powertrain/FuelSystem.yaml → .../Vehicle/Truck/Powertrain/FuelSystem.yaml b/...e/CargoVehicle/Powertrain/FuelSystem.yaml → .../Vehicle/Truck/Powertrain/FuelSystem.yaml
diff --git a/.../CargoVehicle/Powertrain/Powertrain.vspec → ...Vehicle/Truck/Powertrain/Powertrain.vspec b/.../CargoVehicle/Powertrain/Powertrain.vspec → ...Vehicle/Truck/Powertrain/Powertrain.vspec
diff --git a/...goVehicle/Powertrain/TractionBattery.yaml → ...cle/Truck/Powertrain/TractionBattery.yaml b/...goVehicle/Powertrain/TractionBattery.yaml → ...cle/Truck/Powertrain/TractionBattery.yaml
diff --git a/...CargoVehicle/Powertrain/Transmission.yaml → ...ehicle/Truck/Powertrain/Transmission.yaml b/...CargoVehicle/Powertrain/Transmission.yaml → ...ehicle/Truck/Powertrain/Transmission.yaml
diff --git a/...cle/CargoVehicleSignalSpecification.vspec → ...icle/Truck/TruckSignalSpecification.vspec b/...cle/CargoVehicleSignalSpecification.vspec → ...icle/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/...ees/Vehicle/CargoVehicle/Variability.json → spec/trees/Vehicle/Truck/Variability.json b/...ees/Vehicle/CargoVehicle/Variability.json → spec/trees/Vehicle/Truck/Variability.json
diff --git a/...e/CargoVehicle/Vehicle/Connectivity.vspec → .../Vehicle/Truck/Vehicle/Connectivity.vspec b/...e/CargoVehicle/Vehicle/Connectivity.vspec → .../Vehicle/Truck/Vehicle/Connectivity.vspec
diff --git a/...CargoVehicle/Vehicle/CurrentLocation.yaml → ...ehicle/Truck/Vehicle/CurrentLocation.yaml b/...CargoVehicle/Vehicle/CurrentLocation.yaml → ...ehicle/Truck/Vehicle/CurrentLocation.yaml
diff --git a/.../CargoVehicle/Vehicle/GenericVehicle.yaml → ...Vehicle/Truck/Vehicle/GenericVehicle.yaml b/.../CargoVehicle/Vehicle/GenericVehicle.yaml → ...Vehicle/Truck/Vehicle/GenericVehicle.yaml
diff --git a/...rgoVehicle/Vehicle/LowVoltageBattery.yaml → ...icle/Truck/Vehicle/LowVoltageBattery.yaml b/...rgoVehicle/Vehicle/LowVoltageBattery.yaml → ...icle/Truck/Vehicle/LowVoltageBattery.yaml
diff --git a/...ehicle/CargoVehicle/Vehicle/Service.vspec → ...trees/Vehicle/Truck/Vehicle/Service.vspec b/...ehicle/CargoVehicle/Vehicle/Service.vspec → ...trees/Vehicle/Truck/Vehicle/Service.vspec
diff --git a/...Vehicle/CargoVehicle/Vehicle/Trailer.yaml → .../trees/Vehicle/Truck/Vehicle/Trailer.yaml b/...Vehicle/CargoVehicle/Vehicle/Trailer.yaml → .../trees/Vehicle/Truck/Vehicle/Trailer.yaml
diff --git a/...ehicle/CargoVehicle/Vehicle/Vehicle.vspec → ...trees/Vehicle/Truck/Vehicle/Vehicle.vspec b/...ehicle/CargoVehicle/Vehicle/Vehicle.vspec → ...trees/Vehicle/Truck/Vehicle/Vehicle.vspec
diff --git a/...ehicle/Vehicle/VehicleIdentification.yaml → .../Truck/Vehicle/VehicleIdentification.yaml b/...ehicle/Vehicle/VehicleIdentification.yaml → .../Truck/Vehicle/VehicleIdentification.yaml
diff --git a/...Vehicle/CargoVehicle/Vehicle/Version.yaml → .../trees/Vehicle/Truck/Vehicle/Version.yaml b/...Vehicle/CargoVehicle/Vehicle/Version.yaml → .../trees/Vehicle/Truck/Vehicle/Version.yaml
diff --git a/...Vehicle/CargoVehicle/cv-truck-symlinks.sh → .../trees/Vehicle/Truck/cv-truck-symlinks.sh b/...Vehicle/CargoVehicle/cv-truck-symlinks.sh → .../trees/Vehicle/Truck/cv-truck-symlinks.sh
diff --git a/...ehicle/CargoVehicle/himConfiguration.json → ...trees/Vehicle/Truck/himConfiguration.json b/...ehicle/CargoVehicle/himConfiguration.json → ...trees/Vehicle/Truck/himConfiguration.json
diff --git a/...goVehicle/include/ItemHeatingCooling.yaml → ...cle/Truck/include/ItemHeatingCooling.yaml b/...goVehicle/include/ItemHeatingCooling.yaml → ...cle/Truck/include/ItemHeatingCooling.yaml
diff --git a/...Vehicle/include/LockableMovableItem.vspec → ...e/Truck/include/LockableMovableItem.vspec b/...Vehicle/include/LockableMovableItem.vspec → ...e/Truck/include/LockableMovableItem.vspec
diff --git a/...cle/CargoVehicle/include/MovableItem.yaml → ...es/Vehicle/Truck/include/MovableItem.yaml b/...cle/CargoVehicle/include/MovableItem.yaml → ...es/Vehicle/Truck/include/MovableItem.yaml
diff --git a/...e/CargoVehicle/include/PowerOptimize.yaml → .../Vehicle/Truck/include/PowerOptimize.yaml b/...e/CargoVehicle/include/PowerOptimize.yaml → .../Vehicle/Truck/include/PowerOptimize.yaml
diff --git 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)