diff --git a/dasharo-performance/custom-fan-curve.robot b/dasharo-performance/custom-fan-curve.robot index 97b084d63..6ae1dafdb 100644 --- a/dasharo-performance/custom-fan-curve.robot +++ b/dasharo-performance/custom-fan-curve.robot @@ -20,6 +20,8 @@ Resource ../lib/sensors.robot Suite Setup Run Keywords ... Prepare Test Suite ... AND +... Skip If '''${CUSTOM_FAN_CURVE_FILE}''' == '''${TBD}''' CFC not supported - CUSTOM_FAN_CURVE_FILE not defined +... AND ... Import Variables ${CURDIR}/../platform-configs/${CUSTOM_FAN_CURVE_FILE} Suite Teardown Run Keyword ... Log Out And Close Connection diff --git a/platform-configs/include/default.robot b/platform-configs/include/default.robot index 972843c2f..07029f129 100644 --- a/platform-configs/include/default.robot +++ b/platform-configs/include/default.robot @@ -202,6 +202,10 @@ ${PLATFORM_STABILITY_CHECKING}= ${FALSE} ${CUSTOM_FAN_CURVE_SILENT_MODE_SUPPORT}= ${FALSE} ${CUSTOM_FAN_CURVE_PERFORMANCE_MODE_SUPPORT}= ${FALSE} ${CUSTOM_FAN_CURVE_OFF_MODE_SUPPORT}= ${FALSE} +# Variables used in lib/sensors to determine platform-specific methods of +# measuring temperatures, fans etc. +${SENSORS_CONFIG_FILE}= include/sensors/default-sensors-config.yaml +${CUSTOM_FAN_CURVE_FILE}= ${TBD} ${ETH_PERF_PAIR_1_G}= ${FALSE} ${ETH_PERF_PAIR_2_G}= ${FALSE} ${ETH_PERF_PAIR_10_G}= ${FALSE} @@ -274,11 +278,6 @@ ${STABILITY_DETECTION_SUSPEND_ITERATIONS}= 5 ${DCU_SUPPORTED_BOOLEAN_SMMSTORE_VARIABLE}= NetworkBoot ${ETH_PORTS}= ${EMPTY} -# Variables used in lib/sensors to determine platform-specific methods of -# measuring temperatures, fans etc. -${SENSORS_CONFIG_FILE}= include/sensors/default-sensors-config.yaml -${CUSTOM_FAN_CURVE_FILE}= include/sensors/default-fan-curve-config.yaml - *** Keywords *** Power On Default diff --git a/platform-configs/include/sensors/default-fan-curve-config.yaml b/platform-configs/include/sensors/default-fan-curve-config.yaml deleted file mode 100644 index 82a861f43..000000000 --- a/platform-configs/include/sensors/default-fan-curve-config.yaml +++ /dev/null @@ -1,71 +0,0 @@ -# SPDX-FileCopyrightText: 2024 3mdeb -# -# SPDX-License-Identifier: Apache-2.0 - -# example_temperature_curve: -# # range of temperatures for which this linear function applies -# - range: [0, 65] -# # range of values in this temperature range, can be undefined if -# # measuring pwm is not supported on given platform -# evaluation_pwm: [20, 25] -# # range of values in this temperature range, can be undefined if -# # measuring pwm is not supported on given platform -# # accepted tolerance of pwm values - by how much can it differ from the -# # expected value -# tolerance_pwm: 6 -# evaluation_rpm: [0, 3000] -# # accepted tolerance of rpm values - by how much can it differ from the -# # expected value -# tolerance_rpm: 100 -# # Next linear function for next temperature range. The temperature ranges -# # must not overlap and be sorted in an ascending order -# - range: [65, 70] -# evaluation_pwm: [25, 35] -# tolerance_pwm: 6 -# evaluation_rpm: [0, 3000] -# tolerance_rpm: 100 - -temperature_curve_silent: - - range: [0, 65] - evaluation_pwm: [20, 25] - tolerance_pwm: 6 - evaluation_rpm: [0, 0] - tolerance_rpm: 10000 - - - range: [65, 75] - evaluation_pwm: [25, 35] - tolerance_pwm: 6 - evaluation_rpm: [0, 0] - tolerance_rpm: 10000 - - - range: [75, 100] - evaluation: [35, 100] - tolerance_pwm: 6 - evaluation_rpm: [0, 0] - tolerance_rpm: 10000 - -temperature_curve_performance: - - range: [0, 55] - evaluation_pwm: [25, 35] - tolerance_pwm: 6 - evaluation_rpm: [0, 0] - tolerance_rpm: 10000 - - - range: [55, 75] - evaluation_pwm: [35, 60] - tolerance_pwm: 6 - evaluation_rpm: [0, 0] - tolerance_rpm: 10000 - - - range: [75, 100] - evaluation_pwm: [60, 100] - tolerance_pwm: 6 - evaluation_rpm: [0, 0] - tolerance_rpm: 10000 - -temperature_curve_off: - - range: [0, 100] - evaluation_pwm: [0, 0] - tolerance_pwm: 100 - evaluation_rpm: [0, 0] - tolerance_rpm: 10000