replace hex based definition of enum with int, to avoid capi generation error

7 files changed, 59 insertions, 59 deletions

diff --git a/sensors-service/api/franca/Acceleration.fidl b/sensors-service/api/franca/Acceleration.fidl
index 130b278..f274792 100644
--- a/sensors-service/api/franca/Acceleration.fidl
+++ b/sensors-service/api/franca/Acceleration.fidl
@@ -27,16 +27,16 @@ interface Acceleration {
 	enumeration EAccelerationTypeBits{
 	   	<** @description:  An acceleration measurement for the x-axis is provided.
 	  	**>
-	    ACCELERATION_X_PROVIDED             = 0x00000001
+	    ACCELERATION_X_PROVIDED             = 1 //0x00000001
 	   	<** @description:  An acceleration measurement for the y-axis is provided.
 	  	**>    
-	    ACCELERATION_Y_PROVIDED             = 0x00000002
+	    ACCELERATION_Y_PROVIDED             = 2 //0x00000002
 	   	<** @description:  An acceleration measurement for the z-axis is provided.
 	  	**>    
-	    ACCELERATION_Z_PROVIDED             = 0x00000004
+	    ACCELERATION_Z_PROVIDED             = 4 //0x00000004
 	   	<** @description:  A measurement for the temperature is provided.
 	  	**>
-	    ACCELERATION_TEMPERATURE_PROVIDED   = 0x00000008
+	    ACCELERATION_TEMPERATURE_PROVIDED   = 8 //0x00000008
 	}
 
 	<** @description: 
@@ -130,19 +130,19 @@ interface Acceleration {
 	enumeration EAccelerationValidityBits{
 	    <** @description:  Validity bit for field TAccelerationData::x.
 	   	**>    
-	    ACCELERATION_X_VALID                = 0x00000001
+	    ACCELERATION_X_VALID                = 1 //0x00000001
 	    <** @description:  Validity bit for field TAccelerationData::y.
 	   	**>
-	    ACCELERATION_Y_VALID                = 0x00000002
+	    ACCELERATION_Y_VALID                = 2 //0x00000002
 	    <** @description:  Validity bit for field TAccelerationData::z.
 	   	**>
-	    ACCELERATION_Z_VALID                = 0x00000004
+	    ACCELERATION_Z_VALID                = 4 //0x00000004
 	    <** @description:  Validity bit for field TAccelerationData::temperature.
 	   	**>
-	    ACCELERATION_TEMPERATURE_VALID      = 0x00000008
+	    ACCELERATION_TEMPERATURE_VALID      = 8 //0x00000008
 	    <** @description:  Validity bit for field TAccelerationData::measurementInterval.
 	   	**>
-	    ACCELERATION_MEASINT_VALID          = 0x00000010    
+	    ACCELERATION_MEASINT_VALID          = 16 //0x00000010    
 	} 
 
 	<** @description: 
diff --git a/sensors-service/api/franca/AccelerationConfiguration.fidl b/sensors-service/api/franca/AccelerationConfiguration.fidl
index fb630a9..f658f1f 100644
--- a/sensors-service/api/franca/AccelerationConfiguration.fidl
+++ b/sensors-service/api/franca/AccelerationConfiguration.fidl
@@ -26,34 +26,34 @@ interface AccelerationConfiguration {
 	enumeration EAccelerationConfigValidityBits{
 	    <** @description:  Validity bit for field TAccelerationConfiguration::dist2RefPointX.
 	   	**>
-	    ACCELERATION_CONFIG_DISTX_VALID     = 0x00000001
+	    ACCELERATION_CONFIG_DISTX_VALID     = 1 //0x00000001
 	    <** @description:  Validity bit for field TAccelerationConfiguration::dist2RefPointY.
 	   	**>
-	    ACCELERATION_CONFIG_DISTY_VALID     = 0x00000002
+	    ACCELERATION_CONFIG_DISTY_VALID     = 2 //0x00000002
 	    <** @description:  Validity bit for field TAccelerationConfiguration::dist2RefPointZ.
 	   	**>
-	    ACCELERATION_CONFIG_DISTZ_VALID     = 0x00000004
+	    ACCELERATION_CONFIG_DISTZ_VALID     = 4 //0x00000004
 	    <** @description:  Validity bit for field TAccelerationConfiguration::angleYaw.
 	   	**>
-	    ACCELERATION_CONFIG_ANGLEYAW_VALID  = 0x00000008
+	    ACCELERATION_CONFIG_ANGLEYAW_VALID  = 8 //0x00000008
 	    <** @description:  Validity bit for field TAccelerationConfiguration::anglePitch.
 	   	**>
-	    ACCELERATION_CONFIG_ANGLEPITCH_VALID= 0x00000010
+	    ACCELERATION_CONFIG_ANGLEPITCH_VALID= 16 //0x00000010
 	    <** @description:  Validity bit for field TAccelerationConfiguration::angleRoll.
 	   	**>
-	    ACCELERATION_CONFIG_ANGLEROLL_VALID = 0x00000020
+	    ACCELERATION_CONFIG_ANGLEROLL_VALID = 32 //0x00000020
 	    <** @description:  Validity bit for field TAccelerationConfiguration::sigmaX.
 	   	**>
-	    ACCELERATION_CONFIG_SIGMAX_VALID    = 0x00000040
+	    ACCELERATION_CONFIG_SIGMAX_VALID    = 64 //0x00000040
 	    <** @description:  Validity bit for field TAccelerationConfiguration::sigmaX. 
 	   	**>
-	    ACCELERATION_CONFIG_SIGMAY_VALID    = 0x00000080
+	    ACCELERATION_CONFIG_SIGMAY_VALID    = 128 //0x00000080
 	    <** @description:  Validity bit for field TAccelerationConfiguration::sigmaZ.
 	   	**>
-	    ACCELERATION_CONFIG_SIGMAZ_VALID    = 0x00000100
+	    ACCELERATION_CONFIG_SIGMAZ_VALID    = 256 //0x00000100
 	    <** @description:  Validity bit for field TAccelerationConfiguration::typeBits.
 	   	**>
-	    ACCELERATION_CONFIG_TYPE_VALID      = 0x00000200
+	    ACCELERATION_CONFIG_TYPE_VALID      = 512 //0x00000200
 	}
 
 	<** @description: 
diff --git a/sensors-service/api/franca/Gyroscope.fidl b/sensors-service/api/franca/Gyroscope.fidl
index 3d7d461..924e0e6 100644
--- a/sensors-service/api/franca/Gyroscope.fidl
+++ b/sensors-service/api/franca/Gyroscope.fidl
@@ -32,19 +32,19 @@ interface Gyroscope {
 	enumeration EGyroscopeValidityBits {
 	    <** @description: Validity bit for field TGyroscopeData::yawRate.
 	    **>
-	    GYROSCOPE_YAWRATE_VALID             = 0x00000001
+	    GYROSCOPE_YAWRATE_VALID             = 1 //0x00000001
 	    <** @description: Validity bit for field TGyroscopeData::pitchRate.
 	    **>
-	    GYROSCOPE_PITCHRATE_VALID           = 0x00000002
+	    GYROSCOPE_PITCHRATE_VALID           = 2 //0x00000002
 	    <** @description: Validity bit for field TGyroscopeData::rollRate.
 	    **>
-	    GYROSCOPE_ROLLRATE_VALID            = 0x00000004
+	    GYROSCOPE_ROLLRATE_VALID            = 4 //0x00000004
 	    <** @description: Validity bit for field TGyroscopeData::temperature.
 	    **>
-	    GYROSCOPE_TEMPERATURE_VALID         = 0x00000008
+	    GYROSCOPE_TEMPERATURE_VALID         = 8 //0x00000008
 	    <** @description: Validity bit for field TGyroscopeData::measurementInterval.
 	    **>
-	    GYROSCOPE_MEASINT_VALID             = 0x00000010
+	    GYROSCOPE_MEASINT_VALID             = 16 //0x00000010
 	} 
 
 	<** @description: 
diff --git a/sensors-service/api/franca/GyroscopeConfiguration.fidl b/sensors-service/api/franca/GyroscopeConfiguration.fidl
index 6bb7eb7..19a1d65 100644
--- a/sensors-service/api/franca/GyroscopeConfiguration.fidl
+++ b/sensors-service/api/franca/GyroscopeConfiguration.fidl
@@ -27,22 +27,22 @@ interface GyroscopeConfiguration {
 	enumeration EGyroscopeConfigValidityBits{
 	    <** @description: Validity bit for field TGyroscopeConfiguration::angleYaw.
 	    **>
-	    GYROSCOPE_CONFIG_ANGLEYAW_VALID         = 0x00000001
+	    GYROSCOPE_CONFIG_ANGLEYAW_VALID         = 1 //0x00000001
 	    <** @description: Validity bit for field TGyroscopeConfiguration::anglePitch.
 	    **>
-	    GYROSCOPE_CONFIG_ANGLEPITCH_VALID       = 0x00000002
+	    GYROSCOPE_CONFIG_ANGLEPITCH_VALID       = 2 //0x00000002
 	    <** @description: Validity bit for field TGyroscopeConfiguration::angleRoll.
 	    **>
-	    GYROSCOPE_CONFIG_ANGLEROLL_VALID        = 0x00000004
+	    GYROSCOPE_CONFIG_ANGLEROLL_VALID        = 4 //0x00000004
 	    <** @description: Validity bit for field TGyroscopeConfiguration::momentOfYawInertia.
 	    **>    
-	    GYROSCOPE_CONFIG_MOMENTYAW_VALID        = 0x00000008
+	    GYROSCOPE_CONFIG_MOMENTYAW_VALID        = 8 //0x00000008
 	    <** @description: Validity bit for field TGyroscopeConfiguration::sigmaGyroscope.
 	    **>
-	    GYROSCOPE_CONFIG_SIGMAGYROSCOPE_VALID   = 0x00000010
+	    GYROSCOPE_CONFIG_SIGMAGYROSCOPE_VALID   = 16 //0x00000010
 	    <** @description: Validity bit for field TGyroscopeConfiguration::typeBits.
 	    **>
-	    GYROSCOPE_CONFIG_TYPE_VALID             = 0x00000020
+	    GYROSCOPE_CONFIG_TYPE_VALID             = 32 //0x00000020
 	} 
 
 	<** @description: 
@@ -54,19 +54,19 @@ interface GyroscopeConfiguration {
 	enumeration EGyroscopeTypeBits {
 	    <** @description: Temperature bias compensation already applied to gyroscope signals.
 	    **>
-	    GYROSCOPE_TEMPERATURE_COMPENSATED       = 0x00000001
+	    GYROSCOPE_TEMPERATURE_COMPENSATED       = 1 //0x00000001
 	    <** @description: A measurement for the z/yaw-axis is provided.
 	    **>
-	    GYROSCOPE_YAWRATE_PROVIDED              = 0x00000002
+	    GYROSCOPE_YAWRATE_PROVIDED              = 2 //0x00000002
 	    <** @description: A measurement for the y/pitch-axis is provided.
 	    **>
-	    GYROSCOPE_PITCHRATE_PROVIDED            = 0x00000004
+	    GYROSCOPE_PITCHRATE_PROVIDED            = 4 //0x00000004
 	    <** @description: A measurement for the x/roll-axis is provided.
 	    **>
-	    GYROSCOPE_ROLLRATE_PROVIDED             = 0x00000008
+	    GYROSCOPE_ROLLRATE_PROVIDED             = 8 //0x00000008
 	    <** @description: A measurement for the temperature is provided.
 	    **>
-	    GYROSCOPE_TEMPERATURE_PROVIDED          = 0x00000010
+	    GYROSCOPE_TEMPERATURE_PROVIDED          = 16 //0x00000010
 	} 
 
 	<** @description: 
diff --git a/sensors-service/api/franca/SensorsServiceTypes.fidl b/sensors-service/api/franca/SensorsServiceTypes.fidl
index c76e7e2..cf0fe47 100644
--- a/sensors-service/api/franca/SensorsServiceTypes.fidl
+++ b/sensors-service/api/franca/SensorsServiceTypes.fidl
@@ -76,7 +76,7 @@ typeCollection SensorsServiceTypes {
 	It is a or'ed bitmask of the ESensorStatusValidityBits values.
 	 **>
 	enumeration ESensorStatusValidityBits {
-	    SENSOR_STATUS_STATUS_VALID  = 0x00000001    // Validity bit for field TSensorStatus::status.
+	    SENSOR_STATUS_STATUS_VALID  = 1 //0x00000001    // Validity bit for field TSensorStatus::status.
 	}
 
 	<** @description:
@@ -91,4 +91,4 @@ typeCollection SensorsServiceTypes {
 	                                // Must be checked before usage. **>
 	}
 
-}
\ No newline at end of file
+}
diff --git a/sensors-service/api/franca/Wheel.fidl b/sensors-service/api/franca/Wheel.fidl
index 9957615..953f8e7 100644
--- a/sensors-service/api/franca/Wheel.fidl
+++ b/sensors-service/api/franca/Wheel.fidl
@@ -93,11 +93,11 @@ interface Wheel {
 	   - interrupted reception of vehicle bus messages.
 	   This flag will only be set if the detected gap may affect the application.
 	   **>
-	    WHEEL_STATUS_GAP             = 0x00000001
+	    WHEEL_STATUS_GAP             = 1 //0x00000001
 	   <** @description:  This is the first wheel data of a bus or ignition lifecycle,
 	   i.e. the wheel tick difference calculation may be less reliable.
 	   **>
-	    WHEEL_STATUS_INIT            = 0x00000002
+	    WHEEL_STATUS_INIT            = 2 //0x00000002
 	} 
 
 	<** @description: 
@@ -108,31 +108,31 @@ interface Wheel {
 	enumeration EWheelValidityBits{
 	    <** @description:  Validity bit for field TWheelData::data[0].
 	   **>
-	    WHEEL0_VALID                = 0x00000001
+	    WHEEL0_VALID                = 1 //0x00000001
 	    <** @description:  Validity bit for field TWheelData::data[1].
 	   **>
-	    WHEEL1_VALID                = 0x00000002
+	    WHEEL1_VALID                = 2 //0x00000002
 	    <** @description:  Validity bit for field TWheelData::data[2].
 	   **>
-	    WHEEL2_VALID                = 0x00000004
+	    WHEEL2_VALID                = 4 //0x00000004
 	    <** @description:  Validity bit for field TWheelData::data[3].
 	   **>
-	    WHEEL3_VALID                = 0x00000008
+	    WHEEL3_VALID                = 8 //0x00000008
 	    <** @description:  Validity bit for field TWheelData::data[4].
 	   **>
-	    WHEEL4_VALID                = 0x00000010
+	    WHEEL4_VALID                = 16 //0x00000010
 	    <** @description:  Validity bit for field TWheelData::data[5].
 	   **>
-	    WHEEL5_VALID                = 0x00000020
+	    WHEEL5_VALID                = 32 //0x00000020
 	    <** @description:  Validity bit for field TWheelData::data[6].
 	   **>
-	    WHEEL6_VALID                = 0x00000040
+	    WHEEL6_VALID                = 64 //0x00000040
 	    <** @description:  Validity bit for field TWheelData::data[7].
 	   **>
-	    WHEEL7_VALID                = 0x00000080
+	    WHEEL7_VALID                = 128 //0x00000080
 	    <** @description:  Validity bit for field TWheelData::measurementInterval.
 	   **>
-	    WHEEL_MEASINT_VALID         = 0x00000100       
+	    WHEEL_MEASINT_VALID         = 256 //0x00000100       
 	} 
 
 	<** @description: 
diff --git a/sensors-service/api/franca/WheelConfiguration.fidl b/sensors-service/api/franca/WheelConfiguration.fidl
index 353e85c..e2139d4 100644
--- a/sensors-service/api/franca/WheelConfiguration.fidl
+++ b/sensors-service/api/franca/WheelConfiguration.fidl
@@ -52,15 +52,15 @@ interface WheelConfiguration {
 	    <** @description:  The wheel is driven by the powertrain.
 	   It may thus be affected by additional wheel slip.
 	   **>
-	    WHEEL_CONFIG_DRIVEN         = 0x00000001
+	    WHEEL_CONFIG_DRIVEN         = 1 //0x00000001
 	    <** @description:  The wheel may be turned by the steering. 
 	   This is typically the case only for wheels on the front axle.
 	   But for some vehicles also wheels on other axles are permanently or temporarily steered.
 	   **>
-	    WHEEL_CONFIG_STEERED        = 0x00000002
+	    WHEEL_CONFIG_STEERED        = 2 //0x00000002
 	   <** @description:  The differential lock for this wheel is activated.
 	  **>
-	    WHEEL_CONFIG_DIFF_LOCK      = 0x00000004                                                  
+	    WHEEL_CONFIG_DIFF_LOCK      = 4 //0x00000004                                                  
 	} 
 
 	<** @description: 
@@ -71,28 +71,28 @@ interface WheelConfiguration {
 	enumeration EWheelConfigValidityBits{
 	    <** @description:  Validity bit for field TWheelConfiguration::wheelticksPerRevolution.
 	   **>    
-	    WHEEL_CONFIG_TICKS_PER_REV_VALID    = 0x00000001
+	    WHEEL_CONFIG_TICKS_PER_REV_VALID    = 1 //0x00000001
 	    <** @description:  Validity bit for field TWheelConfiguration::tireRollingCircumference.
 	   **>
-	    WHEEL_CONFIG_TIRE_CIRC_VALID        = 0x00000002
+	    WHEEL_CONFIG_TIRE_CIRC_VALID        = 2 //0x00000002
 	    <** @description:  Validity bit for field TWheelConfiguration::dist2RefPointX.
 	   **>
-	    WHEEL_CONFIG_DISTX_VALID            = 0x00000004
+	    WHEEL_CONFIG_DISTX_VALID            = 4 //0x00000004
 	    <** @description:  Validity bit for field TWheelConfiguration::dist2RefPointY.
 	   **>
-	    WHEEL_CONFIG_DISTY_VALID            = 0x00000008
+	    WHEEL_CONFIG_DISTY_VALID            = 8 //0x00000008
 	    <** @description:  Validity bit for field TWheelConfiguration::dist2RefPointZ.
 	   **>
-	    WHEEL_CONFIG_DISTZ_VALID            = 0x00000010
+	    WHEEL_CONFIG_DISTZ_VALID            = 16 //0x00000010
 	    <** @description:  Validity bit for field TWheelConfiguration::EWheelConfigStatusBits::WHEEL_CONFIG_DRIVEN.
 	   **>
-	    WHEEL_CONFIG_DRIVEN_VALID           = 0x00000020
+	    WHEEL_CONFIG_DRIVEN_VALID           = 32 //0x00000020
 	    <** @description:  Validity bit for field TWheelConfiguration::EWheelConfigStatusBits::WHEEL_CONFIG_STEERED.
 	   **>
-	    WHEEL_CONFIG_STEERED_VALID          = 0x00000040
+	    WHEEL_CONFIG_STEERED_VALID          = 64 //0x00000040
 	    <** @description:  Validity bit for field TWheelConfiguration::EWheelConfigStatusBits::WHEEL_CONFIG_DIFF_LOCK.
 	   **>
-	    WHEEL_CONFIG_DIFF_LOCK_VALID        = 0x00000080
+	    WHEEL_CONFIG_DIFF_LOCK_VALID        = 128 //0x00000080
 	} 
 
 	<** @description: