From b51e79357eb4efeb9a654b62c57f5226953f11dd Mon Sep 17 00:00:00 2001 From: rusefi Date: Mon, 2 Sep 2019 22:57:40 -0400 Subject: [PATCH] refactoring: extracting magic command constant --- firmware/controllers/generated/rusefi_generated.h | 2 ++ firmware/controllers/settings.cpp | 4 ++-- firmware/integration/rusefi_config.txt | 3 +++ .../models/src/com/rusefi/config/generated/Fields.java | 4 +++- java_console/ui/src/com/rusefi/ui/etb/CalibrationPanel.java | 5 +++-- 5 files changed, 13 insertions(+), 5 deletions(-) diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h index 2960d0ae8b..71831672e0 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -364,6 +364,8 @@ #define clutchUpPinInverted_offset_hex 3d0 #define clutchUpPinMode_offset 971 #define clutchUpPinMode_offset_hex 3cb +#define CMD_CALIBRATE_PEDAL_DOWN "calibrate_pedal_down" +#define CMD_CALIBRATE_PEDAL_UP "calibrate_pedal_up" #define CMD_DISABLE "disable" #define CMD_ENABLE "enable" #define CMD_REBOOT "reboot" diff --git a/firmware/controllers/settings.cpp b/firmware/controllers/settings.cpp index 343243a2d5..03b4e020a1 100644 --- a/firmware/controllers/settings.cpp +++ b/firmware/controllers/settings.cpp @@ -1370,8 +1370,8 @@ void initSettings(void) { addConsoleAction("tpsinfo", printTPSInfo); addConsoleAction("calibrate_tps_1_closed", grabTPSIsClosed); addConsoleAction("calibrate_tps_1_wot", grabTPSIsWideOpen); - addConsoleAction("calibrate_pedal_up", grabPedalIsUp); - addConsoleAction("calibrate_pedal_down", grabPedalIsWideOpen); + addConsoleAction(CMD_CALIBRATE_PEDAL_UP, grabPedalIsUp); + addConsoleAction(CMD_CALIBRATE_PEDAL_DOWN, grabPedalIsWideOpen); addConsoleAction("info", printAllInfo); addConsoleAction("set_one_coil_ignition", setOneCoilIgnition); diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index 6e86f0de2d..3fd36aae39 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -1237,6 +1237,9 @@ end_struct #define GAUGE_NAME_DEBUG_I5 "debug i5" +#define CMD_CALIBRATE_PEDAL_UP "calibrate_pedal_up" +#define CMD_CALIBRATE_PEDAL_DOWN "calibrate_pedal_down" + #define CMD_TRIGGERINFO "triggerinfo" #define CMD_WRITECONFIG "writeconfig" #define CMD_REBOOT "reboot" diff --git a/java_console/models/src/com/rusefi/config/generated/Fields.java b/java_console/models/src/com/rusefi/config/generated/Fields.java index 4e32669b8a..c5c6020ff6 100644 --- a/java_console/models/src/com/rusefi/config/generated/Fields.java +++ b/java_console/models/src/com/rusefi/config/generated/Fields.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Mon Sep 02 00:13:32 EDT 2019 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Mon Sep 02 22:52:53 EDT 2019 // by class com.rusefi.output.JavaFieldsConsumer import com.rusefi.config.*; @@ -234,6 +234,8 @@ public class Fields { public static final int clutchUpPin_offset = 969; public static final int clutchUpPinInverted_offset = 976; public static final int clutchUpPinMode_offset = 971; + public static final String CMD_CALIBRATE_PEDAL_DOWN = "calibrate_pedal_down"; + public static final String CMD_CALIBRATE_PEDAL_UP = "calibrate_pedal_up"; public static final String CMD_DISABLE = "disable"; public static final String CMD_ENABLE = "enable"; public static final String CMD_REBOOT = "reboot"; diff --git a/java_console/ui/src/com/rusefi/ui/etb/CalibrationPanel.java b/java_console/ui/src/com/rusefi/ui/etb/CalibrationPanel.java index c47cd17b60..e425e3883b 100644 --- a/java_console/ui/src/com/rusefi/ui/etb/CalibrationPanel.java +++ b/java_console/ui/src/com/rusefi/ui/etb/CalibrationPanel.java @@ -1,5 +1,6 @@ package com.rusefi.ui.etb; +import com.rusefi.config.generated.Fields; import com.rusefi.io.CommandQueue; import org.jetbrains.annotations.NotNull; import org.putgemin.VerticalFlowLayout; @@ -18,8 +19,8 @@ public class CalibrationPanel { content.add(createCommandButton("Grab TPS#1 fully closed", "calibrate_tps_1_closed")); content.add(createCommandButton("Grab TPS#1 Wide Open", "calibrate_tps_1_wot")); - content.add(createCommandButton("Grab Pedal Up", "calibrate_pedal_up")); - content.add(createCommandButton("Grab Pedal Down", "calibrate_pedal_down")); + content.add(createCommandButton("Grab Pedal Up", Fields.CMD_CALIBRATE_PEDAL_UP)); + content.add(createCommandButton("Grab Pedal Down", Fields.CMD_CALIBRATE_PEDAL_DOWN)); } @NotNull