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

VVT_INACTIVE

This commit is contained in:
rusefi 2020-05-14 23:13:32 -04:00
parent 5138222428
commit d3785b543e
9 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/config/boards/kinetis/config/controllers/algo/auto_generated_enums.cpp
View File

@ -1105,6 +1105,8 @@ case MIATA_NB2:
return "MIATA_NB2";
case VVT_2JZ:
return "VVT_2JZ";
case VVT_INACTIVE:
return "VVT_INACTIVE";
case VVT_FIRST_HALF:
return "VVT_FIRST_HALF";
case VVT_SECOND_HALF:

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

@ -2484,7 +2484,7 @@
#define VOLTAGE_1_BYTE_PACKING_DIV 0.02
#define vRefAdcChannel_offset 1470
#define vRefAdcChannel_offset_hex 5be
#define vvt_mode_e_enum "First half", "Second half", "2GZ", "Miata NB2", "mode4", "mode5", "mode6", "mode7"
#define vvt_mode_e_enum "Inactive", "Second half", "2GZ", "Miata NB2", "First half", "mode5", "mode6", "mode7"
#define vvtCamSensorUseRise_offset 744
#define vvtCamSensorUseRise_offset_hex 2e8
#define vvtMode_offset 2328

2
firmware/controllers/algo/auto_generated_enums.cpp
View File

@ -1249,6 +1249,8 @@ case MIATA_NB2:
return "MIATA_NB2";
case VVT_2JZ:
return "VVT_2JZ";
case VVT_INACTIVE:
return "VVT_INACTIVE";
case VVT_FIRST_HALF:
return "VVT_FIRST_HALF";
case VVT_SECOND_HALF:

11
firmware/controllers/algo/rusefi_enums.h
View File

@ -391,9 +391,10 @@ typedef enum {
typedef enum {
/**
* Single-tooth cam sensor mode where TDC and cam signal happen in the same 360 degree of 720 degree engine cycle
* This mode is useful for troubleshooting and research - events are logged but no effects on phase synchronization
*/
VVT_FIRST_HALF = 0,
VVT_INACTIVE = 0,
/**
* Single-tooth cam sensor mode where TDC and cam signal happen in opposite 360 degree of 720 degree engine cycle
*/
@ -406,6 +407,12 @@ typedef enum {
* Mazda NB2 has three cam tooth. We synchronize based on gap ratio.
*/
MIATA_NB2 = 3,
/**
* Single-tooth cam sensor mode where TDC and cam signal happen in the same 360 degree of 720 degree engine cycle
*/
VVT_FIRST_HALF = 4,
Force_4_bytes_size_vvt_mode = ENUM_32_BITS,
} vvt_mode_e;

2
firmware/controllers/engine_controller.cpp
View File

@ -717,6 +717,6 @@ int getRusEfiVersion(void) {
if (initBootloader() != 0)
return 123;
#endif /* EFI_BOOTLOADER_INCLUDE_CODE */
return 20200513;
return 20200514;
}
#endif /* EFI_UNIT_TEST */

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

@ -2484,7 +2484,7 @@
#define VOLTAGE_1_BYTE_PACKING_DIV 0.02
#define vRefAdcChannel_offset 1470
#define vRefAdcChannel_offset_hex 5be
#define vvt_mode_e_enum "First half", "Second half", "2GZ", "Miata NB2", "mode4", "mode5", "mode6", "mode7"
#define vvt_mode_e_enum "Inactive", "Second half", "2GZ", "Miata NB2", "First half", "mode5", "mode6", "mode7"
#define vvtCamSensorUseRise_offset 744
#define vvtCamSensorUseRise_offset_hex 2e8
#define vvtMode_offset 2328

6
firmware/controllers/trigger/trigger_central.cpp
View File

@ -206,7 +206,6 @@ void hwHandleVvtCamSignal(trigger_value_e front, efitick_t nowNt DECLARE_ENGINE_
tc->vvtPosition = engineConfiguration->vvtOffset - currentPosition;
switch (engineConfiguration->vvtMode) {
default:
case VVT_FIRST_HALF:
{
@ -247,6 +246,11 @@ void hwHandleVvtCamSignal(trigger_value_e front, efitick_t nowNt DECLARE_ENGINE_
while (tc->triggerState.getTotalRevolutionCounter() % 4 != miataNbIndex) {
tc->triggerState.incrementTotalEventCounter();
}
break;
default:
case VVT_INACTIVE:
// do nothing
break;
}
}

2
firmware/integration/rusefi_config.txt
View File

@ -243,7 +243,7 @@ end_struct
#define debug_mode_e_enum "Alternator PID", "TPS acceleration enrichment", "INVALID", "Idle Control", "Engine Load accl enrich", "Trigger Counters", "FSIO_ADC", "AUX_PID_1", "VVT input", "Cranking", "Timing", "Closed-loop fuel corr PID", "VSS", "SD card", "sr5", "Knock", "mode16", "Electronic Throttle", "Executor", "Bench Test / TS commands", "Aux Valves", "Analog inputs #1", "INSTANT_RPM", "FSIO_EXPRESSION", "Status", "CJ125", "CAN", "MAP", "Metrics", "ETB#2", "Ion Sense", "TLE8888", "Analog inputs #2", "Dwell Metric", "INVALID", "ETB Logic", "Boost Control", "Start/Stop", "Launch", "ETB Autotune", "Mode40"
custom debug_mode_e 4 bits, U32, @OFFSET@, [0:7], @@debug_mode_e_enum@@
#define vvt_mode_e_enum "First half", "Second half", "2GZ", "Miata NB2", "mode4", "mode5", "mode6", "mode7"
#define vvt_mode_e_enum "Inactive", "Second half", "2GZ", "Miata NB2", "First half", "mode5", "mode6", "mode7"
custom vvt_mode_e 4 bits, U32, @OFFSET@, [0:7], @@vvt_mode_e_enum@@
#define mass_storage_e_enum "Auto", "Always", "Never"

4
firmware/tunerstudio/rusefi_microrusefi.ini
View File

@ -89,7 +89,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.bat integration\rusefi_config.txt Thu May 14 20:41:14 EDT 2020
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Thu May 14 23:04:50 EDT 2020
pageSize = 20000
page = 1
@ -855,7 +855,7 @@ page = 1
storageMode = bits, U32, 2260, [0:7], "Auto", "Always", "Never"
narrowToWideOxygenBins = array, F32, 2264, [8], "V", 1, 0, -10.0, 10.0, 3
narrowToWideOxygen = array, F32, 2296, [8], "ratio", 1, 0, -40.0, 40.0, 2
vvtMode = bits, U32, 2328, [0:7], "First half", "Second half", "2GZ", "Miata NB2", "mode4", "mode5", "mode6", "mode7"
vvtMode = bits, U32, 2328, [0:7], "Inactive", "Second half", "2GZ", "Miata NB2", "First half", "mode5", "mode6", "mode7"
;no TS info - skipping unusedOldBiquad offset 2332
cltTimingBins = array, F32, 2352, [8], "C", 1, 0, -100.0, 250.0, 1
cltTimingExtra = array, F32, 2384, [8], "degree", 1, 0, -400.0, 400.0, 0