Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/sdl 0262 new vehicle data seat occupancy #3585

Merged
merged 11 commits into from
Feb 3, 2021
+76 −1,982
Merged

Feature/sdl 0262 new vehicle data seat occupancy #3585

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
8998b77
Add new vehicle data SeatOccupancy
ychernysheva Nov 10, 2020
fbee1c3
Replace sdl_preloaded_pt with copy from AppMain
ychernysheva Nov 11, 2020
8dbb963
Update vehicle_data section
ychernysheva Nov 11, 2020
f34ff0e
Temporary commit with link to rpc_spec fork
ychernysheva Nov 12, 2020
d420676
fixup! Temporary commit with link to rpc_spec fork
Dec 22, 2020
1f41ade
fixup! Add new vehicle data SeatOccupancy
Dec 22, 2020
12201aa
Move seatOccupancy parameter to DrivingCharacteristics-3 group
Dec 22, 2020
5849f70
Merge remote-tracking branch 'smart/develop' into feature/sdl_0262_ne…
dboltovskyi Dec 28, 2020
3d076b1
fixup! Add new vehicle data SeatOccupancy
Jan 11, 2021
c31fc78
Update link to rpc_spec
Feb 3, 2021
bebdc7e
Merge remote-tracking branch 'origin/develop' into feature/sdl_0262_n…
Feb 3, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 31 additions & 0 deletions src/appMain/sdl_preloaded_pt.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -545,6 +545,7 @@
"rpm",
"steeringWheelAngle",
"gearStatus",
"seatOccupancy",
"handsOffSteering"
]
},
Expand All @@ -564,6 +565,7 @@
"rpm",
"steeringWheelAngle",
"gearStatus",
"seatOccupancy",
"handsOffSteering"
]
},
Expand All @@ -583,6 +585,7 @@
"rpm",
"steeringWheelAngle",
"gearStatus",
"seatOccupancy",
"handsOffSteering"
]
},
Expand All @@ -602,6 +605,7 @@
"rpm",
"steeringWheelAngle",
"gearStatus",
"seatOccupancy",
"handsOffSteering"
]
}
Expand Down Expand Up @@ -4334,6 +4338,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"
}
]
}
Expand Down
1 change: 1 addition & 0 deletions src/components/application_manager/include/application_manager/smart_object_keys.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,6 +341,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;
Expand Down
2 changes: 2 additions & 0 deletions src/components/application_manager/src/message_helper/message_helper.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)};
Expand Down
1 change: 1 addition & 0 deletions src/components/application_manager/src/smart_object_keys.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,6 +308,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";
Expand Down
2 changes: 1 addition & 1 deletion src/components/application_manager/test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
Loading