From 7bff37858f29aa2b9d685816bd17ca9dcc5c29ce Mon Sep 17 00:00:00 2001 From: rusEfi Date: Sun, 24 May 2015 11:05:56 -0400 Subject: [PATCH] auto-sync --- .../controllers/algo/engine_configuration.cpp | 13 +++++++------ .../engine_configuration_generated_structures.h | 16 ++++++++++++---- firmware/controllers/algo/rusefi_generated.h | 11 +++++++---- firmware/controllers/alternatorController.cpp | 11 +++++++++++ firmware/controllers/alternatorController.h | 1 + firmware/integration/rusefi_config.txt | 6 ++++-- 6 files changed, 42 insertions(+), 16 deletions(-) diff --git a/firmware/controllers/algo/engine_configuration.cpp b/firmware/controllers/algo/engine_configuration.cpp index 5a8c53465a..9d3b8dea72 100644 --- a/firmware/controllers/algo/engine_configuration.cpp +++ b/firmware/controllers/algo/engine_configuration.cpp @@ -29,6 +29,9 @@ #include "engine_math.h" #include "speed_density.h" #include "advance_map.h" +#if EFI_PROD_CODE +#include "alternatorController.h" +#endif #include "custom_engine.h" #include "acura_rsx.h" @@ -167,8 +170,10 @@ void prepareVoidConfiguration(engine_configuration_s *activeConfiguration) { boardConfiguration->acRelayPin = GPIO_UNASSIGNED; boardConfiguration->acRelayPinMode = OM_DEFAULT; - boardConfiguration->alternatorControlPin = GPIO_UNASSIGNED; - boardConfiguration->alternatorControlPinMode = OM_DEFAULT; +#if EFI_PROD_CODE + setDefaultAlternatorParameters(); +#endif + boardConfiguration->mainRelayPin = GPIO_UNASSIGNED; boardConfiguration->mainRelayPinMode = OM_DEFAULT; boardConfiguration->idle.solenoidPin = GPIO_UNASSIGNED; @@ -391,10 +396,6 @@ void setDefaultConfiguration(DECLARE_ENGINE_PARAMETER_F) { engineConfiguration->HD44780width = 20; engineConfiguration->HD44780height = 4; - engineConfiguration->alternatorOffset = 0; - engineConfiguration->alternatorControlPFactor = 30; - boardConfiguration->alternatorDT = 100; - engineConfiguration->vRefAdcChannel = EFI_ADC_NONE; engineConfiguration->vbattAdcChannel = EFI_ADC_NONE; engineConfiguration->clt.adcChannel = EFI_ADC_6; diff --git a/firmware/controllers/algo/engine_configuration_generated_structures.h b/firmware/controllers/algo/engine_configuration_generated_structures.h index d27722b9db..810ad3a8cb 100644 --- a/firmware/controllers/algo/engine_configuration_generated_structures.h +++ b/firmware/controllers/algo/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated by config_definition.jar on Sat May 23 20:41:38 EDT 2015 +// this section was generated by config_definition.jar on Sun May 24 09:49:35 EDT 2015 // begin #include "rusefi_types.h" typedef struct { @@ -495,6 +495,9 @@ typedef struct { /** offset 384 bit 9 */ bool_t useStepperIdle : 1; + /** + offset 384 bit 10 */ + bool_t enabledStep1Limiter : 1; /** * offset 388 */ @@ -562,9 +565,10 @@ typedef struct { */ brain_pin_e hip9011IntHoldPin; /** + * Turn off alternator output above specified TPS * offset 656 */ - int unused1280; + float alternatorOffAboveTps; /** * offset 660 */ @@ -738,7 +742,11 @@ typedef struct { /** * offset 320 */ - float unused[2]; + int step1rpm; + /** + * offset 324 + */ + int step1timing; /** * offset 328 */ @@ -1337,4 +1345,4 @@ typedef struct { } persistent_config_s; // end -// this section was generated by config_definition.jar on Sat May 23 20:41:38 EDT 2015 +// this section was generated by config_definition.jar on Sun May 24 09:49:35 EDT 2015 diff --git a/firmware/controllers/algo/rusefi_generated.h b/firmware/controllers/algo/rusefi_generated.h index 82d12a610d..6bec50f7e0 100644 --- a/firmware/controllers/algo/rusefi_generated.h +++ b/firmware/controllers/algo/rusefi_generated.h @@ -106,8 +106,10 @@ #define iat_bias_resistor_offset 312 #define iat_bias_resistor_offset_hex 138 #define iat_adcChannel_offset 316 -#define unused_offset 320 -#define unused_offset_hex 140 +#define step1rpm_offset 320 +#define step1rpm_offset_hex 140 +#define step1timing_offset 324 +#define step1timing_offset_hex 144 #define hip9011PrescalerAndSDO_offset 328 #define hip9011PrescalerAndSDO_offset_hex 148 #define knockBandCustom_offset 332 @@ -329,6 +331,7 @@ #define isVerboseAlternator_offset 1008 #define useSerialPort_offset 1008 #define useStepperIdle_offset 1008 +#define enabledStep1Limiter_offset 1008 #define logicAnalyzerPins1_offset 1012 #define logicAnalyzerPins2_offset 1016 #define logicAnalyzerPins3_offset 1020 @@ -434,8 +437,8 @@ #define fsioFrequency16_offset 1270 #define hip9011CsPin_offset 1272 #define hip9011IntHoldPin_offset 1276 -#define unused1280_offset 1280 -#define unused1280_offset_hex 500 +#define alternatorOffAboveTps_offset 1280 +#define alternatorOffAboveTps_offset_hex 500 #define fsio_setting1_offset 1284 #define fsio_setting1_offset_hex 504 #define fsio_setting2_offset 1288 diff --git a/firmware/controllers/alternatorController.cpp b/firmware/controllers/alternatorController.cpp index 4498d09a97..bfee2708e4 100644 --- a/firmware/controllers/alternatorController.cpp +++ b/firmware/controllers/alternatorController.cpp @@ -79,6 +79,17 @@ static void applyAlternatorPinState(PwmConfig *state, int stateIndex) { output->setValue(value); } +void setDefaultAlternatorParameters(void) { + boardConfiguration->alternatorOffAboveTps = 120; + + boardConfiguration->alternatorControlPin = GPIO_UNASSIGNED; + boardConfiguration->alternatorControlPinMode = OM_DEFAULT; + + engineConfiguration->alternatorOffset = 0; + engineConfiguration->alternatorControlPFactor = 30; + boardConfiguration->alternatorDT = 100; +} + void initAlternatorCtrl(Logging *sharedLogger) { logger = sharedLogger; addConsoleAction("altinfo", showAltInfo); diff --git a/firmware/controllers/alternatorController.h b/firmware/controllers/alternatorController.h index 0ebcc612d3..f2ddffd4f3 100644 --- a/firmware/controllers/alternatorController.h +++ b/firmware/controllers/alternatorController.h @@ -14,5 +14,6 @@ void initAlternatorCtrl(Logging *sharedLogger); void setAltPFactor(float p); void showAltInfo(void); +void setDefaultAlternatorParameters(void); #endif /* ALTERNATORCONTROLLER_H_ */ diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index 84d2718bd0..bc95d647a6 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -159,7 +159,8 @@ MAP_sensor_config_s map;@see hasMapSensor\n@see isMapAveragingEnabled ThermistorConf clt;todo: merge with channel settings, use full-scale Thermistor here! ThermistorConf iat; - float[2] unused; + int step1rpm; + int step1timing; int hip9011PrescalerAndSDO;;"integer", 1, 0.0, 0.0, 32, 0 float knockBandCustom;;"kHz", 1, 0.0, 0.0, 10.0, 2 @@ -388,6 +389,7 @@ bit is_enabled_spi_2 bit useSerialPort bit useStepperIdle + bit enabledStep1Limiter; brain_input_pin_e[LOGIC_ANALYZER_CHANNEL_COUNT iterate] logicAnalyzerPins; uint8_t[LOGIC_ANALYZER_CHANNEL_COUNT] logicAnalyzerMode;default or inverted input @@ -417,7 +419,7 @@ custom fsio_pwm_freq_t 2 scalar, U16, @OFFSET@, "Hz", 1, 0, brain_pin_e hip9011CsPin; brain_pin_e hip9011IntHoldPin; - int unused1280; + float alternatorOffAboveTps;Turn off alternator output above specified TPS;"%", 1, 0, 0, 200, 2 custom fsio_setting_t 4 scalar, F32, @OFFSET@, "Val", 1, 0, 0, 18000, 0 fsio_setting_t[LE_COMMAND_COUNT iterate] fsio_setting;