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

MAP phase sensing #3544

This commit is contained in:
rusefillc 2021-12-07 08:57:23 -05:00
parent 37e3f5d4c1
commit b4c07798b5
9 changed files with 34 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/console/binary/generated/data_logs.ini
View File

@ -184,6 +184,8 @@ entry = vvtTargets2, "vvtTargets2", int, "%d"
entry = vvtTargets3, "vvtTargets3", int, "%d"
entry = vvtTargets4, "vvtTargets4", int, "%d"
entry = turboSpeed, "Turbocharger Speed", int, "%d"
entry = TEMPLOG_MAP_AT_SPECIAL_POINT, "TEMPLOG_MAP_AT_SPECIAL_POINT", float, "%.3f"
entry = TEMPLOG_MAP_AT_DIFF, "TEMPLOG_MAP_AT_DIFF", float, "%.3f"
entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f"
entry = vvtCurrentPosition, "vvtCurrentPosition", float, "%.3f"
entry = triggerSyncGapRatio, "triggerSyncGapRatio", float, "%.3f"

10
firmware/console/binary/generated/gauges.ini
View File

@ -340,14 +340,8 @@ unusedAtTheEnd153Gauge = unusedAtTheEnd153,"unusedAtTheEnd153", "", 0.0,0.0, 0.0
unusedAtTheEnd154Gauge = unusedAtTheEnd154,"unusedAtTheEnd154", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0
unusedAtTheEnd155Gauge = unusedAtTheEnd155,"unusedAtTheEnd155", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0
unusedAtTheEnd156Gauge = unusedAtTheEnd156,"unusedAtTheEnd156", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0
unusedAtTheEnd157Gauge = unusedAtTheEnd157,"unusedAtTheEnd157", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0
unusedAtTheEnd158Gauge = unusedAtTheEnd158,"unusedAtTheEnd158", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0
unusedAtTheEnd159Gauge = unusedAtTheEnd159,"unusedAtTheEnd159", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0
unusedAtTheEnd160Gauge = unusedAtTheEnd160,"unusedAtTheEnd160", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0
unusedAtTheEnd161Gauge = unusedAtTheEnd161,"unusedAtTheEnd161", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0
unusedAtTheEnd162Gauge = unusedAtTheEnd162,"unusedAtTheEnd162", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0
unusedAtTheEnd163Gauge = unusedAtTheEnd163,"unusedAtTheEnd163", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0
unusedAtTheEnd164Gauge = unusedAtTheEnd164,"unusedAtTheEnd164", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0
TEMPLOG_MAP_AT_SPECIAL_POINTGauge = TEMPLOG_MAP_AT_SPECIAL_POINT,"TEMPLOG_MAP_AT_SPECIAL_POINT", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3
TEMPLOG_MAP_AT_DIFFGauge = TEMPLOG_MAP_AT_DIFF,"TEMPLOG_MAP_AT_DIFF", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3
vvtSyncGapRatioGauge = vvtSyncGapRatio,"vvtSyncGapRatio", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3
vvtCurrentPositionGauge = vvtCurrentPosition,"vvtCurrentPosition", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3
triggerSyncGapRatioGauge = triggerSyncGapRatio,"triggerSyncGapRatio", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3

10
firmware/console/binary/generated/output_channels.ini
View File

@ -340,14 +340,8 @@ unusedAtTheEnd153 = scalar, U08, 472, "", 1, 0
unusedAtTheEnd154 = scalar, U08, 473, "", 1, 0
unusedAtTheEnd155 = scalar, U08, 474, "", 1, 0
unusedAtTheEnd156 = scalar, U08, 475, "", 1, 0
unusedAtTheEnd157 = scalar, U08, 476, "", 1, 0
unusedAtTheEnd158 = scalar, U08, 477, "", 1, 0
unusedAtTheEnd159 = scalar, U08, 478, "", 1, 0
unusedAtTheEnd160 = scalar, U08, 479, "", 1, 0
unusedAtTheEnd161 = scalar, U08, 480, "", 1, 0
unusedAtTheEnd162 = scalar, U08, 481, "", 1, 0
unusedAtTheEnd163 = scalar, U08, 482, "", 1, 0
unusedAtTheEnd164 = scalar, U08, 483, "", 1, 0
TEMPLOG_MAP_AT_SPECIAL_POINT = scalar, F32, 476, "", 1, 0
TEMPLOG_MAP_AT_DIFF = scalar, F32, 480, "", 1, 0
vvtSyncGapRatio = scalar, F32, 484, "", 1, 0
vvtCurrentPosition = scalar, F32, 488, "", 1, 0
triggerSyncGapRatio = scalar, F32, 492, "", 1, 0

5
firmware/console/binary/output_channels.txt
View File

@ -253,7 +253,10 @@ uint16_t rpmAcceleration;dRPM;"RPM/s",1, 0, 0, 0, 0
! we have some unused bytes to allow compatible TS changes
uint8_t[164 iterate] unusedAtTheEnd;;"",1, 0, 0, 0, 0
uint8_t[156 iterate] unusedAtTheEnd;;"",1, 0, 0, 0, 0
float autoscale TEMPLOG_MAP_AT_SPECIAL_POINT;;"", 1, 0, -10000, 10000, 3
float autoscale TEMPLOG_MAP_AT_DIFF;;"", 1, 0, -10000, 10000, 3
float autoscale vvtSyncGapRatio;;"", 1, 0, -10000, 10000, 3
float autoscale vvtCurrentPosition;;"", 1, 0, -10000, 10000, 3

14
firmware/console/binary/ts_outputs_generated.h
View File

