From 9d6fd7aa5a27794fe0e3d750156d1529c45caf80 Mon Sep 17 00:00:00 2001 From: rusEfi Date: Wed, 28 Jan 2015 18:06:39 -0600 Subject: [PATCH] auto-sync --- ...ngine_configuration_generated_structures.h | 152 +++++++++--------- firmware/controllers/algo/rusefi_types.h | 2 + firmware/flash_openocd.bat | 1 + 3 files changed, 79 insertions(+), 76 deletions(-) create mode 100644 firmware/flash_openocd.bat diff --git a/firmware/controllers/algo/engine_configuration_generated_structures.h b/firmware/controllers/algo/engine_configuration_generated_structures.h index b8454adb01..5406f2e106 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 Tue Jan 27 18:37:17 EST 2015 +// this section was generated by config_definition.jar on Wed Jan 28 18:53:51 EST 2015 // begin #include "rusefi_types.h" typedef struct { @@ -45,7 +45,7 @@ typedef struct { /** * @brief MAP averaging configuration - */ +*/ typedef struct { /** * offset 0 @@ -75,7 +75,7 @@ typedef struct { /** * @brief Thermistor curve parameters - */ +*/ typedef struct { /** * these values are in Celcuus @@ -124,7 +124,7 @@ typedef struct { /** * @brief Trigger wheel(s) configuration - */ +*/ typedef struct { /** * offset 0 @@ -373,26 +373,26 @@ typedef struct { */ pin_output_mode_e o2heaterPinModeTodO; /** - offset 372 bit 0 */ - bool_t is_enabled_spi_1 :1; + offset 372 bit 0 */ + bool_t is_enabled_spi_1 : 1; /** - offset 372 bit 1 */ - bool_t is_enabled_spi_2 :1; + offset 372 bit 1 */ + bool_t is_enabled_spi_2 : 1; /** - offset 372 bit 2 */ - bool_t is_enabled_spi_3 :1; + offset 372 bit 2 */ + bool_t is_enabled_spi_3 : 1; /** - offset 372 bit 3 */ - bool_t isSdCardEnabled :1; + offset 372 bit 3 */ + bool_t isSdCardEnabled : 1; /** - offset 372 bit 4 */ - bool_t isFastAdcEnabled :1; + offset 372 bit 4 */ + bool_t isFastAdcEnabled : 1; /** - offset 372 bit 5 */ - bool_t isEngineControlEnabled :1; + offset 372 bit 5 */ + bool_t isEngineControlEnabled : 1; /** - offset 372 bit 6 */ - bool_t isHip9011Enabled :1; + offset 372 bit 6 */ + bool_t isHip9011Enabled : 1; /** * offset 376 */ @@ -760,7 +760,7 @@ typedef struct { /** * offset 976 */ - int cylindersCount; + cylinders_count_t cylindersCount; /** * offset 980 */ @@ -896,50 +896,50 @@ typedef struct { board_configuration_s bc; /** * @see isMapAveragingEnabled - offset 9480 bit 0 */ - bool_t hasMapSensor :1; + offset 9480 bit 0 */ + bool_t hasMapSensor : 1; /** - offset 9480 bit 1 */ - bool_t hasIatSensor :1; + offset 9480 bit 1 */ + bool_t hasIatSensor : 1; /** - offset 9480 bit 2 */ - bool_t hasBaroSensor :1; + offset 9480 bit 2 */ + bool_t hasBaroSensor : 1; /** - offset 9480 bit 3 */ - bool_t hasAfrSensor :1; + offset 9480 bit 3 */ + bool_t hasAfrSensor : 1; /** - offset 9480 bit 4 */ - bool_t useConstantDwellDuringCranking :1; + offset 9480 bit 4 */ + bool_t useConstantDwellDuringCranking : 1; /** - offset 9480 bit 5 */ - bool_t isDigitalChartEnabled :1; + offset 9480 bit 5 */ + bool_t isDigitalChartEnabled : 1; /** - offset 9480 bit 6 */ - bool_t isCanEnabled :1; + offset 9480 bit 6 */ + bool_t isCanEnabled : 1; /** - offset 9480 bit 7 */ - bool_t hasCltSensor :1; + offset 9480 bit 7 */ + bool_t hasCltSensor : 1; /** - offset 9480 bit 8 */ - bool_t canReadEnabled :1; + offset 9480 bit 8 */ + bool_t canReadEnabled : 1; /** - offset 9480 bit 9 */ - bool_t canWriteEnabled :1; + offset 9480 bit 9 */ + bool_t canWriteEnabled : 1; /** - offset 9480 bit 10 */ - bool_t hasVehicleSpeedSensor :1; + offset 9480 bit 10 */ + bool_t hasVehicleSpeedSensor : 1; /** - offset 9480 bit 11 */ - bool_t isJoystickEnabled :1; + offset 9480 bit 11 */ + bool_t isJoystickEnabled : 1; /** - offset 9480 bit 12 */ - bool_t isGpsEnabled :1; + offset 9480 bit 12 */ + bool_t isGpsEnabled : 1; /** - offset 9480 bit 13 */ - bool_t hasMafSensor :1; + offset 9480 bit 13 */ + bool_t hasMafSensor : 1; /** - offset 9480 bit 14 */ - bool_t hasTpsSensor :1; + offset 9480 bit 14 */ + bool_t hasTpsSensor : 1; /** * offset 9484 */ @@ -949,47 +949,47 @@ typedef struct { */ idle_mode_e idleMode; /** - offset 9492 bit 0 */ - bool_t isInjectionEnabled :1; + offset 9492 bit 0 */ + bool_t isInjectionEnabled : 1; /** - offset 9492 bit 1 */ - bool_t isIgnitionEnabled :1; + offset 9492 bit 1 */ + bool_t isIgnitionEnabled : 1; /** - offset 9492 bit 2 */ - bool_t isCylinderCleanupEnabled :1; + offset 9492 bit 2 */ + bool_t isCylinderCleanupEnabled : 1; /** - offset 9492 bit 3 */ - bool_t secondTriggerChannelEnabled :1; + offset 9492 bit 3 */ + bool_t secondTriggerChannelEnabled : 1; /** - offset 9492 bit 4 */ - bool_t needSecondTriggerInput :1; + offset 9492 bit 4 */ + bool_t needSecondTriggerInput : 1; /** - offset 9492 bit 5 */ - bool_t isMapAveragingEnabled :1; + offset 9492 bit 5 */ + bool_t isMapAveragingEnabled : 1; /** - offset 9492 bit 6 */ - bool_t isMilEnabled :1; + offset 9492 bit 6 */ + bool_t isMilEnabled : 1; /** - offset 9492 bit 7 */ - bool_t isFuelPumpEnabled :1; + offset 9492 bit 7 */ + bool_t isFuelPumpEnabled : 1; /** - offset 9492 bit 8 */ - bool_t isTunerStudioEnabled :1; + offset 9492 bit 8 */ + bool_t isTunerStudioEnabled : 1; /** - offset 9492 bit 9 */ - bool_t isWaveAnalyzerEnabled :1; + offset 9492 bit 9 */ + bool_t isWaveAnalyzerEnabled : 1; /** - offset 9492 bit 10 */ - bool_t isIdleThreadEnabled :1; + offset 9492 bit 10 */ + bool_t isIdleThreadEnabled : 1; /** - offset 9492 bit 11 */ - bool_t isPrintTriggerSynchDetails :1; + offset 9492 bit 11 */ + bool_t isPrintTriggerSynchDetails : 1; /** * Usually if we have no trigger events that means engine is stopped * Unless we are troubleshooting and spinning the engine by hand - this case a longer * delay is needed - offset 9492 bit 12 */ - bool_t isManualSpinningMode :1; + offset 9492 bit 12 */ + bool_t isManualSpinningMode : 1; /** * offset 9496 */ @@ -1109,4 +1109,4 @@ typedef struct { } engine_configuration_s; // end -// this section was generated by config_definition.jar on Tue Jan 27 18:37:17 EST 2015 +// this section was generated by config_definition.jar on Wed Jan 28 18:53:51 EST 2015 diff --git a/firmware/controllers/algo/rusefi_types.h b/firmware/controllers/algo/rusefi_types.h index b424223264..86eb2d561a 100644 --- a/firmware/controllers/algo/rusefi_types.h +++ b/firmware/controllers/algo/rusefi_types.h @@ -83,4 +83,6 @@ typedef struct { ignition_table_t map; } full_i_table_s; +typedef int cylinders_count_t; + #endif /* CONTROLLERS_ALGO_RUSEFI_TYPES_H_ */ diff --git a/firmware/flash_openocd.bat b/firmware/flash_openocd.bat new file mode 100644 index 0000000000..7c79ff8a8c --- /dev/null +++ b/firmware/flash_openocd.bat @@ -0,0 +1 @@ +openocd-0.8.0.exe -f interface/stlink-v2.cfg -f board/stm32f4discovery.cfg -c init -c targets -c "halt" -c "flash write_image erase build/rusefi.elf" -c "verify_image firmware.elf" -c "reset run" -c shutdown