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

updated injector scaler 

git-svn-id: https://svn2.assembla.com/svn/romraider/trunk@17 38686702-15cf-42e4-a595-3071df8bf5ea
This commit is contained in:
kascade 2008-04-06 06:28:13 +00:00
parent 3e7e64a587
commit 60dddfab9e
3 changed files with 16925 additions and 12305 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29211
logger.xml
View File

File diff suppressed because it is too large Load Diff

10
src/enginuity/logger/ecu/ui/handler/injector/InjectorUpdateHandler.java
View File

@ -8,7 +8,8 @@ import javax.swing.SwingUtilities;
import java.util.Set;
public final class InjectorUpdateHandler implements DataUpdateHandler {
private static final String PULSE_WIDTH = "P21";
private static final String PULSE_WIDTH_16 = "E28";
private static final String PULSE_WIDTH_32 = "E60";
private static final String ENGINE_LOAD_16 = "E2";
private static final String ENGINE_LOAD_32 = "E26";
private InjectorTab injectorTab;
@ -17,8 +18,9 @@ public final class InjectorUpdateHandler implements DataUpdateHandler {
}
public synchronized void handleDataUpdate(Response response) {
if (injectorTab.isRecordData() && containsData(response, PULSE_WIDTH)
&& (containsData(response, ENGINE_LOAD_16) || containsData(response, ENGINE_LOAD_32))) {
if (injectorTab.isRecordData()
&& (containsData(response, PULSE_WIDTH_16, ENGINE_LOAD_16)
|| containsData(response, PULSE_WIDTH_32, ENGINE_LOAD_32))) {
boolean valid = true;
// cl/ol check
@ -76,7 +78,7 @@ public final class InjectorUpdateHandler implements DataUpdateHandler {
}
if (valid) {
final double pulseWidth = findValue(response, PULSE_WIDTH);
final double pulseWidth = containsData(response, PULSE_WIDTH_16) ? findValue(response, PULSE_WIDTH_16) : findValue(response, PULSE_WIDTH_32);
double load = containsData(response, ENGINE_LOAD_16) ? findValue(response, ENGINE_LOAD_16) : findValue(response, ENGINE_LOAD_32);
double stoichAfr = injectorTab.getFuelStoichAfr();
double density = injectorTab.getFuelDensity();

9
src/enginuity/logger/ecu/ui/tab/injector/InjectorControlPanel.java
View File

@ -46,10 +46,11 @@ public final class InjectorControlPanel extends JPanel {
private static final String ENGINE_SPEED = "P8";
private static final String INTAKE_AIR_TEMP = "P11";
private static final String MASS_AIR_FLOW = "P12";
private static final String PULSE_WIDTH = "P21";
private static final String AFR = "P58";
private static final String CL_OL_16 = "E3";
private static final String CL_OL_32 = "E27";
private static final String PULSE_WIDTH_16 = "E28";
private static final String PULSE_WIDTH_32 = "E60";
private static final String TIP_IN_THROTTLE_16 = "E23";
private static final String TIP_IN_THROTTLE_32 = "E49";
private static final String ENGINE_LOAD_16 = "E2";
@ -61,7 +62,7 @@ public final class InjectorControlPanel extends JPanel {
private final JTextField afrMax = new JTextField("16.0", 3);
private final JTextField rpmMin = new JTextField("0", 3);
private final JTextField rpmMax = new JTextField("4500", 3);
private final JTextField mafMin = new JTextField("0", 3);
private final JTextField mafMin = new JTextField("20", 3);
private final JTextField mafMax = new JTextField("100", 3);
private final JTextField iatMin = new JTextField("25", 3);
private final JTextField iatMax = new JTextField("35", 3);
@ -259,9 +260,9 @@ public final class InjectorControlPanel extends JPanel {
recordDataButton.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent actionEvent) {
if (recordDataButton.isSelected()) {
registerData(COOLANT_TEMP, ENGINE_SPEED, INTAKE_AIR_TEMP, MASS_AIR_FLOW, AFR, CL_OL_16, CL_OL_32, TIP_IN_THROTTLE_16, TIP_IN_THROTTLE_32, PULSE_WIDTH, ENGINE_LOAD_16, ENGINE_LOAD_32);
registerData(COOLANT_TEMP, ENGINE_SPEED, INTAKE_AIR_TEMP, MASS_AIR_FLOW, AFR, CL_OL_16, CL_OL_32, TIP_IN_THROTTLE_16, TIP_IN_THROTTLE_32, PULSE_WIDTH_16, PULSE_WIDTH_32, ENGINE_LOAD_16, ENGINE_LOAD_32);
} else {
deregisterData(COOLANT_TEMP, ENGINE_SPEED, INTAKE_AIR_TEMP, MASS_AIR_FLOW, AFR, CL_OL_16, CL_OL_32, TIP_IN_THROTTLE_16, TIP_IN_THROTTLE_32, PULSE_WIDTH, ENGINE_LOAD_16, ENGINE_LOAD_32);
deregisterData(COOLANT_TEMP, ENGINE_SPEED, INTAKE_AIR_TEMP, MASS_AIR_FLOW, AFR, CL_OL_16, CL_OL_32, TIP_IN_THROTTLE_16, TIP_IN_THROTTLE_32, PULSE_WIDTH_16, PULSE_WIDTH_32, ENGINE_LOAD_16, ENGINE_LOAD_32);
}
}
});