diff --git a/firmware/config/engines/mazda_miata_custom_hunchback.cpp b/firmware/config/engines/mazda_miata_custom_hunchback.cpp index b7281a4a2a..32c0895a58 100644 --- a/firmware/config/engines/mazda_miata_custom_hunchback.cpp +++ b/firmware/config/engines/mazda_miata_custom_hunchback.cpp @@ -22,6 +22,7 @@ EXTERN_CONFIG; +// todo: why would this not work? //extern const float mazda_miata_nb2_RpmBins[FUEL_RPM_COUNT]; //extern const float mazda_miata_nb2_LoadBins[FUEL_LOAD_COUNT]; diff --git a/firmware/config/engines/mazda_miata_vvt.cpp b/firmware/config/engines/mazda_miata_vvt.cpp index 545d6fa3cf..33d77f33fc 100644 --- a/firmware/config/engines/mazda_miata_vvt.cpp +++ b/firmware/config/engines/mazda_miata_vvt.cpp @@ -1,6 +1,7 @@ /* * @file mazda_miata_vvt.cpp * + * MAZDA_MIATA_2003 * set engine_type 47 * * @date Oct 4, 2016 @@ -264,7 +265,7 @@ static void setMazdaMiataEngineNB2Defaults(DECLARE_CONFIG_PARAMETER_SIGNATURE) { engineConfiguration->idleRpmPid.periodMs = 10; } // end of setMazdaMiataEngineNB2Defaults - +// MAZDA_MIATA_2003 void setMazdaMiata2003EngineConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE) { setFrankensoConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE); diff --git a/firmware/controllers/settings.cpp b/firmware/controllers/settings.cpp index 0dff6b4e40..a43afab3f1 100644 --- a/firmware/controllers/settings.cpp +++ b/firmware/controllers/settings.cpp @@ -1136,7 +1136,7 @@ static void getValue(const char *paramStr) { } #if EFI_RTC - else if (strEqualCaseInsensitive(paramStr, "date")) { + else if (strEqualCaseInsensitive(paramStr, CMD_DATE)) { printDateTime(); } #endif @@ -1357,7 +1357,7 @@ static void setValue(const char *paramStr, const char *valueStr) { } else if (strEqualCaseInsensitive(paramStr, "targetvbatt")) { engineConfiguration->targetVBatt = valueF; #if EFI_RTC - } else if (strEqualCaseInsensitive(paramStr, "date")) { + } else if (strEqualCaseInsensitive(paramStr, CMD_DATE)) { // rusEfi console invokes this method with timestamp in local timezone setDateTime(valueStr); #endif diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index 1060c72c8a..f01100d53f 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -1245,6 +1245,7 @@ end_struct #define CMD_TRIGGERINFO "triggerinfo" #define CMD_WRITECONFIG "writeconfig" +#define CMD_DATE "date" #define CMD_REBOOT "reboot" #define CMD_REBOOT_DFU "reboot_dfu" #define CMD_ENABLE "enable" 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 3d95b101e4..9c6630a0c1 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 Wed Sep 11 20:00:32 EDT 2019 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Fri Sep 20 18:08:52 EDT 2019 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -237,6 +237,7 @@ public class Fields { 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_DATE = "date"; public static final String CMD_DISABLE = "disable"; public static final String CMD_ENABLE = "enable"; public static final String CMD_REBOOT = "reboot"; @@ -366,7 +367,6 @@ public class Fields { public static final int firingOrder_offset_hex = 194; public static final int fixedModeTiming_offset = 452; public static final int fixedTiming_offset = 2204; - public static final int flexFuelSensor_offset = 3100; public static final int frequencyReportingMapInputPin_offset = 970; public static final int FSIO_ANALOG_INPUT_COUNT = 4; public static final int FSIO_COMMAND_COUNT = 16; @@ -1219,6 +1219,7 @@ public class Fields { public static final int unusedAnotherOne_offset = 744; public static final int unusedAtBoardConfigurationEnd_offset = 980; public static final int unusedErrorPin_offset = 2040; + public static final int unusedFlexFuelSensor_offset = 3100; public static final int unusedFormerWarmupAfrPid_offset = 1756; public static final int unusedh_offset = 1471; public static final int unusedMa2_offset = 711; @@ -1989,7 +1990,7 @@ public class Fields { public static final Field OILPRESSURE_V2 = Field.create("OILPRESSURE_V2", 2704, FieldType.FLOAT); public static final Field OILPRESSURE_VALUE2 = Field.create("OILPRESSURE_VALUE2", 2708, FieldType.FLOAT); public static final Field ACCELEROMETERSPIDEVICE = Field.create("ACCELEROMETERSPIDEVICE", 2712, FieldType.INT8); - public static final Field FLEXFUELSENSOR = Field.create("FLEXFUELSENSOR", 3100, FieldType.INT8, brain_input_pin_e); + public static final Field UNUSEDFLEXFUELSENSOR = Field.create("UNUSEDFLEXFUELSENSOR", 3100, FieldType.INT8); public static final Field TEST557PIN = Field.create("TEST557PIN", 3101, FieldType.INT8, brain_pin_e); public static final Field STEPPERDIRECTIONPINMODE = Field.create("STEPPERDIRECTIONPINMODE", 3102, FieldType.INT8, pin_output_mode_e); public static final Field EXTERNALKNOCKSENSEADC = Field.create("EXTERNALKNOCKSENSEADC", 3103, FieldType.INT8, adc_channel_e); @@ -2764,7 +2765,7 @@ public class Fields { OILPRESSURE_V2, OILPRESSURE_VALUE2, ACCELEROMETERSPIDEVICE, - FLEXFUELSENSOR, + UNUSEDFLEXFUELSENSOR, TEST557PIN, STEPPERDIRECTIONPINMODE, EXTERNALKNOCKSENSEADC, diff --git a/java_console/ui/src/com/rusefi/Launcher.java b/java_console/ui/src/com/rusefi/Launcher.java index 534e674df6..7b50fbaa96 100644 --- a/java_console/ui/src/com/rusefi/Launcher.java +++ b/java_console/ui/src/com/rusefi/Launcher.java @@ -48,7 +48,7 @@ import static com.rusefi.ui.storage.PersistentConfiguration.getConfig; * @see EngineSnifferPanel */ public class Launcher { - public static final int CONSOLE_VERSION = 20190914; + public static final int CONSOLE_VERSION = 20190919; public static final String INI_FILE_PATH = System.getProperty("ini_file_path", ".."); public static final String INPUT_FILES_PATH = System.getProperty("input_files_path", ".."); public static final String TOOLS_PATH = System.getProperty("tools_path", "."); @@ -254,7 +254,9 @@ public class Launcher { if (ConnectionStatus.INSTANCE.getValue() == ConnectionStatus.Value.CONNECTED) { long unixGmtTime = System.currentTimeMillis() / 1000L; long withOffset = unixGmtTime + TimeZone.getDefault().getOffset(System.currentTimeMillis()) / 1000; - CommandQueue.getInstance().write("set date " + withOffset, CommandQueue.DEFAULT_TIMEOUT, + CommandQueue.getInstance().write("set " + + Fields.CMD_DATE + + " " + withOffset, CommandQueue.DEFAULT_TIMEOUT, InvocationConfirmationListener.VOID, false); } }