From 8fa4b62f617f9b34184e95f8bdd9f7f78c7f884e Mon Sep 17 00:00:00 2001 From: rusEfi Date: Fri, 8 May 2015 08:09:13 -0400 Subject: [PATCH] auto-sync --- .../engine_configuration_generated_structures.h | 14 ++++---------- firmware/integration/rusefi_config.txt | 3 +-- firmware/tunerstudio/rusefi.ini | 5 ++--- 3 files changed, 7 insertions(+), 15 deletions(-) diff --git a/firmware/controllers/algo/engine_configuration_generated_structures.h b/firmware/controllers/algo/engine_configuration_generated_structures.h index a2a4b8977f..e5948c63bc 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 Thu May 07 22:03:25 EDT 2015 +// this section was generated by config_definition.jar on Fri May 08 07:42:51 EDT 2015 // begin #include "rusefi_types.h" typedef struct { @@ -652,14 +652,8 @@ typedef struct { /** * Should the trigger emulator push data right into trigger input, eliminating the need for physical jumper wires? * PS: Funny name, right? :) - * todo: make this a bit on some bit field - * offset 80 - */ - int16_t directSelfStimulation; - /** - * offset 82 - */ - uint16_t unused334; + offset 80 bit 0 */ + bool_t directSelfStimulation : 1; /** * todo: extract these two fields into a structure * todo: we need two sets of TPS parameters - modern ETBs have two sensors @@ -1292,4 +1286,4 @@ typedef struct { } persistent_config_s; // end -// this section was generated by config_definition.jar on Thu May 07 22:03:25 EDT 2015 +// this section was generated by config_definition.jar on Fri May 08 07:42:51 EDT 2015 diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index 3a7c16502b..604cd37aaf 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -110,8 +110,7 @@ end_struct injector_s injector -int16_t directSelfStimulation;Should the trigger emulator push data right into trigger input, eliminating the need for physical jumper wires?\nPS: Funny name, right? :)\ntodo: make this a bit on some bit field -uint16_t unused334; +bit directSelfStimulation;Should the trigger emulator push data right into trigger input, eliminating the need for physical jumper wires?\nPS: Funny name, right? :) int16_t tpsMin;todo: extract these two fields into a structure\ntodo: we need two sets of TPS parameters - modern ETBs have two sensors;"ADC", 1, 0, 0, 1023, 0 int16_t tpsMax;tpsMax value as 10 bit ADC value. Not Voltage!;"ADC", 1, 0, 0, 1023, 0 diff --git a/firmware/tunerstudio/rusefi.ini b/firmware/tunerstudio/rusefi.ini index af7c7bddbf..1a734befe5 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 Thu May 07 22:03:26 EDT 2015 +; this section was generated by ConfigDefinition.jar on Fri May 08 07:42:56 EDT 2015 pageSize = 15288 page = 1 @@ -50,8 +50,7 @@ page = 1 injector_lag = scalar, F32, 12, "msec", 1, 0, -10, 25.50, 2 injector_battLagCorrBins = array, F32, 16, [8], "V", 1, 0, 0.0, 20.0, 2 injector_battLagCorr = array, F32, 48, [8], "ms/V", 1, 0, 0.0, 50.0, 2 -;skipping directSelfStimulation offset 80 -;skipping unused334 offset 82 + directSelfStimulation = bits, U32, 80, [0:0], "false", "true" tpsMin = scalar, S16, 84, "ADC", 1, 0, 0, 1023, 0 tpsMax = scalar, S16, 86, "ADC", 1, 0, 0, 1023, 0 tpsErrorLowValue = scalar, S16, 88, "*C", 1, 0, -40, 200, 1