From c77926af7054d700ab2bcfd11c3656ac50f9d8e4 Mon Sep 17 00:00:00 2001 From: rusEfi Date: Fri, 23 Jan 2015 16:04:11 -0600 Subject: [PATCH] auto-sync --- .../controllers/algo/engine_configuration.h | 70 ++++++++++++++----- firmware/rusefi_config.ini | 37 +++++++++- 2 files changed, 88 insertions(+), 19 deletions(-) diff --git a/firmware/controllers/algo/engine_configuration.h b/firmware/controllers/algo/engine_configuration.h index 64a7fe5c0b..f4b2dd4980 100644 --- a/firmware/controllers/algo/engine_configuration.h +++ b/firmware/controllers/algo/engine_configuration.h @@ -271,39 +271,73 @@ typedef struct { * offset 336 */ brain_pin_e canRxPin; - - + /** + * offset 340 + */ brain_pin_e triggerSimulatorPins[TRIGGER_SIMULATOR_PIN_COUNT]; + /** + * offset 352 + */ pin_output_mode_e triggerSimulatorPinModes[TRIGGER_SIMULATOR_PIN_COUNT]; - + /** + * offset 364 + */ brain_pin_e o2heaterPin; + /** + * offset 368 + */ pin_output_mode_e o2heaterPinModeTodO; - unsigned int is_enabled_spi_1 : 1; // bit 0 - unsigned int is_enabled_spi_2 : 1; // bit 1 - unsigned int is_enabled_spi_3 : 1; // bit 2 - unsigned int isSdCardEnabled : 1; // bit 3 - unsigned int isFastAdcEnabled : 1; // bit 4 - unsigned int isEngineControlEnabled : 1; // bit 5 - unsigned int isHip9011Enabled : 1; // bit 6 - + /** offset 372 bit 0 */ + uint32_t is_enabled_spi_1 : 1; + /** offset 372 bit 1 */ + uint32_t is_enabled_spi_2 : 1; + /** offset 372 bit 2 */ + uint32_t is_enabled_spi_3 : 1; + /** offset 372 bit 3 */ + uint32_t isSdCardEnabled : 1; + /** offset 372 bit 4 */ + uint32_t isFastAdcEnabled : 1; + /** offset 372 bit 5 */ + uint32_t isEngineControlEnabled : 1; + /** offset 372 bit 6 */ + uint32_t isHip9011Enabled : 1; + /** + * offset 376 + */ brain_pin_e logicAnalyzerPins[LOGIC_ANALYZER_CHANNEL_COUNT]; /** * default or inverted input - */ + * offset 392 + */ uint8_t logicAnalyzerMode[LOGIC_ANALYZER_CHANNEL_COUNT]; - + /** + * offset 396 + */ int unrealisticRpmThreashold; - + /** + * offset 400 + */ pin_output_mode_e mainRelayPinMode; - + /** + * offset 404 + */ egt_cs_array_t max31855_cs; - + /** + * offset 408 + */ spi_device_e max31855spiDevice; - + /** + * offset 412 + */ brain_pin_e fsioPins[LE_COMMAND_COUNT]; + /** + * offset 476 + */ pin_output_mode_e gpioPinModes[LE_COMMAND_COUNT]; - + /** + * offset 540 + */ brain_pin_e joystickPins[JOYSTICK_PIN_COUNT]; /** diff --git a/firmware/rusefi_config.ini b/firmware/rusefi_config.ini index d04a025251..a1116a1018 100644 --- a/firmware/rusefi_config.ini +++ b/firmware/rusefi_config.ini @@ -2,7 +2,7 @@ ! this file defines the format of rusEfi persistent configuration structure ! this file is processed by ../java_tools/config_definition.jar tool ! -! comments start with '#' +! comments start with '!' ! ! each field is declared as ! type name;comment @@ -305,6 +305,41 @@ spi_device_e digitalPotentiometerSpiDevice;Digital Potentiometer is used by stoc brain_pin_e canTxPin; brain_pin_e canRxPin; +#define TRIGGER_SIMULATOR_PIN_COUNT 3 + brain_pin_e[TRIGGER_SIMULATOR_PIN_COUNT] triggerSimulatorPins; + pin_output_mode_e[TRIGGER_SIMULATOR_PIN_COUNT] triggerSimulatorPinModes; + + brain_pin_e o2heaterPin; + pin_output_mode_e o2heaterPinModeTodO; + +bit is_enabled_spi_1 +bit is_enabled_spi_2 + bit is_enabled_spi_3 + bit isSdCardEnabled + bit isFastAdcEnabled + bit isEngineControlEnabled + bit isHip9011Enabled + +#define LOGIC_ANALYZER_CHANNEL_COUNT 4 + + brain_pin_e[LOGIC_ANALYZER_CHANNEL_COUNT] logicAnalyzerPins; + uint8_t[LOGIC_ANALYZER_CHANNEL_COUNT] logicAnalyzerMode;default or inverted input + + int unrealisticRpmThreashold; + + pin_output_mode_e mainRelayPinMode; + + egt_cs_array_t max31855_cs; + + spi_device_e max31855spiDevice; +#define LE_COMMAND_COUNT 16 + + brain_pin_e[LE_COMMAND_COUNT] fsioPins; + pin_output_mode_e[LE_COMMAND_COUNT] gpioPinModes; + + brain_pin_e[JOYSTICK_PIN_COUNT] joystickPins; + + end_struct