diff options
author | Alexander Kutsan (GitHub) <akutsan@luxoft.com> | 2017-07-24 17:12:00 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-07-24 17:12:00 +0300 |
commit | 2de054a7b1b412db061ae5bb6f0018708cecc393 (patch) | |
tree | 01454ea90a986516c85ac4792e91deed6a4dc889 | |
parent | 48fc52f5dc466cb9b55a1e0d3cafb3397d9a0384 (diff) | |
parent | 03eea8f9d53d74d20d67593086c5cb83849afeeb (diff) | |
download | sdl_core-2de054a7b1b412db061ae5bb6f0018708cecc393.tar.gz |
Merge pull request #165 from LuxoftAKutsan/fix/change_sdl_rc_function_ids_according_to_apis
Fix function ids according to latest changes in API
-rw-r--r-- | src/components/functional_module/include/functional_module/function_ids.h | 11 | ||||
-rw-r--r-- | src/components/interfaces/MOBILE_API.xml | 13 |
2 files changed, 8 insertions, 16 deletions
diff --git a/src/components/functional_module/include/functional_module/function_ids.h b/src/components/functional_module/include/functional_module/function_ids.h index 3c188e2abd..5edb517faa 100644 --- a/src/components/functional_module/include/functional_module/function_ids.h +++ b/src/components/functional_module/include/functional_module/function_ids.h @@ -37,10 +37,10 @@ namespace functional_modules { enum MobileFunctionID { // Reverse SDL functions ids - BUTTON_PRESS = 100015, - GET_INTERIOR_VEHICLE_DATA = 100017, - SET_INTERIOR_VEHICLE_DATA = 100018, - ON_INTERIOR_VEHICLE_DATA = 100019, + BUTTON_PRESS = 41, + GET_INTERIOR_VEHICLE_DATA = 43, + SET_INTERIOR_VEHICLE_DATA = 44, + ON_INTERIOR_VEHICLE_DATA = 32783, }; namespace hmi_api { @@ -52,9 +52,6 @@ const char button_press[] = "Buttons.ButtonPress"; const char get_user_consent[] = "RC.GetInteriorVehicleDataConsent"; const char on_app_deactivated[] = "BasicCommunication.OnAppDeactivated"; const char sdl_activate_app[] = "SDL.ActivateApp"; -// Disabled -// const char on_reverse_apps_allowing[] = "VehicleInfo.OnReverseAppsAllowing"; -// const char on_device_rank_changed[] = "RC.OnDeviceRankChanged"; } } // namespace functional_modules diff --git a/src/components/interfaces/MOBILE_API.xml b/src/components/interfaces/MOBILE_API.xml index 913c598906..db25fd6aab 100644 --- a/src/components/interfaces/MOBILE_API.xml +++ b/src/components/interfaces/MOBILE_API.xml @@ -2562,6 +2562,9 @@ <element name="SystemRequestID" value="38" hexvalue="26" /> <element name="SendLocationID" value="39" hexvalue="27" /> <element name="DialNumberID" value="40" hexvalue="28" /> + <element name="ButtonPressID" value="41" hexvalue="29" /> + <element name="GetInteriorVehicleDataID" value="43" hexvalue="2B" /> + <element name="SetInteriorVehicleDataID" value="44" hexvalue="2C" /> <element name="GetWayPointsID" value="45" hexvalue="2D" /> <element name="SubscribeWayPointsID" value="46" hexvalue="2E"/> <element name="UnsubscribeWayPointsID" value="47" hexvalue="2F"/> @@ -2587,6 +2590,7 @@ <element name="OnTouchEventID" value="32780" hexvalue="800C" /> <element name="OnSystemRequestID" value="32781" hexvalue="800D" /> <element name="OnHashChangeID" value="32782" hexvalue="800E" /> + <element name="OnInteriorVehicleDataID" value="32783" hexvalue="800F" /> <element name="OnWayPointChangeID" value="32784" hexvalue="8010" /> <element name="OnSeekMediaClockTimerID" value="32785" hexvalue="8011" /> <!-- @@ -2604,15 +2608,6 @@ <element name="OnEncodedSyncPDataID" value="98304" hexvalue="18000" /> <element name="OnSyncPDataID" value="98305" hexvalue="18001" /> - -<!-- - Reverse SDL specific ids, hardcoded in functional module ---> - <element name="GetInteriorVehicleDataID" value="100017" hexvalue="186B1" /> - <element name="SetInteriorVehicleDataID" value="100018" hexvalue="186B2" /> - <element name="OnInteriorVehicleDataID" value="100019" hexvalue="186B3" /> - <element name="ButtonPressID" value="100015" hexvalue="186AF" /> - </enum> <enum name="messageType"> |