rusefi
/
rusefi-1
mirror of https://github.com/rusefi/rusefi-1.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into master

This commit is contained in:
rusefillc 2020-12-01 10:59:24 -05:00
parent 69af9f4496 c0c566afa6
commit cdd2527f37
42 changed files with 246 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
firmware/config/boards/hellen/cypress/config/controllers/algo/engine_configuration_generated_structures.h
View File

@ -1,4 +1,4 @@
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Sun Nov 29 03:22:10 UTC 2020
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Mon Nov 30 05:13:50 UTC 2020
// by class com.rusefi.output.CHeaderConsumer
// begin
#pragma once
@ -2020,6 +2020,7 @@ struct engine_configuration_s {
bool fuelClosedLoopCorrectionEnabled : 1;
/**
* Print details into rusEfi console
* enable verbose_idle
offset 1464 bit 2 */
bool isVerboseIAC : 1;
/**
@ -3777,4 +3778,4 @@ struct persistent_config_s {
typedef struct persistent_config_s persistent_config_s;
// end
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Sun Nov 29 03:22:10 UTC 2020
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Mon Nov 30 05:13:50 UTC 2020

8
firmware/config/boards/hellen/cypress/config/controllers/algo/rusefi_generated.h
View File

@ -373,7 +373,7 @@
#define ENGINE_MAKE_VAG "VAG"
#define ENGINE_NOISE_CURVE_SIZE 8
#define ENGINE_SNIFFER_UNIT_US 10
#define engine_type_e_auto_enum "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "FORD_FIESTA", "NISSAN_PRIMERA", "HONDA_ACCORD_CD", "FORD_INLINE_6_1995", "GY6_139QMB", "MAZDA_MIATA_NB1", "ROVER_V8", "MRE_MIATA_NB2_MAP", "MRE_MIATA_NA6_VAF", "MRE_MIATA_NB2_ETB", "FORD_ESCORT_GT", "MRE_MIATA_NB2_MAF", "MITSU_4G93", "HONDA_ACCORD_CD_TWO_WIRES", "HONDA_ACCORD_CD_DIP", "MIATA_1990", "MIATA_1994_DEVIATOR", "MIATA_1996", "SUBARU_2003_WRX", "MRE_BODY_CONTROL", "BMW_M73_M", "BMW_E34", "TEST_ENGINE", "ISSUE_898", "MAZDA_626", "SACHS", "MRE_BOARD_OLD_TEST", "MRE_BOARD_NEW_TEST", "VW_ABA", "UNUSED_33", "UNUSED_34", "CAMARO_4", "UNUSED_36", "CHEVY_C20_1973", "TOYOTA_JZS147", "LADA_KALINA", "BMW_M73_F", "MIATA_NA6_MAP", "ZIL_130", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "MAZDA_MIATA_2003", "HONDA_ACCORD_1_24_SHIFTED", "FRANKENSO_QA_ENGINE", "TEST_CIVIC_4_0_BOTH", "TEST_CIVIC_4_0_RISE", "TEST_ISSUE_366_BOTH", "TEST_ISSUE_366_RISE", "MAZDA_MIATA_2003_NA_RAIL", "MAZDA_MIATA_2003_BOARD_TEST", "MAZDA_MIATA_NA8", "MIATA_NA6_VAF", "ETB_BENCH_ENGINE", "TLE8888_BENCH_ENGINE", "MICRO_RUS_EFI", "PROTEUS", "VW_B6", "BMW_M73_PROTEUS", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "MINIMAL_PINS", "PROMETHEUS_DEFAULTS", "SUBARUEJ20G_DEFAULTS", "VAG_18_TURBO", "TEST_33816", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE"
#define engine_type_e_auto_enum "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "FORD_FIESTA", "NISSAN_PRIMERA", "HONDA_ACCORD_CD", "FORD_INLINE_6_1995", "GY6_139QMB", "MAZDA_MIATA_NB1", "ROVER_V8", "MRE_MIATA_NB2_MAP", "MRE_MIATA_NA6_VAF", "MRE_MIATA_NB2_ETB", "FORD_ESCORT_GT", "MRE_MIATA_NB2_MAF", "MITSU_4G93", "HONDA_ACCORD_CD_TWO_WIRES", "HONDA_ACCORD_CD_DIP", "MIATA_1990", "MRE_MIATA_94_MAP", "MIATA_1996", "SUBARU_2003_WRX", "MRE_BODY_CONTROL", "BMW_M73_M", "BMW_E34", "TEST_ENGINE", "ISSUE_898", "MAZDA_626", "SACHS", "MRE_BOARD_OLD_TEST", "MRE_BOARD_NEW_TEST", "VW_ABA", "UNUSED_33", "UNUSED_34", "CAMARO_4", "UNUSED_36", "CHEVY_C20_1973", "TOYOTA_JZS147", "LADA_KALINA", "BMW_M73_F", "MIATA_NA6_MAP", "ZIL_130", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "MAZDA_MIATA_2003", "HONDA_ACCORD_1_24_SHIFTED", "FRANKENSO_QA_ENGINE", "TEST_CIVIC_4_0_BOTH", "TEST_CIVIC_4_0_RISE", "TEST_ISSUE_366_BOTH", "TEST_ISSUE_366_RISE", "MAZDA_MIATA_2003_NA_RAIL", "MAZDA_MIATA_2003_BOARD_TEST", "MAZDA_MIATA_NA8", "MIATA_NA6_VAF", "ETB_BENCH_ENGINE", "TLE8888_BENCH_ENGINE", "MICRO_RUS_EFI", "PROTEUS", "VW_B6", "BMW_M73_PROTEUS", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "MINIMAL_PINS", "PROMETHEUS_DEFAULTS", "SUBARUEJ20G_DEFAULTS", "VAG_18_TURBO", "TEST_33816", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE"
#define engineChartSize_offset 1480
#define engineCode_offset 1128
#define engineConfiguration_offset 0
@ -1212,8 +1212,8 @@
#define showHumanReadableWarning_offset 976
#define showSdCardWarning_offset 76
#define SIGNATURE_BOARD hellen_cypress
#define SIGNATURE_DATE 2020.11.29
#define SIGNATURE_HASH 3486056747
#define SIGNATURE_DATE 2020.11.30
#define SIGNATURE_HASH 2755964311
#define silentTriggerError_offset 1464
#define slowAdcAlpha_offset 2088
#define sparkDwellRpmBins_offset 332
@ -1543,7 +1543,7 @@
#define ts_show_spi true
#define ts_show_trigger_comparator false
#define ts_show_tunerstudio_port true
#define TS_SIGNATURE "rusEFI 2020.11.29.hellen_cypress.3486056747"
#define TS_SIGNATURE "rusEFI 2020.11.30.hellen_cypress.2755964311"
#define TS_SINGLE_WRITE_COMMAND 'W'
#define TS_SINGLE_WRITE_COMMAND_char W
#define TS_TEST_COMMAND 't' // 0x74

5
firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h
View File

@ -1,4 +1,4 @@
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sun Nov 29 03:22:08 UTC 2020
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Mon Nov 30 05:13:48 UTC 2020
// by class com.rusefi.output.CHeaderConsumer
// begin
#pragma once
@ -2020,6 +2020,7 @@ struct engine_configuration_s {
bool fuelClosedLoopCorrectionEnabled : 1;
/**
* Print details into rusEfi console
* enable verbose_idle
offset 1464 bit 2 */
bool isVerboseIAC : 1;
/**
@ -3777,4 +3778,4 @@ struct persistent_config_s {
typedef struct persistent_config_s persistent_config_s;
// end
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sun Nov 29 03:22:08 UTC 2020
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Mon Nov 30 05:13:48 UTC 2020

8
firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h
View File

@ -373,7 +373,7 @@
#define ENGINE_MAKE_VAG "VAG"
#define ENGINE_NOISE_CURVE_SIZE 8
#define ENGINE_SNIFFER_UNIT_US 10
#define engine_type_e_auto_enum "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "FORD_FIESTA", "NISSAN_PRIMERA", "HONDA_ACCORD_CD", "FORD_INLINE_6_1995", "GY6_139QMB", "MAZDA_MIATA_NB1", "ROVER_V8", "MRE_MIATA_NB2_MAP", "MRE_MIATA_NA6_VAF", "MRE_MIATA_NB2_ETB", "FORD_ESCORT_GT", "MRE_MIATA_NB2_MAF", "MITSU_4G93", "HONDA_ACCORD_CD_TWO_WIRES", "HONDA_ACCORD_CD_DIP", "MIATA_1990", "MIATA_1994_DEVIATOR", "MIATA_1996", "SUBARU_2003_WRX", "MRE_BODY_CONTROL", "BMW_M73_M", "BMW_E34", "TEST_ENGINE", "ISSUE_898", "MAZDA_626", "SACHS", "MRE_BOARD_OLD_TEST", "MRE_BOARD_NEW_TEST", "VW_ABA", "UNUSED_33", "UNUSED_34", "CAMARO_4", "UNUSED_36", "CHEVY_C20_1973", "TOYOTA_JZS147", "LADA_KALINA", "BMW_M73_F", "MIATA_NA6_MAP", "ZIL_130", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "MAZDA_MIATA_2003", "HONDA_ACCORD_1_24_SHIFTED", "FRANKENSO_QA_ENGINE", "TEST_CIVIC_4_0_BOTH", "TEST_CIVIC_4_0_RISE", "TEST_ISSUE_366_BOTH", "TEST_ISSUE_366_RISE", "MAZDA_MIATA_2003_NA_RAIL", "MAZDA_MIATA_2003_BOARD_TEST", "MAZDA_MIATA_NA8", "MIATA_NA6_VAF", "ETB_BENCH_ENGINE", "TLE8888_BENCH_ENGINE", "MICRO_RUS_EFI", "PROTEUS", "VW_B6", "BMW_M73_PROTEUS", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "MINIMAL_PINS", "PROMETHEUS_DEFAULTS", "SUBARUEJ20G_DEFAULTS", "VAG_18_TURBO", "TEST_33816", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE"
#define engine_type_e_auto_enum "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "FORD_FIESTA", "NISSAN_PRIMERA", "HONDA_ACCORD_CD", "FORD_INLINE_6_1995", "GY6_139QMB", "MAZDA_MIATA_NB1", "ROVER_V8", "MRE_MIATA_NB2_MAP", "MRE_MIATA_NA6_VAF", "MRE_MIATA_NB2_ETB", "FORD_ESCORT_GT", "MRE_MIATA_NB2_MAF", "MITSU_4G93", "HONDA_ACCORD_CD_TWO_WIRES", "HONDA_ACCORD_CD_DIP", "MIATA_1990", "MRE_MIATA_94_MAP", "MIATA_1996", "SUBARU_2003_WRX", "MRE_BODY_CONTROL", "BMW_M73_M", "BMW_E34", "TEST_ENGINE", "ISSUE_898", "MAZDA_626", "SACHS", "MRE_BOARD_OLD_TEST", "MRE_BOARD_NEW_TEST", "VW_ABA", "UNUSED_33", "UNUSED_34", "CAMARO_4", "UNUSED_36", "CHEVY_C20_1973", "TOYOTA_JZS147", "LADA_KALINA", "BMW_M73_F", "MIATA_NA6_MAP", "ZIL_130", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "MAZDA_MIATA_2003", "HONDA_ACCORD_1_24_SHIFTED", "FRANKENSO_QA_ENGINE", "TEST_CIVIC_4_0_BOTH", "TEST_CIVIC_4_0_RISE", "TEST_ISSUE_366_BOTH", "TEST_ISSUE_366_RISE", "MAZDA_MIATA_2003_NA_RAIL", "MAZDA_MIATA_2003_BOARD_TEST", "MAZDA_MIATA_NA8", "MIATA_NA6_VAF", "ETB_BENCH_ENGINE", "TLE8888_BENCH_ENGINE", "MICRO_RUS_EFI", "PROTEUS", "VW_B6", "BMW_M73_PROTEUS", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "MINIMAL_PINS", "PROMETHEUS_DEFAULTS", "SUBARUEJ20G_DEFAULTS", "VAG_18_TURBO", "TEST_33816", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE"
#define engineChartSize_offset 1480
#define engineCode_offset 1128
#define engineConfiguration_offset 0
@ -1212,8 +1212,8 @@
#define showHumanReadableWarning_offset 976
#define showSdCardWarning_offset 76
#define SIGNATURE_BOARD kin
#define SIGNATURE_DATE 2020.11.29
#define SIGNATURE_HASH 2664774609
#define SIGNATURE_DATE 2020.11.30
#define SIGNATURE_HASH 4116223853
#define silentTriggerError_offset 1464
#define slowAdcAlpha_offset 2088
#define sparkDwellRpmBins_offset 332
@ -1543,7 +1543,7 @@
#define ts_show_spi true
#define ts_show_trigger_comparator true
#define ts_show_tunerstudio_port true
#define TS_SIGNATURE "rusEFI 2020.11.29.kin.2664774609"
#define TS_SIGNATURE "rusEFI 2020.11.30.kin.4116223853"
#define TS_SINGLE_WRITE_COMMAND 'W'
#define TS_SINGLE_WRITE_COMMAND_char W
#define TS_TEST_COMMAND 't' // 0x74

7
firmware/config/engines/mazda_miata_1_6.cpp
View File

@ -372,6 +372,9 @@ void setMiataNA6_VAF_MRE(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
#endif /* BOARD_TLE8888_COUNT */
}
/**
* set engine_type 66
*/
void setMiataNA6_MAP_MRE(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
setMiataNA6_settings(PASS_CONFIG_PARAMETER_SIGNATURE);
miataNAcommonEngineSettings(PASS_CONFIG_PARAMETER_SIGNATURE);
@ -388,7 +391,7 @@ void setMiataNA6_MAP_MRE(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
engineConfiguration->useIacTableForCoasting = true;
engineConfiguration->idlePidDeactivationTpsThreshold = 90;
engineConfiguration->isVerboseIAC = true;
// engineConfiguration->isVerboseIAC = true;
engineConfiguration->idleRpmPid.pFactor = 0.01;
engineConfiguration->idleRpmPid.iFactor = 0.02;
@ -462,8 +465,10 @@ void setMiataNA6_MAP_MRE(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
void setMiata94_MAP_MRE(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
setMiataNA6_MAP_MRE(PASS_CONFIG_PARAMETER_SIGNATURE);
#if (BOARD_TLE8888_COUNT > 0)
// "35 - GP Out 1"
engineConfiguration->fuelPumpPin = TLE8888_PIN_21;
#endif /* BOARD_TLE8888_COUNT */
engineConfiguration->injectionMode = IM_SEQUENTIAL;
engineConfiguration->specs.displacement = 1.8;

4
firmware/config/engines/mazda_miata_1_6.h
View File

@ -22,5 +22,7 @@ void miataNAcommon(DECLARE_CONFIG_PARAMETER_SIGNATURE);
void setMiataNA6_VAF_MRE(DECLARE_CONFIG_PARAMETER_SIGNATURE);
void setMiataNA6_MAP_MRE(DECLARE_CONFIG_PARAMETER_SIGNATURE);
/**
* set engine_type 20
*/
void setMiata94_MAP_MRE(DECLARE_CONFIG_PARAMETER_SIGNATURE);

4
firmware/controllers/algo/launch_control.cpp
View File

@ -152,14 +152,14 @@ void LaunchControlBase::update() {
if (!combinedConditions) {
// conditions not met, reset timer
launchTimer = getTimeNowNt();
m_launchTimer.reset();
engine->isLaunchCondition = false;
engine->setLaunchBoostDuty = false;
engine->applyLaunchControlRetard = false;
engine->applyLaunchExtraFuel = false;
} else {
// If conditions are met...
if ((getTimeNowNt() - launchTimer > MS2NT(timeDelay * 1000)) && combinedConditions) {
if (m_launchTimer.hasElapsedMs(timeDelay) && combinedConditions) {
engine->isLaunchCondition = true; // ...enable launch!
engine->applyLaunchExtraFuel = true;
}

3
firmware/controllers/algo/launch_control.h
View File

@ -8,6 +8,7 @@
#pragma once
#include "engine_ptr.h"
#include "timer.h"
class Logging;
void initLaunchControl(Logging *sharedLogger DECLARE_ENGINE_PARAMETER_SUFFIX);
@ -29,5 +30,5 @@ public:
bool isLaunchConditionMet(int rpm) const;
private:
efitick_t launchTimer = 0;
Timer m_launchTimer;
};

2
firmware/controllers/date_stamp.h
View File

@ -1,2 +1,2 @@
#pragma once
#define VCS_DATE 20201129
#define VCS_DATE 20201201

5
firmware/controllers/generated/engine_configuration_generated_structures.h
View File

@ -1,4 +1,4 @@
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 29 03:21:46 UTC 2020
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Nov 30 05:13:27 UTC 2020
// by class com.rusefi.output.CHeaderConsumer
// begin
#pragma once
@ -2020,6 +2020,7 @@ struct engine_configuration_s {
bool fuelClosedLoopCorrectionEnabled : 1;
/**
* Print details into rusEfi console
* enable verbose_idle
offset 1464 bit 2 */
bool isVerboseIAC : 1;
/**
@ -3777,4 +3778,4 @@ struct persistent_config_s {
typedef struct persistent_config_s persistent_config_s;
// end
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 29 03:21:46 UTC 2020
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Nov 30 05:13:27 UTC 2020

2
firmware/controllers/generated/fsio_enums_generated.def
View File

@ -1,4 +1,4 @@
// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 29 03:21:46 UTC 2020
// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Nov 30 05:13:27 UTC 2020
// by class com.rusefi.output.FileFsioSettingsConsumer
FSIO_SETTING_FANONTEMPERATURE = 1000,

2
firmware/controllers/generated/fsio_getters.def
View File

@ -1,4 +1,4 @@
// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 29 03:21:46 UTC 2020
// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Nov 30 05:13:27 UTC 2020
// by class com.rusefi.output.FileFsioSettingsConsumer
case FSIO_SETTING_FANONTEMPERATURE:

2
firmware/controllers/generated/fsio_names.def
View File

@ -1,4 +1,4 @@
// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 29 03:21:46 UTC 2020
// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Nov 30 05:13:27 UTC 2020
// by class com.rusefi.output.FileFsioSettingsConsumer
static LENameOrdinalPair lefanOnTemperature(FSIO_SETTING_FANONTEMPERATURE, "cfg_fanOnTemperature");

2
firmware/controllers/generated/fsio_strings.def
View File

@ -1,4 +1,4 @@
// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 29 03:21:46 UTC 2020
// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Nov 30 05:13:27 UTC 2020
// by class com.rusefi.output.FileFsioSettingsConsumer
case FSIO_SETTING_FANONTEMPERATURE:

8
firmware/controllers/generated/rusefi_generated.h
View File

@ -373,7 +373,7 @@
#define ENGINE_MAKE_VAG "VAG"
#define ENGINE_NOISE_CURVE_SIZE 8
#define ENGINE_SNIFFER_UNIT_US 10
#define engine_type_e_auto_enum "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "FORD_FIESTA", "NISSAN_PRIMERA", "HONDA_ACCORD_CD", "FORD_INLINE_6_1995", "GY6_139QMB", "MAZDA_MIATA_NB1", "ROVER_V8", "MRE_MIATA_NB2_MAP", "MRE_MIATA_NA6_VAF", "MRE_MIATA_NB2_ETB", "FORD_ESCORT_GT", "MRE_MIATA_NB2_MAF", "MITSU_4G93", "HONDA_ACCORD_CD_TWO_WIRES", "HONDA_ACCORD_CD_DIP", "MIATA_1990", "MIATA_1994_DEVIATOR", "MIATA_1996", "SUBARU_2003_WRX", "MRE_BODY_CONTROL", "BMW_M73_M", "BMW_E34", "TEST_ENGINE", "ISSUE_898", "MAZDA_626", "SACHS", "MRE_BOARD_OLD_TEST", "MRE_BOARD_NEW_TEST", "VW_ABA", "UNUSED_33", "UNUSED_34", "CAMARO_4", "UNUSED_36", "CHEVY_C20_1973", "TOYOTA_JZS147", "LADA_KALINA", "BMW_M73_F", "MIATA_NA6_MAP", "ZIL_130", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "MAZDA_MIATA_2003", "HONDA_ACCORD_1_24_SHIFTED", "FRANKENSO_QA_ENGINE", "TEST_CIVIC_4_0_BOTH", "TEST_CIVIC_4_0_RISE", "TEST_ISSUE_366_BOTH", "TEST_ISSUE_366_RISE", "MAZDA_MIATA_2003_NA_RAIL", "MAZDA_MIATA_2003_BOARD_TEST", "MAZDA_MIATA_NA8", "MIATA_NA6_VAF", "ETB_BENCH_ENGINE", "TLE8888_BENCH_ENGINE", "MICRO_RUS_EFI", "PROTEUS", "VW_B6", "BMW_M73_PROTEUS", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "MINIMAL_PINS", "PROMETHEUS_DEFAULTS", "SUBARUEJ20G_DEFAULTS", "VAG_18_TURBO", "TEST_33816", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE"
#define engine_type_e_auto_enum "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "FORD_FIESTA", "NISSAN_PRIMERA", "HONDA_ACCORD_CD", "FORD_INLINE_6_1995", "GY6_139QMB", "MAZDA_MIATA_NB1", "ROVER_V8", "MRE_MIATA_NB2_MAP", "MRE_MIATA_NA6_VAF", "MRE_MIATA_NB2_ETB", "FORD_ESCORT_GT", "MRE_MIATA_NB2_MAF", "MITSU_4G93", "HONDA_ACCORD_CD_TWO_WIRES", "HONDA_ACCORD_CD_DIP", "MIATA_1990", "MRE_MIATA_94_MAP", "MIATA_1996", "SUBARU_2003_WRX", "MRE_BODY_CONTROL", "BMW_M73_M", "BMW_E34", "TEST_ENGINE", "ISSUE_898", "MAZDA_626", "SACHS", "MRE_BOARD_OLD_TEST", "MRE_BOARD_NEW_TEST", "VW_ABA", "UNUSED_33", "UNUSED_34", "CAMARO_4", "UNUSED_36", "CHEVY_C20_1973", "TOYOTA_JZS147", "LADA_KALINA", "BMW_M73_F", "MIATA_NA6_MAP", "ZIL_130", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "MAZDA_MIATA_2003", "HONDA_ACCORD_1_24_SHIFTED", "FRANKENSO_QA_ENGINE", "TEST_CIVIC_4_0_BOTH", "TEST_CIVIC_4_0_RISE", "TEST_ISSUE_366_BOTH", "TEST_ISSUE_366_RISE", "MAZDA_MIATA_2003_NA_RAIL", "MAZDA_MIATA_2003_BOARD_TEST", "MAZDA_MIATA_NA8", "MIATA_NA6_VAF", "ETB_BENCH_ENGINE", "TLE8888_BENCH_ENGINE", "MICRO_RUS_EFI", "PROTEUS", "VW_B6", "BMW_M73_PROTEUS", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "MINIMAL_PINS", "PROMETHEUS_DEFAULTS", "SUBARUEJ20G_DEFAULTS", "VAG_18_TURBO", "TEST_33816", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE"
#define engineChartSize_offset 1480
#define engineCode_offset 1128
#define engineConfiguration_offset 0
@ -1212,8 +1212,8 @@
#define showHumanReadableWarning_offset 976
#define showSdCardWarning_offset 76
#define SIGNATURE_BOARD all
#define SIGNATURE_DATE 2020.11.29
#define SIGNATURE_HASH 104376296
#define SIGNATURE_DATE 2020.11.30
#define SIGNATURE_HASH 1840581460
#define silentTriggerError_offset 1464
#define slowAdcAlpha_offset 2088
#define sparkDwellRpmBins_offset 332
@ -1543,7 +1543,7 @@
#define ts_show_spi true
#define ts_show_trigger_comparator false
#define ts_show_tunerstudio_port true
#define TS_SIGNATURE "rusEFI 2020.11.29.all.104376296"
#define TS_SIGNATURE "rusEFI 2020.11.30.all.1840581460"
#define TS_SINGLE_WRITE_COMMAND 'W'
#define TS_SINGLE_WRITE_COMMAND_char W
#define TS_TEST_COMMAND 't' // 0x74

6
firmware/controllers/generated/signature_all.h
View File

@ -3,6 +3,6 @@
//
#define SIGNATURE_BOARD all
#define SIGNATURE_DATE 2020.11.29
#define SIGNATURE_HASH 3115617215
#define TS_SIGNATURE "rusEFI 2020.11.29.all.3115617215"
#define SIGNATURE_DATE 2020.11.30
#define SIGNATURE_HASH 1840581460
#define TS_SIGNATURE "rusEFI 2020.11.30.all.1840581460"

6
firmware/controllers/generated/signature_frankenso_na6.h
View File

@ -3,6 +3,6 @@
//
#define SIGNATURE_BOARD frankenso_na6
#define SIGNATURE_DATE 2020.11.29
#define SIGNATURE_HASH 801389124
#define TS_SIGNATURE "rusEFI 2020.11.29.frankenso_na6.801389124"
#define SIGNATURE_DATE 2020.11.30
#define SIGNATURE_HASH 4224039599
#define TS_SIGNATURE "rusEFI 2020.11.30.frankenso_na6.4224039599"

6
firmware/controllers/generated/signature_hellen_cypress.h
View File

@ -3,6 +3,6 @@
//
#define SIGNATURE_BOARD hellen_cypress
#define SIGNATURE_DATE 2020.11.29
#define SIGNATURE_HASH 1883581820
#define TS_SIGNATURE "rusEFI 2020.11.29.hellen_cypress.1883581820"
#define SIGNATURE_DATE 2020.11.30
#define SIGNATURE_HASH 2755964311
#define TS_SIGNATURE "rusEFI 2020.11.30.hellen_cypress.2755964311"

6
firmware/controllers/generated/signature_kin.h
View File

@ -3,6 +3,6 @@
//
#define SIGNATURE_BOARD kin
#define SIGNATURE_DATE 2020.11.29
#define SIGNATURE_HASH 559486854
#define TS_SIGNATURE "rusEFI 2020.11.29.kin.559486854"
#define SIGNATURE_DATE 2020.11.30
#define SIGNATURE_HASH 4116223853
#define TS_SIGNATURE "rusEFI 2020.11.30.kin.4116223853"

6
firmware/controllers/generated/signature_mre_f4.h
View File

@ -3,6 +3,6 @@
//
#define SIGNATURE_BOARD mre_f4
#define SIGNATURE_DATE 2020.11.29
#define SIGNATURE_HASH 2925811142
#define TS_SIGNATURE "rusEFI 2020.11.29.mre_f4.2925811142"
#define SIGNATURE_DATE 2020.11.30
#define SIGNATURE_HASH 2053494061
#define TS_SIGNATURE "rusEFI 2020.11.30.mre_f4.2053494061"

6
firmware/controllers/generated/signature_mre_f7.h
View File

@ -3,6 +3,6 @@
//
#define SIGNATURE_BOARD mre_f7
#define SIGNATURE_DATE 2020.11.29
#define SIGNATURE_HASH 2925811142
#define TS_SIGNATURE "rusEFI 2020.11.29.mre_f7.2925811142"
#define SIGNATURE_DATE 2020.11.30
#define SIGNATURE_HASH 2053494061
#define TS_SIGNATURE "rusEFI 2020.11.30.mre_f7.2053494061"

6
firmware/controllers/generated/signature_prometheus_405.h
View File

@ -3,6 +3,6 @@
//
#define SIGNATURE_BOARD prometheus_405
#define SIGNATURE_DATE 2020.11.29
#define SIGNATURE_HASH 4218195438
#define TS_SIGNATURE "rusEFI 2020.11.29.prometheus_405.4218195438"
#define SIGNATURE_DATE 2020.11.30
#define SIGNATURE_HASH 795675909
#define TS_SIGNATURE "rusEFI 2020.11.30.prometheus_405.795675909"

6
firmware/controllers/generated/signature_prometheus_469.h
View File

@ -3,6 +3,6 @@
//
#define SIGNATURE_BOARD prometheus_469
#define SIGNATURE_DATE 2020.11.29
#define SIGNATURE_HASH 4218195438
#define TS_SIGNATURE "rusEFI 2020.11.29.prometheus_469.4218195438"
#define SIGNATURE_DATE 2020.11.30
#define SIGNATURE_HASH 795675909
#define TS_SIGNATURE "rusEFI 2020.11.30.prometheus_469.795675909"

6
firmware/controllers/generated/signature_proteus_f4.h
View File

@ -3,6 +3,6 @@
//
#define SIGNATURE_BOARD proteus_f4
#define SIGNATURE_DATE 2020.11.29
#define SIGNATURE_HASH 1881063777
#define TS_SIGNATURE "rusEFI 2020.11.29.proteus_f4.1881063777"
#define SIGNATURE_DATE 2020.11.30
#define SIGNATURE_HASH 2753511818
#define TS_SIGNATURE "rusEFI 2020.11.30.proteus_f4.2753511818"

6
firmware/controllers/generated/signature_proteus_f7.h
View File

@ -3,6 +3,6 @@
//
#define SIGNATURE_BOARD proteus_f7
#define SIGNATURE_DATE 2020.11.29
#define SIGNATURE_HASH 1881063777
#define TS_SIGNATURE "rusEFI 2020.11.29.proteus_f7.1881063777"
#define SIGNATURE_DATE 2020.11.30
#define SIGNATURE_HASH 2753511818
#define TS_SIGNATURE "rusEFI 2020.11.30.proteus_f7.2753511818"

2
firmware/integration/rusefi_config.txt
View File

@ -977,7 +977,7 @@ custom maf_sensor_type_e 4 bits, S32, @OFFSET@, [0:1], @@maf_sensor_type_e_enum@
bit unusedHereWeHave
bit fuelClosedLoopCorrectionEnabled;+Enables lambda sensor closed loop feedback for fuelling.
bit isVerboseIAC;+Print details into rusEfi console
bit isVerboseIAC;+Print details into rusEfi console\nenable verbose_idle
bit isVerboseETB;+Prints ETB details to rusEFI console
bit useConstantDwellDuringCranking;+If set to true, will use the specified duration for cranking dwell. If set to false, will use the specified dwell angle. Unless you have a really good reason to, leave this set to true to use duration mode.
bit isEngineChartEnabled;+This options enables data for 'engine sniffer' tab in console, which comes at some CPU price

BIN
firmware/tunerstudio/generated/cache.zip
View File

Binary file not shown.

17
firmware/tunerstudio/generated/rusefi.ini
View File

@ -33,12 +33,12 @@ enable2ndByteCanID = false
[MegaTune]
; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
signature = "rusEFI 2020.11.29.all.3115617215"
signature = "rusEFI 2020.11.30.all.1840581460"
[TunerStudio]
queryCommand = "S"
versionInfo = "V" ; firmwave version for title bar.
signature = "rusEFI 2020.11.29.all.3115617215" ; signature is expected to be 7 or more characters.
signature = "rusEFI 2020.11.30.all.1840581460" ; signature is expected to be 7 or more characters.
[Constants]
; new packet serial format with CRC
@ -74,7 +74,7 @@ enable2ndByteCanID = false
; see PAGE_0_SIZE in C source code
; CONFIG_DEFINITION_START
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 29 03:50:35 UTC 2020
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Nov 30 05:13:27 UTC 2020
pageSize = 20000
page = 1
@ -1357,7 +1357,7 @@ page = 1
engineCode = "For example, LS1 or NB2\nREQUIRED for rusEFI Online"
vehicleName = "For example, Hunchback or Orange Miata\nVehicle name has to be unique between your vehicles.\nREQUIRED for rusEFI Online"
fuelClosedLoopCorrectionEnabled = "Enables lambda sensor closed loop feedback for fuelling."
isVerboseIAC = "Print details into rusEfi console"
isVerboseIAC = "Print details into rusEfi console\nenable verbose_idle"
isVerboseETB = "Prints ETB details to rusEFI console"
useConstantDwellDuringCranking = "If set to true, will use the specified duration for cranking dwell. If set to false, will use the specified dwell angle. Unless you have a really good reason to, leave this set to true to use duration mode."
isEngineChartEnabled = "This options enables data for 'engine sniffer' tab in console, which comes at some CPU price"
@ -1542,6 +1542,11 @@ page = 1
filter = minTps, "Minimum TPS", TPSValue, < , 1, , true
;
; in order to add new TunerStudio gauge you need to chagne two places
; 1) add a line here in '[OutputChannels]'
; 2) in rusEFI firmware make a change to tunerstudio_outputs.h
;
[OutputChannels]
ochGetCommand = "O%2o%2c"
@ -2532,6 +2537,10 @@ gaugeCategory = Knock
showPanel = spi, spiFunction
showPanel = con, connection
;
; this section defines how we log output channels
; see [OutputChannels]
;
[Datalog]
; Channel Label Type Format
entry = time, "Time", float, "%.3f"

17
firmware/tunerstudio/generated/rusefi_frankenso_na6.ini
View File

@ -33,12 +33,12 @@ enable2ndByteCanID = false
[MegaTune]
; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
signature = "rusEFI 2020.11.29.frankenso_na6.801389124"
signature = "rusEFI 2020.11.30.frankenso_na6.4224039599"
[TunerStudio]
queryCommand = "S"
versionInfo = "V" ; firmwave version for title bar.
signature = "rusEFI 2020.11.29.frankenso_na6.801389124" ; signature is expected to be 7 or more characters.
signature = "rusEFI 2020.11.30.frankenso_na6.4224039599" ; signature is expected to be 7 or more characters.
[Constants]
; new packet serial format with CRC
@ -74,7 +74,7 @@ enable2ndByteCanID = false
; see PAGE_0_SIZE in C source code
; CONFIG_DEFINITION_START
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 29 03:50:41 UTC 2020
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Nov 30 05:13:33 UTC 2020
pageSize = 20000
page = 1
@ -1357,7 +1357,7 @@ page = 1
engineCode = "For example, LS1 or NB2\nREQUIRED for rusEFI Online"
vehicleName = "For example, Hunchback or Orange Miata\nVehicle name has to be unique between your vehicles.\nREQUIRED for rusEFI Online"
fuelClosedLoopCorrectionEnabled = "Enables lambda sensor closed loop feedback for fuelling."
isVerboseIAC = "Print details into rusEfi console"
isVerboseIAC = "Print details into rusEfi console\nenable verbose_idle"
isVerboseETB = "Prints ETB details to rusEFI console"
useConstantDwellDuringCranking = "If set to true, will use the specified duration for cranking dwell. If set to false, will use the specified dwell angle. Unless you have a really good reason to, leave this set to true to use duration mode."
isEngineChartEnabled = "This options enables data for 'engine sniffer' tab in console, which comes at some CPU price"
@ -1542,6 +1542,11 @@ page = 1
filter = minTps, "Minimum TPS", TPSValue, < , 1, , true
;
; in order to add new TunerStudio gauge you need to chagne two places
; 1) add a line here in '[OutputChannels]'
; 2) in rusEFI firmware make a change to tunerstudio_outputs.h
;
[OutputChannels]
ochGetCommand = "O%2o%2c"
@ -2532,6 +2537,10 @@ gaugeCategory = Knock
showPanel = spi, spiFunction
showPanel = con, connection
;
; this section defines how we log output channels
; see [OutputChannels]
;
[Datalog]
; Channel Label Type Format
entry = time, "Time", float, "%.3f"

17
firmware/tunerstudio/generated/rusefi_hellen_cypress.ini
View File

@ -33,12 +33,12 @@ enable2ndByteCanID = false
[MegaTune]
; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
signature = "rusEFI 2020.11.29.hellen_cypress.1883581820"
signature = "rusEFI 2020.11.30.hellen_cypress.2755964311"
[TunerStudio]
queryCommand = "S"
versionInfo = "V" ; firmwave version for title bar.
signature = "rusEFI 2020.11.29.hellen_cypress.1883581820" ; signature is expected to be 7 or more characters.
signature = "rusEFI 2020.11.30.hellen_cypress.2755964311" ; signature is expected to be 7 or more characters.
[Constants]
; new packet serial format with CRC
@ -74,7 +74,7 @@ enable2ndByteCanID = false
; see PAGE_0_SIZE in C source code
; CONFIG_DEFINITION_START
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Sun Nov 29 03:50:57 UTC 2020
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Mon Nov 30 05:13:50 UTC 2020
pageSize = 20000
page = 1
@ -1357,7 +1357,7 @@ page = 1
engineCode = "For example, LS1 or NB2\nREQUIRED for rusEFI Online"
vehicleName = "For example, Hunchback or Orange Miata\nVehicle name has to be unique between your vehicles.\nREQUIRED for rusEFI Online"
fuelClosedLoopCorrectionEnabled = "Enables lambda sensor closed loop feedback for fuelling."
isVerboseIAC = "Print details into rusEfi console"
isVerboseIAC = "Print details into rusEfi console\nenable verbose_idle"
isVerboseETB = "Prints ETB details to rusEFI console"
useConstantDwellDuringCranking = "If set to true, will use the specified duration for cranking dwell. If set to false, will use the specified dwell angle. Unless you have a really good reason to, leave this set to true to use duration mode."
isEngineChartEnabled = "This options enables data for 'engine sniffer' tab in console, which comes at some CPU price"
@ -1542,6 +1542,11 @@ page = 1
filter = minTps, "Minimum TPS", TPSValue, < , 1, , true
;
; in order to add new TunerStudio gauge you need to chagne two places
; 1) add a line here in '[OutputChannels]'
; 2) in rusEFI firmware make a change to tunerstudio_outputs.h
;
[OutputChannels]
ochGetCommand = "O%2o%2c"
@ -2532,6 +2537,10 @@ gaugeCategory = Knock
showPanel = spi, spiFunction
showPanel = con, connection
;
; this section defines how we log output channels
; see [OutputChannels]
;
[Datalog]
; Channel Label Type Format
entry = time, "Time", float, "%.3f"

17
firmware/tunerstudio/generated/rusefi_kinetis.ini
View File

@ -33,12 +33,12 @@ enable2ndByteCanID = false
[MegaTune]
; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
signature = "rusEFI 2020.11.29.kin.559486854"
signature = "rusEFI 2020.11.30.kin.4116223853"
[TunerStudio]
queryCommand = "S"
versionInfo = "V" ; firmwave version for title bar.
signature = "rusEFI 2020.11.29.kin.559486854" ; signature is expected to be 7 or more characters.
signature = "rusEFI 2020.11.30.kin.4116223853" ; signature is expected to be 7 or more characters.
[Constants]
; new packet serial format with CRC
@ -74,7 +74,7 @@ enable2ndByteCanID = false
; see PAGE_0_SIZE in C source code
; CONFIG_DEFINITION_START
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sun Nov 29 03:50:56 UTC 2020
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Mon Nov 30 05:13:48 UTC 2020
pageSize = 20000
page = 1
@ -1357,7 +1357,7 @@ page = 1
engineCode = "For example, LS1 or NB2\nREQUIRED for rusEFI Online"
vehicleName = "For example, Hunchback or Orange Miata\nVehicle name has to be unique between your vehicles.\nREQUIRED for rusEFI Online"
fuelClosedLoopCorrectionEnabled = "Enables lambda sensor closed loop feedback for fuelling."
isVerboseIAC = "Print details into rusEfi console"
isVerboseIAC = "Print details into rusEfi console\nenable verbose_idle"
isVerboseETB = "Prints ETB details to rusEFI console"
useConstantDwellDuringCranking = "If set to true, will use the specified duration for cranking dwell. If set to false, will use the specified dwell angle. Unless you have a really good reason to, leave this set to true to use duration mode."
isEngineChartEnabled = "This options enables data for 'engine sniffer' tab in console, which comes at some CPU price"
@ -1542,6 +1542,11 @@ page = 1
filter = minTps, "Minimum TPS", TPSValue, < , 1, , true
;
; in order to add new TunerStudio gauge you need to chagne two places
; 1) add a line here in '[OutputChannels]'
; 2) in rusEFI firmware make a change to tunerstudio_outputs.h
;
[OutputChannels]
ochGetCommand = "O%2o%2c"
@ -2532,6 +2537,10 @@ gaugeCategory = Knock
showPanel = spi, spiFunction
showPanel = con, connection
;
; this section defines how we log output channels
; see [OutputChannels]
;
[Datalog]
; Channel Label Type Format
entry = time, "Time", float, "%.3f"

17
firmware/tunerstudio/generated/rusefi_mre_f4.ini
View File

@ -33,12 +33,12 @@ enable2ndByteCanID = false
[MegaTune]
; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
signature = "rusEFI 2020.11.29.mre_f4.2925811142"
signature = "rusEFI 2020.11.30.mre_f4.2053494061"
[TunerStudio]
queryCommand = "S"
versionInfo = "V" ; firmwave version for title bar.
signature = "rusEFI 2020.11.29.mre_f4.2925811142" ; signature is expected to be 7 or more characters.
signature = "rusEFI 2020.11.30.mre_f4.2053494061" ; signature is expected to be 7 or more characters.
[Constants]
; new packet serial format with CRC
@ -74,7 +74,7 @@ enable2ndByteCanID = false
; see PAGE_0_SIZE in C source code
; CONFIG_DEFINITION_START
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 29 03:50:39 UTC 2020
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Nov 30 05:13:31 UTC 2020
pageSize = 20000
page = 1
@ -1357,7 +1357,7 @@ page = 1
engineCode = "For example, LS1 or NB2\nREQUIRED for rusEFI Online"
vehicleName = "For example, Hunchback or Orange Miata\nVehicle name has to be unique between your vehicles.\nREQUIRED for rusEFI Online"
fuelClosedLoopCorrectionEnabled = "Enables lambda sensor closed loop feedback for fuelling."
isVerboseIAC = "Print details into rusEfi console"
isVerboseIAC = "Print details into rusEfi console\nenable verbose_idle"
isVerboseETB = "Prints ETB details to rusEFI console"
useConstantDwellDuringCranking = "If set to true, will use the specified duration for cranking dwell. If set to false, will use the specified dwell angle. Unless you have a really good reason to, leave this set to true to use duration mode."
isEngineChartEnabled = "This options enables data for 'engine sniffer' tab in console, which comes at some CPU price"
@ -1542,6 +1542,11 @@ page = 1
filter = minTps, "Minimum TPS", TPSValue, < , 1, , true
;
; in order to add new TunerStudio gauge you need to chagne two places
; 1) add a line here in '[OutputChannels]'
; 2) in rusEFI firmware make a change to tunerstudio_outputs.h
;
[OutputChannels]
ochGetCommand = "O%2o%2c"
@ -2532,6 +2537,10 @@ gaugeCategory = Knock
showPanel = spi, spiFunction
showPanel = con, connection
;
; this section defines how we log output channels
; see [OutputChannels]
;
[Datalog]
; Channel Label Type Format
entry = time, "Time", float, "%.3f"

17
firmware/tunerstudio/generated/rusefi_mre_f7.ini
View File

@ -33,12 +33,12 @@ enable2ndByteCanID = false
[MegaTune]
; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
signature = "rusEFI 2020.11.29.mre_f7.2925811142"
signature = "rusEFI 2020.11.30.mre_f7.2053494061"
[TunerStudio]
queryCommand = "S"
versionInfo = "V" ; firmwave version for title bar.
signature = "rusEFI 2020.11.29.mre_f7.2925811142" ; signature is expected to be 7 or more characters.
signature = "rusEFI 2020.11.30.mre_f7.2053494061" ; signature is expected to be 7 or more characters.
[Constants]
; new packet serial format with CRC
@ -74,7 +74,7 @@ enable2ndByteCanID = false
; see PAGE_0_SIZE in C source code
; CONFIG_DEFINITION_START
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 29 03:50:37 UTC 2020
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Nov 30 05:13:29 UTC 2020
pageSize = 20000
page = 1
@ -1357,7 +1357,7 @@ page = 1
engineCode = "For example, LS1 or NB2\nREQUIRED for rusEFI Online"
vehicleName = "For example, Hunchback or Orange Miata\nVehicle name has to be unique between your vehicles.\nREQUIRED for rusEFI Online"
fuelClosedLoopCorrectionEnabled = "Enables lambda sensor closed loop feedback for fuelling."
isVerboseIAC = "Print details into rusEfi console"
isVerboseIAC = "Print details into rusEfi console\nenable verbose_idle"
isVerboseETB = "Prints ETB details to rusEFI console"
useConstantDwellDuringCranking = "If set to true, will use the specified duration for cranking dwell. If set to false, will use the specified dwell angle. Unless you have a really good reason to, leave this set to true to use duration mode."
isEngineChartEnabled = "This options enables data for 'engine sniffer' tab in console, which comes at some CPU price"
@ -1542,6 +1542,11 @@ page = 1
filter = minTps, "Minimum TPS", TPSValue, < , 1, , true
;
; in order to add new TunerStudio gauge you need to chagne two places
; 1) add a line here in '[OutputChannels]'
; 2) in rusEFI firmware make a change to tunerstudio_outputs.h
;
[OutputChannels]
ochGetCommand = "O%2o%2c"
@ -2532,6 +2537,10 @@ gaugeCategory = Knock
showPanel = spi, spiFunction
showPanel = con, connection
;
; this section defines how we log output channels
; see [OutputChannels]
;
[Datalog]
; Channel Label Type Format
entry = time, "Time", float, "%.3f"

17
firmware/tunerstudio/generated/rusefi_prometheus_405.ini
View File

@ -33,12 +33,12 @@ enable2ndByteCanID = false
[MegaTune]
; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
signature = "rusEFI 2020.11.29.prometheus_405.4218195438"
signature = "rusEFI 2020.11.30.prometheus_405.795675909"
[TunerStudio]
queryCommand = "S"
versionInfo = "V" ; firmwave version for title bar.
signature = "rusEFI 2020.11.29.prometheus_405.4218195438" ; signature is expected to be 7 or more characters.
signature = "rusEFI 2020.11.30.prometheus_405.795675909" ; signature is expected to be 7 or more characters.
[Constants]
; new packet serial format with CRC
@ -74,7 +74,7 @@ enable2ndByteCanID = false
; see PAGE_0_SIZE in C source code
; CONFIG_DEFINITION_START
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 29 03:50:44 UTC 2020
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Nov 30 05:13:37 UTC 2020
pageSize = 20000
page = 1
@ -1357,7 +1357,7 @@ page = 1
engineCode = "For example, LS1 or NB2\nREQUIRED for rusEFI Online"
vehicleName = "For example, Hunchback or Orange Miata\nVehicle name has to be unique between your vehicles.\nREQUIRED for rusEFI Online"
fuelClosedLoopCorrectionEnabled = "Enables lambda sensor closed loop feedback for fuelling."
isVerboseIAC = "Print details into rusEfi console"
isVerboseIAC = "Print details into rusEfi console\nenable verbose_idle"
isVerboseETB = "Prints ETB details to rusEFI console"
useConstantDwellDuringCranking = "If set to true, will use the specified duration for cranking dwell. If set to false, will use the specified dwell angle. Unless you have a really good reason to, leave this set to true to use duration mode."
isEngineChartEnabled = "This options enables data for 'engine sniffer' tab in console, which comes at some CPU price"
@ -1542,6 +1542,11 @@ page = 1
filter = minTps, "Minimum TPS", TPSValue, < , 1, , true
;
; in order to add new TunerStudio gauge you need to chagne two places
; 1) add a line here in '[OutputChannels]'
; 2) in rusEFI firmware make a change to tunerstudio_outputs.h
;
[OutputChannels]
ochGetCommand = "O%2o%2c"
@ -2532,6 +2537,10 @@ gaugeCategory = Knock
showPanel = spi, spiFunction
showPanel = con, connection
;
; this section defines how we log output channels
; see [OutputChannels]
;
[Datalog]
; Channel Label Type Format
entry = time, "Time", float, "%.3f"

17
firmware/tunerstudio/generated/rusefi_prometheus_469.ini
View File

@ -33,12 +33,12 @@ enable2ndByteCanID = false
[MegaTune]
; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
signature = "rusEFI 2020.11.29.prometheus_469.4218195438"
signature = "rusEFI 2020.11.30.prometheus_469.795675909"
[TunerStudio]
queryCommand = "S"
versionInfo = "V" ; firmwave version for title bar.
signature = "rusEFI 2020.11.29.prometheus_469.4218195438" ; signature is expected to be 7 or more characters.
signature = "rusEFI 2020.11.30.prometheus_469.795675909" ; signature is expected to be 7 or more characters.
[Constants]
; new packet serial format with CRC
@ -74,7 +74,7 @@ enable2ndByteCanID = false
; see PAGE_0_SIZE in C source code
; CONFIG_DEFINITION_START
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 29 03:50:43 UTC 2020
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Nov 30 05:13:35 UTC 2020
pageSize = 20000
page = 1
@ -1357,7 +1357,7 @@ page = 1
engineCode = "For example, LS1 or NB2\nREQUIRED for rusEFI Online"
vehicleName = "For example, Hunchback or Orange Miata\nVehicle name has to be unique between your vehicles.\nREQUIRED for rusEFI Online"
fuelClosedLoopCorrectionEnabled = "Enables lambda sensor closed loop feedback for fuelling."
isVerboseIAC = "Print details into rusEfi console"
isVerboseIAC = "Print details into rusEfi console\nenable verbose_idle"
isVerboseETB = "Prints ETB details to rusEFI console"
useConstantDwellDuringCranking = "If set to true, will use the specified duration for cranking dwell. If set to false, will use the specified dwell angle. Unless you have a really good reason to, leave this set to true to use duration mode."
isEngineChartEnabled = "This options enables data for 'engine sniffer' tab in console, which comes at some CPU price"
@ -1542,6 +1542,11 @@ page = 1
filter = minTps, "Minimum TPS", TPSValue, < , 1, , true
;
; in order to add new TunerStudio gauge you need to chagne two places
; 1) add a line here in '[OutputChannels]'
; 2) in rusEFI firmware make a change to tunerstudio_outputs.h
;
[OutputChannels]
ochGetCommand = "O%2o%2c"
@ -2532,6 +2537,10 @@ gaugeCategory = Knock
showPanel = spi, spiFunction
showPanel = con, connection
;
; this section defines how we log output channels
; see [OutputChannels]
;
[Datalog]
; Channel Label Type Format
entry = time, "Time", float, "%.3f"

17
firmware/tunerstudio/generated/rusefi_proteus_f4.ini
View File

@ -33,12 +33,12 @@ enable2ndByteCanID = false
[MegaTune]
; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
signature = "rusEFI 2020.11.29.proteus_f4.1881063777"
signature = "rusEFI 2020.11.30.proteus_f4.2753511818"
[TunerStudio]
queryCommand = "S"
versionInfo = "V" ; firmwave version for title bar.
signature = "rusEFI 2020.11.29.proteus_f4.1881063777" ; signature is expected to be 7 or more characters.
signature = "rusEFI 2020.11.30.proteus_f4.2753511818" ; signature is expected to be 7 or more characters.
[Constants]
; new packet serial format with CRC
@ -74,7 +74,7 @@ enable2ndByteCanID = false
; see PAGE_0_SIZE in C source code
; CONFIG_DEFINITION_START
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 29 03:50:54 UTC 2020
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Nov 30 05:13:47 UTC 2020
pageSize = 20000
page = 1
@ -1357,7 +1357,7 @@ page = 1
engineCode = "For example, LS1 or NB2\nREQUIRED for rusEFI Online"
vehicleName = "For example, Hunchback or Orange Miata\nVehicle name has to be unique between your vehicles.\nREQUIRED for rusEFI Online"
fuelClosedLoopCorrectionEnabled = "Enables lambda sensor closed loop feedback for fuelling."
isVerboseIAC = "Print details into rusEfi console"
isVerboseIAC = "Print details into rusEfi console\nenable verbose_idle"
isVerboseETB = "Prints ETB details to rusEFI console"
useConstantDwellDuringCranking = "If set to true, will use the specified duration for cranking dwell. If set to false, will use the specified dwell angle. Unless you have a really good reason to, leave this set to true to use duration mode."
isEngineChartEnabled = "This options enables data for 'engine sniffer' tab in console, which comes at some CPU price"
@ -1542,6 +1542,11 @@ page = 1
filter = minTps, "Minimum TPS", TPSValue, < , 1, , true
;
; in order to add new TunerStudio gauge you need to chagne two places
; 1) add a line here in '[OutputChannels]'
; 2) in rusEFI firmware make a change to tunerstudio_outputs.h
;
[OutputChannels]
ochGetCommand = "O%2o%2c"
@ -2532,6 +2537,10 @@ gaugeCategory = Knock
showPanel = spi, spiFunction
showPanel = con, connection
;
; this section defines how we log output channels
; see [OutputChannels]
;
[Datalog]
; Channel Label Type Format
entry = time, "Time", float, "%.3f"

17
firmware/tunerstudio/generated/rusefi_proteus_f7.ini
View File

@ -33,12 +33,12 @@ enable2ndByteCanID = false
[MegaTune]
; https://rusefi.com/forum/viewtopic.php?p=36201#p36201
signature = "rusEFI 2020.11.29.proteus_f7.1881063777"
signature = "rusEFI 2020.11.30.proteus_f7.2753511818"
[TunerStudio]
queryCommand = "S"
versionInfo = "V" ; firmwave version for title bar.
signature = "rusEFI 2020.11.29.proteus_f7.1881063777" ; signature is expected to be 7 or more characters.
signature = "rusEFI 2020.11.30.proteus_f7.2753511818" ; signature is expected to be 7 or more characters.
[Constants]
; new packet serial format with CRC
@ -74,7 +74,7 @@ enable2ndByteCanID = false
; see PAGE_0_SIZE in C source code
; CONFIG_DEFINITION_START
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 29 03:50:48 UTC 2020
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Nov 30 05:13:40 UTC 2020
pageSize = 20000
page = 1
@ -1357,7 +1357,7 @@ page = 1
engineCode = "For example, LS1 or NB2\nREQUIRED for rusEFI Online"
vehicleName = "For example, Hunchback or Orange Miata\nVehicle name has to be unique between your vehicles.\nREQUIRED for rusEFI Online"
fuelClosedLoopCorrectionEnabled = "Enables lambda sensor closed loop feedback for fuelling."
isVerboseIAC = "Print details into rusEfi console"
isVerboseIAC = "Print details into rusEfi console\nenable verbose_idle"
isVerboseETB = "Prints ETB details to rusEFI console"
useConstantDwellDuringCranking = "If set to true, will use the specified duration for cranking dwell. If set to false, will use the specified dwell angle. Unless you have a really good reason to, leave this set to true to use duration mode."
isEngineChartEnabled = "This options enables data for 'engine sniffer' tab in console, which comes at some CPU price"
@ -1542,6 +1542,11 @@ page = 1
filter = minTps, "Minimum TPS", TPSValue, < , 1, , true
;
; in order to add new TunerStudio gauge you need to chagne two places
; 1) add a line here in '[OutputChannels]'
; 2) in rusEFI firmware make a change to tunerstudio_outputs.h
;
[OutputChannels]
ochGetCommand = "O%2o%2c"
@ -2532,6 +2537,10 @@ gaugeCategory = Knock
showPanel = spi, spiFunction
showPanel = con, connection
;
; this section defines how we log output channels
; see [OutputChannels]
;
[Datalog]
; Channel Label Type Format
entry = time, "Time", float, "%.3f"

27
firmware/util/timer.cpp Normal file
View File

@ -0,0 +1,27 @@
#include "timer.h"
#include "global.h"
void Timer::reset() {
m_lastReset = getTimeNowNt();
}
bool Timer::hasElapsedSec(float seconds) const {
return hasElapsedMs(seconds * 1e3);
}
bool Timer::hasElapsedMs(float milliseconds) const {
return hasElapsedUs(milliseconds * 1e3);
}
bool Timer::hasElapsedUs(float microseconds) const {
auto delta = getTimeNowNt() - m_lastReset;
// If larger than 32 bits, timer has certainly expired
if (delta >= UINT32_MAX) {
return true;
}
auto delta32 = (uint32_t)delta;
return delta32 > USF2NT(microseconds);
}

14
firmware/util/timer.h Normal file
View File

@ -0,0 +1,14 @@
#pragma once
#include "efitime.h"
class Timer {
public:
void reset();
bool hasElapsedSec(float seconds) const;
bool hasElapsedMs(float ms) const;
bool hasElapsedUs(float us) const;
private:
efitick_t m_lastReset = INT64_MIN;
};

1
firmware/util/util.mk
View File

@ -17,6 +17,7 @@ UTILSRC_CPP = \
$(PROJECT_DIR)/util/loggingcentral.cpp \
$(PROJECT_DIR)/util/cli_registry.cpp \
$(PROJECT_DIR)/util/efilib.cpp \
$(PROJECT_DIR)/util/timer.cpp \
UTIL_INC = \

6
java_console/models/src/main/java/com/rusefi/config/generated/Fields.java
View File

@ -1,6 +1,6 @@
package com.rusefi.config.generated;
// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 29 03:21:46 UTC 2020
// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Nov 30 05:13:27 UTC 2020
// by class com.rusefi.output.FileJavaFieldsConsumer
import com.rusefi.config.*;
@ -1167,7 +1167,7 @@ public class Fields {
public static final int servoOutputPins8_offset = 3147;
public static final int showHumanReadableWarning_offset = 976;
public static final int showSdCardWarning_offset = 76;
public static final int SIGNATURE_HASH = 104376296;
public static final int SIGNATURE_HASH = 1840581460;
public static final int silentTriggerError_offset = 1464;
public static final int slowAdcAlpha_offset = 2088;
public static final int sparkDwellRpmBins_offset = 332;
@ -1447,7 +1447,7 @@ public class Fields {
public static final char TS_SD_R_COMMAND = 'r';
public static final char TS_SD_W_COMMAND = 'w';
public static final char TS_SET_LOGGER_SWITCH = 'l';
public static final String TS_SIGNATURE = "rusEFI 2020.11.29.all.104376296";
public static final String TS_SIGNATURE = "rusEFI 2020.11.30.all.1840581460";
public static final char TS_SINGLE_WRITE_COMMAND = 'W';
public static final int TT_TT_60_2_VW = 20;
public static final int TT_TT_ONE = 18;

2
java_console/rusefi.xml
View File

@ -1,6 +1,6 @@
<roms>
<!-- was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh Sun Nov 29 03:21:47 UTC 2020 -->
<!-- was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh Mon Nov 30 05:13:28 UTC 2020 -->
<rom>
<romid>