Permalink
Browse files

Merge remote-tracking branch 'origin/devel'

  • Loading branch information...
bbidault2 committed Oct 24, 2018
2 parents 60ac713 + 85eb3e2 commit 45ce9fccda8b75e58612b70bd45d88bc0621126b
Showing with 35 additions and 41 deletions.
  1. +32 βˆ’37 Jenkinsfile
  2. +2 βˆ’2 api/include/vehicles/kia_niro.h
  3. +1 βˆ’2 firmware/throttle/src/throttle_control.cpp
@@ -17,50 +17,45 @@ node {
def platform = platforms[platform_idx]
builds[platform] = {
node {
try {
checkout scm
image = docker.build("cmake-build:${env.BUILD_ID}")
checkout scm
stage("Build ${platform}") {
image.inside {
sh "cd firmware && \
rm -rf build_${platform} && \
mkdir build_${platform} && \
cd build_${platform} && \
cmake -DVEHICLE=${platform} -DCMAKE_BUILD_TYPE=Release .. && \
make"
image = docker.build("cmake-build:${env.BUILD_ID}")
echo "${platform}: Build Complete!"
}
}
stage("Build ${platform}") {
image.inside {
sh "cd firmware && \
rm -rf build_${platform} && \
mkdir build_${platform} && \
cd build_${platform} && \
cmake -DVEHICLE=${platform} -DCMAKE_BUILD_TYPE=Release .. && \
make"
stage("Test ${platform} unit tests") {
image.inside {
sh "cd firmware && \
rm -rf build_${platform}_tests && \
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!"
}
echo "${platform}: Build Complete!"
}
}
stage("Test ${platform} property-based tests") {
image.inside("--user root:root") {
sh "cd firmware/build_${platform}_tests && \
make run-property-tests"
echo "${platform}: Property-Based Tests Complete!"
}
stage("Test ${platform} unit tests") {
image.inside {
sh "cd firmware && \
rm -rf build_${platform}_tests && \
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!"
}
}
finally {
deleteDir()
stage("Test ${platform} property-based tests") {
image.inside("--user root:root") {
sh "cd firmware/build_${platform}_tests && \
make run-property-tests"
echo "${platform}: Property-Based Tests Complete!"
}
}
}
}
@@ -239,10 +239,10 @@ typedef struct
BRAKE_SPOOF_HIGH_SIGNAL_VOLTAGE_MIN )
/*
* @brief Value of the accelerator position that indicates operator override. [steps]
* @brief Value of the brake position that indicates operator override. [steps]
*
*/
#define BRAKE_PEDAL_OVERRIDE_THRESHOLD ( 200 )
#define BRAKE_PEDAL_OVERRIDE_THRESHOLD ( 130 )
/*
* @brief Minimum value of the high spoof signal that activates the brake lights. [steps]
@@ -61,8 +61,7 @@ void check_for_faults( void )
DEBUG_PRINTLN( "Bad value read from accelerator position sensor" );
}
else if ( operator_overridden == true
&& g_throttle_control_state.operator_override == false )
else if ( operator_overridden == true )
{
disable_control( );

0 comments on commit 45ce9fc

Please sign in to comment.