Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop' into feature/sdl_0205_c…
Browse files Browse the repository at this point in the history 
…ustom_button_subscription
  • Loading branch information
@AKalinich-Luxoft
AKalinich-Luxoft committed Aug 13, 2021
2 parents 873f025 + 04c02ec commit 975d851
Show file tree
Hide file tree
Showing 170 changed files with 2,628 additions and 1,659 deletions.
63 changes: 63 additions & 0 deletions .github/workflows/sdl_core_github_ci_coverity.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
name: SDL Core Build With Coverity
on:
push:
branches:
- master
pull_request:
branches:
- master
jobs:
build:
environment: Coverity
runs-on: ubuntu-20.04
steps:
- shell: bash
env:
COVERITY_SECRET: ${{ secrets.COVERITY_TOKEN }}
run: |
echo "$COVERITY_SECRET" && echo ${{ secrets.COVERITY_TOKEN }} && echo "end"
- uses: actions/checkout@v2
- name: Init Submodules
run: git -C ${{ github.workspace }} submodule update --init --recursive
# Install Dependencies
- name: Apt Get Dependencies
run: sudo apt-get update && sudo apt-get install libssl-dev libbluetooth3 libbluetooth-dev libudev-dev cmake html2text lcov git cmake automake1.11 build-essential libavahi-client-dev sqlite3 libsqlite3-dev libgtest-dev bluez-tools libpulse-dev libusb-1.0.0-dev cppcheck python3-pip python3-setuptools && sudo apt-get install -f clang-format-6.0
- name: Setup CMAKE
uses: jwlawson/actions-setup-cmake@v1.8
with:
cmake-version: '3.16.3'
# Build Project
- name: Cache 3rd Party
id: core-3rd-party
uses: actions/cache@v2
with:
path: ${{ github.workspace }}/core_3rd_party
key: ${{ runner.os }}-core-3rd-party-v3
- name: Make 3rd Party Directory
if: steps.core-3rd-party.outputs.cache-hit != 'true'
run: mkdir ${{ github.workspace }}/core_3rd_party
- name: Make Directories
run: cd ${{ github.workspace }} && cd ../ && mkdir build && cd build
- name: Set 3rd Party Path
run: echo "THIRD_PARTY_INSTALL_PREFIX=${{ github.workspace }}/core_3rd_party" >> $GITHUB_ENV
- name: Set 3rd Party ARCH Path
run: echo "THIRD_PARTY_INSTALL_PREFIX_ARCH=${{ github.workspace }}/core_3rd_party" >> $GITHUB_ENV
- name: Configure
run: cmake ../sdl_core -DLOGGER_NAME=BOOST
- name: Download Coverity
env:
COVERITY_SECRET: ${{ secrets.COVERITY_TOKEN }}
run: wget https://scan.coverity.com/download/linux64 --post-data "token=${COVERITY_SECRET}&project=smartdevicelink%2Fsdl_core" -O coverity_tool.tgz
- name: unzip
run: tar zxvf coverity_tool.tgz
- name: Build
run: make install-3rd_party && ./cov-analysis-linux64-2020.09/bin/cov-build --dir cov-int make -j `nproc` install
- name: Set Library Path
run: echo "LD_LIBRARY_PATH=$THIRD_PARTY_INSTALL_PREFIX/lib:." >> $GITHUB_ENV
- name: Compress Coverity
run: tar czvf myproject.tgz cov-int
- name: Upload Coverity
env:
COVERITY_SECRET: ${{ secrets.COVERITY_TOKEN }}
run: curl --form token=${COVERITY_SECRET} --form email=jack@livio.io --form file=@myproject.tgz --form version="Version" --form description="Description" https://scan.coverity.com/builds?project=smartdevicelink%2Fsdl_core

1 change: 1 addition & 0 deletions CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
# POSSIBILITY OF SUCH DAMAGE.

cmake_minimum_required(VERSION 2.8.11)
cmake_policy(SET CMP0054 NEW)

