From e3010e1c7b89783e274927eb20eeed11e4318cbc Mon Sep 17 00:00:00 2001 From: rusefi Date: Tue, 16 May 2017 20:55:01 -0400 Subject: [PATCH] #4 --- firmware/controllers/algo/auto_generated_enums.cpp | 12 +----------- firmware/controllers/algo/auto_generated_enums.h | 1 - .../algo/engine_configuration_generated_structures.h | 6 +++--- firmware/controllers/algo/rusefi_enums.h | 6 ------ firmware/controllers/algo/rusefi_generated.h | 4 ++-- firmware/integration/rusefi_config.txt | 2 +- firmware/tunerstudio/rusefi.ini | 4 ++-- .../models/src/com/rusefi/config/Fields.java | 8 ++++---- 8 files changed, 13 insertions(+), 30 deletions(-) diff --git a/firmware/controllers/algo/auto_generated_enums.cpp b/firmware/controllers/algo/auto_generated_enums.cpp index 2dfb14f123..63f0de25fb 100644 --- a/firmware/controllers/algo/auto_generated_enums.cpp +++ b/firmware/controllers/algo/auto_generated_enums.cpp @@ -328,17 +328,7 @@ case IM_MANUAL: } return NULL; } -const char *getIdle_control_e(idle_control_e value){ -switch(value) { -case Force_4b_idle_control: - return "Force_4b_idle_control"; -case IC_PID: - return "IC_PID"; -case IC_LINEAR: - return "IC_LINEAR"; - } - return NULL; -} + const char *getPin_output_mode_e(pin_output_mode_e value){ switch(value) { case Force_4b_pin_output_mode: diff --git a/firmware/controllers/algo/auto_generated_enums.h b/firmware/controllers/algo/auto_generated_enums.h index 5091e33f6e..ae3659377b 100644 --- a/firmware/controllers/algo/auto_generated_enums.h +++ b/firmware/controllers/algo/auto_generated_enums.h @@ -18,7 +18,6 @@ const char *getDisplay_mode_e(display_mode_e value); const char *getLog_format_e(log_format_e value); const char *getIdle_mode_e(idle_mode_e value); const char *getPin_output_mode_e(pin_output_mode_e value); -const char *getIdle_control_e(idle_control_e value); const char *getGpio_mode_e(gpio_mode_e value); const char *getPin_input_mode_e(pin_input_mode_e value); const char *getFiring_order_e(firing_order_e value); diff --git a/firmware/controllers/algo/engine_configuration_generated_structures.h b/firmware/controllers/algo/engine_configuration_generated_structures.h index e0ba988f93..13a2bc710c 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 automatically by ConfigDefinition.jar based on rusefi_config.txt Mon May 15 04:47:12 EDT 2017 +// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Tue May 16 20:30:28 EDT 2017 // begin #ifndef ENGINE_CONFIGURATION_GENERATED_H_ #define ENGINE_CONFIGURATION_GENERATED_H_ @@ -1485,7 +1485,7 @@ typedef struct { /** * offset 1920 */ - idle_control_e idleControl; + int unusedIdleControl; /** * blue LED on discovery by default * offset 1924 @@ -2104,4 +2104,4 @@ typedef struct { #endif // end -// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Mon May 15 04:47:12 EDT 2017 +// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Tue May 16 20:30:28 EDT 2017 diff --git a/firmware/controllers/algo/rusefi_enums.h b/firmware/controllers/algo/rusefi_enums.h index 9d34a16031..602d55d172 100644 --- a/firmware/controllers/algo/rusefi_enums.h +++ b/firmware/controllers/algo/rusefi_enums.h @@ -351,12 +351,6 @@ typedef enum { Force_4b_idle_mode = ENUM_32_BITS, } idle_mode_e; -typedef enum { - IC_LINEAR = 0, - IC_PID = 1, - Force_4b_idle_control = ENUM_32_BITS, -} idle_control_e; - typedef enum { /** * GND for logical OFF, VCC for logical ON diff --git a/firmware/controllers/algo/rusefi_generated.h b/firmware/controllers/algo/rusefi_generated.h index 39e8948e5a..2d5f83cdbd 100644 --- a/firmware/controllers/algo/rusefi_generated.h +++ b/firmware/controllers/algo/rusefi_generated.h @@ -1031,8 +1031,8 @@ #define idleRpmPid_offset_offset_hex 778 #define idleDT_offset 1916 #define idleDT_offset_hex 77c -#define idleControl_offset 1920 -#define idleControl_offset_hex 780 +#define unusedIdleControl_offset 1920 +#define unusedIdleControl_offset_hex 780 #define communicationPin_offset 1924 #define communicationPin_offset_hex 784 #define runningPin_offset 1928 diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index bcea3bcda9..08e55829bb 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -693,7 +693,7 @@ custom pin_mode_e 4 bits, U32, @OFFSET@, [0:5], @@pin_mode_e_enum@@ int step1RpmWindow;RPMs prior to step1rpm point where ignition advance is retarded;"rpm", 1, 0, 0, 3000.0, 2 pid_s idleRpmPid; int idleDT; - idle_control_e idleControl; + int unusedIdleControl; brain_pin_e communicationPin;blue LED on discovery by default brain_pin_e runningPin;green LED on discovery by default brain_pin_e binarySerialTxPin; diff --git a/firmware/tunerstudio/rusefi.ini b/firmware/tunerstudio/rusefi.ini index 18aa846062..d83c4c1045 100644 --- a/firmware/tunerstudio/rusefi.ini +++ b/firmware/tunerstudio/rusefi.ini @@ -45,7 +45,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Mon May 15 20:14:12 EDT 2017 +; this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Tue May 16 20:30:28 EDT 2017 pageSize = 16376 page = 1 @@ -520,7 +520,7 @@ page = 1 idleRpmPid_dFactor = scalar, F32, 1908, "value", 1, 0, -1000, 1000, 5 idleRpmPid_offset = scalar, F32, 1912, "value", 1, 0, 0, 1000, 3 ;skipping idleDT offset 1916 -;skipping idleControl offset 1920 +;skipping unusedIdleControl offset 1920 communicationPin = bits, U32, 1924, [0:6], "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "NONE", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" runningPin = bits, U32, 1928, [0:6], "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "NONE", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" binarySerialTxPin = bits, U32, 1932, [0:6], "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "NONE", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" diff --git a/java_console/models/src/com/rusefi/config/Fields.java b/java_console/models/src/com/rusefi/config/Fields.java index 62cce4fb75..bc7816cd11 100644 --- a/java_console/models/src/com/rusefi/config/Fields.java +++ b/java_console/models/src/com/rusefi/config/Fields.java @@ -1,6 +1,6 @@ package com.rusefi.config; -// this file was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Mon May 15 20:14:12 EDT 2017 +// this file was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Tue May 16 20:30:28 EDT 2017 public class Fields { public static final int LE_COMMAND_LENGTH = 200; public static final int FSIO_ADC_COUNT = 4; @@ -747,8 +747,8 @@ public class Fields { public static final int idleRpmPid_offset_offset = 1912; public static final int idleRpmPid_offset_offset_hex = 778; public static final int idleDT_offset = 1916; - public static final int idleControl_offset = 1920; - public static final int idleControl_offset_hex = 780; + public static final int unusedIdleControl_offset = 1920; + public static final int unusedIdleControl_offset_hex = 780; public static final int communicationPin_offset = 1924; public static final int communicationPin_offset_hex = 784; public static final int runningPin_offset = 1928; @@ -1523,7 +1523,7 @@ public class Fields { public static final Field IDLERPMPID_DFACTOR = Field.create("IDLERPMPID_DFACTOR", 1908, FieldType.FLOAT); public static final Field IDLERPMPID_OFFSET = Field.create("IDLERPMPID_OFFSET", 1912, FieldType.FLOAT); public static final Field IDLEDT = Field.create("IDLEDT", 1916, FieldType.INT); - public static final Field IDLECONTROL = Field.create("IDLECONTROL", 1920, FieldType.INT); + public static final Field UNUSEDIDLECONTROL = Field.create("UNUSEDIDLECONTROL", 1920, FieldType.INT); public static final Field COMMUNICATIONPIN = Field.create("COMMUNICATIONPIN", 1924, FieldType.INT, brain_pin_e); public static final Field RUNNINGPIN = Field.create("RUNNINGPIN", 1928, FieldType.INT, brain_pin_e); public static final Field BINARYSERIALTXPIN = Field.create("BINARYSERIALTXPIN", 1932, FieldType.INT, brain_pin_e);