@ -1,4 +1,4 @@
// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Mon Dec 06 16:58:18 EST 2021
// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Tue Dec 07 08:56:06 EST 2021
// by class com.rusefi.output.CHeaderConsumer
// begin
#pragma once
@ -824,7 +824,15 @@ struct ts_outputs_s {
/**
* offset 320
*/
uint8_t unusedAtTheEnd[164];
uint8_t unusedAtTheEnd[156];
/**
* offset 476
*/
scaled_channel<float, 1, 1> TEMPLOG_MAP_AT_SPECIAL_POINT = (float)0;
/**
* offset 480
*/
scaled_channel<float, 1, 1> TEMPLOG_MAP_AT_DIFF = (float)0;
/**
* offset 484
*/
@ -998,4 +1006,4 @@ struct ts_outputs_s {
};
// end
// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Mon Dec 06 16:58:18 EST 2021
// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Tue Dec 07 08:56:06 EST 2021

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

@ -1,6 +1,6 @@
#include "global.h"
#include "rusefi_enums.h"
// was generated automatically by rusEFI tool from rusefi_enums.h // by enum2string.jar tool on Mon Nov 15 03:01:56 UTC 2021
// was generated automatically by rusEFI tool from rusefi_enums.h // by enum2string.jar tool on Tue Dec 07 08:52:50 EST 2021
// see also gen_config_and_enums.bat
@ -697,6 +697,8 @@ case VVT_INACTIVE:
return "VVT_INACTIVE";
case VVT_MAP_V_TWIN:
return "VVT_MAP_V_TWIN";
case VVT_MAP_V_TWIN_ANOTHER:
return "VVT_MAP_V_TWIN_ANOTHER";
case VVT_MIATA_NB2:
return "VVT_MIATA_NB2";
case VVT_NISSAN_MR:

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

@ -115,6 +115,9 @@ typedef enum __attribute__ ((__packed__)) {
* Most HD are 45 degrees with some 60 degree twin.
*/
VVT_MAP_V_TWIN = 12,
VVT_MAP_V_TWIN_ANOTHER = 13,
} vvt_mode_e;
/**

2
firmware/integration/rusefi_config.txt
View File

@ -296,7 +296,7 @@ custom debug_mode_e 4 bits, U32, @OFFSET@, [0:5], @@debug_mode_e_enum@@
#define VM_VVT_INACTIVE 0
#define vvt_mode_e_enum "Inactive", "Single Tooth Second Half", "2GZ", "Miata NB2", "Single Tooth First Half", "Bosch Quick Start", "4/1", "ST 170", "Ford Barra 3+1", "Nissan VQ", "Honda K 4+1", "Nissan MR18", "VTwin 45", "vvt13", "vvt14", "vvt15"
#define vvt_mode_e_enum "Inactive", "Single Tooth Second Half", "2GZ", "Miata NB2", "Single Tooth First Half", "Bosch Quick Start", "4/1", "ST 170", "Ford Barra 3+1", "Nissan VQ", "Honda K 4+1", "Nissan MR18", "VTwin 45", "VTwin by MAP", "vvt14", "vvt15"
custom vvt_mode_e 1 bits, U08, @OFFSET@, [0:3], @@vvt_mode_e_enum@@
! At the moment TIM1, TIM2, TIM3 and TIM9 are configured as ICU

8
firmware/tunerstudio/rusefi.input
View File

@ -801,8 +801,6 @@ etbStatus_dTermGauge = etbStatus_dTerm,"etbStatus_ dTerm", "", -10000.0,10000.0,
etbStatus_outputGauge = etbStatus_output,"etbStatus_ output", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3
etbStatus_errorGauge = etbStatus_error,"etbStatus_ error", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3
etbStatus_resetCounterGauge = etbStatus_resetCounter,"etbStatus_ resetCounter", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 0,0
TEMPLOG_MAP_INSTANT_AVERAGEGauge = TEMPLOG_MAP_INSTANT_AVERAGE,"TEMPLOG_MAP_INSTANT_AVERAGE", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3
TEMPLOG_map_peakGauge = TEMPLOG_map_peak,"TEMPLOG_map_peak", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3
canReadCounterGauge = canReadCounter,"canReadCounter", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0
canWriteOkGauge = canWriteOk,"canWriteOk", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3
canWriteNotOkGauge = canWriteNotOk,"canWriteNotOk", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3
@ -811,6 +809,12 @@ triggerStateIndexGauge = triggerStateIndex,"triggerStateIndex", "", -10000.0,100
vvtSyncGapRatioGauge = vvtSyncGapRatio,"vvtSyncGapRatio", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3
vvtStateIndexGauge = vvtStateIndex,"vvtStateIndex", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3
gaugeCategory = MAP Cam
TEMPLOG_MAP_INSTANT_AVERAGEGauge = TEMPLOG_MAP_INSTANT_AVERAGE,"TEMPLOG_MAP_INSTANT_AVERAGE", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3
TEMPLOG_map_peakGauge = TEMPLOG_map_peak,"TEMPLOG_map_peak", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3
TEMPLOG_MAP_AT_SPECIAL_POINTGauge = TEMPLOG_MAP_AT_SPECIAL_POINT,"TEMPLOG_MAP_AT_SPECIAL_POINT", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3
TEMPLOG_MAP_AT_DIFFGauge = TEMPLOG_MAP_AT_DIFF,"TEMPLOG_MAP_AT_DIFF", "", -10000.0,10000.0, -10000.0,10000.0, -10000.0,10000.0, 3,3
gaugeCategory = Sensors - Extra 2
egt1Gauge = egt1, "EGT#1", "C", 0, 2000