auto-sync
This commit is contained in:
parent
1c634db0f5
commit
80c188a679
|
@ -269,6 +269,8 @@ case FO_1_THEN_3_THEN_4_THEN2:
|
|||
return "FO_1_THEN_3_THEN_4_THEN2";
|
||||
case FO_1_THEN_5_THEN_3_THEN_6_THEN_2_THEN_4:
|
||||
return "FO_1_THEN_5_THEN_3_THEN_6_THEN_2_THEN_4";
|
||||
case FO_1_THEN_4_THEN_2_THEN_5_THEN_3_THEN_6:
|
||||
return "FO_1_THEN_4_THEN_2_THEN_5_THEN_3_THEN_6";
|
||||
case FO_ONE_CYLINDER:
|
||||
return "FO_ONE_CYLINDER";
|
||||
case Force_4b_firing_order:
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
// this section was generated by config_definition.jar on Wed Feb 11 16:24:32 EST 2015
|
||||
// this section was generated by config_definition.jar on Thu Feb 12 18:38:18 EST 2015
|
||||
// begin
|
||||
#include "rusefi_types.h"
|
||||
typedef struct {
|
||||
|
@ -1074,6 +1074,8 @@ typedef struct {
|
|||
*/
|
||||
le_formula_t timingAdditive;
|
||||
/**
|
||||
* kg/hour value.
|
||||
* By the way 2.081989116 kg/h = 1 ft³/m
|
||||
* offset 6200
|
||||
*/
|
||||
float mafDecoding[MAF_DECODING_COUNT];
|
||||
|
@ -1158,4 +1160,4 @@ typedef struct {
|
|||
} engine_configuration_s;
|
||||
|
||||
// end
|
||||
// this section was generated by config_definition.jar on Wed Feb 11 16:24:32 EST 2015
|
||||
// this section was generated by config_definition.jar on Thu Feb 12 18:38:18 EST 2015
|
||||
|
|
|
@ -257,12 +257,16 @@ typedef enum {
|
|||
FO_1_THEN_3_THEN_4_THEN2 = 1,
|
||||
FO_1_THEN_2_THEN_4_THEN3 = 2,
|
||||
FO_1_THEN_3_THEN_2_THEN4 = 3,
|
||||
// 6 cylinder
|
||||
FO_1_THEN_5_THEN_3_THEN_6_THEN_2_THEN_4 = 4,
|
||||
// 8 cylinder
|
||||
FO_1_8_4_3_6_5_7_2 = 5,
|
||||
// 5 cylinder
|
||||
FO_1_2_4_5_3 = 6,
|
||||
|
||||
// 6 cylinder
|
||||
FO_1_THEN_5_THEN_3_THEN_6_THEN_2_THEN_4 = 4,
|
||||
FO_1_THEN_4_THEN_2_THEN_5_THEN_3_THEN_6 = 7,
|
||||
|
||||
|
||||
Force_4b_firing_order = ENUM_32_BITS,
|
||||
} firing_order_e;
|
||||
|
||||
|
|
|
@ -286,6 +286,8 @@ static int order_1_THEN_3_THEN_4_THEN2[] = { 1, 3, 4, 2 };
|
|||
|
||||
static int order_1_THEN_5_THEN_3_THEN_6_THEN_2_THEN_4[] = { 1, 5, 3, 6, 2, 4 };
|
||||
|
||||
static int order_1_THEN_4_THEN_2_THEN_5_THEN_3_THEN_6[] = {1, 4, 2, 5, 3, 6};
|
||||
|
||||
static int order_1_8_4_3_6_5_7_2[] = { 1, 8, 4, 3, 6, 5, 7, 2 };
|
||||
|
||||
/**
|
||||
|
@ -301,6 +303,8 @@ int getCylinderId(firing_order_e firingOrder, int index) {
|
|||
return order_1_THEN_3_THEN_4_THEN2[index];
|
||||
case FO_1_THEN_5_THEN_3_THEN_6_THEN_2_THEN_4:
|
||||
return order_1_THEN_5_THEN_3_THEN_6_THEN_2_THEN_4[index];
|
||||
case FO_1_THEN_4_THEN_2_THEN_5_THEN_3_THEN_6:
|
||||
return order_1_THEN_4_THEN_2_THEN_5_THEN_3_THEN_6[index];
|
||||
case FO_1_8_4_3_6_5_7_2:
|
||||
return order_1_8_4_3_6_5_7_2[index];
|
||||
|
||||
|
|
|
@ -30,9 +30,12 @@ void setBosch0280218037(engine_configuration_s *engineConfiguration) {
|
|||
engineConfiguration->mafDecoding[i] = 738;
|
||||
engineConfiguration->mafDecodingBins[i++] = 4.98046875;
|
||||
|
||||
/**
|
||||
* unrealistic values just to make binary search happy
|
||||
*/
|
||||
while (i < MAF_DECODING_COUNT) {
|
||||
engineConfiguration->mafDecoding[i] = 738;
|
||||
engineConfiguration->mafDecodingBins[i] = 4.98046875 + i;
|
||||
engineConfiguration->mafDecoding[i] = 200;
|
||||
engineConfiguration->mafDecodingBins[i] = 10 + i;
|
||||
i++;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -2,6 +2,8 @@
|
|||
* @file maf.h
|
||||
* @brief
|
||||
*
|
||||
* by the way 2.081989116 kg/h = 1 ft³/m
|
||||
*
|
||||
*
|
||||
* @date Nov 15, 2013
|
||||
* @author Andrey Belomutskiy, (c) 2012-2015
|
||||
|
|
|
@ -473,7 +473,7 @@ custom pin_input_mode_e 4 scalar, F32, @OFFSET@, "ms", 1, 0, 0, 200, 1
|
|||
le_formula_t timingMultiplier;
|
||||
le_formula_t timingAdditive;
|
||||
|
||||
float[MAF_DECODING_COUNT] mafDecoding;;"kg/hour", 1, 0, -500.0, 4000.0, 2
|
||||
float[MAF_DECODING_COUNT] mafDecoding;kg/hour value.\nBy the way 2.081989116 kg/h = 1 ft³/m;"kg/hour", 1, 0, -500.0, 4000.0, 2
|
||||
float[MAF_DECODING_COUNT] mafDecodingBins;; "V", 1, 0, -5.0, 150.0, 2
|
||||
|
||||
|
||||
|
|
|
@ -37,7 +37,7 @@ enable2ndByteCanID = false
|
|||
|
||||
; see PAGE_0_SIZE in C source code
|
||||
; CONFIG_DEFINITION_START
|
||||
; this section was generated by ConfigDefinition.jar on Wed Feb 11 21:39:34 EST 2015
|
||||
; this section was generated by ConfigDefinition.jar on Thu Feb 12 18:38:19 EST 2015
|
||||
|
||||
pageSize = 15160
|
||||
page = 1
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
package com.irnems.core;
|
||||
|
||||
import com.irnems.FileLog;
|
||||
import com.rusefi.SensorConversion;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
|
||||
import javax.swing.*;
|
||||
|
@ -76,6 +77,9 @@ public class EngineState {
|
|||
SensorStats.startDelta(Sensor.INJECTOR_1_DWELL, Sensor.INJECTOR_2_DWELL, Sensor.INJ_1_2_DELTA);
|
||||
SensorStats.startDelta(Sensor.INJECTOR_3_DWELL, Sensor.INJECTOR_4_DWELL, Sensor.INJ_3_4_DELTA);
|
||||
|
||||
SensorStats.startConversion(Sensor.CLT, Sensor.CLT_F, SensorConversion.C_TO_F);
|
||||
SensorStats.startConversion(Sensor.IAT, Sensor.IAT_F, SensorConversion.C_TO_F);
|
||||
|
||||
registerStringValueAction("adcfast_co", NOTHING);
|
||||
registerStringValueAction("adcfast_max", NOTHING);
|
||||
registerStringValueAction("adcfast_min", NOTHING);
|
||||
|
|
|
@ -25,6 +25,9 @@ public enum Sensor {
|
|||
TPS("throttle", SensorCategory.SENSOR_INPUTS, "%", 100),
|
||||
VSS("Speed", SensorCategory.SENSOR_INPUTS, "kph", 100),
|
||||
|
||||
CLT_F("Coolant F", SensorCategory.SENSOR_INPUTS, "temperature, F", -40, 500),
|
||||
IAT_F("Intake Air F", SensorCategory.SENSOR_INPUTS, "temperature, F", -40, 350),
|
||||
|
||||
TRG_0_DUTY("trg0 duty", SensorCategory.SENSOR_INPUTS, "%", 100),
|
||||
TRG_1_DUTY("trg1 duty", SensorCategory.SENSOR_INPUTS, "%", 100),
|
||||
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
package com.irnems.core;
|
||||
|
||||
import com.rusefi.CyclicBuffer;
|
||||
import com.rusefi.SensorConversion;
|
||||
import com.rusefi.waves.WaveReport;
|
||||
|
||||
/**
|
||||
|
@ -9,7 +10,6 @@ import com.rusefi.waves.WaveReport;
|
|||
*/
|
||||
public class SensorStats {
|
||||
public static void start(final Sensor source, final Sensor destination) {
|
||||
|
||||
SensorCentral.getInstance().addListener(source, new SensorCentral.SensorListener() {
|
||||
|
||||
int counter;
|
||||
|
@ -34,8 +34,6 @@ public class SensorStats {
|
|||
}
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -58,7 +56,6 @@ public class SensorStats {
|
|||
}
|
||||
|
||||
public static void startDelta(Sensor input1, final Sensor input2, final Sensor destination) {
|
||||
final CyclicBuffer cb = new CyclicBuffer(30);
|
||||
SensorCentral.getInstance().addListener(input1, new SensorCentral.SensorListener() {
|
||||
@Override
|
||||
public void onSensorUpdate(double value) {
|
||||
|
@ -67,4 +64,14 @@ public class SensorStats {
|
|||
}
|
||||
});
|
||||
}
|
||||
|
||||
public static void startConversion(final Sensor source, final Sensor destination, final SensorConversion conversion) {
|
||||
SensorCentral.getInstance().addListener(source, new SensorCentral.SensorListener() {
|
||||
@Override
|
||||
public void onSensorUpdate(double value) {
|
||||
double converted = conversion.convertValue(value);
|
||||
SensorCentral.getInstance().setValue(converted, destination);
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
|
|
@ -0,0 +1,12 @@
|
|||
package com.rusefi;
|
||||
|
||||
public interface SensorConversion {
|
||||
SensorConversion C_TO_F = new SensorConversion() {
|
||||
@Override
|
||||
public double convertValue(double c) {
|
||||
return c * 9 / 5 + 32;
|
||||
}
|
||||
};
|
||||
|
||||
double convertValue(double value);
|
||||
}
|
|
@ -23,7 +23,7 @@ import static com.rusefi.ui.storage.PersistentConfiguration.getConfig;
|
|||
* @see WavePanel
|
||||
*/
|
||||
public class Launcher extends FrameHelper {
|
||||
public static final int CONSOLE_VERSION = 20150211;
|
||||
public static final int CONSOLE_VERSION = 20150212;
|
||||
public static final boolean SHOW_STIMULATOR = true;
|
||||
public static final String TAB_INDEX = "main_tab";
|
||||
private final String port;
|
||||
|
|
|
@ -24,10 +24,10 @@ import java.util.Hashtable;
|
|||
public class SensorGauge {
|
||||
|
||||
public static Component createGauge(final Sensor sensor) {
|
||||
return createGauge2(sensor, null);
|
||||
return createGauge(sensor, null);
|
||||
}
|
||||
|
||||
private static Component createGauge2(Sensor sensor, GaugeChangeListener listener) {
|
||||
private static Component createGauge(Sensor sensor, GaugeChangeListener listener) {
|
||||
JPanel wrapper = new JPanel(new BorderLayout());
|
||||
|
||||
createGaugeBody(sensor, wrapper, listener);
|
||||
|
@ -105,7 +105,7 @@ public class SensorGauge {
|
|||
ds.onChange(sensor);
|
||||
}
|
||||
};
|
||||
ds.content.add(createGauge2(sensor, listener), BorderLayout.CENTER);
|
||||
ds.content.add(createGauge(sensor, listener), BorderLayout.CENTER);
|
||||
ds.content.add(ds.mockControlPanel, BorderLayout.SOUTH);
|
||||
|
||||
|
||||
|
@ -113,7 +113,7 @@ public class SensorGauge {
|
|||
ds.show(e);
|
||||
}
|
||||
|
||||
final static Hashtable<Integer, JComponent> SLIDER_LABELS = new Hashtable<Integer, JComponent>();
|
||||
final static Hashtable<Integer, JComponent> SLIDER_LABELS = new Hashtable<>();
|
||||
|
||||
static {
|
||||
Format f = new DecimalFormat("0.0");
|
||||
|
|
Loading…
Reference in New Issue