Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/devel'
- Loading branch information
Showing
125 changed files
with
6,326 additions
and
3,434 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -7,3 +7,6 @@ | |
| **/tests/**/Cargo.lock | ||
| **/tests/**/common/ | ||
| **/tests/**/target/ | ||
|
|
||
| #cucumber port | ||
| cucumber.wire | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,51 +1,60 @@ | ||
| #!groovy | ||
| node('arduino') { | ||
| try { | ||
| stage('Checkout') { | ||
| checkout([ | ||
| $class: 'GitSCM', | ||
| branches: scm.branches, | ||
| extensions: scm.extensions + [[$class: 'CleanBeforeCheckout']], | ||
| userRemoteConfigs: scm.userRemoteConfigs | ||
| ]) | ||
| } | ||
| stage('Build') { | ||
| parallel 'kia soul petrol firmware': { | ||
| sh 'cd firmware && mkdir build_kia_soul_petrol && cd build_kia_soul_petrol && cmake .. -DKIA_SOUL=ON -DCMAKE_BUILD_TYPE=Release && make' | ||
| }, 'kia soul EV firmware': { | ||
| sh 'cd firmware && mkdir build_kia_soul_ev && cd build_kia_soul_ev && cmake .. -DKIA_SOUL_EV=ON -DCMAKE_BUILD_TYPE=Release && make' | ||
| } | ||
| echo 'Build Complete!' | ||
| } | ||
| stage('Kia Soul Petrol Tests') { | ||
| parallel 'kia soul petrol unit tests': { | ||
| sh 'cd firmware && mkdir build_kia_soul_petrol_unit_tests && cd build_kia_soul_petrol_unit_tests && cmake .. -DKIA_SOUL=ON -DTESTS=ON -DCMAKE_BUILD_TYPE=Release && make run-unit-tests' | ||
| echo 'Kia Soul Petrol Unit Tests Complete!' | ||
| }, 'kia soul petrol property-based tests': { | ||
| withEnv(["PATH+CARGO=$HOME/.cargo/bin"]) { | ||
| sh 'cd firmware && mkdir build_kia_soul_petrol_property_tests && cd build_kia_soul_petrol_property_tests && cmake .. -DKIA_SOUL=ON -DTESTS=ON -DCMAKE_BUILD_TYPE=Release && make run-property-tests' | ||
| echo 'Kia Soul Petrol Property-Based Tests Complete!' | ||
|
|
||
| def cleanCheckout() { | ||
| checkout([ | ||
| $class: 'GitSCM', | ||
| branches: scm.branches, | ||
| extensions: scm.extensions + [[$class: 'CleanBeforeCheckout']], | ||
| userRemoteConfigs: scm.userRemoteConfigs | ||
| ]) | ||
| } | ||
|
|
||
| node('worker'){ | ||
| def builds = [:] | ||
| cleanCheckout() | ||
| def output = sh returnStdout: true, script: "cmake -LA ./firmware | grep 'VEHICLE_VALUES' | cut -d'=' -f 2" | ||
| def platforms = output.trim().tokenize(';') | ||
|
|
||
| for(int j=0; j<platforms.size(); j++) { | ||
| def platform_idx = j | ||
| def platform = platforms[platform_idx] | ||
| builds[platform] = { | ||
| node('arduino') { | ||
| try { | ||
| stage("Checkout") { | ||
| cleanCheckout() | ||
| } | ||
| stage("Build ${platform}") { | ||
| sh "cd firmware && mkdir build_${platform} && cd build_${platform} \ | ||
| && cmake -DVEHICLE=${platform} -DCMAKE_BUILD_TYPE=Release .. && make" | ||
| echo "${platform}: Build Complete!" | ||
| } | ||
| stage("Test ${platform} unit tests") { | ||
| sh "cd firmware && mkdir build_${platform}_tests && \ | ||
| cd build_${platform}_tests && cmake -DVEHICLE=${platform} \ | ||
| -DTESTS=ON -DPORT_SUFFIX=${EXECUTOR_NUMBER}${platform_idx} \ | ||
| -DCMAKE_BUILD_TYPE=Release .. && make run-unit-tests" | ||
| echo "${platform}: Unit Tests Complete!" | ||
| } | ||
| stage("Test ${platform} property-based tests") { | ||
| withEnv(["PATH+CARGO=$HOME/.cargo/bin"]) { | ||
| sh "cd firmware/build_${platform}_tests && make run-property-tests" | ||
| echo "${platform}: Property-Based Tests Complete!" | ||
| } | ||
| } | ||
| } | ||
| } | ||
| echo 'Kia Soul Petrol Tests Complete!' | ||
| } | ||
| stage('Kia Soul EV Tests') { | ||
| parallel 'kia soul ev unit tests': { | ||
| sh 'cd firmware && mkdir build_kia_soul_ev_unit_tests && cd build_kia_soul_ev_unit_tests && cmake .. -DKIA_SOUL_EV=ON -DTESTS=ON -DCMAKE_BUILD_TYPE=Release && make run-unit-tests' | ||
| echo 'Kia Soul EV Unit Tests Complete!' | ||
| }, 'kia soul ev property-based tests': { | ||
| withEnv(["PATH+CARGO=$HOME/.cargo/bin"]) { | ||
| sh 'cd firmware && mkdir build_kia_soul_ev_property_tests && cd build_kia_soul_ev_property_tests && cmake .. -DKIA_SOUL_EV=ON -DTESTS=ON -DCMAKE_BUILD_TYPE=Release && make run-property-tests' | ||
| echo 'Kia Soul EV Property-Based Tests Complete!' | ||
| finally { | ||
| deleteDir() | ||
| } | ||
| } | ||
| echo 'Kia Soul EV Tests Complete!' | ||
| } | ||
| } | ||
| catch(Exception e) { | ||
| throw e; | ||
|
|
||
| try { | ||
| parallel builds | ||
| } | ||
| finally { | ||
| deleteDir() | ||
| } | ||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1 @@ | ||
| if(KIA_SOUL) | ||
| add_definitions(-DKIA_SOUL) | ||
| elseif(KIA_SOUL_EV) | ||
| add_definitions(-DKIA_SOUL_EV) | ||
| elseif(KIA_NIRO) | ||
| add_definitions(-DKIA_NIRO) | ||
| else() | ||
| message(FATAL_ERROR "No platform selected") | ||
| endif() | ||
| include(${CMAKE_CURRENT_LIST_DIR}/../firmware/cmake/OsccConfig.cmake) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,109 @@ | ||
| VERSION "" | ||
|
|
||
| NS_ : | ||
| BA_ | ||
| BA_DEF_ | ||
| BA_DEF_DEF_ | ||
| BA_DEF_DEF_REL_ | ||
| BA_DEF_REL_ | ||
| BA_DEF_SGTYPE_ | ||
| BA_REL_ | ||
| BA_SGTYPE_ | ||
| BO_TX_BU_ | ||
| BU_BO_REL_ | ||
| BU_EV_REL_ | ||
| BU_SG_REL_ | ||
| CAT_ | ||
| CAT_DEF_ | ||
| CM_ | ||
| ENVVAR_DATA_ | ||
| EV_DATA_ | ||
| FILTER | ||
| NS_DESC_ | ||
| SGTYPE_ | ||
| SGTYPE_VAL_ | ||
| SG_MUL_VAL_ | ||
| SIGTYPE_VALTYPE_ | ||
| SIG_GROUP_ | ||
| SIG_TYPE_REF_ | ||
| SIG_VALTYPE_ | ||
| VAL_ | ||
| VAL_TABLE_ | ||
|
|
||
| BS_: | ||
|
|
||
| BU_: BRAKE STEERING THROTTLE FAULT | ||
|
|
||
| BO_ 112 BRAKE_ENABLE: 8 BRAKE | ||
| SG_ brake_enable_magic : 0|16@1+ (1,0) [0|0] "" BRAKE | ||
| SG_ brake_enable_reserved : 16|48@1+ (1,0) [0|0] "" BRAKE | ||
|
|
||
| BO_ 113 BRAKE_DISABLE: 8 BRAKE | ||
| SG_ brake_disable_magic : 0|16@1+ (1,0) [0|0] "" BRAKE | ||
| SG_ brake_disable_reserved : 16|48@1+ (1,0) [0|0] "" BRAKE | ||
|
|
||
| BO_ 114 BRAKE_COMMAND: 8 BRAKE | ||
| SG_ brake_command_magic : 0|16@1+ (1,0) [0|0] "" BRAKE | ||
| SG_ brake_command_pedal_request : 16|32@1+ (1,0) [0|1] "" BRAKE | ||
| SG_ brake_command_reserved : 48|16@1+ (1,0) [0|0] "" BRAKE | ||
|
|
||
| BO_ 115 BRAKE_REPORT: 8 BRAKE | ||
| SG_ brake_report_magic : 0|16@1+ (1,0) [0|0] "" BRAKE | ||
| SG_ brake_report_enabled : 16|8@1+ (1,0) [0|0] "" BRAKE | ||
| SG_ brake_report_operator_override : 24|8@1+ (1,0) [0|0] "" BRAKE | ||
| SG_ brake_report_dtcs : 32|8@1+ (1,0) [0|0] "" BRAKE | ||
| SG_ brake_report_reserved : 40|24@1+ (1,0) [0|0] "" BRAKE | ||
|
|
||
| BO_ 128 STEERING_ENABLE: 8 STEERING | ||
| SG_ steering_enable_magic : 0|16@1+ (1,0) [0|0] "" STEERING | ||
| SG_ steering_enable_reserved : 16|48@1+ (1,0) [0|0] "" STEERING | ||
|
|
||
| BO_ 129 STEERING_DISABLE: 8 STEERING | ||
| SG_ steering_disable_magic : 0|16@1+ (1,0) [0|0] "" STEERING | ||
| SG_ steering_disable_reserved : 16|48@1+ (1,0) [0|0] "" STEERING | ||
|
|
||
| BO_ 130 STEERING_COMMAND: 8 STEERING | ||
| SG_ steering_command_magic : 0|16@1+ (1,0) [0|0] "" STEERING | ||
| SG_ steering_command_torque_request : 16|32@1- (1,0) [-1|1] "" STEERING | ||
| SG_ steering_command_reserved : 48|16@1+ (1,0) [0|0] "" STEERING | ||
|
|
||
| BO_ 131 STEERING_REPORT: 8 STEERING | ||
| SG_ steering_report_magic : 0|16@1+ (1,0) [0|0] "" STEERING | ||
| SG_ steering_report_enabled : 16|8@1+ (1,0) [0|0] "" STEERING | ||
| SG_ steering_report_operator_override : 24|8@1+ (1,0) [0|0] "" STEERING | ||
| SG_ steering_report_dtcs : 32|8@1+ (1,0) [0|0] "" STEERING | ||
| SG_ steering_report_reserved : 40|24@1+ (1,0) [0|0] "" STEERING | ||
|
|
||
| BO_ 144 THROTTLE_ENABLE: 8 THROTTLE | ||
| SG_ throttle_enable_magic : 0|16@1+ (1,0) [0|0] "" THROTTLE | ||
| SG_ throttle_enable_reserved : 16|48@1+ (1,0) [0|0] "" THROTTLE | ||
|
|
||
| BO_ 145 THROTTLE_DISABLE: 8 THROTTLE | ||
| SG_ throttle_disable_magic : 0|16@1+ (1,0) [0|0] "" THROTTLE | ||
| SG_ throttle_disable_reserved : 16|48@1+ (1,0) [0|0] "" THROTTLE | ||
|
|
||
| BO_ 146 THROTTLE_COMMAND: 8 THROTTLE | ||
| SG_ throttle_command_magic : 0|16@1+ (1,0) [0|0] "" THROTTLE | ||
| SG_ throttle_command_pedal_request : 16|32@1- (1,0) [0|1] "" THROTTLE | ||
| SG_ throttle_command_reserved : 48|16@1+ (1,0) [0|0] "" THROTTLE | ||
|
|
||
| BO_ 147 THROTTLE_REPORT: 8 THROTTLE | ||
| SG_ throttle_report_magic : 0|16@1+ (1,0) [0|0] "" THROTTLE | ||
| SG_ throttle_report_enabled : 16|8@1+ (1,0) [0|0] "" THROTTLE | ||
| SG_ throttle_report_operator_override : 24|8@1+ (1,0) [0|0] "" THROTTLE | ||
| SG_ throttle_report_dtcs : 32|8@1+ (1,0) [0|0] "" THROTTLE | ||
| SG_ throttle_report_reserved : 40|24@1+ (1,0) [0|0] "" THROTTLE | ||
|
|
||
| BO_ 175 FAULT_REPORT: 8 FAULT | ||
| SG_ fault_report_magic : 0|16@1+ (1,0) [0|0] "" FAULT | ||
| SG_ fault_report_fault_origin_id : 16|32@1+ (1,0) [0|0] "" FAULT | ||
| SG_ fault_report_dtcs : 48|8@1+ (1,0) [0|0] "" FAULT | ||
| SG_ fault_report_reserved : 56|8@1+ (1,0) [0|0] "" FAULT | ||
|
|
||
| CM_ BU_ BRAKE "The OSCC brake module"; | ||
| CM_ BU_ STEERING "The OSCC steering module"; | ||
| CM_ BU_ THROTTLE "The OSCC throttle module"; | ||
| CM_ BU_ FAULT "The OSCC fault report"; | ||
| SIG_VALTYPE_ 114 brake_command_pedal_request : 1; | ||
| SIG_VALTYPE_ 130 steering_command_torque_request : 1; | ||
| SIG_VALTYPE_ 146 throttle_command_pedal_request : 1; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.