From 3c60a315ca78405ab0dd6c678557e25e63992ed7 Mon Sep 17 00:00:00 2001 From: Shea Newton Date: Tue, 17 Oct 2017 17:34:30 -0700 Subject: [PATCH 1/2] Add license file for the cucumber-cpp artifacts. Prior to this commit the license file for the vendored cucumber-cpp artifacts required for tests was missing. This commit adds their license to the directory where the artifacts are tracked. --- .../framework/cucumber-cpp/LICENSE.txt | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 firmware/common/testing/framework/cucumber-cpp/LICENSE.txt diff --git a/firmware/common/testing/framework/cucumber-cpp/LICENSE.txt b/firmware/common/testing/framework/cucumber-cpp/LICENSE.txt new file mode 100644 index 00000000..074e7912 --- /dev/null +++ b/firmware/common/testing/framework/cucumber-cpp/LICENSE.txt @@ -0,0 +1,21 @@ +The MIT License + +Copyright (c) 2010 Paolo Ambrosio + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. \ No newline at end of file From dc03aa4f303e685eb41866899969a0140f5a9573 Mon Sep 17 00:00:00 2001 From: Boris Bidault Date: Thu, 2 Nov 2017 14:54:35 -0700 Subject: [PATCH 2/2] brake pressure update --- api/include/vehicles/kia_soul_ev.h | 16 ++++++++-------- .../tests/features/receiving_messages.feature | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/api/include/vehicles/kia_soul_ev.h b/api/include/vehicles/kia_soul_ev.h index e960fbe4..675c95e9 100644 --- a/api/include/vehicles/kia_soul_ev.h +++ b/api/include/vehicles/kia_soul_ev.h @@ -122,53 +122,53 @@ typedef struct * @brief Minimum allowed voltage for the low spoof signal voltage. [volts] * */ -#define BRAKE_SPOOF_LOW_SIGNAL_VOLTAGE_MIN ( 0.303 ) +#define BRAKE_SPOOF_LOW_SIGNAL_VOLTAGE_MIN ( 0.333 ) /* * @brief Maximum allowed voltage for the low spoof signal voltage. [volts] * */ -#define BRAKE_SPOOF_LOW_SIGNAL_VOLTAGE_MAX ( 1.40 ) +#define BRAKE_SPOOF_LOW_SIGNAL_VOLTAGE_MAX ( 1.12 ) /** * @brief Minimum allowed voltage for the high spoof signal voltage. [volts] * */ -#define BRAKE_SPOOF_HIGH_SIGNAL_VOLTAGE_MIN ( 0.635 ) +#define BRAKE_SPOOF_HIGH_SIGNAL_VOLTAGE_MIN ( 0.698 ) /** * @brief Maximum allowed voltage for the high spoof signal voltage. [volts] * */ -#define BRAKE_SPOOF_HIGH_SIGNAL_VOLTAGE_MAX ( 2.87 ) +#define BRAKE_SPOOF_HIGH_SIGNAL_VOLTAGE_MAX ( 2.29 ) /* * @brief Minimum allowed value for the low spoof signal value. [steps] * * Equal to \ref BRAKE_SPOOF_LOW_SIGNAL_VOLTAGE_MIN * \ref STEPS_PER_VOLT. */ -#define BRAKE_SPOOF_LOW_SIGNAL_RANGE_MIN ( 249 ) +#define BRAKE_SPOOF_LOW_SIGNAL_RANGE_MIN ( 273 ) /* * @brief Minimum allowed value for the low spoof signal value. [steps] * * Equal to \ref BRAKE_SPOOF_LOW_SIGNAL_VOLTAGE_MAX * \ref STEPS_PER_VOLT. */ -#define BRAKE_SPOOF_LOW_SIGNAL_RANGE_MAX ( 1146 ) +#define BRAKE_SPOOF_LOW_SIGNAL_RANGE_MAX ( 917 ) /* * @brief Minimum allowed value for the low spoof signal value. [steps] * * Equal to \ref BRAKE_SPOOF_HIGH_SIGNAL_VOLTAGE_MIN * \ref STEPS_PER_VOLT. */ -#define BRAKE_SPOOF_HIGH_SIGNAL_RANGE_MIN ( 521 ) +#define BRAKE_SPOOF_HIGH_SIGNAL_RANGE_MIN ( 572 ) /* * @brief Minimum allowed value for the low spoof signal value. [steps] * * Equal to \ref BRAKE_SPOOF_HIGH_SIGNAL_VOLTAGE_MAX * \ref STEPS_PER_VOLT. */ -#define BRAKE_SPOOF_HIGH_SIGNAL_RANGE_MAX ( 2351 ) +#define BRAKE_SPOOF_HIGH_SIGNAL_RANGE_MAX ( 1876 ) /* * @brief Calculation to convert a brake position to a low spoof voltage. diff --git a/firmware/brake/kia_soul_ev/tests/features/receiving_messages.feature b/firmware/brake/kia_soul_ev/tests/features/receiving_messages.feature index a9c130a9..e84d358c 100644 --- a/firmware/brake/kia_soul_ev/tests/features/receiving_messages.feature +++ b/firmware/brake/kia_soul_ev/tests/features/receiving_messages.feature @@ -39,12 +39,12 @@ Feature: Receiving commands Examples: | high | low | - | 2300 | 250 | - | 2000 | 300 | + | 1876 | 273 | + | 1800 | 300 | | 1500 | 500 | | 1000 | 750 | - | 750 | 1000 | - | 550 | 1100 | + | 750 | 900 | + | 572 | 917 | Scenario Outline: Spoof value sent from application outside valid range @@ -57,7 +57,7 @@ Feature: Receiving commands Examples: | high | low | high_clamped | low_clamped | - | 4000 | 0 | 2351 | 249 | - | 3500 | 500 | 2351 | 500 | - | 500 | 3500 | 521 | 1146 | - | 0 | 4000 | 521 | 1146 | + | 4000 | 0 | 1876 | 273 | + | 3500 | 500 | 1876 | 500 | + | 500 | 3500 | 572 | 917 | + | 0 | 4000 | 572 | 917 |