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

[SDL 0269] Feature/New vehicle data ClimateData #2491

Merged
merged 17 commits into from
Feb 9, 2021
Merged

[SDL 0269] Feature/New vehicle data ClimateData #2491

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
19f79c2
Add new functions into utils module
dboltovskyi Nov 25, 2020
4d83c71
Add new API common modules
dboltovskyi Nov 25, 2020
f38ed32
Update VD common module
dboltovskyi Nov 25, 2020
ede9f29
Update existing scripts
dboltovskyi Nov 25, 2020
f783052
Add new scripts
dboltovskyi Nov 25, 2020
bbd8000
Remove old scripts
dboltovskyi Nov 25, 2020
e9d5c9b
Update VD test set
dboltovskyi Nov 25, 2020
1ba8021
Adding climateData to existed scripts for vehicle data
GetmanetsIrina Nov 11, 2020
761cfe8
Adding climateData to existed scripts for GNSD
GetmanetsIrina Nov 11, 2020
45ab0c6
Removing redundant data type and if conditions in GNSD scripts
GetmanetsIrina Nov 11, 2020
27af7bf
Add posibility to run tests only for specified VD parameter
dboltovskyi Dec 1, 2020
94ed2ae
Merge branch 'feature/extended_vd_coverage' into feature/sdl_0269_new…
dboltovskyi Dec 2, 2020
4fc18f6
Merge remote-tracking branch 'smart/develop' into feature/extended_vd…
dboltovskyi Dec 28, 2020
66f140f
Merge branch 'feature/extended_vd_coverage' into feature/sdl_0269_new…
dboltovskyi Dec 28, 2020
200361a
Merge remote-tracking branch 'smart/develop' into feature/sdl_0269_ne…
dboltovskyi Jan 25, 2021
8e686d1
Merge remote-tracking branch 'smart/develop' into feature/sdl_0269_ne…
dboltovskyi Feb 9, 2021
9bfe03c
Fix values for climateData
dboltovskyi Feb 9, 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
44 changes: 21 additions & 23 deletions test_scripts/API/VehicleData/GenericNetworkSignalData/commonGenericNetSignalData.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,6 @@ local function VehicleDataItemsWithDataTableCreation()
end
end

common.VehicleDataItemsWithData.engineTorque.APItype = "VEHICLEDATA_ENGINETORQUE"
local gpsParams = common.VehicleDataItemsWithData.gps.params
gpsParams.longitudeDegrees.value = 100
gpsParams.latitudeDegrees.value = 20.5
Expand Down Expand Up @@ -137,35 +136,34 @@ local function VehicleDataItemsWithDataTableCreation()
common.VehicleDataItemsWithData.fuelRange.APItype = "VEHICLEDATA_FUELRANGE"
common.VehicleDataItemsWithData.externalTemperature.value = 24.1
common.VehicleDataItemsWithData.externalTemperature.APItype = "VEHICLEDATA_EXTERNTEMP"
local climateDataParams = common.VehicleDataItemsWithData.climateData.params
climateDataParams.externalTemperature.params.value.value = 25.5
climateDataParams.externalTemperature.params.unit.value = "CELSIUS"
climateDataParams.cabinTemperature.params.value.value = 20.5
climateDataParams.cabinTemperature.params.unit.value = "CELSIUS"
climateDataParams.atmosphericPressure.value = 1024
common.VehicleDataItemsWithData.climateData.APItype = "VEHICLEDATA_CLIMATEDATA"
common.VehicleDataItemsWithData.turnSignal.value = "OFF"
common.VehicleDataItemsWithData.turnSignal.APItype = "VEHICLEDATA_TURNSIGNAL"
common.VehicleDataItemsWithData.vin.value = "SJFHSIGD4058569"
common.VehicleDataItemsWithData.vin.APItype = "VEHICLEDATA_VIN"
common.VehicleDataItemsWithData.prndl.value = "PARK"
common.VehicleDataItemsWithData.prndl.APItype = "VEHICLEDATA_PRNDL"
if common.VehicleDataItemsWithData.handsOffSteering then
common.VehicleDataItemsWithData.handsOffSteering.value = true
common.VehicleDataItemsWithData.handsOffSteering.APItype = "VEHICLEDATA_HANDSOFFSTEERING"
end
if common.VehicleDataItemsWithData.stabilityControlsStatus then
common.VehicleDataItemsWithData.stabilityControlsStatus.value = {
escSystem = "ON" , trailerSwayControl = "OFF" }
common.VehicleDataItemsWithData.stabilityControlsStatus.APItype = "VEHICLEDATA_STABILITYCONTROLSSTATUS"
end
if common.VehicleDataItemsWithData.gearStatus then
local gearStatusParams = common.VehicleDataItemsWithData.gearStatus.params
gearStatusParams.userSelectedGear.value = "NINTH"
gearStatusParams.actualGear.value = "TENTH"
gearStatusParams.transmissionType.value = "MANUAL"
common.VehicleDataItemsWithData.gearStatus.APItype = "VEHICLEDATA_GEARSTATUS"
end
if common.VehicleDataItemsWithData.windowStatus then
common.VehicleDataItemsWithData.windowStatus.value = {
{ location = { col = 49, row = 49, level = 49, colspan = 49, rowspan = 49, levelspan = 49 },
state = { approximatePosition = 50, deviation = 50 }
}}
common.VehicleDataItemsWithData.handsOffSteering.value = true
common.VehicleDataItemsWithData.handsOffSteering.APItype = "VEHICLEDATA_HANDSOFFSTEERING"
common.VehicleDataItemsWithData.stabilityControlsStatus.value = {
escSystem = "ON" , trailerSwayControl = "OFF" }
common.VehicleDataItemsWithData.stabilityControlsStatus.APItype = "VEHICLEDATA_STABILITYCONTROLSSTATUS"
local gearStatusParams = common.VehicleDataItemsWithData.gearStatus.params
gearStatusParams.userSelectedGear.value = "NINTH"
gearStatusParams.actualGear.value = "TENTH"
gearStatusParams.transmissionType.value = "MANUAL"
common.VehicleDataItemsWithData.gearStatus.APItype = "VEHICLEDATA_GEARSTATUS"
common.VehicleDataItemsWithData.windowStatus.value = {
{ location = { col = 49, row = 49, level = 49, colspan = 49, rowspan = 49, levelspan = 49 },
state = { approximatePosition = 50, deviation = 50 }
}}
common.VehicleDataItemsWithData.windowStatus.APItype = "VEHICLEDATA_WINDOWSTATUS"
end
local tirePressureParams = common.VehicleDataItemsWithData.tirePressure.params
tirePressureParams.pressureTelltale.value = "OFF"
local leftFrontParams = tirePressureParams.leftFront.params
Expand Down
3 changes: 2 additions & 1 deletion test_scripts/API/VehicleData/common.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,8 @@ m.vd = {
stabilityControlsStatus = "VEHICLEDATA_STABILITYCONTROLSSTATUS",
gearStatus = "VEHICLEDATA_GEARSTATUS",
windowStatus = "VEHICLEDATA_WINDOWSTATUS",
seatOccupancy = "VEHICLEDATA_SEATOCCUPANCY"
seatOccupancy = "VEHICLEDATA_SEATOCCUPANCY",
climateData = "VEHICLEDATA_CLIMATEDATA"
}

m.operator = {
Expand Down