auto-sync

This commit is contained in:
rusEfi 2015-01-24 17:04:20 -06:00
parent 2f8c7d18fc
commit 7935f58b58
3 changed files with 242 additions and 44 deletions

View File

@ -358,7 +358,7 @@ void setMiata1994_s(engine_configuration_s *engineConfiguration, board_configura
initEgoSensor(&engineConfiguration->afrSensor, ES_Innovate_MTX_L);
/**
* This board has PE0 & PE1 mosfets rewires to PD3 and PD5
* This board has PE0<>PD5 & PE1<>PD3 rewired in order to avoid Discovery issue
*/
boardConfiguration->injectionPins[0] = GPIOD_3; // avoiding PE1
boardConfiguration->injectionPins[1] = GPIOE_2; // injector #2

View File

@ -339,56 +339,121 @@ typedef struct {
* offset 540
*/
brain_pin_e joystickPins[JOYSTICK_PIN_COUNT];
/**
* This pin is used for debugging - snap a logic analyzer on it and see if it's ever high
*/
* offset 560
*/
brain_pin_e triggerErrorPin;
/**
* offset 564
*/
pin_output_mode_e triggerErrorPinMode;
/**
* value between 0 and 1
*/
* offset 568
*/
float idleSolenoidPwm;
/**
* offset 572
*/
brain_pin_e acRelayPin;
/**
* offset 576
*/
pin_output_mode_e acRelayPinMode;
/**
* offset 580
*/
int16_t fsioFrequency[LE_COMMAND_COUNT];
/**
* offset 612
*/
brain_pin_e hip9011CsPin;
/**
* offset 616
*/
brain_pin_e hip9011IntHoldPin;
/**
* offset 620
*/
brain_pin_e hip9011OutPin;
/**
* offset 624
*/
float fsio_setting[LE_COMMAND_COUNT];
/**
* offset 688
*/
brain_pin_e spi1mosiPin;
/**
* offset 692
*/
brain_pin_e spi1misoPin;
/**
* offset 696
*/
brain_pin_e spi1sckPin;
/**
* offset 700
*/
brain_pin_e spi2mosiPin;
/**
* offset 704
*/
brain_pin_e spi2misoPin;
/**
* offset 708
*/
brain_pin_e spi2sckPin;
/**
* offset 712
*/
brain_pin_e spi3mosiPin;
/**
* offset 716
*/
brain_pin_e spi3misoPin;
/**
* offset 720
*/
brain_pin_e spi3sckPin;
// offset 6228
/**
* offset 724
*/
float hip9011Gain;
// offset 6232
/**
* offset 728
*/
brain_pin_e joystickCenterPin;
// offset 6236
/**
* offset 732
*/
brain_pin_e joystickAPin;
// offset 6240
/**
* offset 736
*/
brain_pin_e joystickBPin;
// offset 6244
/**
* offset 740
*/
brain_pin_e joystickCPin;
// offset 6248
/**
* offset 744
*/
brain_pin_e joystickDPin;
// offset 6252
/**
* offset 748
*/
analog_chart_e analogChartMode;
/**
* offset 752
*/
int unusedbs[6];
/**
* offset 776
*/
le_formula_t le_formulas[LE_COMMAND_COUNT];
/** total size 3976*/
} board_configuration_s;
// 19010105 decimal
@ -755,7 +820,7 @@ typedef struct {
board_configuration_s bc;
// offset 6280
// offset 6280 ????
/**
* @see isMapAveragingEnabled
*/
@ -776,8 +841,7 @@ typedef struct {
bool_t hasTpsSensor : 1; // bit 13
/**
* see also
* offset 6284
* offset 6284 ???
*/
adc_channel_e hipOutputChannel;
@ -813,37 +877,71 @@ typedef struct {
*/
float injectorFlow; // size 4
/**
* offset 9504
*/
float crankingFuelCoef[CRANKING_CURVE_SIZE];
/**
* offset 9536
*/
float crankingFuelBins[CRANKING_CURVE_SIZE];
/**
* offset 9568
*/
float crankingCycleCoef[CRANKING_CURVE_SIZE];
/**
* offset 9600
*/
float crankingCycleBins[CRANKING_CURVE_SIZE];
/**
* offset 9632
*/
float ignitionDwellForCrankingMs;
/**
* offset 9636
*/
int targetIdleRpm;
/**
* A/C button input handled as analog input
*/
* offset 9640
*/
adc_channel_e acSwitchAdc;
/**
* offset 9644
*/
int ignMathCalculateAtIndex;
/**
* offset 9648
*/
int16_t acCutoffLowRpm;
/**
* offset 9650
*/
int16_t acCutoffHighRpm;
/**
* offset 9652
*/
int16_t acIdleRpmBump;
/**
* offset 9654
*/
int16_t unusedShort;
/**
* offset 9656
*/
adc_channel_e vRefAdcChannel;
/**
* offset 9660
*/
float knockDetectionWindowStart;
/**
* offset 9664
*/
float knockDetectionWindowEnd;
/**
* Cylinder diameter, in mm.
*/
* offset 9668
*/
float cylinderBore;
/**

View File

@ -157,31 +157,42 @@ float vehicleSpeedCoef;This coefficient translates vehicle speed input frequency
custom canNbcType 4 bits, U32, @OFFSET@, [0:1], "BMW", "FIAT", "VAG" , "INVALID"
can_nbc_e canNbcType;
int canSleepPeriod;;"RPM", 1, 0, 0, 1000.0, 2
int canSleepPeriod;;"ms", 1, 0, 0, 1000.0, 2
int cylindersCount;
custom ignition_mode_e 4 bits, U32, %OFFSET%, [0:1], "One coil", "Individual Coils", "Wasted", "INVALID"
ignition_mode_e ignitionMode;
custom firing_order_e 4 bits, U32, %OFFSET%, [0:2], "One Cylinder", "1-3-4-2", "1-2-4-3", "1-3-2-4", "1-5-3-6-2-4", "1-8-4-3-6-5-7-2", "INVALID", "INVALID"
firing_order_e firingOrder;
float rpmMultiplier;todo: refactor this, see operation_mode_e
custom display_mode_e 4 bits, U32, %OFFSET%, [0:1], "none", "hd44780", "hd44780 over pcf8574", "INVALID"
display_mode_e displayMode;
custom log_format_e 4 bits, U32, %OFFSET%, [0:0], "native", "Mega Log Viewer"
log_format_e logFormat;
int firmwareVersion;
int HD44780width;
int HD44780height;
int firmwareVersion;"index", 1, 0, 0, 300, 0
int HD44780width;"index", 1, 0, 0, 300, 0
int HD44780height;"index", 1, 0, 0, 300, 0
adc_channel_e tpsAdcChannel;
int overrideCrankingIgnition;
int analogChartFrequency;
struct trigger_config_s @brief Trigger wheel(s) configuration
custom trigger_type_e 4 bits, U32, %OFFSET%, [0:3], "custom toothed wheel", "ford aspire", "dodge neon", "Miata NA", "Miata NB", "GM_7X", "Cooper", "Escort GT", "60/2", "36/1", "Accord CD", "MITSU", "INVALID", "INVALID", "INVALID", "INVALID"
trigger_type_e type;
int customIsSynchronizationNeeded;
int customTotalToothCount;
int customSkippedToothCount;
int customTotalToothCount;;"number", 1, 0.0, 0, 1000.0, 2
int customSkippedToothCount;;"number", 1, 0.0, 0, 1000.0, 2
float customSyncRatioFrom;
float customSyncRatioTo;
float customSyncRatioFrom;;"number", 1, 0.0, 0, 1000.0, 2
float customSyncRatioTo;;"number", 1, 0.0, 0, 1000.0, 2
int customUseRiseEdge;
end_struct
@ -329,6 +340,7 @@ bit is_enabled_spi_2
pin_output_mode_e mainRelayPinMode;
custom egt_cs_array_t 32 todo array? type?
egt_cs_array_t max31855_cs;
spi_device_e max31855spiDevice;
@ -339,12 +351,100 @@ bit is_enabled_spi_2
brain_pin_e[JOYSTICK_PIN_COUNT] joystickPins;
brain_pin_e triggerErrorPin;This pin is used for debugging - snap a logic analyzer on it and see if it's ever high
pin_output_mode_e triggerErrorPinMode;
float idleSolenoidPwm;value between 0 and 1
brain_pin_e acRelayPin;
pin_output_mode_e acRelayPinMode;
int16_t[LE_COMMAND_COUNT] fsioFrequency;
brain_pin_e hip9011CsPin;
brain_pin_e hip9011IntHoldPin;
brain_pin_e hip9011OutPin;
float[LE_COMMAND_COUNT] fsio_setting;
brain_pin_e spi1mosiPin;
brain_pin_e spi1misoPin;
brain_pin_e spi1sckPin;
brain_pin_e spi2mosiPin;
brain_pin_e spi2misoPin;
brain_pin_e spi2sckPin;
brain_pin_e spi3mosiPin;
brain_pin_e spi3misoPin;
brain_pin_e spi3sckPin;
float hip9011Gain;
brain_pin_e joystickCenterPin;
brain_pin_e joystickAPin;
brain_pin_e joystickBPin;
brain_pin_e joystickCPin;
brain_pin_e joystickDPin;
custom analog_chart_e 4 bits, S32, @OFFSET@, [0:1], "none", "trigger", "MAP", "INVALID"
analog_chart_e analogChartMode;
int[6] unusedbs;
custom le_formula_t 200 todo
le_formula_t[LE_COMMAND_COUNT] le_formulas;
end_struct
board_configuration_s bc;
bit hasMapSensor
adc_channel_e hipOutputChannel;
idle_mode_e idleMode;
bit isInjectionEnabled
uint32_t digitalChartSize;
float injectorFlow;
float[CRANKING_CURVE_SIZE] crankingFuelCoef;
float[CRANKING_CURVE_SIZE] crankingFuelBins;
float[CRANKING_CURVE_SIZE] crankingCycleCoef;
float[CRANKING_CURVE_SIZE] crankingCycleBins;
float ignitionDwellForCrankingMs;
int targetIdleRpm;
adc_channel_e acSwitchAdc;A/C button input handled as analog input
int ignMathCalculateAtIndex;
int16_t acCutoffLowRpm;
int16_t acCutoffHighRpm;
int16_t acIdleRpmBump;
int16_t unusedShort;
adc_channel_e vRefAdcChannel;
float knockDetectionWindowStart;
float knockDetectionWindowEnd;
float cylinderBore;Cylinder diameter, in mm.
brain_pin_e clutchUpPin;Some vehicles have a switch to indicate that clutch pedal is all the way up
pin_input_mode_e clutchUpPinMode;
float hipThreshold;
brain_pin_e[LE_COMMAND_COUNT] fsioInputs;
pin_input_mode_e[LE_COMMAND_COUNT] fsioInputModes;
int[149] unused3;
le_formula_t timingMultiplier;
le_formula_t timingAdditive;
fuel_table_t injectionPhase;
!custom analog_chart_e 4 bits, S32, @OFFSET@, [0:1], "none", "trigger", "MAP", "INVALID"
!analog_chart_e analogChartMode;
end_struct