From a3b7115a7f55de4f5594ac0efd01595ed5f1e6b2 Mon Sep 17 00:00:00 2001 From: rusEfi Date: Wed, 8 Apr 2015 21:07:52 -0500 Subject: [PATCH] auto-sync --- .../algo/engine_configuration_generated_structures.h | 8 ++++++-- firmware/controllers/trigger/trigger_central.cpp | 4 ++-- firmware/integration/rusefi_config.txt | 4 +++- firmware/tunerstudio/rusefi.ini | 4 ++-- 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/firmware/controllers/algo/engine_configuration_generated_structures.h b/firmware/controllers/algo/engine_configuration_generated_structures.h index d0e5d16cfe..afa8344083 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 Sun Apr 05 16:35:24 EDT 2015 +// this section was generated by config_definition.jar on Wed Apr 08 21:53:21 EDT 2015 // begin #include "rusefi_types.h" typedef struct { @@ -998,6 +998,10 @@ typedef struct { /** offset 1500 bit 13 */ bool_t twoWireBatch : 1; + /** + * See #172 + offset 1500 bit 14 */ + bool_t useOnlyFrontForTrigger : 1; /** * offset 1504 */ @@ -1251,4 +1255,4 @@ typedef struct { } persistent_config_s; // end -// this section was generated by config_definition.jar on Sun Apr 05 16:35:24 EDT 2015 +// this section was generated by config_definition.jar on Wed Apr 08 21:53:21 EDT 2015 diff --git a/firmware/controllers/trigger/trigger_central.cpp b/firmware/controllers/trigger/trigger_central.cpp index 8ad4843e41..41a737bc53 100644 --- a/firmware/controllers/trigger/trigger_central.cpp +++ b/firmware/controllers/trigger/trigger_central.cpp @@ -236,9 +236,9 @@ void triggerInfo(Engine *engine) { TriggerShape *ts = &engine->triggerShape; - scheduleMsg(logger, "Template %s (%d) trigger %s (%d)", getConfigurationName(engineConfiguration->engineType), + scheduleMsg(logger, "Template %s (%d) trigger %s (%d) useRiseEdge=%s only=", getConfigurationName(engineConfiguration->engineType), engineConfiguration->engineType, getTrigger_type_e(engineConfiguration->trigger.type), - engineConfiguration->trigger.type); + engineConfiguration->trigger.type, boolToString(TRIGGER_SHAPE(useRiseEdge))); scheduleMsg(logger, "trigger#1 event counters up=%d/down=%d", triggerCentral.getHwEventCounter(0), triggerCentral.getHwEventCounter(1)); diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index 6f6fa7784e..dcd168d8ec 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -445,7 +445,9 @@ bit hasMapSensor;@see isMapAveragingEnabled bit isIdleThreadEnabled bit isPrintTriggerSynchDetails bit isManualSpinningMode;Usually if we have no trigger events that means engine is stopped\nUnless we are troubleshooting and spinning the engine by hand - this case a longer\ndelay is needed - bit twoWireBatch + bit twoWireBatch + + bit useOnlyFrontForTrigger;See #172 uint32_t digitalChartSize;;"count", 1, 0, 0, 300, 0 diff --git a/firmware/tunerstudio/rusefi.ini b/firmware/tunerstudio/rusefi.ini index 4de207aa0d..b406d142bc 100644 --- a/firmware/tunerstudio/rusefi.ini +++ b/firmware/tunerstudio/rusefi.ini @@ -40,7 +40,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated by ConfigDefinition.jar on Wed Apr 08 17:54:54 EDT 2015 +; this section was generated by ConfigDefinition.jar on Wed Apr 08 21:53:24 EDT 2015 pageSize = 15288 page = 1 @@ -414,6 +414,7 @@ page = 1 isPrintTriggerSynchDetails= bits, U32, 1500, [11:11], "false", "true" isManualSpinningMode = bits, U32, 1500, [12:12], "false", "true" twoWireBatch = bits, U32, 1500, [13:13], "false", "true" + useOnlyFrontForTrigger = bits, U32, 1500, [14:14], "false", "true" digitalChartSize = scalar, U32, 1504, "count", 1, 0, 0, 300, 0 ignitionDwellForCrankingMs = scalar, F32, 1508, "ms", 1, 0, 0, 200, 1 ;skipping targetIdleRpm offset 1512 @@ -946,7 +947,6 @@ fileVersion = { 20150406 } field = "accel length", accelLength field = "Accel threshold", accelEnrichmentThreshold field = "Accel Mult", accelEnrichmentMultiplier -; field = "Operation Mode", operationMode ; Engine->Trigger configuration dialog = triggerConfiguration, "Trigger configuration"