auto-sync

This commit is contained in:
rusEfi 2015-03-01 11:07:24 -06:00
parent 4a9c3209b9
commit bf0ad6291e
7 changed files with 61 additions and 41 deletions

View File

@ -23,7 +23,7 @@ void setCustomEngineConfiguration(DECLARE_ENGINE_PARAMETER_F) {
/**
* Frankenso analog #1 PC2 ADC12 CLT
* Frankenso analog #2 PC1 ADC11 IAT
* Frankenso analog #3 PA0 ADC0
* Frankenso analog #3 PA0 ADC0 MAP
* Frankenso analog #4 PC3 ADC13 WBO / O2
* Frankenso analog #5 PA2 ADC2 TPS
* Frankenso analog #6 PA1 ADC1
@ -36,8 +36,10 @@ void setCustomEngineConfiguration(DECLARE_ENGINE_PARAMETER_F) {
*/
engineConfiguration->tpsAdcChannel = EFI_ADC_2;
boardConfiguration->adcHwChannelEnabled[4] = ADC_FAST;
engineConfiguration->map.sensor.hwChannel = EFI_ADC_4;
boardConfiguration->adcHwChannelEnabled[0] = ADC_FAST;
engineConfiguration->map.sensor.hwChannel = EFI_ADC_0;
boardConfiguration->adcHwChannelEnabled[4] = ADC_SLOW;
engineConfiguration->cltAdcChannel = EFI_ADC_12;
engineConfiguration->iatAdcChannel = EFI_ADC_11;

View File

@ -97,6 +97,8 @@ static FastInterpolation *getDecoder(air_pressure_sensor_type_e type) {
return &honda3bar;
case MT_DODGE_NEON_2003:
return &dodgeNeon2003;
case MT_SUBY_DENSO:
return &subyDenso;
default:
firmwareError("Unknown MAP type: %d", type);
return &customMap;

View File

@ -30,14 +30,13 @@ LIBS:atmel
LIBS:contrib
LIBS:valves
LIBS:vnd5e025aktr
LIBS:PowerSSO-24_breakout-cache
EELAYER 27 0
EELAYER END
$Descr A 11000 8500
encoding utf-8
Sheet 1 1
Title "pOWERsso-24 breakout"
Date "4 jan 2015"
Date "1 mar 2015"
Rev "R0.1"
Comp "rusEFI"
Comment1 ""
@ -402,48 +401,48 @@ Wire Notes Line
Text Notes 9950 4700 0 60 ~ 0
ALTERNATOR\n FIELD
Wire Notes Line
9050 4150 10050 4150
9050 5650 10050 5650
Wire Notes Line
10050 4300 10050 4000
10050 5800 10050 5500
Wire Notes Line
10100 4250 10100 4050
10100 5750 10100 5550
Wire Notes Line
10150 4200 10150 4100
Text Notes 9750 5800 0 60 ~ 0
10150 5700 10150 5600
Text Notes 9750 4250 0 60 ~ 0
BAT
Wire Notes Line
9750 5650 9750 5700
9750 4100 9750 4150
Wire Notes Line
9050 5650 9750 5650
9050 4100 9750 4100
Wire Notes Line
9700 5650 9700 5700
9700 4100 9700 4150
Wire Notes Line
9700 5700 9650 5700
9700 4150 9650 4150
Wire Notes Line
9650 5700 9650 5850
9650 4150 9650 4300
Wire Notes Line
9650 5850 10000 5850
9650 4300 10000 4300
Wire Notes Line
10000 5850 10000 5700
10000 4300 10000 4150
Wire Notes Line
10000 5700 9950 5700
10000 4150 9950 4150
Wire Notes Line
9950 5700 9950 5650
9950 4150 9950 4100
Wire Notes Line
9900 5650 10300 5650
9900 4100 10300 4100
Wire Notes Line
9900 5650 9900 5700
9900 4100 9900 4150
Wire Notes Line
9900 5700 9750 5700
9900 4150 9750 4150
Wire Notes Line
10300 5650 10300 5750
10300 4100 10300 4200
Wire Notes Line
10150 5750 10450 5750
10150 4200 10450 4200
Wire Notes Line
10200 5800 10400 5800
10200 4250 10400 4250
Wire Notes Line
10250 5850 10350 5850
Text Notes 9650 5650 0 60 ~ 0
10250 4300 10350 4300
Text Notes 9650 4100 0 60 ~ 0
+ -
Text Notes 6100 4500 0 60 ~ 0
MCU GND\n\nMCU TTL\n\nMCU TTL
@ -467,4 +466,6 @@ NoConn ~ 9650 6650
NoConn ~ 9650 6750
NoConn ~ 9650 6850
NoConn ~ 9650 6950
Text Notes 5500 3650 0 60 ~ 0
10A PCB drive capable design \n\n5V / 10k = .5 mohms, then 3X potentail MCU on-states, so Is = 1.5mA.\n(Is is max on-state current)\n\nR101 <= .6V / .0015 = 400 ohms\nR101 >= -16V / .2A = 80 ohms
$EndSCHEMATC

View File

@ -53,16 +53,19 @@
52) RESOLVED IN R0.4 Add header for CAN bus with 5V and GND. see P401
53) verify D9 is the same BOM item as discovery board.
54) RESOLVED IN R0.4 Add 5V and GND vias to proto area
55) Add Top, T-1, T-2 and T-3 to PCB copper layers to more clearly identify layers to MFG
56) knock1 is actually knock2 and vice versa. Need to fix net names & the pinout picture
57) route unused stm32 pins (D3 PC13 etc) to unused connector pins
58) cheaper battery holder - through-hole (need to find out footprint)
59) remove some/all EGT - expand prototyping area?
60) idle valve SMD diode?
61) better test pads silkscreen: 5V, GND, 12V
62) LED for cam/crank signal. we can remove cam/crank test points if we need space
63) why do we have W1002 & W1003 if these are usually there? Removing them would remove one point of failure
64) JP04 & JP05 are defined on the main schematics sheet. if would be better to define then on Page 8 with the rest of cam/crank stuff
55) RESOLVED IN R0.4 Add Top, T-1, T-2 and T-3 to PCB copper layers to more clearly identify layers to MFG
56) RESOLVED IN R0.4 knock2 is actually knock0. Need to fix net names & the pinout picture
57) RESOLVED IN R0.4 Change C166 and C167 to 30pF instead of 20pF, to match XTAL specified 20CL. (30*30)/(30+30)+5= 20pF with 5pF stray capacitance.
58) RESOLVED IN R0.4 add pF cap to HIP9011 knock chip to help fast transients and XTAL starting.
59) FIX CLAIMED ERRORS IN SCHEMATIC ERC
60) remove AC RELAY ect from harness connector net names.
61) RESOLVED IN R0.4 add 0R jumper between 5V and 5V plane to allow power supply verification before powering the 5V devices.
62) add resistor divider or some mechanism for identifying via firmware sensing PCB revision. Perhaps to PB1 AN input
63) better test pads silkscreen: 5V, GND, 12V
64) LED for cam/crank signal. we can remove cam/crank test points if we need space
65) why do we have W1002 & W1003 if these are usually there? Removing them would remove one point of failure
66) JP04 & JP05 are defined on the main schematics sheet. if would be better to define then on Page 8 with the rest of cam/crank stuff
67) Updated silk screen notes, draws .12 amps normal, with a typical inrush of .3A.
For honda add-on / rewiring board

