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

another attempt at dead code

This commit is contained in:
rusefi 2020-08-25 15:58:56 -04:00
parent f225e63544
commit 639e5be4d9
5 changed files with 8 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -248,11 +248,14 @@ typedef enum {
TT_MAZDA_DOHC_1_4 = 15,
// "1+1"
// see also TT_ONE a bit below
/**
* "1+1" - one tooth on primary channel, one tooth on secondary channel
* this trigger is used only by unit tests
* see also TT_ONE a bit below
*/
TT_ONE_PLUS_ONE = 16,
// "1+60/2"
TT_ONE_PLUS_TOOTHED_WHEEL_60_2 = 17,
TT_UNUSED_17 = 17,
// just one channel with just one tooth
TT_ONE = 18,

5
firmware/controllers/trigger/decoders/trigger_structure.cpp
View File

@ -533,10 +533,6 @@ void TriggerWaveform::initializeTriggerWaveform(Logging *logger, operation_mode_
configure3_1_cam(this);
break;
case TT_ONE_PLUS_TOOTHED_WHEEL_60_2:
configureOnePlus60_2(this);
break;
case TT_ONE:
setToothedWheelConfiguration(this, 1, 0, ambiguousOperationMode);
break;
@ -549,6 +545,7 @@ void TriggerWaveform::initializeTriggerWaveform(Logging *logger, operation_mode_
configureMiniCooperTriggerWaveform(this);
break;
case TT_UNUSED_17:
case TT_TOOTHED_WHEEL_60_2:
setToothedWheelConfiguration(this, 60, 2, ambiguousOperationMode);
break;

20
firmware/controllers/trigger/decoders/trigger_universal.cpp
View File

@ -50,7 +50,6 @@ void initializeSkippedToothTriggerWaveformExt(TriggerWaveform *s, int totalTeeth
NO_LEFT_FILTER, NO_RIGHT_FILTER);
}
void configureOnePlusOne(TriggerWaveform *s) {
s->initialize(FOUR_STROKE_CAM_SENSOR);
@ -64,25 +63,6 @@ void configureOnePlusOne(TriggerWaveform *s) {
s->useOnlyPrimaryForSync = true;
}
// todo: open question if we need this trigger
void configureOnePlus60_2(TriggerWaveform *s) {
s->initialize(FOUR_STROKE_CAM_SENSOR);
int totalTeethCount = 60;
int skippedCount = 2;
s->addEvent720(2, T_PRIMARY, TV_RISE);
addSkippedToothTriggerEvents(T_SECONDARY, s, totalTeethCount, skippedCount, 0.5, 0, 360, 2, 20);
s->addEvent720(20, T_PRIMARY, TV_FALL);
addSkippedToothTriggerEvents(T_SECONDARY, s, totalTeethCount, skippedCount, 0.5, 0, 360, 20, NO_RIGHT_FILTER);
addSkippedToothTriggerEvents(T_SECONDARY, s, totalTeethCount, skippedCount, 0.5, 360, 360, NO_LEFT_FILTER,
NO_RIGHT_FILTER);
s->isSynchronizationNeeded = false;
s->useOnlyPrimaryForSync = true;
}
void configure3_1_cam(TriggerWaveform *s) {
s->initialize(FOUR_STROKE_CAM_SENSOR);

2
firmware/controllers/trigger/decoders/trigger_universal.h
View File

@ -20,8 +20,6 @@ void addSkippedToothTriggerEvents(trigger_wheel_e wheel, TriggerWaveform *s,
void initializeSkippedToothTriggerWaveformExt(TriggerWaveform *s, int totalTeethCount, int skippedCount, operation_mode_e operationMode);;
void configureOnePlus60_2(TriggerWaveform *s);
// TT_3_1_CAM
void configure3_1_cam(TriggerWaveform *s);

2
firmware/integration/rusefi_config.txt
View File

@ -568,7 +568,7 @@ struct trigger_config_s @brief Trigger wheel(s) configuration
custom bool32_t 4 bits, U32, @OFFSET@, [0:0], "false", "true"
#define trigger_type_e_enum "custom toothed wheel", "Ford Aspire", "Dodge Neon 1995", "Miata NA", "Miata NB", "GM_7X", "Cooper R50", "Mazda SOHC 4", "60/2", "36/1", "Honda 4+24+1", "Mitsubishi", "Honda 4+24", "Honda 1+4+24", "Dodge Neon 2003", "Mazda DOHC 1+4", "1+1", "1+60/2", "Single Tooth", "Dodge Ram 1+16", "60/2 VW", "Honda 1+24", "Dodge Stratus", "36_2_2_2", "Nissan Primera", "dev 2JZ 3/34 simulator", "Rover K", "GM LS 24", "Honda CBR 600", "2JZ_1_12", "Honda CBR 600 custom", "3/1 skipped" , "Dodge Neon 2003 crank", "Miata VVT", "trg34", "trg35", "Subaru 7+6", "Jeep 18-2-2-2", "WIP", "Dodge Neon 1995 crank only", "Jeep XJ 4 cyl", "FiatIAQ_P8", "Mazda Z5", "trg43", "Renix 44-2-2", "Renix 66-2-2-2", "Honda K 12+1", "trg47", "36/2", "Subaru SVX", "trg50", "INVALID"
#define trigger_type_e_enum "custom toothed wheel", "Ford Aspire", "Dodge Neon 1995", "Miata NA", "Miata NB", "GM_7X", "Cooper R50", "Mazda SOHC 4", "60/2", "36/1", "Honda 4+24+1", "Mitsubishi", "Honda 4+24", "Honda 1+4+24", "Dodge Neon 2003", "Mazda DOHC 1+4", "1+1", "INVALID", "Single Tooth", "Dodge Ram 1+16", "60/2 VW", "Honda 1+24", "Dodge Stratus", "36_2_2_2", "Nissan Primera", "dev 2JZ 3/34 simulator", "Rover K", "GM LS 24", "Honda CBR 600", "2JZ_1_12", "Honda CBR 600 custom", "3/1 skipped" , "Dodge Neon 2003 crank", "Miata VVT", "trg34", "trg35", "Subaru 7+6", "Jeep 18-2-2-2", "WIP", "Dodge Neon 1995 crank only", "Jeep XJ 4 cyl", "FiatIAQ_P8", "Mazda Z5", "trg43", "Renix 44-2-2", "Renix 66-2-2-2", "Honda K 12+1", "trg47", "36/2", "Subaru SVX", "trg50", "INVALID"
custom trigger_type_e 4 bits, U32, @OFFSET@, [0:5], @@trigger_type_e_enum@@
trigger_type_e type;set trigger_type X