diff --git a/LibCarla/source/carla/sensor/data/V2XEvent.h b/LibCarla/source/carla/sensor/data/V2XEvent.h index f1966a5ad..817630fe7 100644 --- a/LibCarla/source/carla/sensor/data/V2XEvent.h +++ b/LibCarla/source/carla/sensor/data/V2XEvent.h @@ -58,4 +58,4 @@ namespace carla } // namespace data } // namespace sensor -} // namespace carla \ No newline at end of file +} // namespace carla diff --git a/LibCarla/source/carla/sensor/s11n/V2XSerializer.cpp b/LibCarla/source/carla/sensor/s11n/V2XSerializer.cpp index 7babb44ef..7853afac7 100644 --- a/LibCarla/source/carla/sensor/s11n/V2XSerializer.cpp +++ b/LibCarla/source/carla/sensor/s11n/V2XSerializer.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2024 Institut fuer Technik der Informationsverarbeitung (ITIV) at the +// Copyright (c) 2024 Institut fuer Technik der Informationsverarbeitung (ITIV) at the // Karlsruhe Institute of Technology // // This work is licensed under the terms of the MIT license. @@ -8,18 +8,23 @@ #include "carla/sensor/data/V2XEvent.h" -namespace carla { -namespace sensor { -namespace s11n { +namespace carla +{ + namespace sensor + { + namespace s11n + { - SharedPtr CAMDataSerializer::Deserialize(RawData &&data) { - return SharedPtr(new data::CAMEvent(std::move(data))); - } + SharedPtr CAMDataSerializer::Deserialize(RawData &&data) + { + return SharedPtr(new data::CAMEvent(std::move(data))); + } - SharedPtr CustomV2XDataSerializer::Deserialize(RawData &&data) { - return SharedPtr(new data::CustomV2XEvent(std::move(data))); - } + SharedPtr CustomV2XDataSerializer::Deserialize(RawData &&data) + { + return SharedPtr(new data::CustomV2XEvent(std::move(data))); + } -} // namespace s11n -} // namespace sensor -} // namespace carla \ No newline at end of file + } // namespace s11n + } // namespace sensor +} // namespace carla diff --git a/LibCarla/source/carla/sensor/s11n/V2XSerializer.h b/LibCarla/source/carla/sensor/s11n/V2XSerializer.h index 9d6c7e700..4c38aed47 100644 --- a/LibCarla/source/carla/sensor/s11n/V2XSerializer.h +++ b/LibCarla/source/carla/sensor/s11n/V2XSerializer.h @@ -76,4 +76,4 @@ namespace carla } // namespace s11n } // namespace sensor -} // namespace carla \ No newline at end of file +} // namespace carla diff --git a/PythonAPI/carla/source/libcarla/V2XData.cpp b/PythonAPI/carla/source/libcarla/V2XData.cpp index a29cf152e..748e330a9 100644 --- a/PythonAPI/carla/source/libcarla/V2XData.cpp +++ b/PythonAPI/carla/source/libcarla/V2XData.cpp @@ -477,45 +477,7 @@ std::string GetVehicleRoleString(ITSContainer::VehicleRole_t vehicleRole) return "Default"; } } -// boost::python::list GetVehicleExteriorLightList(const ITSContainer::ExteriorLights_t exteriorLights) -// { -// boost::python::list ExteriorLightsList; -// uint8_t light = *exteriorLights.buf; -// if(light & 0x80) -// { -// ExteriorLightsList.append("Low Beam Head Lights On"); -// } -// if(light & 0x40) -// { -// ExteriorLightsList.append("High Beam Head Lights On"); -// } -// if(light & 0x20) -// { -// ExteriorLightsList.append("Left turn signal on"); -// } -// if(light & 0x10) -// { -// ExteriorLightsList.append("Right turn signal on"); -// } -// if(light & 0x08) -// { -// ExteriorLightsList.append("Day time running lights on"); -// } -// if(light & 0x04) -// { -// ExteriorLightsList.append("Reverse light on"); -// } -// if(light & 0x02) -// { -// ExteriorLightsList.append("Fog light on"); -// } -// if(light & 0x01) -// { -// ExteriorLightsList.append("Parking Lights on"); -// } -// return ExteriorLightsList; -// } boost::python::list GetPathHistory(const ITSContainer::PathHistory_t pathHistory) { @@ -542,7 +504,7 @@ boost::python::dict GetBVCLowFrequency(const CAMContainer::BasicVehicleContainer { boost::python::dict BVC; BVC["Vehicle Role"] = GetVehicleRoleString(bvc.vehicleRole); - BVC["Exterior Light"] = bvc.exteriorLights; // GetVehicleExteriorLightList(bvc.exteriorLights); + BVC["Exterior Light"] = bvc.exteriorLights; if (bvc.pathHistory.NumberOfPathPoint != 0) { BVC["Path History"] = GetPathHistory(bvc.pathHistory); diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/V2X/CaService.h b/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/V2X/CaService.h index 6147352e4..749b54e65 100644 --- a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/V2X/CaService.h +++ b/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/V2X/CaService.h @@ -134,4 +134,4 @@ private: ITSContainer::SpeedValue_t buildSpeedValue(const float vel); -}; \ No newline at end of file +}; diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/V2X/PathLossModel.h b/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/V2X/PathLossModel.h index 04d71fa38..beb37398b 100644 --- a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/V2X/PathLossModel.h +++ b/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/V2X/PathLossModel.h @@ -141,4 +141,4 @@ protected: void CalculateFSPL_d0(); TArray HitResult; -}; \ No newline at end of file +}; diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/V2X/VehicleObstacle.cpp b/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/V2X/VehicleObstacle.cpp index 0bac279c7..4f44a31d1 100644 --- a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/V2X/VehicleObstacle.cpp +++ b/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/V2X/VehicleObstacle.cpp @@ -225,4 +225,4 @@ double PathLossModel::MakeVehicleBlockageLoss(double TxHeight, double RxHeight, float mean = 5.0f + fmax(0.0f, 15.0f * log10(obj_distance)-41.0f); return mRandomEngine->GetNormalDistribution(mean, 4.0f); } -} \ No newline at end of file +} diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/V2XSensor.cpp b/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/V2XSensor.cpp index 321b21686..503f1e923 100644 --- a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/V2XSensor.cpp +++ b/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/V2XSensor.cpp @@ -232,4 +232,4 @@ void AV2XSensor::WriteMessageToV2XData(const AV2XSensor::V2XDataList &msg_receiv { mV2XData.WriteMessage(elem); } -} \ No newline at end of file +} diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/V2XSensor.h b/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/V2XSensor.h index 940d5eeee..89b6be27a 100644 --- a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/V2XSensor.h +++ b/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/V2XSensor.h @@ -74,4 +74,4 @@ private: //write void WriteMessageToV2XData(const V2XDataList &msg_received_power_list); -}; \ No newline at end of file +};