mirror of https://github.com/FOME-Tech/fome-fw.git
auto-sync
This commit is contained in:
parent
f68a70bd05
commit
1bb4b04364
|
@ -18,7 +18,8 @@ void setMazdaMiata2003EngineConfiguration(DECLARE_ENGINE_PARAMETER_F) {
|
||||||
|
|
||||||
engineConfiguration->hasMapSensor = true;
|
engineConfiguration->hasMapSensor = true;
|
||||||
|
|
||||||
engineConfiguration->trigger.type = TT_ONE;
|
engineConfiguration->trigger.type = TT_MIATA_VVT;
|
||||||
|
setOperationMode(engineConfiguration, FOUR_STROKE_CRANK_SENSOR);
|
||||||
engineConfiguration->specs.displacement = 1.8;
|
engineConfiguration->specs.displacement = 1.8;
|
||||||
|
|
||||||
boardConfiguration->triggerInputPins[0] = GPIOA_5;
|
boardConfiguration->triggerInputPins[0] = GPIOA_5;
|
||||||
|
|
|
@ -395,6 +395,8 @@ case FOUR_STROKE_CRANK_SENSOR:
|
||||||
return "FOUR_STROKE_CRANK_SENSOR";
|
return "FOUR_STROKE_CRANK_SENSOR";
|
||||||
case TWO_STROKE:
|
case TWO_STROKE:
|
||||||
return "TWO_STROKE";
|
return "TWO_STROKE";
|
||||||
|
case FOUR_STROKE_SYMMETRICAL_CRANK_SENSOR:
|
||||||
|
return "FOUR_STROKE_SYMMETRICAL_CRANK_SENSOR";
|
||||||
case Force_4b_operation_mode_e:
|
case Force_4b_operation_mode_e:
|
||||||
return "Force_4b_operation_mode_e";
|
return "Force_4b_operation_mode_e";
|
||||||
case OM_NONE:
|
case OM_NONE:
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Fri Nov 11 21:53:11 EST 2016
|
// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sun Nov 13 22:09:24 EST 2016
|
||||||
// begin
|
// begin
|
||||||
#ifndef ENGINE_CONFIGURATION_GENERATED_H_
|
#ifndef ENGINE_CONFIGURATION_GENERATED_H_
|
||||||
#define ENGINE_CONFIGURATION_GENERATED_H_
|
#define ENGINE_CONFIGURATION_GENERATED_H_
|
||||||
|
@ -1116,6 +1116,7 @@ typedef struct {
|
||||||
int canSleepPeriod;
|
int canSleepPeriod;
|
||||||
/**
|
/**
|
||||||
* See engineCycle
|
* See engineCycle
|
||||||
|
* set operation_mode X
|
||||||
* offset 500
|
* offset 500
|
||||||
*/
|
*/
|
||||||
operation_mode_e operationMode;
|
operation_mode_e operationMode;
|
||||||
|
@ -1993,4 +1994,4 @@ typedef struct {
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
// end
|
// end
|
||||||
// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Fri Nov 11 21:53:11 EST 2016
|
// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sun Nov 13 22:09:24 EST 2016
|
||||||
|
|
|
@ -365,6 +365,11 @@ typedef enum {
|
||||||
*/
|
*/
|
||||||
TWO_STROKE = 3,
|
TWO_STROKE = 3,
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 720 degree engine cycle but trigger is defined using a 180 cycle which is when repeated three more times
|
||||||
|
*/
|
||||||
|
FOUR_STROKE_SYMMETRICAL_CRANK_SENSOR = 4,
|
||||||
|
|
||||||
Force_4b_operation_mode_e = ENUM_32_BITS,
|
Force_4b_operation_mode_e = ENUM_32_BITS,
|
||||||
} operation_mode_e;
|
} operation_mode_e;
|
||||||
|
|
||||||
|
|
|
@ -988,6 +988,8 @@ static void setValue(const char *paramStr, const char *valueStr) {
|
||||||
engineConfiguration->step1rpm = valueI;
|
engineConfiguration->step1rpm = valueI;
|
||||||
} else if (strEqualCaseInsensitive(paramStr, "step1timing")) {
|
} else if (strEqualCaseInsensitive(paramStr, "step1timing")) {
|
||||||
engineConfiguration->step1timing = valueI;
|
engineConfiguration->step1timing = valueI;
|
||||||
|
} else if (strEqualCaseInsensitive(paramStr, "operation_mode")) {
|
||||||
|
engineConfiguration->operationMode = (operation_mode_e)valueI;
|
||||||
} else if (strEqualCaseInsensitive(paramStr, "suckedOffCoef")) {
|
} else if (strEqualCaseInsensitive(paramStr, "suckedOffCoef")) {
|
||||||
engineConfiguration->suckedOffCoef = valueF;
|
engineConfiguration->suckedOffCoef = valueF;
|
||||||
} else if (strEqualCaseInsensitive(paramStr, "addedToWallCoef")) {
|
} else if (strEqualCaseInsensitive(paramStr, "addedToWallCoef")) {
|
||||||
|
|
|
@ -240,13 +240,16 @@ void TriggerCentral::handleShaftSignal(trigger_event_e signal DECLARE_ENGINE_PAR
|
||||||
* cycle into a four stroke, 720 degrees cycle.
|
* cycle into a four stroke, 720 degrees cycle.
|
||||||
*/
|
*/
|
||||||
int triggerIndexForListeners;
|
int triggerIndexForListeners;
|
||||||
if (engineConfiguration->operationMode != FOUR_STROKE_CRANK_SENSOR) {
|
if (engineConfiguration->operationMode == FOUR_STROKE_CAM_SENSOR ||
|
||||||
|
engineConfiguration->operationMode == TWO_STROKE) {
|
||||||
// That's easy - trigger cycle matches engine cycle
|
// That's easy - trigger cycle matches engine cycle
|
||||||
triggerIndexForListeners = triggerState.getCurrentIndex();
|
triggerIndexForListeners = triggerState.getCurrentIndex();
|
||||||
} else {
|
} else {
|
||||||
bool isEven = triggerState.isEvenRevolution();
|
int crankDivider = engineConfiguration->operationMode == FOUR_STROKE_CRANK_SENSOR ? 2 : 4;
|
||||||
|
|
||||||
triggerIndexForListeners = triggerState.getCurrentIndex() + (isEven ? 0 : TRIGGER_SHAPE(size));
|
int crankInternalIndex = triggerState.getTotalRevolutionCounter() % crankDivider;
|
||||||
|
|
||||||
|
triggerIndexForListeners = triggerState.getCurrentIndex() + (crankInternalIndex * TRIGGER_SHAPE(size));
|
||||||
}
|
}
|
||||||
if (triggerIndexForListeners == 0) {
|
if (triggerIndexForListeners == 0) {
|
||||||
timeAtVirtualZeroNt = nowNt;
|
timeAtVirtualZeroNt = nowNt;
|
||||||
|
|
|
@ -482,6 +482,8 @@ void TriggerShape::initializeTriggerShape(Logging *logger DECLARE_ENGINE_PARAMET
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case TT_MIATA_VVT:
|
case TT_MIATA_VVT:
|
||||||
|
initializeMazdaMiataNb2Crank(triggerShape PASS_ENGINE_PARAMETER);
|
||||||
|
break;
|
||||||
|
|
||||||
case TT_DODGE_NEON_1995:
|
case TT_DODGE_NEON_1995:
|
||||||
configureNeon1995TriggerShape(triggerShape PASS_ENGINE_PARAMETER);
|
configureNeon1995TriggerShape(triggerShape PASS_ENGINE_PARAMETER);
|
||||||
|
|
|
@ -319,8 +319,8 @@ can_nbc_e canNbcType;
|
||||||
int canSleepPeriod;CANbus thread period, ms;"ms", 1, 0, 0, 1000.0, 2
|
int canSleepPeriod;CANbus thread period, ms;"ms", 1, 0, 0, 1000.0, 2
|
||||||
|
|
||||||
|
|
||||||
custom operation_mode_e 4 bits, U32, @OFFSET@, [0:1], "INVALID", "4 stroke without cam sensor", "4 stroke with cam sensor", "2 stroke"
|
custom operation_mode_e 4 bits, U32, @OFFSET@, [0:2], "INVALID", "4 stroke without cam sensor", "4 stroke with cam sensor", "2 stroke", "4 stroke with symmetrical crank", "INVALID", "INVALID", "INVALID"
|
||||||
operation_mode_e operationMode;See engineCycle
|
operation_mode_e operationMode;See engineCycle\nset operation_mode X
|
||||||
|
|
||||||
custom display_mode_e 4 bits, U32, @OFFSET@, [0:1], "none", "hd44780", "hd44780 over pcf8574", "INVALID"
|
custom display_mode_e 4 bits, U32, @OFFSET@, [0:1], "none", "hd44780", "hd44780 over pcf8574", "INVALID"
|
||||||
display_mode_e displayMode;
|
display_mode_e displayMode;
|
||||||
|
@ -340,9 +340,9 @@ struct trigger_config_s @brief Trigger wheel(s) configuration
|
||||||
|
|
||||||
custom bool32_t 4 bits, U32, @OFFSET@, [0:0], "false", "true"
|
custom bool32_t 4 bits, U32, @OFFSET@, [0:0], "false", "true"
|
||||||
|
|
||||||
#define trigger_type_e_enum "custom toothed wheel", "ford aspire", "dodge neon", "Miata NA", "Miata NB", "GM_7X", "Cooper", "Mazda SOHC 4", "60/2", "36/1", "Accord CD", "MITSU", "ACCORD 2", "ACCORD DIP", "Neon 2003", "MAZDA D 1+4", "1+1", "1+60/2", "Single Tooth", "Dodge Ram 1+16", "60/2 VW", "Accord 1+24", "DODGE STRATUS", "36_2_2_2", "Nissan", "2JZ", "Rover K", "GM LS 24", "Honda CBR 600", "trg29", "trg30", "INVALID"
|
#define trigger_type_e_enum "custom toothed wheel", "ford aspire", "dodge neon", "Miata NA", "Miata NB", "GM_7X", "Cooper", "Mazda SOHC 4", "60/2", "36/1", "Accord CD", "MITSU", "ACCORD 2", "ACCORD DIP", "Neon 2003", "MAZDA D 1+4", "1+1", "1+60/2", "Single Tooth", "Dodge Ram 1+16", "60/2 VW", "Accord 1+24", "DODGE STRATUS", "36_2_2_2", "Nissan", "2JZ", "Rover K", "GM LS 24", "Honda CBR 600", "2JZ_1_12", "Honda CBR 600 custom", "3/1 skipped" , "2003 neon crank", "Miata VVT", "INVALID", "INVALID", "INVALID", "INVALID"
|
||||||
|
|
||||||
custom trigger_type_e 4 bits, U32, @OFFSET@, [0:4], @@trigger_type_e_enum@@
|
custom trigger_type_e 4 bits, U32, @OFFSET@, [0:5], @@trigger_type_e_enum@@
|
||||||
trigger_type_e type;set_trigger_type X
|
trigger_type_e type;set_trigger_type X
|
||||||
|
|
||||||
bit customIsSynchronizationNeeded;
|
bit customIsSynchronizationNeeded;
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
package com.rusefi.config;
|
package com.rusefi.config;
|
||||||
|
|
||||||
// this file was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Fri Nov 11 21:53:11 EST 2016
|
// this file was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sun Nov 13 22:09:24 EST 2016
|
||||||
public class Fields {
|
public class Fields {
|
||||||
public static final int LE_COMMAND_LENGTH = 200;
|
public static final int LE_COMMAND_LENGTH = 200;
|
||||||
public static final int FSIO_ADC_COUNT = 4;
|
public static final int FSIO_ADC_COUNT = 4;
|
||||||
|
@ -1075,7 +1075,7 @@ public class Fields {
|
||||||
public static final Field TPSADCCHANNEL = Field.create("TPSADCCHANNEL", 524, FieldType.INT, adc_channel_e);
|
public static final Field TPSADCCHANNEL = Field.create("TPSADCCHANNEL", 524, FieldType.INT, adc_channel_e);
|
||||||
public static final Field OVERRIDECRANKINGIGNITION = Field.create("OVERRIDECRANKINGIGNITION", 528, FieldType.INT);
|
public static final Field OVERRIDECRANKINGIGNITION = Field.create("OVERRIDECRANKINGIGNITION", 528, FieldType.INT);
|
||||||
public static final Field SENSORCHARTFREQUENCY = Field.create("SENSORCHARTFREQUENCY", 532, FieldType.INT);
|
public static final Field SENSORCHARTFREQUENCY = Field.create("SENSORCHARTFREQUENCY", 532, FieldType.INT);
|
||||||
public static final String[] trigger_type_e = {"custom toothed wheel", "ford aspire", "dodge neon", "Miata NA", "Miata NB", "GM_7X", "Cooper", "Mazda SOHC 4", "60/2", "36/1", "Accord CD", "MITSU", "ACCORD 2", "ACCORD DIP", "Neon 2003", "MAZDA D 1+4", "1+1", "1+60/2", "Single Tooth", "Dodge Ram 1+16", "60/2 VW", "Accord 1+24", "DODGE STRATUS", "36_2_2_2", "Nissan", "2JZ", "Rover K", "GM LS 24", "Honda CBR 600", "trg29", "trg30", "INVALID"};
|
public static final String[] trigger_type_e = {"custom toothed wheel", "ford aspire", "dodge neon", "Miata NA", "Miata NB", "GM_7X", "Cooper", "Mazda SOHC 4", "60/2", "36/1", "Accord CD", "MITSU", "ACCORD 2", "ACCORD DIP", "Neon 2003", "MAZDA D 1+4", "1+1", "1+60/2", "Single Tooth", "Dodge Ram 1+16", "60/2 VW", "Accord 1+24", "DODGE STRATUS", "36_2_2_2", "Nissan", "2JZ", "Rover K", "GM LS 24", "Honda CBR 600", "2JZ_1_12", "Honda CBR 600 custom", "3/1 skipped" , "2003 neon crank", "Miata VVT", "INVALID", "INVALID", "INVALID", "INVALID"};
|
||||||
public static final Field TRIGGER_TYPE = Field.create("TRIGGER_TYPE", 536, FieldType.INT, trigger_type_e);
|
public static final Field TRIGGER_TYPE = Field.create("TRIGGER_TYPE", 536, FieldType.INT, trigger_type_e);
|
||||||
public static final Field TRIGGER_CUSTOMISSYNCHRONIZATIONNEEDED = Field.create("TRIGGER_CUSTOMISSYNCHRONIZATIONNEEDED", 540, FieldType.BIT, 0);
|
public static final Field TRIGGER_CUSTOMISSYNCHRONIZATIONNEEDED = Field.create("TRIGGER_CUSTOMISSYNCHRONIZATIONNEEDED", 540, FieldType.BIT, 0);
|
||||||
public static final Field TRIGGER_CUSTOMNEEDSECONDTRIGGERINPUT = Field.create("TRIGGER_CUSTOMNEEDSECONDTRIGGERINPUT", 540, FieldType.BIT, 1);
|
public static final Field TRIGGER_CUSTOMNEEDSECONDTRIGGERINPUT = Field.create("TRIGGER_CUSTOMNEEDSECONDTRIGGERINPUT", 540, FieldType.BIT, 1);
|
||||||
|
|
Loading…
Reference in New Issue