auto-sync

This commit is contained in:
rusEfi 2016-12-25 22:02:40 -05:00
parent 59c83d11a4
commit 2f23b4a3b9
6 changed files with 1617 additions and 1368 deletions

View File

@ -44,7 +44,7 @@ public:
* this method schedules all fuel events for an engine cycle * this method schedules all fuel events for an engine cycle
*/ */
void addFuelEvents(DECLARE_ENGINE_PARAMETER_F); void addFuelEvents(DECLARE_ENGINE_PARAMETER_F);
void addFuelEventsForCylinder(int i DECLARE_ENGINE_PARAMETER_S); bool addFuelEventsForCylinder(int i DECLARE_ENGINE_PARAMETER_S);
InjectionEvent elements[MAX_INJECTION_OUTPUT_COUNT]; InjectionEvent elements[MAX_INJECTION_OUTPUT_COUNT];
bool isReady; bool isReady;

View File

@ -101,13 +101,13 @@ void FuelSchedule::clear() {
isReady = false; isReady = false;
} }
void FuelSchedule::addFuelEventsForCylinder(int i DECLARE_ENGINE_PARAMETER_S) { bool FuelSchedule::addFuelEventsForCylinder(int i DECLARE_ENGINE_PARAMETER_S) {
efiAssertVoid(engine!=NULL, "engine is NULL"); efiAssert(engine!=NULL, "engine is NULL", false);
if (cisnan(engine->rpmCalculator.oneDegreeUs)) { if (cisnan(engine->rpmCalculator.oneDegreeUs)) {
// in order to have fuel schedule we need to have current RPM // in order to have fuel schedule we need to have current RPM
// wonder if this line slows engine startup? // wonder if this line slows engine startup?
return; return false;
} }
/** /**
@ -142,9 +142,9 @@ void FuelSchedule::addFuelEventsForCylinder(int i DECLARE_ENGINE_PARAMETER_S) {
int cylindersCount = CONFIG(specs.cylindersCount); int cylindersCount = CONFIG(specs.cylindersCount);
if (cylindersCount < 1) { if (cylindersCount < 1) {
firmwareError(OBD_PCM_Processor_Fault, "temp cylindersCount %d", cylindersCount); warning(CUSTOM_OBD_ZERO_CYLINDER_COUNT, "temp cylindersCount %d", cylindersCount);
return false;
} }
efiAssertVoid(cylindersCount > 0, "cylindersCount");
float angle = baseAngle float angle = baseAngle
+ i * ENGINE(engineCycle) / cylindersCount; + i * ENGINE(engineCycle) / cylindersCount;
@ -179,12 +179,13 @@ void FuelSchedule::addFuelEventsForCylinder(int i DECLARE_ENGINE_PARAMETER_S) {
ev->isSimultanious = isSimultanious; ev->isSimultanious = isSimultanious;
efiAssertVoid(TRIGGER_SHAPE(getSize()) > 0, "uninitialized TriggerShape"); efiAssert(TRIGGER_SHAPE(getSize()) > 0, "uninitialized TriggerShape", false);
TRIGGER_SHAPE(findTriggerPosition(&ev->injectionStart, angle PASS_ENGINE_PARAMETER)); TRIGGER_SHAPE(findTriggerPosition(&ev->injectionStart, angle PASS_ENGINE_PARAMETER));
#if EFI_UNIT_TEST #if EFI_UNIT_TEST
printf("registerInjectionEvent angle=%f trgIndex=%d inj %d\r\n", angle, ev->injectionStart.eventIndex, index); printf("registerInjectionEvent angle=%f trgIndex=%d inj %d\r\n", angle, ev->injectionStart.eventIndex, index);
#endif #endif
return true;
} }
void FuelSchedule::addFuelEvents(DECLARE_ENGINE_PARAMETER_F) { void FuelSchedule::addFuelEvents(DECLARE_ENGINE_PARAMETER_F) {
@ -193,7 +194,9 @@ void FuelSchedule::addFuelEvents(DECLARE_ENGINE_PARAMETER_F) {
for (int i = 0; i < CONFIG(specs.cylindersCount); i++) { for (int i = 0; i < CONFIG(specs.cylindersCount); i++) {
InjectionEvent *ev = &elements[i]; InjectionEvent *ev = &elements[i];
ev->ownIndex = i; ev->ownIndex = i;
addFuelEventsForCylinder(i PASS_ENGINE_PARAMETER); bool result = addFuelEventsForCylinder(i PASS_ENGINE_PARAMETER);
if (!result)
return;
} }
isReady = true; isReady = true;
} }

File diff suppressed because it is too large Load Diff

View File

@ -1,7 +1,7 @@
(export (version D) (export (version D)
(design (design
(source C:/Users/Vista_64_D630/Desktop/Jared/code/Hardware/trunk/rusefi.com/brain_board_STM32F407/brain_board_STM32F407.sch) (source C:/Users/Vista_64_D630/Desktop/Jared/code/Hardware/trunk/rusefi.com/brain_board_STM32F407/brain_board_STM32F407.sch)
(date "12/25/2016 7:28:20 AM") (date "12/25/2016 9:06:12 PM")
(tool "Eeschema 4.0.1-stable") (tool "Eeschema 4.0.1-stable")
(sheet (number 1) (name /) (tstamps /) (sheet (number 1) (name /) (tstamps /)
(title_block (title_block
@ -431,7 +431,13 @@
(footprint Connect:IDC_Header_Straight_10pins) (footprint Connect:IDC_Header_Straight_10pins)
(libsource (lib conn) (part CONN_02X05)) (libsource (lib conn) (part CONN_02X05))
(sheetpath (names /) (tstamps /)) (sheetpath (names /) (tstamps /))
(tstamp 58635876))) (tstamp 58635876))
(comp (ref P5)
(value CONN_01X06)
(footprint Pin_Headers:Pin_Header_Angled_1x06)
(libsource (lib conn) (part CONN_01X06))
(sheetpath (names /) (tstamps /))
(tstamp 58616354)))
(libparts (libparts
(libpart (lib KICAD_Older_Version) (part BATTERY_CR2032) (libpart (lib KICAD_Older_Version) (part BATTERY_CR2032)
(footprints (footprints
@ -453,6 +459,23 @@
(pins (pins
(pin (num 1) (name ~) (type passive)) (pin (num 1) (name ~) (type passive))
(pin (num 2) (name ~) (type passive)))) (pin (num 2) (name ~) (type passive))))
(libpart (lib conn) (part CONN_01X06)
(description "Connector 01x06")
(footprints
(fp Pin_Header_Straight_1X06)
(fp Pin_Header_Angled_1X06)
(fp Socket_Strip_Straight_1X06)
(fp Socket_Strip_Angled_1X06))
(fields
(field (name Reference) P)
(field (name Value) CONN_01X06))
(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))))
(libpart (lib conn) (part CONN_02X05) (libpart (lib conn) (part CONN_02X05)
(description "Connector 02x05") (description "Connector 02x05")
(footprints (footprints
@ -787,472 +810,478 @@
(library (logical "crystal(mc306)") (library (logical "crystal(mc306)")
(uri "C:\\Users\\Vista_64_D630\\Desktop\\Jared\\code\\Hardware\\trunk\\rusefi.com\\rusefi_lib\\crystal(mc306).lib"))) (uri "C:\\Users\\Vista_64_D630\\Desktop\\Jared\\code\\Hardware\\trunk\\rusefi.com\\rusefi_lib\\crystal(mc306).lib")))
(nets (nets
(net (code 1) (name /PB12) (net (code 1) (name /PB10)
(node (ref P1) (pin 36))
(node (ref U1) (pin 51)))
(net (code 2) (name /PB11)
(node (ref U1) (pin 48))
(node (ref P1) (pin 35)))
(net (code 3) (name /PB13)
(node (ref P1) (pin 37))
(node (ref U1) (pin 52)))
(net (code 4) (name /PB15)
(node (ref P1) (pin 39))
(node (ref U1) (pin 54)))
(net (code 5) (name /PB10)
(node (ref U1) (pin 47)) (node (ref U1) (pin 47))
(node (ref P1) (pin 34))) (node (ref P1) (pin 34)))
(net (code 6) (name /PB14) (net (code 2) (name /PB12)
(node (ref U1) (pin 53)) (node (ref U1) (pin 51))
(node (ref P1) (pin 38))) (node (ref P1) (pin 36)))
(net (code 7) (name /PD8) (net (code 3) (name /PB14)
(node (ref P1) (pin 38))
(node (ref U1) (pin 53)))
(net (code 4) (name /PD8)
(node (ref U1) (pin 55)) (node (ref U1) (pin 55))
(node (ref P1) (pin 40))) (node (ref P1) (pin 40)))
(net (code 8) (name /PB8) (net (code 5) (name /PD10)
(node (ref U1) (pin 57))
(node (ref P1) (pin 42)))
(net (code 6) (name /PB8)
(node (ref U1) (pin 95)) (node (ref U1) (pin 95))
(node (ref P2) (pin 19))) (node (ref P2) (pin 19)))
(net (code 9) (name /BOOT0) (net (code 7) (name /PD7)
(node (ref U1) (pin 94)) (node (ref U1) (pin 88))
(node (ref R4) (pin 2)) (node (ref P2) (pin 27)))
(node (ref P2) (pin 21))) (net (code 8) (name /PD5)
(net (code 10) (name /PD7)
(node (ref P2) (pin 27))
(node (ref U1) (pin 88)))
(net (code 11) (name /PD5)
(node (ref P2) (pin 29)) (node (ref P2) (pin 29))
(node (ref U1) (pin 86))) (node (ref U1) (pin 86)))
(net (code 12) (name /PD3) (net (code 9) (name /PD3)
(node (ref U1) (pin 84)) (node (ref P2) (pin 31))
(node (ref P2) (pin 31))) (node (ref U1) (pin 84)))
(net (code 13) (name /PA5) (net (code 10) (name /PD1)
(node (ref P1) (pin 15))
(node (ref U1) (pin 30)))
(net (code 14) (name /PC1)
(node (ref U1) (pin 16))
(node (ref P1) (pin 7)))
(net (code 15) (name /PC3)
(node (ref U1) (pin 18))
(node (ref P1) (pin 9)))
(net (code 16) (name /PA1)
(node (ref U1) (pin 24))
(node (ref P1) (pin 11)))
(net (code 17) (name /PA3)
(node (ref P1) (pin 13))
(node (ref U1) (pin 26)))
(net (code 18) (name /PD1)
(node (ref P2) (pin 33)) (node (ref P2) (pin 33))
(node (ref U1) (pin 82))) (node (ref U1) (pin 82)))
(net (code 19) (name /PA7) (net (code 11) (name /PC12)
(node (ref U1) (pin 32)) (node (ref U1) (pin 80))
(node (ref P1) (pin 17))) (node (ref P2) (pin 35)))
(net (code 20) (name /PC5) (net (code 12) (name /PC10)
(node (ref P1) (pin 19))
(node (ref U1) (pin 34)))
(net (code 21) (name /PB1)
(node (ref P1) (pin 21))
(node (ref U1) (pin 36)))
(net (code 22) (name /PC0)
(node (ref U1) (pin 15))
(node (ref P1) (pin 8)))
(net (code 23) (name /PC2)
(node (ref U1) (pin 17))
(node (ref P1) (pin 10)))
(net (code 24) (name /PA0)
(node (ref R5) (pin 1))
(node (ref P1) (pin 12))
(node (ref U1) (pin 23)))
(net (code 25) (name /PA2)
(node (ref P1) (pin 14))
(node (ref U1) (pin 25)))
(net (code 26) (name /PA4)
(node (ref P1) (pin 16))
(node (ref U1) (pin 29)))
(net (code 27) (name /PA6)
(node (ref P1) (pin 18))
(node (ref U1) (pin 31)))
(net (code 28) (name /PC4)
(node (ref U1) (pin 33))
(node (ref P1) (pin 20)))
(net (code 29) (name /PB0)
(node (ref U1) (pin 35))
(node (ref P1) (pin 22)))
(net (code 30) (name /PB2)
(node (ref P1) (pin 24))
(node (ref U1) (pin 37)))
(net (code 31) (name /PB5)
(node (ref U1) (pin 91))
(node (ref P2) (pin 26)))
(net (code 32) (name /PC12)
(node (ref P2) (pin 35))
(node (ref U1) (pin 80)))
(net (code 33) (name /PC10)
(node (ref U1) (pin 78)) (node (ref U1) (pin 78))
(node (ref P2) (pin 37))) (node (ref P2) (pin 37)))
(net (code 34) (name /PA10) (net (code 13) (name /PA10)
(node (ref U1) (pin 69)) (node (ref U1) (pin 69))
(node (ref P2) (pin 41))) (node (ref P2) (pin 41)))
(net (code 35) (name /PA8) (net (code 14) (name /PA8)
(node (ref P2) (pin 43)) (node (ref P2) (pin 43))
(node (ref U1) (pin 67))) (node (ref U1) (pin 67)))
(net (code 36) (name /PC8) (net (code 15) (name /PC8)
(node (ref U1) (pin 65)) (node (ref P2) (pin 45))
(node (ref P2) (pin 45))) (node (ref U1) (pin 65)))
(net (code 37) (name /PC6) (net (code 16) (name /PC6)
(node (ref U1) (pin 63)) (node (ref P2) (pin 47))
(node (ref P2) (pin 47))) (node (ref U1) (pin 63)))
(net (code 38) (name /PC13) (net (code 17) (name /PC13)
(node (ref P2) (pin 12)) (node (ref U1) (pin 7))
(node (ref U1) (pin 7))) (node (ref P2) (pin 12)))
(net (code 39) (name /PB9) (net (code 18) (name /PA2)
(node (ref U1) (pin 96)) (node (ref U1) (pin 25))
(node (ref P2) (pin 20))) (node (ref P1) (pin 14)))
(net (code 40) (name /PB7) (net (code 19) (name /PC1)
(node (ref P2) (pin 24)) (node (ref P1) (pin 7))
(node (ref U1) (pin 93))) (node (ref U1) (pin 16)))
(net (code 41) (name /PD6) (net (code 20) (name /PC3)
(node (ref U1) (pin 18))
(node (ref P1) (pin 9)))
(net (code 21) (name /PA1)
(node (ref U1) (pin 24))
(node (ref P1) (pin 11)))
(net (code 22) (name /PA3)
(node (ref P1) (pin 13))
(node (ref U1) (pin 26)))
(net (code 23) (name /PA5)
(node (ref P1) (pin 15))
(node (ref U1) (pin 30)))
(net (code 24) (name /PA7)
(node (ref P1) (pin 17))
(node (ref U1) (pin 32)))
(net (code 25) (name /PC5)
(node (ref U1) (pin 34))
(node (ref P1) (pin 19)))
(net (code 26) (name /PB1)
(node (ref P1) (pin 21))
(node (ref U1) (pin 36)))
(net (code 27) (name /PC0)
(node (ref P1) (pin 8))
(node (ref U1) (pin 15)))
(net (code 28) (name /PC2)
(node (ref P1) (pin 10))
(node (ref U1) (pin 17)))
(net (code 29) (name /PA0)
(node (ref P1) (pin 12))
(node (ref R5) (pin 1))
(node (ref U1) (pin 23)))
(net (code 30) (name /PA4)
(node (ref U1) (pin 29))
(node (ref P1) (pin 16)))
(net (code 31) (name /PA6)
(node (ref P1) (pin 18))
(node (ref U1) (pin 31)))
(net (code 32) (name /PC4)
(node (ref U1) (pin 33))
(node (ref P1) (pin 20)))
(net (code 33) (name /PB0)
(node (ref P1) (pin 22))
(node (ref U1) (pin 35)))
(net (code 34) (name /PB2)
(node (ref U1) (pin 37))
(node (ref P1) (pin 24)))
(net (code 35) (name /PE9)
(node (ref P1) (pin 27))
(node (ref U1) (pin 40)))
(net (code 36) (name /PB11)
(node (ref U1) (pin 48))
(node (ref P1) (pin 35)))
(net (code 37) (name /PB13)
(node (ref P1) (pin 37))
(node (ref U1) (pin 52)))
(net (code 38) (name /PB15)
(node (ref U1) (pin 54))
(node (ref P1) (pin 39)))
(net (code 39) (name /PD9)
(node (ref P1) (pin 41))
(node (ref U1) (pin 56)))
(net (code 40) (name /PD11)
(node (ref P1) (pin 43))
(node (ref U1) (pin 58)))
(net (code 41) (name /PC9)
(node (ref P2) (pin 46))
(node (ref U1) (pin 66)))
(net (code 42) (name /PB9)
(node (ref P2) (pin 20))
(node (ref U1) (pin 96)))
(net (code 43) (name /PB7)
(node (ref U1) (pin 93))
(node (ref P2) (pin 24)))
(net (code 44) (name /PD6)
(node (ref P2) (pin 30)) (node (ref P2) (pin 30))
(node (ref U1) (pin 87))) (node (ref U1) (pin 87)))
(net (code 42) (name /PD4) (net (code 45) (name /PD2)
(node (ref P2) (pin 32)) (node (ref P2) (pin 34))
(node (ref U1) (pin 85))) (node (ref U1) (pin 83)))
(net (code 43) (name /PD2) (net (code 46) (name /PD0)
(node (ref U1) (pin 83))
(node (ref P2) (pin 34)))
(net (code 44) (name /PD0)
(node (ref P2) (pin 36)) (node (ref P2) (pin 36))
(node (ref U1) (pin 81))) (node (ref U1) (pin 81)))
(net (code 45) (name /PC11) (net (code 47) (name /PC11)
(node (ref P2) (pin 38)) (node (ref P2) (pin 38))
(node (ref U1) (pin 79))) (node (ref U1) (pin 79)))
(net (code 46) (name /PA15) (net (code 48) (name /PA15)
(node (ref U1) (pin 77)) (node (ref U1) (pin 77))
(node (ref P2) (pin 40))) (node (ref P2) (pin 40)))
(net (code 47) (name /PC9) (net (code 49) (name /PC7)
(node (ref U1) (pin 66)) (node (ref P2) (pin 48))
(node (ref P2) (pin 46))) (node (ref U1) (pin 64)))
(net (code 48) (name "Net-(JP5-Pad2)")
(node (ref U1) (pin 6))
(node (ref JP5) (pin 2)))
(net (code 49) (name "Net-(BT1-Pad1)")
(node (ref BT1) (pin 1))
(node (ref JP5) (pin 3)))
(net (code 50) (name GND) (net (code 50) (name GND)
(node (ref U1) (pin 27)) (node (ref BT1) (pin 2))
(node (ref C15) (pin 2)) (node (ref D1) (pin 2))
(node (ref D2) (pin 2))
(node (ref P1) (pin 49))
(node (ref P2) (pin 2))
(node (ref U1) (pin 74))
(node (ref P1) (pin 23))
(node (ref U1) (pin 10))
(node (ref U1) (pin 20))
(node (ref P2) (pin 1))
(node (ref P2) (pin 50))
(node (ref P2) (pin 49))
(node (ref P4) (pin 8))
(node (ref P4) (pin 7))
(node (ref U1) (pin 99))
(node (ref P1) (pin 1))
(node (ref P1) (pin 2))
(node (ref P1) (pin 5))
(node (ref J1) (pin 5))
(node (ref C2) (pin 2))
(node (ref C3) (pin 2))
(node (ref P3) (pin 2))
(node (ref U3) (pin 4)) (node (ref U3) (pin 4))
(node (ref U3) (pin 2)) (node (ref U3) (pin 2))
(node (ref C1) (pin 1)) (node (ref J2) (pin 5))
(node (ref C17) (pin 2)) (node (ref C9) (pin 1))
(node (ref C10) (pin 1)) (node (ref C10) (pin 1))
(node (ref C11) (pin 1)) (node (ref C11) (pin 1))
(node (ref C12) (pin 1)) (node (ref C12) (pin 1))
(node (ref P2) (pin 1))
(node (ref P2) (pin 2))
(node (ref C8) (pin 1))
(node (ref P1) (pin 23))
(node (ref C5) (pin 1))
(node (ref C9) (pin 1))
(node (ref C14) (pin 1))
(node (ref C16) (pin 1))
(node (ref P2) (pin 50))
(node (ref P1) (pin 49))
(node (ref C13) (pin 1)) (node (ref C13) (pin 1))
(node (ref C18) (pin 1)) (node (ref C14) (pin 1))
(node (ref C6) (pin 1))
(node (ref C7) (pin 1))
(node (ref C22) (pin 1))
(node (ref C21) (pin 1))
(node (ref P4) (pin 7))
(node (ref P4) (pin 8))
(node (ref U1) (pin 74))
(node (ref BT1) (pin 2))
(node (ref P1) (pin 5))
(node (ref R1) (pin 2))
(node (ref SW1) (pin 2)) (node (ref SW1) (pin 2))
(node (ref U1) (pin 99)) (node (ref C1) (pin 1))
(node (ref D11) (pin 2))
(node (ref D1) (pin 2))
(node (ref D2) (pin 2))
(node (ref D3) (pin 2))
(node (ref D4) (pin 2))
(node (ref U1) (pin 20))
(node (ref D7) (pin 2))
(node (ref U1) (pin 10))
(node (ref D8) (pin 2))
(node (ref C20) (pin 2))
(node (ref R14) (pin 2))
(node (ref C2) (pin 2))
(node (ref P3) (pin 2))
(node (ref P1) (pin 2))
(node (ref C3) (pin 2))
(node (ref R4) (pin 1))
(node (ref J2) (pin 5))
(node (ref J1) (pin 5))
(node (ref P1) (pin 50))
(node (ref C19) (pin 2))
(node (ref U2) (pin 2)) (node (ref U2) (pin 2))
(node (ref P2) (pin 49)) (node (ref U1) (pin 27))
(node (ref P1) (pin 1))) (node (ref R14) (pin 2))
(net (code 51) (name "Net-(JP1-Pad2)") (node (ref C20) (pin 2))
(node (ref D11) (pin 2))
(node (ref C6) (pin 1))
(node (ref D8) (pin 2))
(node (ref C7) (pin 1))
(node (ref C8) (pin 1))
(node (ref D4) (pin 2))
(node (ref D7) (pin 2))
(node (ref C17) (pin 2))
(node (ref C16) (pin 1))
(node (ref C15) (pin 2))
(node (ref C22) (pin 1))
(node (ref R1) (pin 2))
(node (ref D3) (pin 2))
(node (ref C21) (pin 1))
(node (ref P1) (pin 50))
(node (ref R4) (pin 1))
(node (ref C5) (pin 1))
(node (ref P5) (pin 6))
(node (ref C19) (pin 2))
(node (ref C18) (pin 1)))
(net (code 51) (name /VDD)
(node (ref U1) (pin 28))
(node (ref P1) (pin 4))
(node (ref U1) (pin 19))
(node (ref P1) (pin 3))
(node (ref C16) (pin 2))
(node (ref U1) (pin 100))
(node (ref U1) (pin 11))
(node (ref U1) (pin 75))
(node (ref R3) (pin 1))
(node (ref U1) (pin 50))
(node (ref SW2) (pin 2))
(node (ref FB1) (pin 2))
(node (ref C4) (pin 1))
(node (ref C12) (pin 2))
(node (ref C9) (pin 2))
(node (ref C11) (pin 2))
(node (ref C13) (pin 2))
(node (ref C14) (pin 2))
(node (ref R13) (pin 2))
(node (ref C10) (pin 2))
(node (ref P2) (pin 22))
(node (ref P5) (pin 1))
(node (ref U3) (pin 3))
(node (ref P4) (pin 3))
(node (ref P4) (pin 4))
(node (ref D9) (pin 1))
(node (ref JP5) (pin 1)))
(net (code 52) (name "Net-(JP4-Pad2)")
(node (ref R9) (pin 2))
(node (ref JP4) (pin 2)))
(net (code 53) (name "Net-(JP1-Pad2)")
(node (ref JP1) (pin 2)) (node (ref JP1) (pin 2))
(node (ref R6) (pin 2))) (node (ref R6) (pin 2)))
(net (code 52) (name "Net-(JP2-Pad2)") (net (code 54) (name "Net-(JP2-Pad2)")
(node (ref JP2) (pin 2)) (node (ref JP2) (pin 2))
(node (ref R7) (pin 2))) (node (ref R7) (pin 2)))
(net (code 53) (name "Net-(JP4-Pad2)") (net (code 55) (name "Net-(JP3-Pad2)")
(node (ref JP4) (pin 2)) (node (ref JP3) (pin 2))
(node (ref R9) (pin 2))) (node (ref R8) (pin 2)))
(net (code 54) (name "Net-(JP3-Pad2)") (net (code 56) (name /PD12)
(node (ref R8) (pin 2))
(node (ref JP3) (pin 2)))
(net (code 55) (name /PD12)
(node (ref U1) (pin 59))
(node (ref JP1) (pin 1)) (node (ref JP1) (pin 1))
(node (ref P1) (pin 44))) (node (ref P1) (pin 44))
(net (code 56) (name /PD13) (node (ref U1) (pin 59)))
(node (ref P1) (pin 45)) (net (code 57) (name /PD13)
(node (ref JP2) (pin 1))
(node (ref U1) (pin 60)) (node (ref U1) (pin 60))
(node (ref JP2) (pin 1))) (node (ref P1) (pin 45)))
(net (code 57) (name /PD14) (net (code 58) (name /PD14)
(node (ref JP3) (pin 1))
(node (ref U1) (pin 61)) (node (ref U1) (pin 61))
(node (ref JP3) (pin 1))
(node (ref P1) (pin 46))) (node (ref P1) (pin 46)))
(net (code 58) (name /PD15) (net (code 59) (name /PD15)
(node (ref U1) (pin 62)) (node (ref U1) (pin 62))
(node (ref P1) (pin 47)) (node (ref JP4) (pin 1))
(node (ref JP4) (pin 1))) (node (ref P1) (pin 47)))
(net (code 59) (name "Net-(P2-Pad7)") (net (code 60) (name "Net-(P2-Pad7)")
(node (ref P2) (pin 7))) (node (ref P2) (pin 7)))
(net (code 60) (name "Net-(P2-Pad8)") (net (code 61) (name "Net-(P2-Pad8)")
(node (ref P2) (pin 8))) (node (ref P2) (pin 8)))
(net (code 61) (name /5V) (net (code 62) (name "Net-(JP5-Pad2)")
(node (ref P4) (pin 2)) (node (ref U1) (pin 6))
(node (ref C19) (pin 1)) (node (ref JP5) (pin 2)))
(node (ref D6) (pin 2)) (net (code 63) (name "Net-(BT1-Pad1)")
(node (ref U3) (pin 1)) (node (ref JP5) (pin 3))
(node (ref C18) (pin 2)) (node (ref BT1) (pin 1)))
(node (ref P2) (pin 4)) (net (code 64) (name "Net-(D7-Pad1)")
(node (ref P2) (pin 3)) (node (ref D7) (pin 1))
(node (ref R11) (pin 1)))
(net (code 65) (name "Net-(D8-Pad1)")
(node (ref R12) (pin 1))
(node (ref D8) (pin 1)))
(net (code 66) (name /3V)
(node (ref P2) (pin 6))
(node (ref P2) (pin 5))
(node (ref D9) (pin 2)))
(net (code 67) (name "Net-(J1-Pad4)")
(node (ref J1) (pin 4)))
(net (code 68) (name "Net-(J2-Pad4)")
(node (ref J2) (pin 4)))
(net (code 69) (name "Net-(D5-Pad1)")
(node (ref D5) (pin 1))
(node (ref P3) (pin 1))
(node (ref R11) (pin 2)))
(net (code 70) (name /5V)
(node (ref P4) (pin 1)) (node (ref P4) (pin 1))
(node (ref P2) (pin 4))
(node (ref P4) (pin 2))
(node (ref C18) (pin 2))
(node (ref C19) (pin 1))
(node (ref F1002) (pin 2)) (node (ref F1002) (pin 2))
(node (ref F1002) (pin 1)) (node (ref F1002) (pin 1))
(node (ref D5) (pin 2))) (node (ref D5) (pin 2))
(net (code 62) (name "Net-(D7-Pad1)") (node (ref U3) (pin 1))
(node (ref R11) (pin 1)) (node (ref D6) (pin 2))
(node (ref D7) (pin 1))) (node (ref P2) (pin 3)))
(net (code 63) (name "Net-(D8-Pad1)") (net (code 71) (name "Net-(P2-Pad10)")
(node (ref D8) (pin 1)) (node (ref P2) (pin 10)))
(node (ref R12) (pin 1))) (net (code 72) (name /PE7)
(net (code 64) (name /3V) (node (ref U1) (pin 38))
(node (ref D9) (pin 2)) (node (ref P1) (pin 25)))
(node (ref P2) (pin 5)) (net (code 73) (name /PB4)
(node (ref P2) (pin 6))) (node (ref P2) (pin 25))
(net (code 65) (name "Net-(J2-Pad4)")
(node (ref J2) (pin 4)))
(net (code 66) (name "Net-(J1-Pad4)")
(node (ref J1) (pin 4)))
(net (code 67) (name /Shield)
(node (ref J2) (pin 6))
(node (ref J1) (pin 6))
(node (ref R14) (pin 1))
(node (ref C20) (pin 1)))
(net (code 68) (name "Net-(D5-Pad1)")
(node (ref P3) (pin 1))
(node (ref R11) (pin 2))
(node (ref D5) (pin 1)))
(net (code 69) (name /NC)
(node (ref P1) (pin 48)))
(net (code 70) (name "Net-(C5-Pad2)")
(node (ref R10) (pin 2))
(node (ref C5) (pin 2))
(node (ref C6) (pin 2))
(node (ref U1) (pin 21)))
(net (code 71) (name /PB4)
(node (ref U1) (pin 90)) (node (ref U1) (pin 90))
(node (ref P2) (pin 25))) (node (ref P5) (pin 3)))
(net (code 72) (name /PB6) (net (code 74) (name /PB6)
(node (ref P2) (pin 23)) (node (ref P2) (pin 23))
(node (ref U1) (pin 92))) (node (ref U1) (pin 92)))
(net (code 73) (name "Net-(C21-Pad2)") (net (code 75) (name /NC)
(node (ref U1) (pin 8)) (node (ref P1) (pin 48)))
(net (code 76) (name "Net-(C21-Pad2)")
(node (ref C21) (pin 2)) (node (ref C21) (pin 2))
(node (ref X2) (pin 1))) (node (ref X2) (pin 1))
(net (code 74) (name "Net-(C22-Pad2)") (node (ref U1) (pin 8)))
(node (ref X2) (pin 4)) (net (code 77) (name "Net-(C22-Pad2)")
(node (ref C22) (pin 2)) (node (ref C22) (pin 2))
(node (ref U1) (pin 9))) (node (ref U1) (pin 9))
(net (code 75) (name "Net-(P2-Pad10)") (node (ref X2) (pin 4)))
(node (ref P2) (pin 10))) (net (code 78) (name "Net-(P2-Pad9)")
(net (code 76) (name "Net-(P2-Pad9)")
(node (ref P2) (pin 9))) (node (ref P2) (pin 9)))
(net (code 77) (name "Net-(D1-Pad1)") (net (code 79) (name /Shield)
(node (ref R6) (pin 1)) (node (ref C20) (pin 1))
(node (ref D1) (pin 1))) (node (ref R14) (pin 1))
(net (code 78) (name "Net-(D2-Pad1)") (node (ref J2) (pin 6))
(node (ref R7) (pin 1)) (node (ref J1) (pin 6)))
(node (ref D2) (pin 1)))
(net (code 79) (name "Net-(D3-Pad1)")
(node (ref R8) (pin 1))
(node (ref D3) (pin 1)))
(net (code 80) (name "Net-(D4-Pad1)") (net (code 80) (name "Net-(D4-Pad1)")
(node (ref D4) (pin 1)) (node (ref D4) (pin 1))
(node (ref R9) (pin 1))) (node (ref R9) (pin 1)))
(net (code 81) (name "Net-(D11-Pad1)") (net (code 81) (name "Net-(D11-Pad1)")
(node (ref R13) (pin 1)) (node (ref D11) (pin 1))
(node (ref D11) (pin 1))) (node (ref R13) (pin 1)))
(net (code 82) (name /PB3) (net (code 82) (name "Net-(C5-Pad2)")
(node (ref U1) (pin 89)) (node (ref C5) (pin 2))
(node (ref P2) (pin 28)) (node (ref R10) (pin 2))
(node (ref P4) (pin 5))) (node (ref U1) (pin 21))
(net (code 83) (name /PA14) (node (ref C6) (pin 2)))
(node (ref U1) (pin 76)) (net (code 83) (name /PA13)
(node (ref P2) (pin 39))
(node (ref P4) (pin 6)))
(net (code 84) (name /NRST)
(node (ref R3) (pin 2))
(node (ref U1) (pin 14))
(node (ref C1) (pin 2))
(node (ref SW1) (pin 1))
(node (ref P1) (pin 6))
(node (ref P4) (pin 9)))
(net (code 85) (name /PA13)
(node (ref U1) (pin 72))
(node (ref P2) (pin 42)) (node (ref P2) (pin 42))
(node (ref U1) (pin 72))
(node (ref P4) (pin 10))) (node (ref P4) (pin 10)))
(net (code 86) (name /PA11) (net (code 84) (name /PB5)
(node (ref U2) (pin 3)) (node (ref U1) (pin 91))
(node (ref U1) (pin 70))) (node (ref P2) (pin 26))
(node (ref P5) (pin 2)))
(net (code 85) (name /PB3)
(node (ref P5) (pin 4))
(node (ref U1) (pin 89))
(node (ref P4) (pin 5))
(node (ref P2) (pin 28)))
(net (code 86) (name /PD4)
(node (ref P2) (pin 32))
(node (ref P5) (pin 5))
(node (ref U1) (pin 85)))
(net (code 87) (name /PA12) (net (code 87) (name /PA12)
(node (ref U1) (pin 71)) (node (ref U1) (pin 71))
(node (ref U2) (pin 1))) (node (ref U2) (pin 1)))
(net (code 88) (name /D-) (net (code 88) (name /PA11)
(node (ref U2) (pin 3))
(node (ref U1) (pin 70)))
(net (code 89) (name /D-)
(node (ref U2) (pin 4))
(node (ref J2) (pin 2)) (node (ref J2) (pin 2))
(node (ref J1) (pin 2)) (node (ref J1) (pin 2)))
(node (ref U2) (pin 4))) (net (code 90) (name /D+)
(net (code 89) (name /D+)
(node (ref U2) (pin 6)) (node (ref U2) (pin 6))
(node (ref J2) (pin 3)) (node (ref J2) (pin 3))
(node (ref J1) (pin 3))) (node (ref J1) (pin 3)))
(net (code 90) (name /PA9) (net (code 91) (name /PA9)
(node (ref P2) (pin 44))
(node (ref U2) (pin 5))
(node (ref J2) (pin 1)) (node (ref J2) (pin 1))
(node (ref J1) (pin 1)) (node (ref J1) (pin 1))
(node (ref D6) (pin 1)) (node (ref D6) (pin 1))
(node (ref R12) (pin 2)) (node (ref R12) (pin 2))
(node (ref P2) (pin 44))
(node (ref U2) (pin 5))
(node (ref U1) (pin 68))) (node (ref U1) (pin 68)))
(net (code 92) (name /PE14) (net (code 92) (name "Net-(D3-Pad1)")
(node (ref P1) (pin 32)) (node (ref R8) (pin 1))
(node (ref U1) (pin 45))) (node (ref D3) (pin 1)))
(net (code 93) (name /PE13) (net (code 93) (name /PA14)
(node (ref U1) (pin 44)) (node (ref P2) (pin 39))
(node (ref P1) (pin 31))) (node (ref P4) (pin 6))
(net (code 94) (name /PE12) (node (ref U1) (pin 76)))
(node (ref U1) (pin 43)) (net (code 94) (name /NRST)
(node (ref P1) (pin 30))) (node (ref U1) (pin 14))
(net (code 95) (name /PE11) (node (ref C1) (pin 2))
(node (ref P1) (pin 29)) (node (ref SW1) (pin 1))
(node (ref U1) (pin 42))) (node (ref P1) (pin 6))
(net (code 96) (name /PE10) (node (ref P4) (pin 9))
(node (ref P1) (pin 28)) (node (ref R3) (pin 2)))
(node (ref U1) (pin 41))) (net (code 95) (name /PE3)
(net (code 97) (name /PE9)
(node (ref U1) (pin 40))
(node (ref P1) (pin 27)))
(net (code 98) (name /PE8)
(node (ref P1) (pin 26))
(node (ref U1) (pin 39)))
(net (code 99) (name /PE6)
(node (ref P2) (pin 11))
(node (ref U1) (pin 5)))
(net (code 100) (name /PE5)
(node (ref P2) (pin 14))
(node (ref U1) (pin 4)))
(net (code 101) (name /PE4)
(node (ref U1) (pin 3))
(node (ref P2) (pin 13)))
(net (code 102) (name /PE3)
(node (ref P2) (pin 16)) (node (ref P2) (pin 16))
(node (ref U1) (pin 2))) (node (ref U1) (pin 2)))
(net (code 103) (name /PE2) (net (code 96) (name /PE2)
(node (ref U1) (pin 1)) (node (ref U1) (pin 1))
(node (ref P2) (pin 15))) (node (ref P2) (pin 15)))
(net (code 104) (name /PE1) (net (code 97) (name /PE1)
(node (ref U1) (pin 98)) (node (ref U1) (pin 98))
(node (ref P2) (pin 18))) (node (ref P2) (pin 18)))
(net (code 105) (name /PE0) (net (code 98) (name /PE0)
(node (ref P2) (pin 17)) (node (ref U1) (pin 97))
(node (ref U1) (pin 97))) (node (ref P2) (pin 17)))
(net (code 106) (name /PE15) (net (code 100) (name /PE4)
(node (ref P1) (pin 33)) (node (ref P2) (pin 13))
(node (ref U1) (pin 46))) (node (ref U1) (pin 3)))
(net (code 107) (name /PC7) (net (code 101) (name /BOOT0)
(node (ref U1) (pin 64)) (node (ref R4) (pin 2))
(node (ref P2) (pin 48))) (node (ref P2) (pin 21))
(net (code 108) (name /PD9) (node (ref U1) (pin 94)))
(node (ref P1) (pin 41)) (net (code 102) (name "Net-(R1-Pad1)")
(node (ref U1) (pin 56)))
(net (code 109) (name /PD11)
(node (ref U1) (pin 58))
(node (ref P1) (pin 43)))
(net (code 110) (name /PD10)
(node (ref P1) (pin 42))
(node (ref U1) (pin 57)))
(net (code 111) (name "Net-(R1-Pad1)")
(node (ref R5) (pin 2)) (node (ref R5) (pin 2))
(node (ref R2) (pin 2)) (node (ref R2) (pin 2))
(node (ref R1) (pin 1)) (node (ref R1) (pin 1))
(node (ref SW2) (pin 1))) (node (ref SW2) (pin 1)))
(net (code 112) (name "Net-(C3-Pad1)") (net (code 103) (name "Net-(D1-Pad1)")
(node (ref U1) (pin 13)) (node (ref D1) (pin 1))
(node (ref R6) (pin 1)))
(net (code 104) (name "Net-(D2-Pad1)")
(node (ref D2) (pin 1))
(node (ref R7) (pin 1)))
(net (code 105) (name /PE15)
(node (ref U1) (pin 46))
(node (ref P1) (pin 33)))
(net (code 106) (name /PE14)
(node (ref P1) (pin 32))
(node (ref U1) (pin 45)))
(net (code 107) (name /PE13)
(node (ref P1) (pin 31))
(node (ref U1) (pin 44)))
(net (code 108) (name /PE12)
(node (ref P1) (pin 30))
(node (ref U1) (pin 43)))
(net (code 109) (name /PE11)
(node (ref P1) (pin 29))
(node (ref U1) (pin 42)))
(net (code 110) (name /PE10)
(node (ref U1) (pin 41))
(node (ref P1) (pin 28)))
(net (code 111) (name /PE8)
(node (ref U1) (pin 39))
(node (ref P1) (pin 26)))
(net (code 112) (name /PE6)
(node (ref U1) (pin 5))
(node (ref P2) (pin 11)))
(net (code 113) (name /PE5)
(node (ref P2) (pin 14))
(node (ref U1) (pin 4)))
(net (code 114) (name "Net-(C3-Pad1)")
(node (ref C3) (pin 1)) (node (ref C3) (pin 1))
(node (ref U1) (pin 13))
(node (ref X1) (pin 1))) (node (ref X1) (pin 1)))
(net (code 113) (name "Net-(C17-Pad1)") (net (code 115) (name "Net-(C17-Pad1)")
(node (ref U1) (pin 73)) (node (ref C17) (pin 1))
(node (ref C17) (pin 1))) (node (ref U1) (pin 73)))
(net (code 114) (name "Net-(C2-Pad1)") (net (code 116) (name "Net-(C2-Pad1)")
(node (ref C2) (pin 1)) (node (ref C2) (pin 1))
(node (ref U1) (pin 12)) (node (ref U1) (pin 12))
(node (ref X1) (pin 2))) (node (ref X1) (pin 2)))
(net (code 115) (name "Net-(C15-Pad1)") (net (code 117) (name "Net-(C15-Pad1)")
(node (ref U1) (pin 49)) (node (ref U1) (pin 49))
(node (ref C15) (pin 1))) (node (ref C15) (pin 1)))
(net (code 116) (name "Net-(C7-Pad2)") (net (code 118) (name "Net-(C7-Pad2)")
(node (ref FB1) (pin 1))
(node (ref U1) (pin 22)) (node (ref U1) (pin 22))
(node (ref R10) (pin 1))
(node (ref C7) (pin 2)) (node (ref C7) (pin 2))
(node (ref C8) (pin 2))) (node (ref C8) (pin 2))
(net (code 117) (name /PE7) (node (ref R10) (pin 1))
(node (ref U1) (pin 38)) (node (ref FB1) (pin 1)))
(node (ref P1) (pin 25))) (net (code 119) (name "Net-(C4-Pad2)")
(net (code 118) (name "Net-(C4-Pad2)") (node (ref R2) (pin 1))
(node (ref C4) (pin 2)) (node (ref C4) (pin 2)))))
(node (ref R2) (pin 1)))
(net (code 119) (name /VDD)
(node (ref U1) (pin 28))
(node (ref C14) (pin 2))
(node (ref C16) (pin 2))
(node (ref P4) (pin 4))
(node (ref C13) (pin 2))
(node (ref C12) (pin 2))
(node (ref C11) (pin 2))
(node (ref C10) (pin 2))
(node (ref C9) (pin 2))
(node (ref SW2) (pin 2))
(node (ref R3) (pin 1))
(node (ref P1) (pin 4))
(node (ref JP5) (pin 1))
(node (ref P1) (pin 3))
(node (ref U1) (pin 100))
(node (ref P2) (pin 22))
(node (ref R13) (pin 2))
(node (ref D9) (pin 1))
(node (ref C4) (pin 1))
(node (ref P4) (pin 3))
(node (ref U3) (pin 3))
(node (ref U1) (pin 19))
(node (ref U1) (pin 11))
(node (ref U1) (pin 75))
(node (ref U1) (pin 50))
(node (ref FB1) (pin 2)))))

View File

@ -2463,4 +2463,38 @@ Wire Wire Line
12575 4575 12575 4900 12575 4575 12575 4900
Wire Wire Line Wire Wire Line
15300 3075 15150 3075 15300 3075 15150 3075
$Comp
L CONN_01X06 P5
U 1 1 58616354
P 13975 7500
F 0 "P5" H 13975 7850 50 0000 C CNN
F 1 "CONN_01X06" V 14075 7500 50 0001 C CNN
F 2 "Pin_Headers:Pin_Header_Angled_1x06" H 13975 7500 50 0001 C CNN
F 3 "" H 13975 7500 50 0000 C CNN
1 13975 7500
1 0 0 -1
$EndComp
Text Label 13775 7350 2 60 ~ 0
PB5
Text Label 13775 7550 2 60 ~ 0
PB3
Text Label 13775 7650 2 60 ~ 0
PD4
Text Label 13775 7250 2 60 ~ 0
VDD
Text Label 13775 7450 2 60 ~ 0
PB4
$Comp
L GND #PWR066
U 1 1 5861744D
P 13775 7750
F 0 "#PWR066" H 13775 7750 30 0001 C CNN
F 1 "GND" H 13775 7680 30 0001 C CNN
F 2 "" H 13775 7750 60 0000 C CNN
F 3 "" H 13775 7750 60 0000 C CNN
1 13775 7750
0 1 1 0
$EndComp
Text Notes 14075 7525 0 60 ~ 0
SD Card
$EndSCHEMATC $EndSCHEMATC

View File

@ -4,7 +4,6 @@
4) RESOLVED IN R0.2 renamed sm32f407_Board to STM32F407_Brain_Board 4) RESOLVED IN R0.2 renamed sm32f407_Board to STM32F407_Brain_Board
5) change LED to use SM0806_Jumpers 5) change LED to use SM0806_Jumpers
6) RESOLVED IN R0.2 Change Fuse to match frankenso 6) RESOLVED IN R0.2 Change Fuse to match frankenso
7) RESOLVED IN R0.2 set solder mask to 0.003 inches, per OSHPark suggestion.
SD card vias
SD card PCB