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

refactoring "date" command and flex dead code

This commit is contained in:
rusefi 2019-09-20 18:12:56 -04:00
parent 6c8b2bd126
commit d95740467e
6 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
firmware/config/engines/mazda_miata_custom_hunchback.cpp
View File

@ -22,6 +22,7 @@
EXTERN_CONFIG; EXTERN_CONFIG;
// todo: why would this not work?
//extern const float mazda_miata_nb2_RpmBins[FUEL_RPM_COUNT]; //extern const float mazda_miata_nb2_RpmBins[FUEL_RPM_COUNT];
//extern const float mazda_miata_nb2_LoadBins[FUEL_LOAD_COUNT]; //extern const float mazda_miata_nb2_LoadBins[FUEL_LOAD_COUNT];

3
firmware/config/engines/mazda_miata_vvt.cpp
View File

@ -1,6 +1,7 @@
/* /*
* @file mazda_miata_vvt.cpp * @file mazda_miata_vvt.cpp
* *
* MAZDA_MIATA_2003
* set engine_type 47 * set engine_type 47
* *
* @date Oct 4, 2016 * @date Oct 4, 2016
@ -264,7 +265,7 @@ static void setMazdaMiataEngineNB2Defaults(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
engineConfiguration->idleRpmPid.periodMs = 10; engineConfiguration->idleRpmPid.periodMs = 10;
} // end of setMazdaMiataEngineNB2Defaults } // end of setMazdaMiataEngineNB2Defaults
// MAZDA_MIATA_2003
void setMazdaMiata2003EngineConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE) { void setMazdaMiata2003EngineConfiguration(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
setFrankensoConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE); setFrankensoConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE);

4
firmware/controllers/settings.cpp
View File

@ -1136,7 +1136,7 @@ static void getValue(const char *paramStr) {
} }
#if EFI_RTC #if EFI_RTC
else if (strEqualCaseInsensitive(paramStr, "date")) { else if (strEqualCaseInsensitive(paramStr, CMD_DATE)) {
printDateTime(); printDateTime();
} }
#endif #endif
@ -1357,7 +1357,7 @@ static void setValue(const char *paramStr, const char *valueStr) {
} else if (strEqualCaseInsensitive(paramStr, "targetvbatt")) { } else if (strEqualCaseInsensitive(paramStr, "targetvbatt")) {
engineConfiguration->targetVBatt = valueF; engineConfiguration->targetVBatt = valueF;
#if EFI_RTC #if EFI_RTC
} else if (strEqualCaseInsensitive(paramStr, "date")) { } else if (strEqualCaseInsensitive(paramStr, CMD_DATE)) {
// rusEfi console invokes this method with timestamp in local timezone // rusEfi console invokes this method with timestamp in local timezone
setDateTime(valueStr); setDateTime(valueStr);
#endif #endif

1
firmware/integration/rusefi_config.txt
View File

@ -1245,6 +1245,7 @@ end_struct
#define CMD_TRIGGERINFO "triggerinfo" #define CMD_TRIGGERINFO "triggerinfo"
#define CMD_WRITECONFIG "writeconfig" #define CMD_WRITECONFIG "writeconfig"
#define CMD_DATE "date"
#define CMD_REBOOT "reboot" #define CMD_REBOOT "reboot"
#define CMD_REBOOT_DFU "reboot_dfu" #define CMD_REBOOT_DFU "reboot_dfu"
#define CMD_ENABLE "enable" #define CMD_ENABLE "enable"

9
java_console/models/src/com/rusefi/config/generated/Fields.java
View File

@ -1,6 +1,6 @@
package com.rusefi.config.generated; 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 // by class com.rusefi.output.FileJavaFieldsConsumer
import com.rusefi.config.*; import com.rusefi.config.*;
@ -237,6 +237,7 @@ public class Fields {
public static final int clutchUpPinMode_offset = 971; 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_DOWN = "calibrate_pedal_down";
public static final String CMD_CALIBRATE_PEDAL_UP = "calibrate_pedal_up"; 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_DISABLE = "disable";
public static final String CMD_ENABLE = "enable"; public static final String CMD_ENABLE = "enable";
public static final String CMD_REBOOT = "reboot"; 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 firingOrder_offset_hex = 194;
public static final int fixedModeTiming_offset = 452; public static final int fixedModeTiming_offset = 452;
public static final int fixedTiming_offset = 2204; 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 frequencyReportingMapInputPin_offset = 970;
public static final int FSIO_ANALOG_INPUT_COUNT = 4; public static final int FSIO_ANALOG_INPUT_COUNT = 4;
public static final int FSIO_COMMAND_COUNT = 16; 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 unusedAnotherOne_offset = 744;
public static final int unusedAtBoardConfigurationEnd_offset = 980; public static final int unusedAtBoardConfigurationEnd_offset = 980;
public static final int unusedErrorPin_offset = 2040; 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 unusedFormerWarmupAfrPid_offset = 1756;
public static final int unusedh_offset = 1471; public static final int unusedh_offset = 1471;
public static final int unusedMa2_offset = 711; 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_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 OILPRESSURE_VALUE2 = Field.create("OILPRESSURE_VALUE2", 2708, FieldType.FLOAT);
public static final Field ACCELEROMETERSPIDEVICE = Field.create("ACCELEROMETERSPIDEVICE", 2712, FieldType.INT8); 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 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 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); public static final Field EXTERNALKNOCKSENSEADC = Field.create("EXTERNALKNOCKSENSEADC", 3103, FieldType.INT8, adc_channel_e);
@ -2764,7 +2765,7 @@ public class Fields {
OILPRESSURE_V2, OILPRESSURE_V2,
OILPRESSURE_VALUE2, OILPRESSURE_VALUE2,
ACCELEROMETERSPIDEVICE, ACCELEROMETERSPIDEVICE,
FLEXFUELSENSOR, UNUSEDFLEXFUELSENSOR,
TEST557PIN, TEST557PIN,
STEPPERDIRECTIONPINMODE, STEPPERDIRECTIONPINMODE,
EXTERNALKNOCKSENSEADC, EXTERNALKNOCKSENSEADC,

6
java_console/ui/src/com/rusefi/Launcher.java
View File

@ -48,7 +48,7 @@ import static com.rusefi.ui.storage.PersistentConfiguration.getConfig;
* @see EngineSnifferPanel * @see EngineSnifferPanel
*/ */
public class Launcher { 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 INI_FILE_PATH = System.getProperty("ini_file_path", "..");
public static final String INPUT_FILES_PATH = System.getProperty("input_files_path", ".."); public static final String INPUT_FILES_PATH = System.getProperty("input_files_path", "..");
public static final String TOOLS_PATH = System.getProperty("tools_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) { if (ConnectionStatus.INSTANCE.getValue() == ConnectionStatus.Value.CONNECTED) {
long unixGmtTime = System.currentTimeMillis() / 1000L; long unixGmtTime = System.currentTimeMillis() / 1000L;
long withOffset = unixGmtTime + TimeZone.getDefault().getOffset(System.currentTimeMillis()) / 1000; 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); InvocationConfirmationListener.VOID, false);
} }
} }