Feature/sdl 0262 new vehicle data seat occupancy (#3585)

* Add new vehicle data SeatOccupancy * Replace sdl_preloaded_pt with copy from AppMain In fact file components/application_manager/test/sdl_preloaded_pt.json is a copy of current version of sdl_preloaded_pt.json from AppMain folder. That's why instead of manual update of this copy we can delete it from application_manager/test folder and simply copy actual version of this file from AppMain. Co-authored-by: Jacob Keeler <jacob.keeler@livioradio.com> Co-authored-by: Yana Chernysheva <ychernysheva@luxoft.com> Co-authored-by: Dmitriy Boltovskiy <dboltovskyi@luxoft.com> Co-authored-by: Jacob Keeler <jacob.keeler@livioradio.com>
smartdevicelink · Feb 3, 2021 · 30f5587 · 30f5587
1 parent 248232e
commit 30f5587
Show file tree

Hide file tree

Showing 9 changed files with 76 additions and 1,982 deletions.
diff --git a/src/appMain/sdl_preloaded_pt.json b/src/appMain/sdl_preloaded_pt.json
@@ -545,6 +545,7 @@
                             "rpm",
                             "steeringWheelAngle",
                             "gearStatus",
+                            "seatOccupancy",
                             "handsOffSteering"
                         ]
                     },
@@ -564,6 +565,7 @@
                             "rpm",
                             "steeringWheelAngle",
                             "gearStatus",
+                            "seatOccupancy",
                             "handsOffSteering"
                         ]
                     },
@@ -583,6 +585,7 @@
                             "rpm",
                             "steeringWheelAngle",
                             "gearStatus",
+                            "seatOccupancy",
                             "handsOffSteering"
                         ]
                     },
@@ -602,6 +605,7 @@
                             "rpm",
                             "steeringWheelAngle",
                             "gearStatus",
+                            "seatOccupancy",
                             "handsOffSteering"
                         ]
                     }
@@ -4372,6 +4376,33 @@
                     "type": "Boolean",
                     "mandatory": false,
                     "since": "7.0"
+                },
+                {
+                    "name": "seatOccupancy",
+                    "key": "OEM_REF_SEAT_OCCUP",
+                    "params": [
+                        {
+                            "name": "seatsOccupied",
+                            "key": "OEM_REF_SEATS_OCCUP",
+                            "type": "SeatStatus",
+                            "array": true,
+                            "minsize": 0,
+                            "maxsize": 100,
+                            "mandatory": false
+                        },
+                        {
+                            "name": "seatsBelted",
+                            "key": "OEM_REF_SEATS_BELT",
+                            "type": "SeatStatus",
+                            "array": true,
+                            "minsize": 0,
+                            "maxsize": 100,
+                            "mandatory": false
+                        }
+                    ],
+                    "type": "Struct",
+                    "mandatory": false,
+                    "since": "7.1"
                 }
             ]
         }

diff --git a/src/components/application_manager/include/application_manager/smart_object_keys.h b/src/components/application_manager/include/application_manager/smart_object_keys.h
@@ -344,6 +344,7 @@ extern const char* engine_oil_life;
 extern const char* oem_custom_data_type;
 extern const char* window_status;
 extern const char* hands_off_steering;
+extern const char* seat_occupancy;
 
 // app services
 extern const char* app_service_manifest;

diff --git a/src/components/application_manager/src/message_helper/message_helper.cc b/src/components/application_manager/src/message_helper/message_helper.cc
@@ -246,6 +246,8 @@ std::pair<std::string, mobile_apis::VehicleDataType::eType>
                        mobile_apis::VehicleDataType::VEHICLEDATA_ENGINEOILLIFE),
         std::make_pair(strings::window_status,
                        mobile_apis::VehicleDataType::VEHICLEDATA_WINDOWSTATUS),
+        std::make_pair(strings::seat_occupancy,
+                       mobile_apis::VehicleDataType::VEHICLEDATA_SEATOCCUPANCY),
         std::make_pair(
             strings::hands_off_steering,
             mobile_apis::VehicleDataType::VEHICLEDATA_HANDSOFFSTEERING)};

diff --git a/src/components/application_manager/src/smart_object_keys.cc b/src/components/application_manager/src/smart_object_keys.cc
@@ -311,6 +311,7 @@ const char* engine_oil_life = "engineOilLife";
 const char* oem_custom_data_type = "oemCustomDataType";
 const char* window_status = "windowStatus";
 const char* hands_off_steering = "handsOffSteering";
+const char* seat_occupancy = "seatOccupancy";
 
 // app services
 const char* app_service_manifest = "appServiceManifest";

diff --git a/src/components/application_manager/test/CMakeLists.txt b/src/components/application_manager/test/CMakeLists.txt
@@ -130,8 +130,8 @@ if (ENABLE_LOG)
   list(APPEND LIBRARIES expat -L${EXPAT_LIBS_DIRECTORY})
 endif()
 
+file(COPY ${CMAKE_SOURCE_DIR}/src/appMain/sdl_preloaded_pt.json DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
 file(COPY smartDeviceLink_test2.ini DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
-file(COPY sdl_preloaded_pt.json DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
 file(COPY sdl_pt_update.json DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
 
 add_custom_command(