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

auto-sync

This commit is contained in:
rusEfi 2014-08-31 07:02:40 -05:00
parent f50b86e2df
commit 00ca77f137
10 changed files with 4615 additions and 4042 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
firmware/controllers/trigger/trigger_central.cpp
View File

@ -91,7 +91,6 @@ static void reportEventToWaveChart(trigger_event_e ckpSignalType, int index) {
} }
} }
void TriggerCentral::handleShaftSignal(configuration_s *configuration, trigger_event_e signal, uint64_t nowUs) { void TriggerCentral::handleShaftSignal(configuration_s *configuration, trigger_event_e signal, uint64_t nowUs) {
efiAssertVoid(configuration!=NULL, "configuration"); efiAssertVoid(configuration!=NULL, "configuration");
@ -173,6 +172,15 @@ extern engine_configuration2_s * engineConfiguration2;
extern board_configuration_s *boardConfiguration; extern board_configuration_s *boardConfiguration;
#endif #endif
static void triggerShapeInfo() {
#if EFI_PROD_CODE || EFI_SIMULATOR
trigger_shape_s *s = &engineConfiguration2->triggerShape;
for (int i = 0; i < s->getSize(); i++) {
scheduleMsg(&logger, "event %d %f", i, s->eventAngles[i]);
}
#endif
}
static void triggerInfo() { static void triggerInfo() {
#if EFI_PROD_CODE || EFI_SIMULATOR #if EFI_PROD_CODE || EFI_SIMULATOR
scheduleMsg(&logger, "Template %s/%d trigger %d", getConfigurationName(engineConfiguration), scheduleMsg(&logger, "Template %s/%d trigger %d", getConfigurationName(engineConfiguration),
@ -216,11 +224,12 @@ void initTriggerCentral(void) {
#if EFI_WAVE_CHART #if EFI_WAVE_CHART
initWaveChart(&waveChart); initWaveChart(&waveChart);
#endif #endif /* EFI_WAVE_CHART */
#if EFI_PROD_CODE || EFI_SIMULATOR #if EFI_PROD_CODE || EFI_SIMULATOR
initLogging(&logger, "ShaftPosition"); initLogging(&logger, "ShaftPosition");
addConsoleAction("triggerinfo", triggerInfo); addConsoleAction("triggerinfo", triggerInfo);
addConsoleAction("triggershapeinfo", triggerShapeInfo);
#endif #endif
#if EFI_HISTOGRAMS #if EFI_HISTOGRAMS

24
firmware/controllers/trigger/trigger_mazda.cpp
View File

@ -23,26 +23,24 @@
void initializeMazdaMiataNaShape(trigger_shape_s *s) { void initializeMazdaMiataNaShape(trigger_shape_s *s) {
s->reset(FOUR_STROKE_CAM_SENSOR); s->reset(FOUR_STROKE_CAM_SENSOR);
setTriggerSynchronizationGap(s, 1.68f); setTriggerSynchronizationGap(s, 1.68f);
float z = 0.093;
s->useRiseEdge = false; s->useRiseEdge = false;
s->isSynchronizationNeeded = true; s->isSynchronizationNeeded = true;
s->addEvent(180.0f - 1.75 * z * 720, T_SECONDARY, TV_HIGH); s->addEvent(49.15363636, T_SECONDARY, TV_HIGH);
s->addEvent(180.0f - 0.75 * z * 720, T_SECONDARY, TV_LOW); s->addEvent(114.1581818, T_SECONDARY, TV_LOW);
s->addEvent(213.0222222, T_PRIMARY, TV_HIGH);
s->addEvent(225.759, T_SECONDARY, TV_HIGH);
s->addEvent(279.54375, T_PRIMARY, TV_LOW);
s->addEvent(294.786, T_SECONDARY, TV_LOW);
s->addEvent(360.0f - 2 * z * 720, T_PRIMARY, TV_HIGH); s->addEvent(410.318, T_SECONDARY, TV_HIGH);
s->addEvent(360.0f - 1.75 * z * 720, T_SECONDARY, TV_HIGH); s->addEvent(477.6911111, T_SECONDARY, TV_LOW);
s->addEvent(360.0f - z * 720, T_PRIMARY, TV_LOW);
s->addEvent(360.0f - 0.75 * z * 720, T_SECONDARY, TV_LOW);
s->addEvent(540.0f - 1.75 * z * 720, T_SECONDARY, TV_HIGH); s->addEvent(576.4975, T_PRIMARY, TV_HIGH);
s->addEvent(540.0f - 0.75 * z * 720, T_SECONDARY, TV_LOW); s->addEvent(590.39625, T_SECONDARY, TV_HIGH);
s->addEvent(656.5125, T_SECONDARY, TV_LOW);
s->addEvent(720.0f - 2 * z * 720, T_PRIMARY, TV_HIGH);
s->addEvent(720.0f - 1.75 * z * 720, T_SECONDARY, TV_HIGH);
s->addEvent(720.0f - 0.75 * z * 720, T_SECONDARY, TV_LOW);
s->addEvent(720.0f, T_PRIMARY, TV_LOW); s->addEvent(720.0f, T_PRIMARY, TV_LOW);
s->shaftPositionEventCount = s->getSize(); s->shaftPositionEventCount = s->getSize();

2
firmware/rusefi.cpp
View File

@ -229,5 +229,5 @@ void firmwareError(const char *fmt, ...) {
} }
int getRusEfiVersion(void) { int getRusEfiVersion(void) {
return 20140830; return 20140831;
} }

4
firmware/svnversion.h
View File

@ -1,5 +1,5 @@
// This file was generated by Version2Header // This file was generated by Version2Header
// Thu Aug 21 13:54:37 EDT 2014 // Sun Aug 31 07:15:41 EDT 2014
#ifndef VCS_VERSION #ifndef VCS_VERSION
#define VCS_VERSION "4372" #define VCS_VERSION "4498"
#endif #endif

7375
hardware/Stimulator/Stimulator.kicad_pcb
View File

File diff suppressed because it is too large Load Diff

985
hardware/Stimulator/Stimulator.net
View File

File diff suppressed because it is too large Load Diff

8
hardware/Stimulator/Stimulator.pro
View File

@ -1,4 +1,4 @@
update=8/28/2014 7:44:04 PM update=8/30/2014 1:35:04 PM
version=1 version=1
last_client=pcbnew last_client=pcbnew
[cvpcb] [cvpcb]
@ -11,7 +11,7 @@ version=1
[eeschema] [eeschema]
version=1 version=1
LibDir=../rusefi_lib LibDir=../rusefi_lib
NetFmtName= NetFmtName=PcbnewAdvanced
RptD_X=0 RptD_X=0
RptD_Y=100 RptD_Y=100
RptLab=1 RptLab=1
@ -48,6 +48,8 @@ LibName28=atmel
LibName29=contrib LibName29=contrib
LibName30=valves LibName30=valves
LibName31=ECUStimS LibName31=ECUStimS
LibName32=logo_flipped
LibName33=logo
[pcbnew] [pcbnew]
version=1 version=1
LastNetListRead=Stimulator.net LastNetListRead=Stimulator.net
@ -85,3 +87,5 @@ LibName13=led
LibName14=dip_sockets LibName14=dip_sockets
LibName15=pga_sockets LibName15=pga_sockets
LibName16=valves LibName16=valves
LibName17=logo
LibName18=logo_flipped

242
hardware/Stimulator/Stimulator.sch
View File

@ -30,6 +30,8 @@ LIBS:atmel
LIBS:contrib LIBS:contrib
LIBS:valves LIBS:valves
LIBS:ECUStimS LIBS:ECUStimS
LIBS:logo_flipped
LIBS:logo
LIBS:Stimulator-cache LIBS:Stimulator-cache
EELAYER 27 0 EELAYER 27 0
EELAYER END EELAYER END
@ -1957,7 +1959,7 @@ U 1 1 53FF1CCA
P 1900 5000 P 1900 5000
F 0 "U1" H 1900 5850 70 0000 C CNN F 0 "U1" H 1900 5850 70 0000 C CNN
F 1 "MAX232" H 1900 4150 70 0000 C CNN F 1 "MAX232" H 1900 4150 70 0000 C CNN
F 2 "DIP-20__300_ELL" H 1900 5000 60 0001 C CNN F 2 "DIP-16__300_ELL" H 1900 5000 60 0001 C CNN
F 3 "" H 1900 5000 60 0000 C CNN F 3 "" H 1900 5000 60 0000 C CNN
1 1900 5000 1 1900 5000
1 0 0 -1 1 0 0 -1
@ -2093,23 +2095,23 @@ $EndComp
$Comp $Comp
L CONN_1 P6 L CONN_1 P6
U 1 1 53FF20B9 U 1 1 53FF20B9
P 2850 5700 P 2950 5700
F 0 "P6" H 2930 5700 40 0000 L CNN F 0 "P6" H 3030 5700 40 0000 L CNN
F 1 "CONN_1" H 2850 5755 30 0001 C CNN F 1 "CONN_1" H 2950 5755 30 0001 C CNN
F 2 "PIN_ARRAY_1" H 2850 5700 60 0001 C CNN F 2 "PIN_ARRAY_1" H 2950 5700 60 0001 C CNN
F 3 "" H 2850 5700 60 0000 C CNN F 3 "" H 2950 5700 60 0000 C CNN
1 2850 5700 1 2950 5700
1 0 0 -1 1 0 0 -1
$EndComp $EndComp
$Comp $Comp
L CONN_1 P5 L CONN_1 P5
U 1 1 53FF20BF U 1 1 53FF20BF
P 2850 5600 P 2950 5600
F 0 "P5" H 2930 5600 40 0000 L CNN F 0 "P5" H 3030 5600 40 0000 L CNN
F 1 "CONN_1" H 2850 5655 30 0001 C CNN F 1 "CONN_1" H 2950 5655 30 0001 C CNN
F 2 "PIN_ARRAY_1" H 2850 5600 60 0001 C CNN F 2 "PIN_ARRAY_1" H 2950 5600 60 0001 C CNN
F 3 "" H 2850 5600 60 0000 C CNN F 3 "" H 2950 5600 60 0000 C CNN
1 2850 5600 1 2950 5600
1 0 0 -1 1 0 0 -1
$EndComp $EndComp
$Comp $Comp
@ -2281,7 +2283,7 @@ U 1 1 53FF2DDB
P 13200 6350 P 13200 6350
F 0 "U6" H 13200 7200 70 0000 C CNN F 0 "U6" H 13200 7200 70 0000 C CNN
F 1 "MAX232" H 13200 5500 70 0000 C CNN F 1 "MAX232" H 13200 5500 70 0000 C CNN
F 2 "DIP-20__300_ELL" H 13200 6350 60 0001 C CNN F 2 "DIP-16__300_ELL" H 13200 6350 60 0001 C CNN
F 3 "" H 13200 6350 60 0000 C CNN F 3 "" H 13200 6350 60 0000 C CNN
1 13200 6350 1 13200 6350
1 0 0 -1 1 0 0 -1
@ -2417,23 +2419,23 @@ $EndComp
$Comp $Comp
L CONN_1 P77 L CONN_1 P77
U 1 1 53FF2E2D U 1 1 53FF2E2D
P 14150 7050 P 14300 7050
F 0 "P77" H 14230 7050 40 0000 L CNN F 0 "P77" H 14380 7050 40 0000 L CNN
F 1 "CONN_1" H 14150 7105 30 0001 C CNN F 1 "CONN_1" H 14300 7105 30 0001 C CNN
F 2 "PIN_ARRAY_1" H 14150 7050 60 0001 C CNN F 2 "PIN_ARRAY_1" H 14300 7050 60 0001 C CNN
F 3 "" H 14150 7050 60 0000 C CNN F 3 "" H 14300 7050 60 0000 C CNN
1 14150 7050 1 14300 7050
1 0 0 -1 1 0 0 -1
$EndComp $EndComp
$Comp $Comp
L CONN_1 P76 L CONN_1 P76
U 1 1 53FF2E33 U 1 1 53FF2E33
P 14150 6950 P 14300 6950
F 0 "P76" H 14230 6950 40 0000 L CNN F 0 "P76" H 14380 6950 40 0000 L CNN
F 1 "CONN_1" H 14150 7005 30 0001 C CNN F 1 "CONN_1" H 14300 7005 30 0001 C CNN
F 2 "PIN_ARRAY_1" H 14150 6950 60 0001 C CNN F 2 "PIN_ARRAY_1" H 14300 6950 60 0001 C CNN
F 3 "" H 14150 6950 60 0000 C CNN F 3 "" H 14300 6950 60 0000 C CNN
1 14150 6950 1 14300 6950
1 0 0 -1 1 0 0 -1
$EndComp $EndComp
$Comp $Comp
@ -2509,11 +2511,11 @@ Wire Wire Line
Wire Wire Line Wire Wire Line
14000 6750 14700 6750 14000 6750 14700 6750
Wire Wire Line Wire Wire Line
14000 6850 14450 6850 14000 6850 14500 6850
Wire Wire Line Wire Wire Line
14450 6850 14450 7100 14500 6850 14500 7100
Wire Wire Line Wire Wire Line
14450 7100 14700 7100 14500 7100 14700 7100
Text Label 14150 5650 2 60 ~ 0 Text Label 14150 5650 2 60 ~ 0
Vd Vd
Wire Wire Line Wire Wire Line
@ -2608,4 +2610,186 @@ Wire Wire Line
15500 6750 15100 6750 15500 6750 15100 6750
Wire Wire Line Wire Wire Line
15500 7100 15100 7100 15500 7100 15100 7100
$Comp
L DIL16 P80
U 1 1 5401F705
P 1950 6500
F 0 "P80" H 1950 6950 60 0000 C CNN
F 1 "DIL16" V 1950 6500 50 0000 C CNN
F 2 "SO16N" H 1950 6500 60 0001 C CNN
F 3 "" H 1950 6500 60 0000 C CNN
1 1950 6500
1 0 0 -1
$EndComp
Text Label 2300 6650 0 60 ~ 0
VR1_i1
Text Label 2300 6750 0 60 ~ 0
VR1_i2
Text Label 1100 5600 2 60 ~ 0
U1-12
Text Label 1100 5700 2 60 ~ 0
U1-09
Text Label 2700 5400 0 60 ~ 0
U1-14
Text Label 2700 5500 0 60 ~ 0
U1-07
Text Label 2700 5600 0 60 ~ 0
U1-13
Text Label 2700 5700 0 60 ~ 0
U1-08
Wire Wire Line
2800 5600 2700 5600
Wire Wire Line
2800 5700 2700 5700
Text Label 2300 6350 0 60 ~ 0
U1-14
Text Label 1600 6750 2 60 ~ 0
U1-07
Text Label 2300 6450 0 60 ~ 0
U1-13
Text Label 1600 6850 2 60 ~ 0
U1-08
Text Label 2700 5200 0 60 ~ 0
U1-06
Text Label 2700 4700 0 60 ~ 0
U1-02
Text Label 1100 5200 2 60 ~ 0
U1-05
Text Label 1100 4800 2 60 ~ 0
U1-04
Text Label 1100 4700 2 60 ~ 0
U1-03
Text Label 1100 4300 2 60 ~ 0
U1-01
Text Label 1600 6650 2 60 ~ 0
U1-06
Text Label 1600 6550 2 60 ~ 0
U1-05
Text Label 1600 6450 2 60 ~ 0
U1-04
Text Label 1600 6350 2 60 ~ 0
U1-03
Text Label 1600 6250 2 60 ~ 0
U1-02
Text Label 1600 6150 2 60 ~ 0
U1-01
Text Label 2300 6550 0 60 ~ 0
U1-12
Text Label 2300 6150 0 60 ~ 0
Vd
Text Label 2300 6850 0 60 ~ 0
U1-09
$Comp
L GND #PWR026
U 1 1 5401FAD3
P 2300 6250
F 0 "#PWR026" H 2300 6250 30 0001 C CNN
F 1 "GND" H 2300 6180 30 0001 C CNN
F 2 "" H 2300 6250 60 0000 C CNN
F 3 "" H 2300 6250 60 0000 C CNN
1 2300 6250
0 -1 -1 0
$EndComp
$Comp
L DIL16 P81
U 1 1 5401FAE1
P 13150 7800
F 0 "P81" H 13150 8250 60 0000 C CNN
F 1 "DIL16" V 13150 7800 50 0000 C CNN
F 2 "SO16N" H 13150 7800 60 0001 C CNN
F 3 "" H 13150 7800 60 0000 C CNN
1 13150 7800
1 0 0 -1
$EndComp
Text Label 13500 7950 0 60 ~ 0
VR2_i1
Text Label 13500 8050 0 60 ~ 0
VR2_i2
Text Label 13500 7650 0 60 ~ 0
U6-14
Text Label 12800 8050 2 60 ~ 0
U6-07
Text Label 13500 7750 0 60 ~ 0
U6-13
Text Label 12800 8150 2 60 ~ 0
U6-08
Text Label 12800 7950 2 60 ~ 0
U6-06
Text Label 12800 7850 2 60 ~ 0
U6-05
Text Label 12800 7750 2 60 ~ 0
U6-04
Text Label 12800 7650 2 60 ~ 0
U6-03
Text Label 12800 7550 2 60 ~ 0
U6-02
Text Label 12800 7450 2 60 ~ 0
U6-01
Text Label 13500 7850 0 60 ~ 0
U6-12
Text Label 13500 7450 0 60 ~ 0
Vd
Text Label 13500 8150 0 60 ~ 0
U6-09
$Comp
L GND #PWR027
U 1 1 5401FAF6
P 13500 7550
F 0 "#PWR027" H 13500 7550 30 0001 C CNN
F 1 "GND" H 13500 7480 30 0001 C CNN
F 2 "" H 13500 7550 60 0000 C CNN
F 3 "" H 13500 7550 60 0000 C CNN
1 13500 7550
0 -1 -1 0
$EndComp
Text Label 12400 6950 2 60 ~ 0
U6-12
Text Label 12400 7050 2 60 ~ 0
U6-09
Text Label 14000 6750 0 60 ~ 0
U6-14
Text Label 14000 6850 0 60 ~ 0
U6-07
Text Label 14000 6950 0 60 ~ 0
U6-13
Text Label 14000 7050 0 60 ~ 0
U6-08
Text Label 14000 6550 0 60 ~ 0
U6-06
Text Label 14000 6050 0 60 ~ 0
U6-02
Text Label 12400 6550 2 60 ~ 0
U6-05
Text Label 12400 6150 2 60 ~ 0
U6-04
Text Label 12400 6050 2 60 ~ 0
U6-03
Text Label 12400 5650 2 60 ~ 0
U6-01
Wire Wire Line
14000 6950 14150 6950
Wire Wire Line
14000 7050 14150 7050
$Comp
L LOGO #G1
U 1 1 54020A96
P 11650 10700
F 0 "#G1" H 11650 10597 60 0001 C CNN
F 1 "LOGO" H 11650 10803 60 0001 C CNN
F 2 "LOGO" H 11650 10700 60 0001 C CNN
F 3 "" H 11650 10700 60 0000 C CNN
1 11650 10700
1 0 0 -1
$EndComp
$Comp
L LOGO #G2
U 1 1 54020AA5
P 11650 11000
F 0 "#G2" H 11650 10897 60 0001 C CNN
F 1 "LOGO" H 11650 11103 60 0001 C CNN
F 2 "LOGO_F" H 11650 11000 60 0001 C CNN
F 3 "" H 11650 11000 60 0000 C CNN
1 11650 11000
1 0 0 -1
$EndComp
$EndSCHEMATC $EndSCHEMATC

2
unit_tests/main.cpp
View File

@ -126,7 +126,7 @@ int main(void) {
testFLStack(); testFLStack();
// resizeMap(); // resizeMap();
printf("Success 20130829\r\n"); printf("Success 20130830\r\n");
return EXIT_SUCCESS; return EXIT_SUCCESS;
} }

2
unit_tests/test_trigger_decoder.cpp
View File

@ -472,7 +472,7 @@ void testTriggerDecoder(void) {
testTriggerDecoder2("testMitsu", MITSU_4G93, 3, 0.3750, 0.3889); testTriggerDecoder2("testMitsu", MITSU_4G93, 3, 0.3750, 0.3889);
// testTriggerDecoder2("miata 1990", MIATA_1990, 0, 0.6280, 0.0); // testTriggerDecoder2("miata 1990", MIATA_1990, 0, 0.6280, 0.0);
testTriggerDecoder2("miata 1994", MIATA_1994, 11, 0.2790, 0.3720); testTriggerDecoder2("miata 1994", MIATA_1994, 11, 0.2917, 0.3716);
testMazda323(); testMazda323();