From 8e107cc4775a966f61d7c4ba23efe63f5c9e43d1 Mon Sep 17 00:00:00 2001 From: Matthew Kennedy Date: Fri, 1 Jul 2022 03:51:47 -0700 Subject: [PATCH] more generous script table axis limits (#4309) * script table axis limits * curves too, why not * s * s * table type --- firmware/controllers/core/fsio_impl.h | 4 +-- firmware/integration/rusefi_config.txt | 42 +++++++++++++------------- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/firmware/controllers/core/fsio_impl.h b/firmware/controllers/core/fsio_impl.h index c4abf7c3a1..a17ad731f5 100644 --- a/firmware/controllers/core/fsio_impl.h +++ b/firmware/controllers/core/fsio_impl.h @@ -10,8 +10,8 @@ #include "expected.h" -typedef Map3D fsio8_Map3D_f32t; -typedef Map3D fsio8_Map3D_u8t; +typedef Map3D fsio8_Map3D_f32t; +typedef Map3D fsio8_Map3D_u8t; void initFsioImpl(); diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index 28fc20ca0f..4427913143 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -1533,18 +1533,18 @@ engine_configuration_s engineConfiguration; float[CLT_TIMING_CURVE_SIZE] cltTimingExtra;;"degree", 1, 0, -400, 400, 0 - float[SCRIPT_CURVE_16] scriptCurve1Bins;;"x", 1, 0, -999, 1000, 3 - float[SCRIPT_CURVE_16] scriptCurve1;;"y", 1, 0, -999, 1000, 3 - float[SCRIPT_CURVE_16] scriptCurve2Bins;;"x", 1, 0, -999, 1000, 3 - float[SCRIPT_CURVE_16] scriptCurve2;;"y", 1, 0, -999, 1000, 3 - float[SCRIPT_CURVE_8] scriptCurve3Bins;;"x", 1, 0, -999, 1000, 3 - float[SCRIPT_CURVE_8] scriptCurve3;;"y", 1, 0, -999, 1000, 3 - float[SCRIPT_CURVE_8] scriptCurve4Bins;;"x", 1, 0, -999, 1000, 3 - float[SCRIPT_CURVE_8] scriptCurve4;;"y", 1, 0, -999, 1000, 3 - float[SCRIPT_CURVE_8] scriptCurve5Bins;;"x", 1, 0, -999, 1000, 3 - float[SCRIPT_CURVE_8] scriptCurve5;;"y", 1, 0, -999, 1000, 3 - float[SCRIPT_CURVE_8] scriptCurve6Bins;;"x", 1, 0, -999, 1000, 3 - float[SCRIPT_CURVE_8] scriptCurve6;;"y", 1, 0, -999, 1000, 3 + float[SCRIPT_CURVE_16] scriptCurve1Bins;;"x", 1, 0, -10000, 10000, 3 + float[SCRIPT_CURVE_16] scriptCurve1;;"y", 1, 0, -10000, 10000, 3 + float[SCRIPT_CURVE_16] scriptCurve2Bins;;"x", 1, 0, -10000, 10000, 3 + float[SCRIPT_CURVE_16] scriptCurve2;;"y", 1, 0, -10000, 10000, 3 + float[SCRIPT_CURVE_8] scriptCurve3Bins;;"x", 1, 0, -10000, 10000, 3 + float[SCRIPT_CURVE_8] scriptCurve3;;"y", 1, 0, -10000, 10000, 3 + float[SCRIPT_CURVE_8] scriptCurve4Bins;;"x", 1, 0, -10000, 10000, 3 + float[SCRIPT_CURVE_8] scriptCurve4;;"y", 1, 0, -10000, 10000, 3 + float[SCRIPT_CURVE_8] scriptCurve5Bins;;"x", 1, 0, -10000, 10000, 3 + float[SCRIPT_CURVE_8] scriptCurve5;;"y", 1, 0, -10000, 10000, 3 + float[SCRIPT_CURVE_8] scriptCurve6Bins;;"x", 1, 0, -10000, 10000, 3 + float[SCRIPT_CURVE_8] scriptCurve6;;"y", 1, 0, -10000, 10000, 3 float[BARO_CORR_SIZE] baroCorrPressureBins;;"kPa", 1, 0, 0, 200, 2 float[BARO_CORR_SIZE] baroCorrRpmBins;;"RPM", 1, 0, 0, 18000, 0 @@ -1657,21 +1657,21 @@ float[TPS_TPS_ACCEL_TABLE x TPS_TPS_ACCEL_TABLE] tpsTpsAccelTable;;"value", 1, 0 float[TPS_TPS_ACCEL_TABLE] tpsTpsAccelFromRpmBins;;"from", 1, 0, 0, 30000, 2 float[TPS_TPS_ACCEL_TABLE] tpsTpsAccelToRpmBins;;"to", 1, 0, 0, 25500, 2 -float[SCRIPT_TABLE_8 x SCRIPT_TABLE_8] scriptTable1;;"value", 1, 0, 0, 30000, 2 -uint16_t[SCRIPT_TABLE_8] scriptTable1LoadBins;;"L", 1, 0, 0, 30000, 0 -uint16_t[SCRIPT_TABLE_8] scriptTable1RpmBins;;"RPM", 1, 0, 0, 25500, 0 +float[SCRIPT_TABLE_8 x SCRIPT_TABLE_8] scriptTable1;;"value", 1, 0, -100000, 100000, 2 +int16_t[SCRIPT_TABLE_8] scriptTable1LoadBins;;"L", 1, 0, -32000, 32000, 0 +int16_t[SCRIPT_TABLE_8] scriptTable1RpmBins;;"RPM", 1, 0, -32000, 32000, 0 uint8_t[SCRIPT_TABLE_8 x SCRIPT_TABLE_8] scriptTable2;;"value", 1, 0, 0, 255, 0 -uint16_t[SCRIPT_TABLE_8] scriptTable2LoadBins;;"L", 1, 0, 0, 255, 0 -uint16_t[SCRIPT_TABLE_8] scriptTable2RpmBins;;"RPM", 1, 0, 0, 25500, 0 +int16_t[SCRIPT_TABLE_8] scriptTable2LoadBins;;"L", 1, 0, -32000, 32000, 0 +int16_t[SCRIPT_TABLE_8] scriptTable2RpmBins;;"RPM", 1, 0, -32000, 32000, 0 uint8_t[SCRIPT_TABLE_8 x SCRIPT_TABLE_8] scriptTable3;;"value", 1, 0, 0, 255, 0 -uint16_t[SCRIPT_TABLE_8] scriptTable3LoadBins;;"L", 1, 0, 0, 255, 0 -uint16_t[SCRIPT_TABLE_8] scriptTable3RpmBins;;"RPM", 1, 0, 0, 25500, 0 +int16_t[SCRIPT_TABLE_8] scriptTable3LoadBins;;"L", 1, 0, -32000, 32000, 0 +int16_t[SCRIPT_TABLE_8] scriptTable3RpmBins;;"RPM", 1, 0, -32000, 32000, 0 uint8_t[SCRIPT_TABLE_8 x SCRIPT_TABLE_8] scriptTable4;;"value", 1, 0, 0, 255, 0 -uint16_t[SCRIPT_TABLE_8] scriptTable4LoadBins;;"L", 1, 0, 0, 255, 0 -uint16_t[SCRIPT_TABLE_8] scriptTable4RpmBins;;"RPM", 1, 0, 0, 25500, 0 +int16_t[SCRIPT_TABLE_8] scriptTable4LoadBins;;"L", 1, 0, -32000, 32000, 0 +int16_t[SCRIPT_TABLE_8] scriptTable4RpmBins;;"RPM", 1, 0, -32000, 32000, 0 #define TRIM_SIZE 4