set (PROJECT smartDeviceLinkCore)
project (${PROJECT})
Expand Down
221 changes: 214 additions & 7 deletions src/appMain/sdl_preloaded_pt.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3616,7 +3616,16 @@
"name": "pressureTelltale",
"key": "OEM_REF_PRES_TEL",
"type": "WarningLightStatus",
"mandatory": true
"mandatory": true,
"since": "2.0",
"until": "8.0"
},
{
"name": "pressureTelltale",
"key": "OEM_REF_PRES_TEL",
"type": "WarningLightStatus",
"mandatory": false,
"since": "8.0"
},
{
"name": "leftFront",
Expand Down Expand Up @@ -3646,7 +3655,40 @@
],
"key": "OEM_REF_LEFT_FR",
"type": "Struct",
"mandatory": true
"mandatory": true,
"since": "2.0",
"until": "8.0"
},
{
"name": "leftFront",
"params": [
{
"name": "status",
"key": "OEM_REF_LEFT_FR_ST",
"type": "ComponentVolumeStatus",
"mandatory": true
},
{
"name": "tpms",
"key": "OEM_REF_LEFT_FR_TMPS",
"type": "TPMS",
"mandatory": false,
"since": "5.0"
},
{
"name": "pressure",
"key": "OEM_REF_LEFT_FR_PRES",
"type": "Float",
"mandatory": false,
"minvalue": 0,
"maxvalue": 2000,
"since": "5.0"
}
],
"key": "OEM_REF_LEFT_FR",
"type": "Struct",
"mandatory": false,
"since": "8.0"
},
{
"name": "rightFront",
Expand Down Expand Up @@ -3676,7 +3718,40 @@
],
"key": "OEM_REF_RIGHT_FR",
"type": "Struct",
"mandatory": true
"mandatory": true,
"since": "2.0",
"until": "8.0"
},
{
"name": "rightFront",
"params": [
{
"name": "status",
"key": "OEM_REF_RIGHT_FR_ST",
"type": "ComponentVolumeStatus",
"mandatory": true
},
{
"name": "tpms",
"key": "OEM_REF_RIGHT_FR_TMPS",
"type": "TPMS",
"mandatory": false,
"since": "5.0"
},
{
"name": "pressure",
"key": "OEM_REF_RIGHT_FR_PRES",
"type": "Float",
"mandatory": false,
"minvalue": 0,
"maxvalue": 2000,
"since": "5.0"
}
],
"key": "OEM_REF_RIGHT_FR",
"type": "Struct",
"mandatory": false,
"since": "8.0"
},
{
"name": "leftRear",
Expand Down Expand Up @@ -3706,7 +3781,40 @@
],
"key": "OEM_REF_LEFT_REAR",
"type": "Struct",
"mandatory": true
"mandatory": true,
"since": "2.0",
"until": "8.0"
},
{
"name": "leftRear",
"params": [
{
"name": "status",
"key": "OEM_REF_LEFT_REAR_ST",
"type": "ComponentVolumeStatus",
"mandatory": true
},
{
"name": "tpms",
"key": "OEM_REF_LEFT_REAR_TMPS",
"type": "TPMS",
"mandatory": false,
"since": "5.0"
},
{
"name": "pressure",
"key": "OEM_REF_LEFT_REAR_PRES",
"type": "Float",
"mandatory": false,
"minvalue": 0,
"maxvalue": 2000,
"since": "5.0"
}
],
"key": "OEM_REF_LEFT_REAR",
"type": "Struct",
"mandatory": false,
"since": "8.0"
},
{
"name": "rightRear",
Expand Down Expand Up @@ -3736,7 +3844,40 @@
],
"key": "OEM_REF_RIGHT_REAR",
"type": "Struct",
"mandatory": true
"mandatory": true,
"since": "2.0",
"until": "8.0"
},
{
"name": "rightRear",
"params": [
{
"name": "status",
"key": "OEM_REF_RIGHT_REAR_ST",
"type": "ComponentVolumeStatus",
"mandatory": true
},
{
"name": "tpms",
"key": "OEM_REF_RIGHT_REAR_TMPS",
"type": "TPMS",
"mandatory": false,
"since": "5.0"
},
{
"name": "pressure",
"key": "OEM_REF_RIGHT_REAR_PRES",
"type": "Float",
"mandatory": false,
"minvalue": 0,
"maxvalue": 2000,
"since": "5.0"
}
],
"key": "OEM_REF_RIGHT_REAR",
"type": "Struct",
"mandatory": false,
"since": "8.0"
},
{
"name": "innerLeftRear",
Expand Down Expand Up @@ -3766,7 +3907,40 @@
],
"key": "OEM_REF_IN_LEFT_REAR",
"type": "Struct",
"mandatory": true
"mandatory": true,
"since": "2.0",
"until": "8.0"
},
{
"name": "innerLeftRear",
"params": [
{
"name": "status",
"key": "OEM_REF_IN_LEFT_REAR_ST",
"type": "ComponentVolumeStatus",
"mandatory": true
},
{
"name": "tpms",
"key": "OEM_REF_IN_LEFT_REAR_TMPS",
"type": "TPMS",
"mandatory": false,
"since": "5.0"
},
{
"name": "pressure",
"key": "OEM_REF_IN_LEFT_REAR_PRES",
"type": "Float",
"mandatory": false,
"minvalue": 0,
"maxvalue": 2000,
"since": "5.0"
}
],
"key": "OEM_REF_IN_LEFT_REAR",
"type": "Struct",
"mandatory": false,
"since": "8.0"
},
{
"name": "innerRightRear",
Expand Down Expand Up @@ -3796,7 +3970,40 @@
],
"key": "OEM_REF_IN_RIGHT_REAR",
"type": "Struct",
"mandatory": true
"mandatory": true,
"since": "2.0",
"until": "8.0"
},
{
"name": "innerRightRear",
"params": [
{
"name": "status",
"key": "OEM_REF_IN_RIGHT_REAR_ST",
"type": "ComponentVolumeStatus",
"mandatory": true
},
{
"name": "tpms",
"key": "OEM_REF_IN_RIGHT_REAR_TMPS",
"type": "TPMS",
"mandatory": false,
"since": "5.0"
},
{
"name": "pressure",
"key": "OEM_REF_IN_RIGHT_REAR_PRES",
"type": "Float",
"mandatory": false,
"minvalue": 0,
"maxvalue": 2000,
"since": "5.0"
}
],
"key": "OEM_REF_IN_RIGHT_REAR",
"type": "Struct",
"mandatory": false,
"since": "8.0"
}
],
"key": "OEM_REF_TIRE_PRES",
Expand Down
2 changes: 2 additions & 0 deletions src/appMain/smartDeviceLink.ini
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,8 @@ HMICapabilitiesCacheFile = hmi_capabilities_cache.json
MaxCmdID = 2000000000
; SDL respond timeout (in milliseconds) in case of HMI has not respond on a mobile request
DefaultTimeout = 10000
; Extra time to compensate default timeout due to external delays
DefaultTimeoutCompensation = 1000
; Available disk space in bytes for each application file handling
; Default value is 100 MiB
AppDirectoryQuota = 104857600
Expand Down
8 changes: 0 additions & 8 deletions ...ponents/application_manager/include/application_manager/app_launch/app_launch_data_json.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,6 @@ class AppLaunchDataJson : public AppLaunchDataImpl {
AppLaunchDataJson(const AppLaunchSettings& settings,
resumption::LastStateWrapperPtr last_state_wrapper);

DEPRECATED
AppLaunchDataJson(const AppLaunchSettings& settings,
resumption::LastState& last_state);

/**
* @brief allows to destroy AppLaunchDataJson object
*/
Expand Down Expand Up @@ -99,10 +95,6 @@ class AppLaunchDataJson : public AppLaunchDataImpl {
int32_t& found_index,
Json::Value& dictionary) const;

DEPRECATED
Json::Value& GetApplicationListAndIndex(const ApplicationData& app_data,
int32_t& founded_index) const;

private:
/**
* @brief update time stamp
Expand Down
3 changes: 0 additions & 3 deletions src/components/application_manager/include/application_manager/app_service_manager.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,6 @@ class AppServiceManager {
AppServiceManager(ApplicationManager& app_manager,
resumption::LastStateWrapperPtr last_state);

DEPRECATED AppServiceManager(ApplicationManager& app_manager,
resumption::LastState& last_state);

/**
* @brief Class destructor
*/
Expand Down
Loading

0 comments on commit 975d851

Please sign in to comment.