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

fixing mock voltage controls

This commit is contained in:
rusefi 2019-05-01 09:36:29 -04:00
parent 55cf1083f9
commit 1ad0df904e
6 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
firmware/controllers/algo/rusefi_generated.h
View File

@ -1406,6 +1406,7 @@
#define mc33972spiDevice_offset_hex fc0
#define measureMapOnlyInOneCylinder_offset 744
#define measureMapOnlyInOneCylinder_offset_hex 2e8
#define MOCK_IAT_COMMAND "mock_iat_voltage"
#define NARROW_BAND_WIDE_BAND_CONVERSION_SIZE 8
#define narrowToWideOxygen_offset 2320
#define narrowToWideOxygen_offset_hex 910

2
firmware/controllers/settings.cpp
View File

@ -1141,7 +1141,7 @@ typedef struct {
const command_f_s commandsF[] = {
#if EFI_ENGINE_CONTROL && EFI_ENABLE_MOCK_ADC
{"mock_iat_voltage", setMockIatVoltage},
{MOCK_IAT_COMMAND, setMockIatVoltage},
{"mock_pedal_position", setMockPedalPosition},
{"mock_maf_voltage", setMockMafVoltage},
{"mock_afr_voltage", setMockAfrVoltage},

2
firmware/integration/rusefi_config.txt
View File

@ -1118,6 +1118,8 @@ float[FSIO_TABLE_8] fsioTable4RpmBins;RPM is float and not integer in order to u
end_struct
#define MOCK_IAT_COMMAND "mock_iat_voltage"
#define GAUGE_NAME_VERSION "firmware"
#define GAUGE_NAME_VVT "VVT postion"
#define GAUGE_NAME_TIMING_ADVANCE "timing"

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

@ -1,6 +1,6 @@
package com.rusefi.config;
// this file was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sun Apr 28 23:03:20 EDT 2019
// this file was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Wed May 01 09:30:56 EDT 2019
public class Fields {
public static final int accelerometerSpiDevice_offset = 2736;
public static final int acCutoffHighRpm_offset = 1498;
@ -918,6 +918,7 @@ public class Fields {
public static final int mc33972_csPinMode_offset = 678;
public static final int mc33972spiDevice_offset = 4032;
public static final int measureMapOnlyInOneCylinder_offset = 744;
public static final String MOCK_IAT_COMMAND = "mock_iat_voltage";
public static final int NARROW_BAND_WIDE_BAND_CONVERSION_SIZE = 8;
public static final int narrowToWideOxygen_offset = 2320;
public static final int narrowToWideOxygen_offset_hex = 910;

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

@ -45,7 +45,7 @@ import static com.rusefi.ui.storage.PersistentConfiguration.getConfig;
* @see EngineSnifferPanel
*/
public class Launcher {
public static final int CONSOLE_VERSION = 20190430;
public static final int CONSOLE_VERSION = 20190501;
public static final boolean SHOW_STIMULATOR = false;
private static final String TAB_INDEX = "main_tab";
protected static final String PORT_KEY = "port";

13
java_console/ui/src/com/rusefi/ui/widgets/DetachedSensor.java
View File

@ -1,5 +1,6 @@
package com.rusefi.ui.widgets;
import com.rusefi.config.Fields;
import com.rusefi.core.Sensor;
import com.rusefi.io.CommandQueue;
import com.rusefi.io.LinkManager;
@ -27,7 +28,15 @@ import java.util.Hashtable;
public class DetachedSensor {
private static final String NAME = "name";
private static final String WIDTH = "width";
private static final Collection<Sensor> MOCKABLE = Arrays.asList(Sensor.CLT, Sensor.AFR, Sensor.IAT, Sensor.MAF,
/**
* @see Fields#MOCK_IAT_COMMAND
*/
private static final Collection<Sensor> MOCKABLE = Arrays.asList(
Sensor.CLT,
Sensor.AFR,
Sensor.IAT,
Sensor.MAF,
Sensor.MAP,
Sensor.TPS);
private final static Hashtable<Integer, JComponent> SLIDER_LABELS = new Hashtable<>();
@ -127,7 +136,7 @@ public class DetachedSensor {
@Override
public void stateChanged(ChangeEvent e) {
double value = slider.getValue() / 10.0;
CommandQueue.getInstance().write("set_mock_" + sensor.name().toLowerCase() + "_voltage " + value);
CommandQueue.getInstance().write("set mock_" + sensor.name().toLowerCase() + "_voltage " + value);
}
});