rusefi
/
rusefi-1
mirror of https://github.com/rusefi/rusefi-1.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

auto-sync

This commit is contained in:
rusEfi 2015-04-08 21:07:52 -05:00
parent 83da2b8afb
commit a3b7115a7f
4 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
firmware/controllers/algo/engine_configuration_generated_structures.h
View File

@ -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 // begin
#include "rusefi_types.h" #include "rusefi_types.h"
typedef struct { typedef struct {
@ -998,6 +998,10 @@ typedef struct {
/** /**
offset 1500 bit 13 */ offset 1500 bit 13 */
bool_t twoWireBatch : 1; bool_t twoWireBatch : 1;
/**
* See #172
offset 1500 bit 14 */
bool_t useOnlyFrontForTrigger : 1;
/** /**
* offset 1504 * offset 1504
*/ */
@ -1251,4 +1255,4 @@ typedef struct {
} persistent_config_s; } persistent_config_s;
// end // 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

4
firmware/controllers/trigger/trigger_central.cpp
View File

@ -236,9 +236,9 @@ void triggerInfo(Engine *engine) {
TriggerShape *ts = &engine->triggerShape; 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->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), scheduleMsg(logger, "trigger#1 event counters up=%d/down=%d", triggerCentral.getHwEventCounter(0),
triggerCentral.getHwEventCounter(1)); triggerCentral.getHwEventCounter(1));

4
firmware/integration/rusefi_config.txt
View File

@ -445,7 +445,9 @@ bit hasMapSensor;@see isMapAveragingEnabled
bit isIdleThreadEnabled bit isIdleThreadEnabled
bit isPrintTriggerSynchDetails 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 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 uint32_t digitalChartSize;;"count", 1, 0, 0, 300, 0

4
firmware/tunerstudio/rusefi.ini
View File

@ -40,7 +40,7 @@ enable2ndByteCanID = false
; see PAGE_0_SIZE in C source code ; see PAGE_0_SIZE in C source code
; CONFIG_DEFINITION_START ; 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 pageSize = 15288
page = 1 page = 1
@ -414,6 +414,7 @@ page = 1
isPrintTriggerSynchDetails= bits, U32, 1500, [11:11], "false", "true" isPrintTriggerSynchDetails= bits, U32, 1500, [11:11], "false", "true"
isManualSpinningMode = bits, U32, 1500, [12:12], "false", "true" isManualSpinningMode = bits, U32, 1500, [12:12], "false", "true"
twoWireBatch = bits, U32, 1500, [13:13], "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 digitalChartSize = scalar, U32, 1504, "count", 1, 0, 0, 300, 0
ignitionDwellForCrankingMs = scalar, F32, 1508, "ms", 1, 0, 0, 200, 1 ignitionDwellForCrankingMs = scalar, F32, 1508, "ms", 1, 0, 0, 200, 1
;skipping targetIdleRpm offset 1512 ;skipping targetIdleRpm offset 1512
@ -946,7 +947,6 @@ fileVersion = { 20150406 }
field = "accel length", accelLength field = "accel length", accelLength
field = "Accel threshold", accelEnrichmentThreshold field = "Accel threshold", accelEnrichmentThreshold
field = "Accel Mult", accelEnrichmentMultiplier field = "Accel Mult", accelEnrichmentMultiplier
; field = "Operation Mode", operationMode
; Engine->Trigger configuration ; Engine->Trigger configuration
dialog = triggerConfiguration, "Trigger configuration" dialog = triggerConfiguration, "Trigger configuration"