From b05d93f874c4d86aa014fc274847e5ee12dd4372 Mon Sep 17 00:00:00 2001 From: rusEfi Date: Wed, 15 Oct 2014 15:04:27 -0500 Subject: [PATCH] auto-sync --- .../controllers/algo/engine_configuration.h | 6 + firmware/controllers/settings.cpp | 13 + firmware/rusefi.cpp | 2 +- .../NGC_38_connector/NGC_38_connector.cmp | 23 +- .../NGC_38_connector.kicad_pcb | 308 ++++++++++++++++-- .../NGC_38_connector/NGC_38_connector.net | 184 +++++++---- .../NGC_38_connector/NGC_38_connector.sch | 91 +++++- 7 files changed, 532 insertions(+), 95 deletions(-) diff --git a/firmware/controllers/algo/engine_configuration.h b/firmware/controllers/algo/engine_configuration.h index 4dad3032eb..4c71547ba7 100644 --- a/firmware/controllers/algo/engine_configuration.h +++ b/firmware/controllers/algo/engine_configuration.h @@ -436,6 +436,12 @@ typedef struct { bool isTunerStudioEnabled : 1; // bit 8 bool isWaveAnalyzerEnabled : 1; // bit 9 bool isIdleThreadEnabled : 1; // bit 10 + /** + * Usually if we have no trigger events that means engine is stopped + * Unless we are troubleshooting and spinning the engine by hand - this case a longer + * delay is needed + */ + bool isManualSpinningMode : 1; // bit 11 uint32_t digitalChartSize; /** diff --git a/firmware/controllers/settings.cpp b/firmware/controllers/settings.cpp index f51476b2fc..a81d624682 100644 --- a/firmware/controllers/settings.cpp +++ b/firmware/controllers/settings.cpp @@ -115,6 +115,10 @@ void printConfiguration(engine_configuration_s *engineConfiguration, engine_conf boolToString(engineConfiguration->isWaveAnalyzerEnabled), boolToString(engineConfiguration->isIdleThreadEnabled), boolToString(boardConfiguration->isFastAdcEnabled)); + scheduleMsg(&logger, "isManualSpinningMode=%s/isCylinderCleanupEnabled=%s", + boolToString(engineConfiguration->isManualSpinningMode), + boolToString(engineConfiguration->isCylinderCleanupEnabled)); + scheduleMsg(&logger, "crankingChargeAngle=%f", engineConfiguration->crankingChargeAngle); scheduleMsg(&logger, "crankingTimingAngle=%f", engineConfiguration->crankingTimingAngle); scheduleMsg(&logger, "globalTriggerAngleOffset=%f", engineConfiguration->globalTriggerAngleOffset); @@ -203,6 +207,10 @@ void setEngineType(int value) { doPrintConfiguration(&engine); } +static void setIdleSolenoidFrequency(int value) { + boardConfiguration->idleSolenoidFrequency = value; +} + static void setInjectionPinMode(int value) { boardConfiguration->injectionPinMode = (pin_output_mode_e) value; doPrintConfiguration(&engine); @@ -668,6 +676,10 @@ static void enableOrDisable(const char *param, bool isEnabled) { engineConfiguration->isWaveAnalyzerEnabled = isEnabled; } else if (strEqualCaseInsensitive(param, "idle_thread")) { engineConfiguration->isIdleThreadEnabled = isEnabled; + } else if (strEqualCaseInsensitive(param, "manual_spinning")) { + engineConfiguration->isManualSpinningMode = isEnabled; + } else if (strEqualCaseInsensitive(param, "cylinder_cleanup")) { + engineConfiguration->isCylinderCleanupEnabled = isEnabled; } else { scheduleMsg(&logger, "unexpected [%s]", param); return; // well, MISRA would not like this 'return' here :( @@ -805,6 +817,7 @@ void initSettings(engine_configuration_s *engineConfiguration) { addConsoleActionF("set_clt_bias", setCltBias); addConsoleActionF("set_iat_bias", setIatBias); + addConsoleActionI("set_idle_solenoid_freq", setIdleSolenoidFrequency); #if EFI_PROD_CODE addConsoleActionSS("set_injection_pin", setInjectionPin); diff --git a/firmware/rusefi.cpp b/firmware/rusefi.cpp index 23c9ecfac2..9a2defb86d 100644 --- a/firmware/rusefi.cpp +++ b/firmware/rusefi.cpp @@ -241,5 +241,5 @@ void firmwareError(const char *fmt, ...) { } int getRusEfiVersion(void) { - return 20141014; + return 20141015; } diff --git a/hardware/NGC_38_connector/NGC_38_connector.cmp b/hardware/NGC_38_connector/NGC_38_connector.cmp index b549ece83d..7145ff9a75 100644 --- a/hardware/NGC_38_connector/NGC_38_connector.cmp +++ b/hardware/NGC_38_connector/NGC_38_connector.cmp @@ -1,4 +1,4 @@ -Cmp-Mod V01 Created by CvPcb (2013-07-07 BZR 4022)-stable date = 13/10/2014 14:53:27 +Cmp-Mod V01 Created by CvPcb (2013-07-07 BZR 4022)-stable date = 15/10/2014 23:51:34 BeginCmp TimeStamp = /543BAB9B; @@ -14,4 +14,25 @@ ValeurCmp = CONN_10; IdModule = SIL-10; EndCmp +BeginCmp +TimeStamp = /543ECFEB; +Reference = P3; +ValeurCmp = CONN_9; +IdModule = SIL-9; +EndCmp + +BeginCmp +TimeStamp = /543ECFCF; +Reference = P4; +ValeurCmp = CONN_10; +IdModule = SIL-10; +EndCmp + +BeginCmp +TimeStamp = /543ECFDE; +Reference = P5; +ValeurCmp = CONN_9; +IdModule = SIL-9; +EndCmp + EndListe diff --git a/hardware/NGC_38_connector/NGC_38_connector.kicad_pcb b/hardware/NGC_38_connector/NGC_38_connector.kicad_pcb index 88183e13b9..0af81e4ac1 100644 --- a/hardware/NGC_38_connector/NGC_38_connector.kicad_pcb +++ b/hardware/NGC_38_connector/NGC_38_connector.kicad_pcb @@ -1,15 +1,15 @@ (kicad_pcb (version 3) (host pcbnew "(2013-07-07 BZR 4022)-stable") (general - (links 10) - (no_connects 10) + (links 38) + (no_connects 38) (area 136.893223 119.949999 180.050001 190.050001) (thickness 1.6) (drawings 5) (tracks 0) (zones 0) - (modules 2) - (nets 11) + (modules 5) + (nets 39) ) (page A3) @@ -94,9 +94,37 @@ (net 5 N-0000013) (net 6 N-0000014) (net 7 N-0000015) - (net 8 N-0000017) - (net 9 N-0000018) - (net 10 N-0000019) + (net 8 N-0000016) + (net 9 N-0000017) + (net 10 N-0000018) + (net 11 N-0000019) + (net 12 N-000002) + (net 13 N-0000020) + (net 14 N-0000021) + (net 15 N-0000022) + (net 16 N-0000023) + (net 17 N-0000024) + (net 18 N-0000025) + (net 19 N-0000026) + (net 20 N-0000027) + (net 21 N-0000028) + (net 22 N-0000029) + (net 23 N-000003) + (net 24 N-0000030) + (net 25 N-0000031) + (net 26 N-0000032) + (net 27 N-0000033) + (net 28 N-0000034) + (net 29 N-0000035) + (net 30 N-0000036) + (net 31 N-0000037) + (net 32 N-0000038) + (net 33 N-000004) + (net 34 N-000005) + (net 35 N-000006) + (net 36 N-000007) + (net 37 N-000008) + (net 38 N-000009) (net_class Default "This is the default net class." (clearance 0.254) @@ -113,9 +141,37 @@ (add_net N-0000013) (add_net N-0000014) (add_net N-0000015) + (add_net N-0000016) (add_net N-0000017) (add_net N-0000018) (add_net N-0000019) + (add_net N-000002) + (add_net N-0000020) + (add_net N-0000021) + (add_net N-0000022) + (add_net N-0000023) + (add_net N-0000024) + (add_net N-0000025) + (add_net N-0000026) + (add_net N-0000027) + (add_net N-0000028) + (add_net N-0000029) + (add_net N-000003) + (add_net N-0000030) + (add_net N-0000031) + (add_net N-0000032) + (add_net N-0000033) + (add_net N-0000034) + (add_net N-0000035) + (add_net N-0000036) + (add_net N-0000037) + (add_net N-0000038) + (add_net N-000004) + (add_net N-000005) + (add_net N-000006) + (add_net N-000007) + (add_net N-000008) + (add_net N-000009) ) (module PCM_C1 (layer F.Cu) (tedit 5435849B) (tstamp 543BACA2) @@ -131,133 +187,161 @@ ) (pad 1 thru_hole circle (at 10 10) (size 1.5 1.5) (drill 1) (layers *.Cu *.Mask F.SilkS) - (net 2 N-0000010) + (net 32 N-0000038) (zone_connect 2) ) (pad 2 thru_hole circle (at 13 10) (size 1.5 1.5) (drill 1) (layers *.Cu *.Mask F.SilkS) - (net 3 N-0000011) + (net 30 N-0000036) ) (pad 3 thru_hole circle (at 16 10) (size 1.5 1.5) (drill 1) (layers *.Cu *.Mask F.SilkS) - (net 4 N-0000012) + (net 29 N-0000035) ) (pad 4 thru_hole circle (at 19 10) (size 1.5 1.5) (drill 1) (layers *.Cu *.Mask F.SilkS) - (net 5 N-0000013) + (net 28 N-0000034) ) (pad 5 thru_hole circle (at 22 10) (size 1.5 1.5) (drill 1) (layers *.Cu *.Mask F.SilkS) - (net 6 N-0000014) + (net 27 N-0000033) ) (pad 6 thru_hole circle (at 25 10) (size 1.5 1.5) (drill 1) (layers *.Cu *.Mask F.SilkS) - (net 7 N-0000015) + (net 31 N-0000037) ) (pad 7 thru_hole circle (at 28 10) (size 1.5 1.5) (drill 1) (layers *.Cu *.Mask F.SilkS) - (net 1 N-000001) + (net 26 N-0000032) ) (pad 8 thru_hole circle (at 31 10) (size 1.5 1.5) (drill 1) (layers *.Cu *.Mask F.SilkS) - (net 8 N-0000017) + (net 25 N-0000031) ) (pad 9 thru_hole circle (at 34 10) (size 1.5 1.5) (drill 1) (layers *.Cu *.Mask F.SilkS) - (net 9 N-0000018) + (net 24 N-0000030) ) (pad 10 thru_hole circle (at 37 10) (size 1.5 1.5) (drill 1) (layers *.Cu *.Mask F.SilkS) - (net 10 N-0000019) + (net 22 N-0000029) ) (pad 29 thru_hole circle (at 10 25) (size 1.5 1.5) (drill 1) (layers *.Cu *.Mask F.SilkS) + (net 21 N-0000028) ) (pad 30 thru_hole circle (at 13 25) (size 1.5 1.5) (drill 1) (layers *.Cu *.Mask F.SilkS) + (net 20 N-0000027) ) (pad 31 thru_hole circle (at 16 25) (size 1.5 1.5) (drill 1) (layers *.Cu *.Mask F.SilkS) + (net 19 N-0000026) ) (pad 32 thru_hole circle (at 19 25) (size 1.5 1.5) (drill 1) (layers *.Cu *.Mask F.SilkS) + (net 18 N-0000025) ) (pad 33 thru_hole circle (at 22 25) (size 1.5 1.5) (drill 1) (layers *.Cu *.Mask F.SilkS) + (net 17 N-0000024) ) (pad 34 thru_hole circle (at 25 25) (size 1.5 1.5) (drill 1) (layers *.Cu *.Mask F.SilkS) + (net 16 N-0000023) ) (pad 35 thru_hole circle (at 28 25) (size 1.5 1.5) (drill 1) (layers *.Cu *.Mask F.SilkS) + (net 15 N-0000022) ) (pad 36 thru_hole circle (at 31 25) (size 1.5 1.5) (drill 1) (layers *.Cu *.Mask F.SilkS) + (net 14 N-0000021) ) (pad 37 thru_hole circle (at 34 25) (size 1.5 1.5) (drill 1) (layers *.Cu *.Mask F.SilkS) + (net 13 N-0000020) ) (pad 38 thru_hole circle (at 37 25) (size 1.5 1.5) (drill 1) (layers *.Cu *.Mask F.SilkS) + (net 11 N-0000019) ) (pad 11 thru_hole circle (at 11.508 14.746) (size 1.5 1.5) (drill 1) (layers *.Cu *.Mask F.SilkS) + (net 2 N-0000010) ) (pad 12 thru_hole circle (at 14.508 14.746) (size 1.5 1.5) (drill 1) (layers *.Cu *.Mask F.SilkS) + (net 38 N-000009) ) (pad 13 thru_hole circle (at 17.508 14.746) (size 1.5 1.5) (drill 1) (layers *.Cu *.Mask F.SilkS) + (net 37 N-000008) ) (pad 14 thru_hole circle (at 20.508 14.746) (size 1.5 1.5) (drill 1) (layers *.Cu *.Mask F.SilkS) + (net 36 N-000007) ) (pad 15 thru_hole circle (at 23.508 14.746) (size 1.5 1.5) (drill 1) (layers *.Cu *.Mask F.SilkS) + (net 35 N-000006) ) (pad 16 thru_hole circle (at 26.508 14.746) (size 1.5 1.5) (drill 1) (layers *.Cu *.Mask F.SilkS) + (net 34 N-000005) ) (pad 17 thru_hole circle (at 29.508 14.746) (size 1.5 1.5) (drill 1) (layers *.Cu *.Mask F.SilkS) + (net 33 N-000004) ) (pad 18 thru_hole circle (at 32.508 14.746) (size 1.5 1.5) (drill 1) (layers *.Cu *.Mask F.SilkS) + (net 23 N-000003) ) (pad 19 thru_hole circle (at 35.508 14.746) (size 1.5 1.5) (drill 1) (layers *.Cu *.Mask F.SilkS) + (net 12 N-000002) ) (pad 20 thru_hole circle (at 11.508 20.254) (size 1.5 1.5) (drill 1) (layers *.Cu *.Mask F.SilkS) + (net 8 N-0000016) ) (pad 21 thru_hole circle (at 14.508 20.254) (size 1.5 1.5) (drill 1) (layers *.Cu *.Mask F.SilkS) + (net 10 N-0000018) ) (pad 22 thru_hole circle (at 17.508 20.254) (size 1.5 1.5) (drill 1) (layers *.Cu *.Mask F.SilkS) + (net 9 N-0000017) ) (pad 23 thru_hole circle (at 20.508 20.254) (size 1.5 1.5) (drill 1) (layers *.Cu *.Mask F.SilkS) + (net 1 N-000001) ) (pad 24 thru_hole circle (at 23.508 20.254) (size 1.5 1.5) (drill 1) (layers *.Cu *.Mask F.SilkS) + (net 7 N-0000015) ) (pad 25 thru_hole circle (at 26.508 20.254) (size 1.5 1.5) (drill 1) (layers *.Cu *.Mask F.SilkS) + (net 6 N-0000014) ) (pad 26 thru_hole circle (at 29.508 20.254) (size 1.5 1.5) (drill 1) (layers *.Cu *.Mask F.SilkS) + (net 5 N-0000013) ) (pad 27 thru_hole circle (at 32.508 20.254) (size 1.5 1.5) (drill 1) (layers *.Cu *.Mask F.SilkS) + (net 4 N-0000012) ) (pad 28 thru_hole circle (at 35.508 20.254) (size 1.5 1.5) (drill 1) (layers *.Cu *.Mask F.SilkS) + (net 3 N-0000011) ) ) (module SIL-10 (layer F.Cu) (tedit 543BAF74) (tstamp 543BAF3F) - (at 163.32 144.53) + (at 162.42 136.28) (descr "Connecteur 10 pins") (tags "CONN DEV") (path /543BAEB3) @@ -274,47 +358,213 @@ (fp_line (start -10.16 1.27) (end -10.16 -1.27) (layer F.SilkS) (width 0.3048)) (pad 1 thru_hole rect (at -11.43 0) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS) - (net 2 N-0000010) + (net 32 N-0000038) ) (pad 2 thru_hole circle (at -8.89 0) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS) - (net 3 N-0000011) + (net 30 N-0000036) ) (pad 3 thru_hole circle (at -6.35 0) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS) - (net 4 N-0000012) + (net 29 N-0000035) ) (pad 4 thru_hole circle (at -3.81 0) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS) - (net 5 N-0000013) + (net 28 N-0000034) ) (pad 5 thru_hole circle (at -1.27 0) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS) - (net 6 N-0000014) + (net 27 N-0000033) ) (pad 6 thru_hole circle (at 1.27 0) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS) - (net 7 N-0000015) + (net 31 N-0000037) ) (pad 7 thru_hole circle (at 3.81 0) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS) - (net 1 N-000001) + (net 26 N-0000032) ) (pad 8 thru_hole circle (at 6.35 0) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS) - (net 8 N-0000017) + (net 25 N-0000031) ) (pad 9 thru_hole circle (at 8.89 0) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS) - (net 9 N-0000018) + (net 24 N-0000030) ) (pad 10 thru_hole circle (at 11.43 0) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS) - (net 10 N-0000019) + (net 22 N-0000029) ) ) - (gr_text "NGC 38 pin rev 0.1" (at 163.32 170.69) (layer F.SilkS) + (module SIL-9 (layer F.Cu) (tedit 200000) (tstamp 543ED05C) + (at 163.39 169.65) + (descr "Connecteur 9 pins") + (tags "CONN DEV") + (path /543ECFDE) + (fp_text reference P5 (at -7.62 -2.54) (layer F.SilkS) + (effects (font (size 1.72974 1.08712) (thickness 0.3048))) + ) + (fp_text value CONN_9 (at 5.08 -2.54) (layer F.SilkS) + (effects (font (size 1.524 1.016) (thickness 0.3048))) + ) + (fp_line (start 11.43 -1.27) (end 11.43 1.27) (layer F.SilkS) (width 0.3048)) + (fp_line (start 11.43 1.27) (end -11.43 1.27) (layer F.SilkS) (width 0.3048)) + (fp_line (start -11.43 1.27) (end -11.43 -1.27) (layer F.SilkS) (width 0.3048)) + (fp_line (start 11.43 -1.27) (end -11.43 -1.27) (layer F.SilkS) (width 0.3048)) + (fp_line (start -8.89 -1.27) (end -8.89 1.27) (layer F.SilkS) (width 0.3048)) + (pad 1 thru_hole rect (at -10.16 0) (size 1.397 1.397) (drill 0.8128) + (layers *.Cu *.Mask F.SilkS) + (net 8 N-0000016) + ) + (pad 2 thru_hole circle (at -7.62 0) (size 1.397 1.397) (drill 0.8128) + (layers *.Cu *.Mask F.SilkS) + (net 10 N-0000018) + ) + (pad 3 thru_hole circle (at -5.08 0) (size 1.397 1.397) (drill 0.8128) + (layers *.Cu *.Mask F.SilkS) + (net 9 N-0000017) + ) + (pad 4 thru_hole circle (at -2.54 0) (size 1.397 1.397) (drill 0.8128) + (layers *.Cu *.Mask F.SilkS) + (net 1 N-000001) + ) + (pad 5 thru_hole circle (at 0 0) (size 1.397 1.397) (drill 0.8128) + (layers *.Cu *.Mask F.SilkS) + (net 7 N-0000015) + ) + (pad 6 thru_hole circle (at 2.54 0) (size 1.397 1.397) (drill 0.8128) + (layers *.Cu *.Mask F.SilkS) + (net 6 N-0000014) + ) + (pad 7 thru_hole circle (at 5.08 0) (size 1.397 1.397) (drill 0.8128) + (layers *.Cu *.Mask F.SilkS) + (net 5 N-0000013) + ) + (pad 8 thru_hole circle (at 7.62 0) (size 1.397 1.397) (drill 0.8128) + (layers *.Cu *.Mask F.SilkS) + (net 4 N-0000012) + ) + (pad 9 thru_hole circle (at 10.16 0) (size 1.397 1.397) (drill 0.8128) + (layers *.Cu *.Mask F.SilkS) + (net 3 N-0000011) + ) + ) + + (module SIL-9 (layer F.Cu) (tedit 200000) (tstamp 543ED06E) + (at 162.95 143.4) + (descr "Connecteur 9 pins") + (tags "CONN DEV") + (path /543ECFEB) + (fp_text reference P3 (at -7.62 -2.54) (layer F.SilkS) + (effects (font (size 1.72974 1.08712) (thickness 0.3048))) + ) + (fp_text value CONN_9 (at 5.08 -2.54) (layer F.SilkS) + (effects (font (size 1.524 1.016) (thickness 0.3048))) + ) + (fp_line (start 11.43 -1.27) (end 11.43 1.27) (layer F.SilkS) (width 0.3048)) + (fp_line (start 11.43 1.27) (end -11.43 1.27) (layer F.SilkS) (width 0.3048)) + (fp_line (start -11.43 1.27) (end -11.43 -1.27) (layer F.SilkS) (width 0.3048)) + (fp_line (start 11.43 -1.27) (end -11.43 -1.27) (layer F.SilkS) (width 0.3048)) + (fp_line (start -8.89 -1.27) (end -8.89 1.27) (layer F.SilkS) (width 0.3048)) + (pad 1 thru_hole rect (at -10.16 0) (size 1.397 1.397) (drill 0.8128) + (layers *.Cu *.Mask F.SilkS) + (net 2 N-0000010) + ) + (pad 2 thru_hole circle (at -7.62 0) (size 1.397 1.397) (drill 0.8128) + (layers *.Cu *.Mask F.SilkS) + (net 38 N-000009) + ) + (pad 3 thru_hole circle (at -5.08 0) (size 1.397 1.397) (drill 0.8128) + (layers *.Cu *.Mask F.SilkS) + (net 37 N-000008) + ) + (pad 4 thru_hole circle (at -2.54 0) (size 1.397 1.397) (drill 0.8128) + (layers *.Cu *.Mask F.SilkS) + (net 36 N-000007) + ) + (pad 5 thru_hole circle (at 0 0) (size 1.397 1.397) (drill 0.8128) + (layers *.Cu *.Mask F.SilkS) + (net 35 N-000006) + ) + (pad 6 thru_hole circle (at 2.54 0) (size 1.397 1.397) (drill 0.8128) + (layers *.Cu *.Mask F.SilkS) + (net 34 N-000005) + ) + (pad 7 thru_hole circle (at 5.08 0) (size 1.397 1.397) (drill 0.8128) + (layers *.Cu *.Mask F.SilkS) + (net 33 N-000004) + ) + (pad 8 thru_hole circle (at 7.62 0) (size 1.397 1.397) (drill 0.8128) + (layers *.Cu *.Mask F.SilkS) + (net 23 N-000003) + ) + (pad 9 thru_hole circle (at 10.16 0) (size 1.397 1.397) (drill 0.8128) + (layers *.Cu *.Mask F.SilkS) + (net 12 N-000002) + ) + ) + + (module SIL-10 (layer F.Cu) (tedit 200000) (tstamp 543ED081) + (at 163.06 175.74) + (descr "Connecteur 10 pins") + (tags "CONN DEV") + (path /543ECFCF) + (fp_text reference P4 (at -6.35 -2.54) (layer F.SilkS) + (effects (font (size 1.72974 1.08712) (thickness 0.3048))) + ) + (fp_text value CONN_10 (at 6.35 -2.54) (layer F.SilkS) + (effects (font (size 1.524 1.016) (thickness 0.3048))) + ) + (fp_line (start -12.7 1.27) (end -12.7 -1.27) (layer F.SilkS) (width 0.3048)) + (fp_line (start -12.7 -1.27) (end 12.7 -1.27) (layer F.SilkS) (width 0.3048)) + (fp_line (start 12.7 -1.27) (end 12.7 1.27) (layer F.SilkS) (width 0.3048)) + (fp_line (start 12.7 1.27) (end -12.7 1.27) (layer F.SilkS) (width 0.3048)) + (fp_line (start -10.16 1.27) (end -10.16 -1.27) (layer F.SilkS) (width 0.3048)) + (pad 1 thru_hole rect (at -11.43 0) (size 1.397 1.397) (drill 0.8128) + (layers *.Cu *.Mask F.SilkS) + (net 21 N-0000028) + ) + (pad 2 thru_hole circle (at -8.89 0) (size 1.397 1.397) (drill 0.8128) + (layers *.Cu *.Mask F.SilkS) + (net 20 N-0000027) + ) + (pad 3 thru_hole circle (at -6.35 0) (size 1.397 1.397) (drill 0.8128) + (layers *.Cu *.Mask F.SilkS) + (net 19 N-0000026) + ) + (pad 4 thru_hole circle (at -3.81 0) (size 1.397 1.397) (drill 0.8128) + (layers *.Cu *.Mask F.SilkS) + (net 18 N-0000025) + ) + (pad 5 thru_hole circle (at -1.27 0) (size 1.397 1.397) (drill 0.8128) + (layers *.Cu *.Mask F.SilkS) + (net 17 N-0000024) + ) + (pad 6 thru_hole circle (at 1.27 0) (size 1.397 1.397) (drill 0.8128) + (layers *.Cu *.Mask F.SilkS) + (net 16 N-0000023) + ) + (pad 7 thru_hole circle (at 3.81 0) (size 1.397 1.397) (drill 0.8128) + (layers *.Cu *.Mask F.SilkS) + (net 15 N-0000022) + ) + (pad 8 thru_hole circle (at 6.35 0) (size 1.397 1.397) (drill 0.8128) + (layers *.Cu *.Mask F.SilkS) + (net 14 N-0000021) + ) + (pad 9 thru_hole circle (at 8.89 0) (size 1.397 1.397) (drill 0.8128) + (layers *.Cu *.Mask F.SilkS) + (net 13 N-0000020) + ) + (pad 10 thru_hole circle (at 11.43 0) (size 1.397 1.397) (drill 0.8128) + (layers *.Cu *.Mask F.SilkS) + (net 11 N-0000019) + ) + ) + + (gr_text "NGC 38 pin rev 0.1" (at 163.23 182.62) (layer F.SilkS) (effects (font (size 1.5 1.5) (thickness 0.3))) ) (gr_line (start 180 120) (end 145 120) (angle 90) (layer Edge.Cuts) (width 0.1)) diff --git a/hardware/NGC_38_connector/NGC_38_connector.net b/hardware/NGC_38_connector/NGC_38_connector.net index 082bf0603b..e1c3e15d17 100644 --- a/hardware/NGC_38_connector/NGC_38_connector.net +++ b/hardware/NGC_38_connector/NGC_38_connector.net @@ -1,7 +1,7 @@ (export (version D) (design (source C:/stuff/rusefi_sourceforge/hardware/NGC_38_connector/NGC_38_connector.sch) - (date "13/10/2014 14:52:33") + (date "15/10/2014 23:52:59") (tool "eeschema (2013-07-07 BZR 4022)-stable")) (components (comp (ref P1) @@ -13,7 +13,22 @@ (value CONN_10) (libsource (lib conn) (part CONN_10)) (sheetpath (names /) (tstamps /)) - (tstamp 543BAEB3))) + (tstamp 543BAEB3)) + (comp (ref P4) + (value CONN_10) + (libsource (lib conn) (part CONN_10)) + (sheetpath (names /) (tstamps /)) + (tstamp 543ECFCF)) + (comp (ref P5) + (value CONN_9) + (libsource (lib conn) (part CONN_9)) + (sheetpath (names /) (tstamps /)) + (tstamp 543ECFDE)) + (comp (ref P3) + (value CONN_9) + (libsource (lib conn) (part CONN_9)) + (sheetpath (names /) (tstamps /)) + (tstamp 543ECFEB))) (libparts (libpart (lib conn) (part CONN_10) (description "Symbole general de connecteur") @@ -31,6 +46,21 @@ (pin (num 8) (name P8) (type passive)) (pin (num 9) (name P9) (type passive)) (pin (num 10) (name P10) (type passive)))) + (libpart (lib conn) (part CONN_9) + (description "Symbole general de connecteur") + (fields + (field (name Reference) P) + (field (name Value) CONN_9)) + (pins + (pin (num 1) (name P1) (type passive)) + (pin (num 2) (name P2) (type passive)) + (pin (num 3) (name P3) (type passive)) + (pin (num 4) (name P4) (type passive)) + (pin (num 5) (name P5) (type passive)) + (pin (num 6) (name P6) (type passive)) + (pin (num 7) (name P7) (type passive)) + (pin (num 8) (name P8) (type passive)) + (pin (num 9) (name P9) (type passive)))) (libpart (lib conn) (part DIL38) (fields (field (name Reference) P) @@ -79,88 +109,116 @@ (uri "C:\\Program Files (x86)\\KiCad\\share\\library\\conn.lib"))) (nets (net (code 1) (name "") - (node (ref P1) (pin 7)) - (node (ref P2) (pin 7))) + (node (ref P5) (pin 4)) + (node (ref P1) (pin 23))) (net (code 2) (name "") - (node (ref P1) (pin 17))) - (net (code 3) (name "") - (node (ref P1) (pin 27))) - (net (code 4) (name "") - (node (ref P1) (pin 37))) - (net (code 5) (name "") - (node (ref P1) (pin 18))) - (net (code 6) (name "") - (node (ref P1) (pin 28))) - (net (code 7) (name "") - (node (ref P1) (pin 38))) - (net (code 8) (name "") + (node (ref P3) (pin 9)) (node (ref P1) (pin 19))) + (net (code 3) (name "") + (node (ref P3) (pin 8)) + (node (ref P1) (pin 18))) + (net (code 4) (name "") + (node (ref P1) (pin 17)) + (node (ref P3) (pin 7))) + (net (code 5) (name "") + (node (ref P3) (pin 6)) + (node (ref P1) (pin 16))) + (net (code 6) (name "") + (node (ref P1) (pin 15)) + (node (ref P3) (pin 5))) + (net (code 7) (name "") + (node (ref P1) (pin 14)) + (node (ref P3) (pin 4))) + (net (code 8) (name "") + (node (ref P3) (pin 3)) + (node (ref P1) (pin 13))) (net (code 9) (name "") - (node (ref P1) (pin 29))) + (node (ref P3) (pin 2)) + (node (ref P1) (pin 12))) (net (code 10) (name "") - (node (ref P2) (pin 1)) - (node (ref P1) (pin 1))) + (node (ref P3) (pin 1)) + (node (ref P1) (pin 11))) (net (code 11) (name "") - (node (ref P1) (pin 2)) - (node (ref P2) (pin 2))) + (node (ref P5) (pin 9)) + (node (ref P1) (pin 28))) (net (code 12) (name "") - (node (ref P2) (pin 3)) - (node (ref P1) (pin 3))) + (node (ref P5) (pin 8)) + (node (ref P1) (pin 27))) (net (code 13) (name "") - (node (ref P1) (pin 4)) - (node (ref P2) (pin 4))) + (node (ref P5) (pin 7)) + (node (ref P1) (pin 26))) (net (code 14) (name "") - (node (ref P1) (pin 5)) - (node (ref P2) (pin 5))) + (node (ref P1) (pin 25)) + (node (ref P5) (pin 6))) (net (code 15) (name "") - (node (ref P2) (pin 6)) - (node (ref P1) (pin 6))) + (node (ref P5) (pin 5)) + (node (ref P1) (pin 24))) (net (code 16) (name "") - (node (ref P1) (pin 36))) + (node (ref P5) (pin 1)) + (node (ref P1) (pin 20))) (net (code 17) (name "") - (node (ref P2) (pin 8)) - (node (ref P1) (pin 8))) + (node (ref P1) (pin 22)) + (node (ref P5) (pin 3))) (net (code 18) (name "") - (node (ref P1) (pin 9)) - (node (ref P2) (pin 9))) + (node (ref P1) (pin 21)) + (node (ref P5) (pin 2))) (net (code 19) (name "") + (node (ref P4) (pin 10)) + (node (ref P1) (pin 38))) + (net (code 20) (name "") + (node (ref P1) (pin 37)) + (node (ref P4) (pin 9))) + (net (code 21) (name "") + (node (ref P4) (pin 8)) + (node (ref P1) (pin 36))) + (net (code 22) (name "") + (node (ref P4) (pin 7)) + (node (ref P1) (pin 35))) + (net (code 23) (name "") + (node (ref P4) (pin 6)) + (node (ref P1) (pin 34))) + (net (code 24) (name "") + (node (ref P1) (pin 33)) + (node (ref P4) (pin 5))) + (net (code 25) (name "") + (node (ref P1) (pin 32)) + (node (ref P4) (pin 4))) + (net (code 26) (name "") + (node (ref P1) (pin 31)) + (node (ref P4) (pin 3))) + (net (code 27) (name "") + (node (ref P1) (pin 30)) + (node (ref P4) (pin 2))) + (net (code 28) (name "") + (node (ref P1) (pin 29)) + (node (ref P4) (pin 1))) + (net (code 29) (name "") (node (ref P2) (pin 10)) (node (ref P1) (pin 10))) - (net (code 20) (name "") - (node (ref P1) (pin 12))) - (net (code 21) (name "") - (node (ref P1) (pin 20))) - (net (code 22) (name "") - (node (ref P1) (pin 30))) - (net (code 23) (name "") - (node (ref P1) (pin 11))) - (net (code 24) (name "") - (node (ref P1) (pin 21))) - (net (code 25) (name "") - (node (ref P1) (pin 31))) - (net (code 26) (name "") - (node (ref P1) (pin 22))) - (net (code 27) (name "") - (node (ref P1) (pin 32))) - (net (code 28) (name "") - (node (ref P1) (pin 13))) - (net (code 29) (name "") - (node (ref P1) (pin 23))) (net (code 30) (name "") - (node (ref P1) (pin 33))) + (node (ref P1) (pin 9)) + (node (ref P2) (pin 9))) (net (code 31) (name "") - (node (ref P1) (pin 14))) + (node (ref P1) (pin 8)) + (node (ref P2) (pin 8))) (net (code 32) (name "") - (node (ref P1) (pin 24))) + (node (ref P1) (pin 7)) + (node (ref P2) (pin 7))) (net (code 33) (name "") - (node (ref P1) (pin 34))) + (node (ref P1) (pin 5)) + (node (ref P2) (pin 5))) (net (code 34) (name "") - (node (ref P1) (pin 15))) + (node (ref P2) (pin 4)) + (node (ref P1) (pin 4))) (net (code 35) (name "") - (node (ref P1) (pin 25))) + (node (ref P2) (pin 3)) + (node (ref P1) (pin 3))) (net (code 36) (name "") - (node (ref P1) (pin 35))) + (node (ref P1) (pin 2)) + (node (ref P2) (pin 2))) (net (code 37) (name "") - (node (ref P1) (pin 16))) + (node (ref P2) (pin 6)) + (node (ref P1) (pin 6))) (net (code 38) (name "") - (node (ref P1) (pin 26))))) \ No newline at end of file + (node (ref P2) (pin 1)) + (node (ref P1) (pin 1))))) \ No newline at end of file diff --git a/hardware/NGC_38_connector/NGC_38_connector.sch b/hardware/NGC_38_connector/NGC_38_connector.sch index c299e5bbaf..471420e69f 100644 --- a/hardware/NGC_38_connector/NGC_38_connector.sch +++ b/hardware/NGC_38_connector/NGC_38_connector.sch @@ -36,7 +36,7 @@ $Descr A4 11693 8268 encoding utf-8 Sheet 1 1 Title "" -Date "13 oct 2014" +Date "15 oct 2014" Rev "" Comp "" Comment1 "" @@ -86,4 +86,93 @@ Wire Wire Line 4700 2750 4550 2750 Wire Wire Line 4550 2850 4700 2850 +$Comp +L CONN_10 P4 +U 1 1 543ECFCF +P 6050 3300 +F 0 "P4" V 6000 3300 60 0000 C CNN +F 1 "CONN_10" V 6100 3300 60 0000 C CNN +F 2 "" H 6050 3300 60 0000 C CNN +F 3 "" H 6050 3300 60 0000 C CNN + 1 6050 3300 + 1 0 0 -1 +$EndComp +$Comp +L CONN_9 P5 +U 1 1 543ECFDE +P 6050 2350 +F 0 "P5" V 6000 2350 60 0000 C CNN +F 1 "CONN_9" V 6100 2350 60 0000 C CNN +F 2 "" H 6050 2350 60 0000 C CNN +F 3 "" H 6050 2350 60 0000 C CNN + 1 6050 2350 + 1 0 0 -1 +$EndComp +$Comp +L CONN_9 P3 +U 1 1 543ECFEB +P 4200 3350 +F 0 "P3" V 4150 3350 60 0000 C CNN +F 1 "CONN_9" V 4250 3350 60 0000 C CNN +F 2 "" H 4200 3350 60 0000 C CNN +F 3 "" H 4200 3350 60 0000 C CNN + 1 4200 3350 + -1 0 0 -1 +$EndComp +Wire Wire Line + 5700 1950 5400 1950 +Wire Wire Line + 5400 2050 5700 2050 +Wire Wire Line + 5700 2150 5400 2150 +Wire Wire Line + 5400 2550 5700 2550 +Wire Wire Line + 5700 3450 5400 3450 +Wire Wire Line + 5400 3550 5700 3550 +Wire Wire Line + 5700 3650 5400 3650 +Wire Wire Line + 5400 3750 5700 3750 +Wire Wire Line + 4700 3750 4550 3750 +Wire Wire Line + 4550 3650 4700 3650 +Wire Wire Line + 4550 3550 4700 3550 +Wire Wire Line + 5400 2650 5700 2650 +Wire Wire Line + 5700 2450 5400 2450 +Wire Wire Line + 5400 2350 5700 2350 +Wire Wire Line + 5700 2250 5400 2250 +Wire Wire Line + 5400 2750 5700 2750 +Wire Wire Line + 5700 2850 5400 2850 +Wire Wire Line + 5400 2950 5700 2950 +Wire Wire Line + 5700 3050 5400 3050 +Wire Wire Line + 5400 3150 5700 3150 +Wire Wire Line + 5700 3250 5400 3250 +Wire Wire Line + 5400 3350 5700 3350 +Wire Wire Line + 4700 2950 4550 2950 +Wire Wire Line + 4550 3050 4700 3050 +Wire Wire Line + 4700 3150 4550 3150 +Wire Wire Line + 4550 3250 4700 3250 +Wire Wire Line + 4700 3350 4550 3350 +Wire Wire Line + 4550 3450 4700 3450 $EndSCHEMATC