From 88fc56b1c48e2dc9556a38a369f6d75ea83226a6 Mon Sep 17 00:00:00 2001 From: jinholee Date: Thu, 30 May 2024 22:11:40 +0200 Subject: [PATCH] updated fidl --- fidl/CanTransceiver.fidl | 5 ++-- src-gen/core/v0/commonapi/CanTransceiver.hpp | 24 ++++++++----------- .../core/v0/commonapi/CanTransceiverProxy.hpp | 4 ++-- .../v0/commonapi/CanTransceiverProxyBase.hpp | 2 +- .../core/v0/commonapi/CanTransceiverStub.hpp | 4 ++-- .../commonapi/CanTransceiverStubDefault.hpp | 2 +- .../CanTransceiverSomeIPDeployment.hpp | 1 - 7 files changed, 18 insertions(+), 24 deletions(-) diff --git a/fidl/CanTransceiver.fidl b/fidl/CanTransceiver.fidl index c720422..0b69314 100644 --- a/fidl/CanTransceiver.fidl +++ b/fidl/CanTransceiver.fidl @@ -8,8 +8,7 @@ interface CanTransceiver { attribute UInt32 rpm readonly struct SonarArrayStruct { - UInt32 sensorfrontleft - UInt32 sensorfrontmiddle - UInt32 sensorfrontright + UInt32 sensorfront + UInt32 sensorrear } } \ No newline at end of file diff --git a/src-gen/core/v0/commonapi/CanTransceiver.hpp b/src-gen/core/v0/commonapi/CanTransceiver.hpp index 840c6f6..6612f4a 100644 --- a/src-gen/core/v0/commonapi/CanTransceiver.hpp +++ b/src-gen/core/v0/commonapi/CanTransceiver.hpp @@ -1,6 +1,6 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 3.2.14.v202310241605. +* Used org.genivi.commonapi.core 3.2.0.v202012010850. * Used org.franca.core 0.13.1.201807231814. * * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. @@ -39,28 +39,24 @@ class CanTransceiver { static inline const char* getInterface(); static inline CommonAPI::Version getInterfaceVersion(); - struct SonarArrayStruct : CommonAPI::Struct< uint32_t, uint32_t, uint32_t> { + struct SonarArrayStruct : CommonAPI::Struct< uint32_t, uint32_t> { SonarArrayStruct() { std::get< 0>(values_) = 0ul; std::get< 1>(values_) = 0ul; - std::get< 2>(values_) = 0ul; } - SonarArrayStruct(const uint32_t &_sensorfrontleft, const uint32_t &_sensorfrontmiddle, const uint32_t &_sensorfrontright) + SonarArrayStruct(const uint32_t &_sensorfront, const uint32_t &_sensorrear) { - std::get< 0>(values_) = _sensorfrontleft; - std::get< 1>(values_) = _sensorfrontmiddle; - std::get< 2>(values_) = _sensorfrontright; + std::get< 0>(values_) = _sensorfront; + std::get< 1>(values_) = _sensorrear; } - inline const uint32_t &getSensorfrontleft() const { return std::get< 0>(values_); } - inline void setSensorfrontleft(const uint32_t &_value) { std::get< 0>(values_) = _value; } - inline const uint32_t &getSensorfrontmiddle() const { return std::get< 1>(values_); } - inline void setSensorfrontmiddle(const uint32_t &_value) { std::get< 1>(values_) = _value; } - inline const uint32_t &getSensorfrontright() const { return std::get< 2>(values_); } - inline void setSensorfrontright(const uint32_t &_value) { std::get< 2>(values_) = _value; } + inline const uint32_t &getSensorfront() const { return std::get< 0>(values_); } + inline void setSensorfront(const uint32_t &_value) { std::get< 0>(values_) = _value; } + inline const uint32_t &getSensorrear() const { return std::get< 1>(values_); } + inline void setSensorrear(const uint32_t &_value) { std::get< 1>(values_) = _value; } inline bool operator==(const SonarArrayStruct& _other) const { - return (getSensorfrontleft() == _other.getSensorfrontleft() && getSensorfrontmiddle() == _other.getSensorfrontmiddle() && getSensorfrontright() == _other.getSensorfrontright()); + return (getSensorfront() == _other.getSensorfront() && getSensorrear() == _other.getSensorrear()); } inline bool operator!=(const SonarArrayStruct &_other) const { return !((*this) == _other); diff --git a/src-gen/core/v0/commonapi/CanTransceiverProxy.hpp b/src-gen/core/v0/commonapi/CanTransceiverProxy.hpp index 7ade24b..ab4dfda 100644 --- a/src-gen/core/v0/commonapi/CanTransceiverProxy.hpp +++ b/src-gen/core/v0/commonapi/CanTransceiverProxy.hpp @@ -1,6 +1,6 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 3.2.14.v202310241605. +* Used org.genivi.commonapi.core 3.2.0.v202012010850. * Used org.franca.core 0.13.1.201807231814. * * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. @@ -38,7 +38,7 @@ class CanTransceiverProxy CanTransceiverProxy(std::shared_ptr delegate); ~CanTransceiverProxy(); - typedef ::v0::commonapi::CanTransceiver InterfaceType; + typedef CanTransceiver InterfaceType; /** diff --git a/src-gen/core/v0/commonapi/CanTransceiverProxyBase.hpp b/src-gen/core/v0/commonapi/CanTransceiverProxyBase.hpp index 19214f5..f5f272e 100644 --- a/src-gen/core/v0/commonapi/CanTransceiverProxyBase.hpp +++ b/src-gen/core/v0/commonapi/CanTransceiverProxyBase.hpp @@ -1,6 +1,6 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 3.2.14.v202310241605. +* Used org.genivi.commonapi.core 3.2.0.v202012010850. * Used org.franca.core 0.13.1.201807231814. * * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. diff --git a/src-gen/core/v0/commonapi/CanTransceiverStub.hpp b/src-gen/core/v0/commonapi/CanTransceiverStub.hpp index 7cbd500..26508a6 100644 --- a/src-gen/core/v0/commonapi/CanTransceiverStub.hpp +++ b/src-gen/core/v0/commonapi/CanTransceiverStub.hpp @@ -1,6 +1,6 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 3.2.14.v202310241605. +* Used org.genivi.commonapi.core 3.2.0.v202012010850. * Used org.franca.core 0.13.1.201807231814. * * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. @@ -176,7 +176,7 @@ class CanTransceiverStub typedef CommonAPI::Stub::StubAdapterType StubAdapterType; typedef CommonAPI::Stub::RemoteEventHandlerType RemoteEventHandlerType; typedef CanTransceiverStubRemoteEvent RemoteEventType; - typedef ::v0::commonapi::CanTransceiver StubInterface; + typedef CanTransceiver StubInterface; }; } // namespace commonapi diff --git a/src-gen/core/v0/commonapi/CanTransceiverStubDefault.hpp b/src-gen/core/v0/commonapi/CanTransceiverStubDefault.hpp index e7319b2..7fcce9c 100644 --- a/src-gen/core/v0/commonapi/CanTransceiverStubDefault.hpp +++ b/src-gen/core/v0/commonapi/CanTransceiverStubDefault.hpp @@ -1,6 +1,6 @@ /* * This file was generated by the CommonAPI Generators. -* Used org.genivi.commonapi.core 3.2.14.v202310241605. +* Used org.genivi.commonapi.core 3.2.0.v202012010850. * Used org.franca.core 0.13.1.201807231814. * * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. diff --git a/src-gen/someip/v0/commonapi/CanTransceiverSomeIPDeployment.hpp b/src-gen/someip/v0/commonapi/CanTransceiverSomeIPDeployment.hpp index 5109a8d..0ab853c 100644 --- a/src-gen/someip/v0/commonapi/CanTransceiverSomeIPDeployment.hpp +++ b/src-gen/someip/v0/commonapi/CanTransceiverSomeIPDeployment.hpp @@ -28,7 +28,6 @@ namespace CanTransceiver_ { // Interface-specific deployment types typedef CommonAPI::SomeIP::StructDeployment< - CommonAPI::SomeIP::IntegerDeployment, CommonAPI::SomeIP::IntegerDeployment, CommonAPI::SomeIP::IntegerDeployment > SonarArrayStructDeployment_t;