View File

@ -18,7 +18,9 @@ import java.util.concurrent.LinkedBlockingQueue;
@SuppressWarnings("FieldCanBeLocal")
public class CommandQueue {
private static final String CONFIRMATION_PREFIX = "confirmation_";
public static final int DEFAULT_TIMEOUT = 300;
public static final int DEFAULT_TIMEOUT = 500;
private static final int COMMAND_CONFIRMATION_TIMEOUT = 1000;
private static final int SLOW_CONFIRMATION_TIMEOUT = 5000;
private final Object lock = new Object();
private String latestConfirmation;
@ -43,6 +45,15 @@ public class CommandQueue {
}
};
private static boolean isSlowCommand(String cmd) {
String lc = cmd.toLowerCase();
return lc.startsWith("set_engine_type") || lc.startsWith("writeconfig") || lc.startsWith("rewriteconfig");
}
public static int getTimeout(String cmd) {
return isSlowCommand(cmd) ? SLOW_CONFIRMATION_TIMEOUT : COMMAND_CONFIRMATION_TIMEOUT;
}
public void addListener(CommandQueueListener listener) {
commandListeners.add(listener);
}

View File

@ -88,7 +88,8 @@ public class RecentCommands {
@Override
public void actionPerformed(ActionEvent e) {
reentrant = true;
CommandQueue.getInstance().write(entry.command);
int timeout = CommandQueue.getTimeout(entry.command);
CommandQueue.getInstance().write(entry.command, timeout);
reentrant = false;
}
});

View File

@ -15,7 +15,6 @@ import java.awt.event.ActionListener;
* (c) Andrey Belomutskiy
*/
public class AnyCommand {
private static final int COMMAND_CONFIRMATION_TIMEOUT = 1000;
public static final String KEY = "last_value";
private final JTextField text = new JTextField() {
@Override
@ -45,7 +44,8 @@ public class AnyCommand {
String cmd = text.getText();
if (!isValidInput(text))
return;
CommandQueue.getInstance().write(cmd.toLowerCase(), COMMAND_CONFIRMATION_TIMEOUT);
int timeout = CommandQueue.getTimeout(cmd);
CommandQueue.getInstance().write(cmd.toLowerCase(), timeout);
}
});
text.getDocument().addDocumentListener(new DocumentListener() {