diff --git a/firmware/config/engines/mazda_miata_nb.cpp b/firmware/config/engines/mazda_miata_nb.cpp index 4afd3701d5..2daca94d3b 100644 --- a/firmware/config/engines/mazda_miata_nb.cpp +++ b/firmware/config/engines/mazda_miata_nb.cpp @@ -88,6 +88,7 @@ void setMazdaMiataNbEngineConfiguration(DECLARE_ENGINE_PARAMETER_F) { * set_fsio_setting 0 5000 */ engineConfiguration->bc.fsio_setting[0] = 5000; - // set_fsio_expression 1 "rpm 0 fsio_setting >" -// setFsioExt(0, GPIOE_3, "rpm 0 fsio_setting >", 150 PASS_ENGINE_PARAMETER); + // (self and (rpm > 4800)) OR (rpm > 5000) + // set_fsio_expression 1 "self rpm 4800 > & rpm 5000 > OR" +// setFsioExt(0, GPIOE_3, "self rpm 4800 > & rpm 5000 > OR", 150 PASS_ENGINE_PARAMETER); } diff --git a/hardware/VR_Board/vrs_io_1.kicad_pcb b/hardware/VR_Board/vrs_io_1.kicad_pcb index 769e3f3c2c..d0ae64fb98 100644 --- a/hardware/VR_Board/vrs_io_1.kicad_pcb +++ b/hardware/VR_Board/vrs_io_1.kicad_pcb @@ -3,9 +3,9 @@ (general (links 51) (no_connects 51) - (area 177.192214 111.76 223.520001 145.7579) + (area 177.192214 111.76 232.382788 140.970001) (thickness 1.6) - (drawings 11) + (drawings 13) (tracks 0) (zones 0) (modules 28) @@ -95,25 +95,25 @@ (net 0 "") (net 1 /5V) - (net 2 /CAM) - (net 3 /CAM+) - (net 4 /CAM-) - (net 5 /CRANK) - (net 6 /CRK2+) - (net 7 /CRK2-) - (net 8 GND) - (net 9 "Net-(C101-Pad1)") - (net 10 "Net-(C101-Pad2)") - (net 11 "Net-(C102-Pad1)") - (net 12 "Net-(C102-Pad2)") - (net 13 "Net-(R102-Pad2)") - (net 14 "Net-(R103-Pad2)") - (net 15 "Net-(R104-Pad2)") - (net 16 "Net-(R106-Pad2)") - (net 17 "Net-(D801-Pad2)") - (net 18 "Net-(D802-Pad2)") - (net 19 "Net-(R137-Pad2)") - (net 20 "Net-(R141-Pad2)") + (net 2 /CAM+) + (net 3 /CAM-) + (net 4 /CRK2+) + (net 5 /CRK2-) + (net 6 GND) + (net 7 "Net-(C101-Pad1)") + (net 8 "Net-(C101-Pad2)") + (net 9 "Net-(C102-Pad1)") + (net 10 "Net-(C102-Pad2)") + (net 11 "Net-(R102-Pad2)") + (net 12 "Net-(R103-Pad2)") + (net 13 "Net-(R104-Pad2)") + (net 14 "Net-(R106-Pad2)") + (net 15 "Net-(D801-Pad2)") + (net 16 "Net-(D802-Pad2)") + (net 17 "Net-(R137-Pad2)") + (net 18 "Net-(R141-Pad2)") + (net 19 /Cout2) + (net 20 /Cout1) (net_class Default "Это класс цепей по умолчанию." (clearance 0.1524) @@ -123,12 +123,12 @@ (uvia_dia 0.508) (uvia_drill 0.127) (add_net /5V) - (add_net /CAM) (add_net /CAM+) (add_net /CAM-) - (add_net /CRANK) (add_net /CRK2+) (add_net /CRK2-) + (add_net /Cout1) + (add_net /Cout2) (add_net GND) (add_net "Net-(C101-Pad1)") (add_net "Net-(C101-Pad2)") @@ -162,9 +162,9 @@ (fp_line (start 1.524 -0.762) (end 1.524 0.762) (layer F.SilkS) (width 0.09906)) (fp_line (start 1.524 0.762) (end 0.508 0.762) (layer F.SilkS) (width 0.09906)) (pad 1 smd rect (at -0.9525 0 90) (size 0.889 1.397) (layers F.Cu F.Paste F.Mask) - (net 9 "Net-(C101-Pad1)")) + (net 7 "Net-(C101-Pad1)")) (pad 2 smd rect (at 0.9525 0 90) (size 0.889 1.397) (layers F.Cu F.Paste F.Mask) - (net 10 "Net-(C101-Pad2)")) + (net 8 "Net-(C101-Pad2)")) (model smd/chip_cms.wrl (at (xyz 0 0 0)) (scale (xyz 0.1 0.1 0.1)) @@ -190,9 +190,9 @@ (fp_line (start 1.524 -0.762) (end 1.524 0.762) (layer F.SilkS) (width 0.09906)) (fp_line (start 1.524 0.762) (end 0.508 0.762) (layer F.SilkS) (width 0.09906)) (pad 1 smd rect (at -0.9525 0 90) (size 0.889 1.397) (layers F.Cu F.Paste F.Mask) - (net 11 "Net-(C102-Pad1)")) + (net 9 "Net-(C102-Pad1)")) (pad 2 smd rect (at 0.9525 0 90) (size 0.889 1.397) (layers F.Cu F.Paste F.Mask) - (net 12 "Net-(C102-Pad2)")) + (net 10 "Net-(C102-Pad2)")) (model smd/chip_cms.wrl (at (xyz 0 0 0)) (scale (xyz 0.1 0.1 0.1)) @@ -201,7 +201,7 @@ ) (module SM0805 placed (layer F.Cu) (tedit 56D4E60A) (tstamp 528A14FA) - (at 210.82 120.015) + (at 211.455 120.015) (path /50D6291F) (attr smd) (fp_text reference C104 (at 0 0 90) (layer F.SilkS) @@ -220,7 +220,7 @@ (pad 1 smd rect (at -0.9525 0) (size 0.889 1.397) (layers F.Cu F.Paste F.Mask) (net 1 /5V)) (pad 2 smd rect (at 0.9525 0) (size 0.889 1.397) (layers F.Cu F.Paste F.Mask) - (net 8 GND)) + (net 6 GND)) (model smd/chip_cms.wrl (at (xyz 0 0 0)) (scale (xyz 0.1 0.1 0.1)) @@ -246,9 +246,9 @@ (fp_line (start 1.524 -0.762) (end 1.524 0.762) (layer F.SilkS) (width 0.09906)) (fp_line (start 1.524 0.762) (end 0.508 0.762) (layer F.SilkS) (width 0.09906)) (pad 1 smd rect (at -0.9525 0) (size 0.889 1.397) (layers F.Cu F.Paste F.Mask) - (net 7 /CRK2-)) + (net 5 /CRK2-)) (pad 2 smd rect (at 0.9525 0) (size 0.889 1.397) (layers F.Cu F.Paste F.Mask) - (net 13 "Net-(R102-Pad2)")) + (net 11 "Net-(R102-Pad2)")) (model smd/chip_cms.wrl (at (xyz 0 0 0)) (scale (xyz 0.1 0.1 0.1)) @@ -274,9 +274,9 @@ (fp_line (start 1.524 -0.762) (end 1.524 0.762) (layer F.SilkS) (width 0.09906)) (fp_line (start 1.524 0.762) (end 0.508 0.762) (layer F.SilkS) (width 0.09906)) (pad 1 smd rect (at -0.9525 0) (size 0.889 1.397) (layers F.Cu F.Paste F.Mask) - (net 6 /CRK2+)) + (net 4 /CRK2+)) (pad 2 smd rect (at 0.9525 0) (size 0.889 1.397) (layers F.Cu F.Paste F.Mask) - (net 14 "Net-(R103-Pad2)")) + (net 12 "Net-(R103-Pad2)")) (model smd/chip_cms.wrl (at (xyz 0 0 0)) (scale (xyz 0.1 0.1 0.1)) @@ -302,9 +302,9 @@ (fp_line (start 1.524 -0.762) (end 1.524 0.762) (layer F.SilkS) (width 0.09906)) (fp_line (start 1.524 0.762) (end 0.508 0.762) (layer F.SilkS) (width 0.09906)) (pad 1 smd rect (at -0.9525 0) (size 0.889 1.397) (layers F.Cu F.Paste F.Mask) - (net 3 /CAM+)) + (net 2 /CAM+)) (pad 2 smd rect (at 0.9525 0) (size 0.889 1.397) (layers F.Cu F.Paste F.Mask) - (net 15 "Net-(R104-Pad2)")) + (net 13 "Net-(R104-Pad2)")) (model smd/chip_cms.wrl (at (xyz 0 0 0)) (scale (xyz 0.1 0.1 0.1)) @@ -330,9 +330,9 @@ (fp_line (start 1.524 -0.762) (end 1.524 0.762) (layer F.SilkS) (width 0.09906)) (fp_line (start 1.524 0.762) (end 0.508 0.762) (layer F.SilkS) (width 0.09906)) (pad 1 smd rect (at -0.9525 0) (size 0.889 1.397) (layers F.Cu F.Paste F.Mask) - (net 4 /CAM-)) + (net 3 /CAM-)) (pad 2 smd rect (at 0.9525 0) (size 0.889 1.397) (layers F.Cu F.Paste F.Mask) - (net 16 "Net-(R106-Pad2)")) + (net 14 "Net-(R106-Pad2)")) (model smd/chip_cms.wrl (at (xyz 0 0 0)) (scale (xyz 0.1 0.1 0.1)) @@ -358,9 +358,9 @@ (fp_line (start 1.524 -0.762) (end 1.524 0.762) (layer F.SilkS) (width 0.09906)) (fp_line (start 1.524 0.762) (end 0.508 0.762) (layer F.SilkS) (width 0.09906)) (pad 1 smd rect (at -0.9525 0) (size 0.889 1.397) (layers F.Cu F.Paste F.Mask) - (net 13 "Net-(R102-Pad2)")) + (net 11 "Net-(R102-Pad2)")) (pad 2 smd rect (at 0.9525 0) (size 0.889 1.397) (layers F.Cu F.Paste F.Mask) - (net 10 "Net-(C101-Pad2)")) + (net 8 "Net-(C101-Pad2)")) (model smd/chip_cms.wrl (at (xyz 0 0 0)) (scale (xyz 0.1 0.1 0.1)) @@ -386,9 +386,9 @@ (fp_line (start 1.524 -0.762) (end 1.524 0.762) (layer F.SilkS) (width 0.09906)) (fp_line (start 1.524 0.762) (end 0.508 0.762) (layer F.SilkS) (width 0.09906)) (pad 1 smd rect (at -0.9525 0) (size 0.889 1.397) (layers F.Cu F.Paste F.Mask) - (net 14 "Net-(R103-Pad2)")) + (net 12 "Net-(R103-Pad2)")) (pad 2 smd rect (at 0.9525 0) (size 0.889 1.397) (layers F.Cu F.Paste F.Mask) - (net 9 "Net-(C101-Pad1)")) + (net 7 "Net-(C101-Pad1)")) (model smd/chip_cms.wrl (at (xyz 0 0 0)) (scale (xyz 0.1 0.1 0.1)) @@ -414,9 +414,9 @@ (fp_line (start 1.524 -0.762) (end 1.524 0.762) (layer F.SilkS) (width 0.09906)) (fp_line (start 1.524 0.762) (end 0.508 0.762) (layer F.SilkS) (width 0.09906)) (pad 1 smd rect (at -0.9525 0) (size 0.889 1.397) (layers F.Cu F.Paste F.Mask) - (net 15 "Net-(R104-Pad2)")) + (net 13 "Net-(R104-Pad2)")) (pad 2 smd rect (at 0.9525 0) (size 0.889 1.397) (layers F.Cu F.Paste F.Mask) - (net 12 "Net-(C102-Pad2)")) + (net 10 "Net-(C102-Pad2)")) (model smd/chip_cms.wrl (at (xyz 0 0 0)) (scale (xyz 0.1 0.1 0.1)) @@ -442,9 +442,9 @@ (fp_line (start 1.524 -0.762) (end 1.524 0.762) (layer F.SilkS) (width 0.09906)) (fp_line (start 1.524 0.762) (end 0.508 0.762) (layer F.SilkS) (width 0.09906)) (pad 1 smd rect (at -0.9525 0) (size 0.889 1.397) (layers F.Cu F.Paste F.Mask) - (net 16 "Net-(R106-Pad2)")) + (net 14 "Net-(R106-Pad2)")) (pad 2 smd rect (at 0.9525 0) (size 0.889 1.397) (layers F.Cu F.Paste F.Mask) - (net 11 "Net-(C102-Pad1)")) + (net 9 "Net-(C102-Pad1)")) (model smd/chip_cms.wrl (at (xyz 0 0 0)) (scale (xyz 0.1 0.1 0.1)) @@ -470,9 +470,9 @@ (fp_line (start 1.524 -0.762) (end 1.524 0.762) (layer F.SilkS) (width 0.09906)) (fp_line (start 1.524 0.762) (end 0.508 0.762) (layer F.SilkS) (width 0.09906)) (pad 1 smd rect (at -0.9525 0 90) (size 0.889 1.397) (layers F.Cu F.Paste F.Mask) - (net 9 "Net-(C101-Pad1)")) + (net 7 "Net-(C101-Pad1)")) (pad 2 smd rect (at 0.9525 0 90) (size 0.889 1.397) (layers F.Cu F.Paste F.Mask) - (net 10 "Net-(C101-Pad2)")) + (net 8 "Net-(C101-Pad2)")) (model smd/chip_cms.wrl (at (xyz 0 0 0)) (scale (xyz 0.1 0.1 0.1)) @@ -498,9 +498,9 @@ (fp_line (start 1.524 -0.762) (end 1.524 0.762) (layer F.SilkS) (width 0.09906)) (fp_line (start 1.524 0.762) (end 0.508 0.762) (layer F.SilkS) (width 0.09906)) (pad 1 smd rect (at -0.9525 0 90) (size 0.889 1.397) (layers F.Cu F.Paste F.Mask) - (net 11 "Net-(C102-Pad1)")) + (net 9 "Net-(C102-Pad1)")) (pad 2 smd rect (at 0.9525 0 90) (size 0.889 1.397) (layers F.Cu F.Paste F.Mask) - (net 12 "Net-(C102-Pad2)")) + (net 10 "Net-(C102-Pad2)")) (model smd/chip_cms.wrl (at (xyz 0 0 0)) (scale (xyz 0.1 0.1 0.1)) @@ -526,9 +526,9 @@ (fp_line (start 1.524 -0.762) (end 1.524 0.762) (layer F.SilkS) (width 0.09906)) (fp_line (start 1.524 0.762) (end 0.508 0.762) (layer F.SilkS) (width 0.09906)) (pad 1 smd rect (at -0.9525 0 90) (size 0.889 1.397) (layers F.Cu F.Paste F.Mask) - (net 17 "Net-(D801-Pad2)")) + (net 15 "Net-(D801-Pad2)")) (pad 2 smd rect (at 0.9525 0 90) (size 0.889 1.397) (layers F.Cu F.Paste F.Mask) - (net 5 /CRANK)) + (net 20 /Cout1)) (model smd/chip_cms.wrl (at (xyz 0 0 0)) (scale (xyz 0.1 0.1 0.1)) @@ -554,9 +554,9 @@ (fp_line (start 1.524 -0.762) (end 1.524 0.762) (layer F.SilkS) (width 0.09906)) (fp_line (start 1.524 0.762) (end 0.508 0.762) (layer F.SilkS) (width 0.09906)) (pad 1 smd rect (at -0.9525 0 90) (size 0.889 1.397) (layers F.Cu F.Paste F.Mask) - (net 2 /CAM)) + (net 19 /Cout2)) (pad 2 smd rect (at 0.9525 0 90) (size 0.889 1.397) (layers F.Cu F.Paste F.Mask) - (net 18 "Net-(D802-Pad2)")) + (net 16 "Net-(D802-Pad2)")) (model smd/chip_cms.wrl (at (xyz 0 0 0)) (scale (xyz 0.1 0.1 0.1)) @@ -646,35 +646,35 @@ (fp_line (start 2.46888 -1.84912) (end -2.46888 -1.84912) (layer F.SilkS) (width 0.2032)) (fp_circle (center -1.64846 1.04902) (end -1.79832 1.19888) (layer F.SilkS) (width 0.00254)) (pad 1 smd rect (at -2.2225 2.68986 90) (size 0.44958 1.4986) (layers F.Cu F.Paste F.Mask) - (net 8 GND)) + (net 6 GND)) (pad 2 smd rect (at -1.5875 2.68986 90) (size 0.44958 1.4986) (layers F.Cu F.Paste F.Mask)) (pad 3 smd rect (at -0.9525 2.68986 90) (size 0.44958 1.4986) (layers F.Cu F.Paste F.Mask) - (net 8 GND)) + (net 6 GND)) (pad 4 smd rect (at -0.3175 2.68986 90) (size 0.44958 1.4986) (layers F.Cu F.Paste F.Mask) - (net 5 /CRANK)) + (net 20 /Cout1)) (pad 5 smd rect (at 0.3175 2.68986 90) (size 0.44958 1.4986) (layers F.Cu F.Paste F.Mask) - (net 2 /CAM)) + (net 19 /Cout2)) (pad 6 smd rect (at 0.9525 2.68986 90) (size 0.44958 1.4986) (layers F.Cu F.Paste F.Mask) - (net 8 GND)) + (net 6 GND)) (pad 7 smd rect (at 1.5875 2.68986 90) (size 0.44958 1.4986) (layers F.Cu F.Paste F.Mask)) (pad 8 smd rect (at 2.2225 2.68986 90) (size 0.44958 1.4986) (layers F.Cu F.Paste F.Mask) - (net 8 GND)) + (net 6 GND)) (pad 9 smd rect (at 2.2225 -2.68986 90) (size 0.44958 1.4986) (layers F.Cu F.Paste F.Mask) - (net 12 "Net-(C102-Pad2)")) + (net 10 "Net-(C102-Pad2)")) (pad 10 smd rect (at 1.5875 -2.68986 90) (size 0.44958 1.4986) (layers F.Cu F.Paste F.Mask) - (net 11 "Net-(C102-Pad1)")) + (net 9 "Net-(C102-Pad1)")) (pad 11 smd rect (at 0.9525 -2.68986 90) (size 0.44958 1.4986) (layers F.Cu F.Paste F.Mask) - (net 8 GND)) + (net 6 GND)) (pad 12 smd rect (at 0.3175 -2.68986 90) (size 0.44958 1.4986) (layers F.Cu F.Paste F.Mask) - (net 8 GND)) + (net 6 GND)) (pad 13 smd rect (at -0.3175 -2.68986 90) (size 0.44958 1.4986) (layers F.Cu F.Paste F.Mask) - (net 8 GND)) + (net 6 GND)) (pad 14 smd rect (at -0.9525 -2.68986 90) (size 0.44958 1.4986) (layers F.Cu F.Paste F.Mask) (net 1 /5V)) (pad 15 smd rect (at -1.5875 -2.68986 90) (size 0.44958 1.4986) (layers F.Cu F.Paste F.Mask) - (net 10 "Net-(C101-Pad2)")) + (net 8 "Net-(C101-Pad2)")) (pad 16 smd rect (at -2.2225 -2.68986 90) (size 0.44958 1.4986) (layers F.Cu F.Paste F.Mask) - (net 9 "Net-(C101-Pad1)")) + (net 7 "Net-(C101-Pad1)")) (model smd/smd_dil/ssop-16.wrl (at (xyz 0 0 0)) (scale (xyz 1 1 1)) @@ -682,29 +682,29 @@ ) ) - (module PIN_ARRAY_4x1 (layer F.Cu) (tedit 56D4ECA2) (tstamp 529C6E69) + (module PIN_ARRAY_4x1 (layer B.Cu) (tedit 56D78D6C) (tstamp 529C6E69) (at 193.04 123.825 90) (descr "Double rangee de contacts 2 x 5 pins") (tags CONN) (path /56D5985E) - (fp_text reference P104 (at 5.969 0.889 180) (layer F.SilkS) - (effects (font (size 1.016 1.016) (thickness 0.2032))) + (fp_text reference P104 (at 3.81 3.81 360) (layer B.SilkS) + (effects (font (size 1.016 1.016) (thickness 0.2032)) (justify mirror)) ) - (fp_text value CONN_4 (at 0 2.54 90) (layer F.SilkS) hide - (effects (font (size 1.016 1.016) (thickness 0.2032))) + (fp_text value CONN_4 (at 0 -2.54 90) (layer B.SilkS) hide + (effects (font (size 1.016 1.016) (thickness 0.2032)) (justify mirror)) ) - (fp_line (start 5.08 1.27) (end -5.08 1.27) (layer F.SilkS) (width 0.254)) - (fp_line (start 5.08 -1.27) (end -5.08 -1.27) (layer F.SilkS) (width 0.254)) - (fp_line (start -5.08 -1.27) (end -5.08 1.27) (layer F.SilkS) (width 0.254)) - (fp_line (start 5.08 1.27) (end 5.08 -1.27) (layer F.SilkS) (width 0.254)) - (pad 1 thru_hole rect (at -3.81 0 90) (size 1.524 1.524) (drill 1.016) (layers *.Cu *.Mask F.SilkS) - (net 6 /CRK2+)) - (pad 2 thru_hole circle (at -1.27 0 90) (size 1.524 1.524) (drill 1.016) (layers *.Cu *.Mask F.SilkS) - (net 7 /CRK2-)) - (pad 3 thru_hole circle (at 1.27 0 90) (size 1.524 1.524) (drill 1.016) (layers *.Cu *.Mask F.SilkS) - (net 4 /CAM-)) - (pad 4 thru_hole circle (at 3.81 0 90) (size 1.524 1.524) (drill 1.016) (layers *.Cu *.Mask F.SilkS) - (net 3 /CAM+)) + (fp_line (start 5.08 -1.27) (end -5.08 -1.27) (layer B.SilkS) (width 0.254)) + (fp_line (start 5.08 1.27) (end -5.08 1.27) (layer B.SilkS) (width 0.254)) + (fp_line (start -5.08 1.27) (end -5.08 -1.27) (layer B.SilkS) (width 0.254)) + (fp_line (start 5.08 -1.27) (end 5.08 1.27) (layer B.SilkS) (width 0.254)) + (pad 1 thru_hole rect (at -3.81 0 90) (size 1.524 1.524) (drill 1.016) (layers *.Cu *.Mask B.SilkS) + (net 4 /CRK2+)) + (pad 2 thru_hole circle (at -1.27 0 90) (size 1.524 1.524) (drill 1.016) (layers *.Cu *.Mask B.SilkS) + (net 5 /CRK2-)) + (pad 3 thru_hole circle (at 1.27 0 90) (size 1.524 1.524) (drill 1.016) (layers *.Cu *.Mask B.SilkS) + (net 3 /CAM-)) + (pad 4 thru_hole circle (at 3.81 0 90) (size 1.524 1.524) (drill 1.016) (layers *.Cu *.Mask B.SilkS) + (net 2 /CAM+)) (model pin_array\pins_array_4x1.wrl (at (xyz 0 0 0)) (scale (xyz 1 1 1)) @@ -713,7 +713,7 @@ ) (module SM0805 (layer F.Cu) (tedit 56D4E60F) (tstamp 528A14ED) - (at 210.185 127.635 180) + (at 212.09 127.635 180) (path /4AD9CB8E) (attr smd) (fp_text reference C103 (at 0 0 270) (layer F.SilkS) @@ -730,7 +730,7 @@ (fp_line (start 1.524 -0.762) (end 1.524 0.762) (layer F.SilkS) (width 0.09906)) (fp_line (start 1.524 0.762) (end 0.508 0.762) (layer F.SilkS) (width 0.09906)) (pad 1 smd rect (at -0.9525 0 180) (size 0.889 1.397) (layers F.Cu F.Paste F.Mask) - (net 8 GND)) + (net 6 GND)) (pad 2 smd rect (at 0.9525 0 180) (size 0.889 1.397) (layers F.Cu F.Paste F.Mask) (net 1 /5V)) (model smd/chip_cms.wrl @@ -760,7 +760,7 @@ (pad 1 smd rect (at -0.9525 0 180) (size 0.889 1.397) (layers B.Cu B.Paste B.Mask) (net 1 /5V)) (pad 2 smd rect (at 0.9525 0 180) (size 0.889 1.397) (layers B.Cu B.Paste B.Mask) - (net 19 "Net-(R137-Pad2)")) + (net 17 "Net-(R137-Pad2)")) (model smd/chip_cms.wrl (at (xyz 0 0 0)) (scale (xyz 0.1 0.1 0.1)) @@ -788,7 +788,7 @@ (pad 1 smd rect (at -0.9525 0 180) (size 0.889 1.397) (layers B.Cu B.Paste B.Mask) (net 1 /5V)) (pad 2 smd rect (at 0.9525 0 180) (size 0.889 1.397) (layers B.Cu B.Paste B.Mask) - (net 20 "Net-(R141-Pad2)")) + (net 18 "Net-(R141-Pad2)")) (model smd/chip_cms.wrl (at (xyz 0 0 0)) (scale (xyz 0.1 0.1 0.1)) @@ -814,9 +814,9 @@ (fp_line (start 1.524 0.762) (end 1.524 -0.762) (layer B.SilkS) (width 0.09906)) (fp_line (start 1.524 -0.762) (end 0.508 -0.762) (layer B.SilkS) (width 0.09906)) (pad 1 smd rect (at -0.9525 0 180) (size 0.889 1.397) (layers B.Cu B.Paste B.Mask) - (net 8 GND)) + (net 6 GND)) (pad 2 smd rect (at 0.9525 0 180) (size 0.889 1.397) (layers B.Cu B.Paste B.Mask) - (net 19 "Net-(R137-Pad2)")) + (net 17 "Net-(R137-Pad2)")) (model smd/chip_cms.wrl (at (xyz 0 0 0)) (scale (xyz 0.1 0.1 0.1)) @@ -842,9 +842,9 @@ (fp_line (start 1.524 0.762) (end 1.524 -0.762) (layer B.SilkS) (width 0.09906)) (fp_line (start 1.524 -0.762) (end 0.508 -0.762) (layer B.SilkS) (width 0.09906)) (pad 1 smd rect (at -0.9525 0 180) (size 0.889 1.397) (layers B.Cu B.Paste B.Mask) - (net 8 GND)) + (net 6 GND)) (pad 2 smd rect (at 0.9525 0 180) (size 0.889 1.397) (layers B.Cu B.Paste B.Mask) - (net 20 "Net-(R141-Pad2)")) + (net 18 "Net-(R141-Pad2)")) (model smd/chip_cms.wrl (at (xyz 0 0 0)) (scale (xyz 0.1 0.1 0.1)) @@ -878,7 +878,7 @@ (fp_line (start -1.9 0.95) (end -1.9 -0.95) (layer F.CrtYd) (width 0.05)) (fp_line (start -1.9 -0.95) (end 1.9 -0.95) (layer F.CrtYd) (width 0.05)) (pad 2 smd rect (at 1.04902 0 90) (size 1.19888 1.19888) (layers F.Cu F.Paste F.Mask) - (net 17 "Net-(D801-Pad2)")) + (net 15 "Net-(D801-Pad2)")) (pad 1 smd rect (at -1.04902 0 90) (size 1.19888 1.19888) (layers F.Cu F.Paste F.Mask) (net 1 /5V)) (model LEDs.3dshapes/LED_0805.wrl @@ -914,7 +914,7 @@ (fp_line (start -1.9 0.95) (end -1.9 -0.95) (layer F.CrtYd) (width 0.05)) (fp_line (start -1.9 -0.95) (end 1.9 -0.95) (layer F.CrtYd) (width 0.05)) (pad 2 smd rect (at 1.04902 0 270) (size 1.19888 1.19888) (layers F.Cu F.Paste F.Mask) - (net 18 "Net-(D802-Pad2)")) + (net 16 "Net-(D802-Pad2)")) (pad 1 smd rect (at -1.04902 0 270) (size 1.19888 1.19888) (layers F.Cu F.Paste F.Mask) (net 1 /5V)) (model LEDs.3dshapes/LED_0805.wrl @@ -942,9 +942,9 @@ (fp_line (start 1.524 0.762) (end 1.524 -0.762) (layer B.SilkS) (width 0.09906)) (fp_line (start 1.524 -0.762) (end 0.508 -0.762) (layer B.SilkS) (width 0.09906)) (pad 1 smd rect (at -0.9525 0) (size 0.889 1.397) (layers B.Cu B.Paste B.Mask) - (net 7 /CRK2-)) + (net 5 /CRK2-)) (pad 2 smd rect (at 0.9525 0) (size 0.889 1.397) (layers B.Cu B.Paste B.Mask) - (net 19 "Net-(R137-Pad2)")) + (net 17 "Net-(R137-Pad2)")) (model smd/chip_cms.wrl (at (xyz 0 0 0)) (scale (xyz 0.1 0.1 0.1)) @@ -970,9 +970,9 @@ (fp_line (start 1.524 0.762) (end 1.524 -0.762) (layer B.SilkS) (width 0.09906)) (fp_line (start 1.524 -0.762) (end 0.508 -0.762) (layer B.SilkS) (width 0.09906)) (pad 1 smd rect (at -0.9525 0) (size 0.889 1.397) (layers B.Cu B.Paste B.Mask) - (net 4 /CAM-)) + (net 3 /CAM-)) (pad 2 smd rect (at 0.9525 0) (size 0.889 1.397) (layers B.Cu B.Paste B.Mask) - (net 20 "Net-(R141-Pad2)")) + (net 18 "Net-(R141-Pad2)")) (model smd/chip_cms.wrl (at (xyz 0 0 0)) (scale (xyz 0.1 0.1 0.1)) @@ -980,45 +980,6 @@ ) ) - (module Socket_Strip_Straight_2x02 (layer F.Cu) (tedit 56D56F3B) (tstamp 56D56A76) - (at 210.82 130.81) - (descr "Through hole socket strip") - (tags "socket strip") - (path /56D6232B) - (fp_text reference P103 (at 2.54 -1.905 180) (layer F.SilkS) - (effects (font (size 0.762 0.762) (thickness 0.10922))) - ) - (fp_text value CONN_02X02 (at 0 -3.1) (layer F.Fab) hide - (effects (font (size 1 1) (thickness 0.15))) - ) - (fp_line (start -1.55 -1.55) (end -1.55 0) (layer F.SilkS) (width 0.15)) - (fp_line (start -1.75 -1.75) (end -1.75 4.3) (layer F.CrtYd) (width 0.05)) - (fp_line (start 4.3 -1.75) (end 4.3 4.3) (layer F.CrtYd) (width 0.05)) - (fp_line (start -1.75 -1.75) (end 4.3 -1.75) (layer F.CrtYd) (width 0.05)) - (fp_line (start -1.75 4.3) (end 4.3 4.3) (layer F.CrtYd) (width 0.05)) - (fp_line (start 0 -1.55) (end -1.55 -1.55) (layer F.SilkS) (width 0.15)) - (fp_line (start 0 -1.55) (end -1.55 -1.55) (layer F.SilkS) (width 0.15)) - (fp_line (start 1.27 -1.27) (end 1.27 1.27) (layer F.SilkS) (width 0.15)) - (fp_line (start 1.27 1.27) (end -1.27 1.27) (layer F.SilkS) (width 0.15)) - (fp_line (start -1.27 1.27) (end -1.27 3.81) (layer F.SilkS) (width 0.15)) - (fp_line (start -1.27 3.81) (end 3.81 3.81) (layer F.SilkS) (width 0.15)) - (fp_line (start 3.81 3.81) (end 3.81 -1.27) (layer F.SilkS) (width 0.15)) - (fp_line (start 3.81 -1.27) (end 1.27 -1.27) (layer F.SilkS) (width 0.15)) - (pad 1 thru_hole rect (at 0 0) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask F.SilkS) - (net 2 /CAM)) - (pad 2 thru_hole oval (at 0 2.54) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask F.SilkS) - (net 5 /CRANK)) - (pad 3 thru_hole oval (at 2.54 0) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask F.SilkS) - (net 8 GND)) - (pad 4 thru_hole oval (at 2.54 2.54) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask F.SilkS) - (net 8 GND)) - (model Socket_Strips.3dshapes/Socket_Strip_Straight_2x02.wrl - (at (xyz 0.05 -0.05 0)) - (scale (xyz 1 1 1)) - (rotate (xyz 0 0 180)) - ) - ) - (module Socket_Strip_Straight_1x01 (layer F.Cu) (tedit 56D5769A) (tstamp 56D56F5B) (at 215.9 130.81 90) (descr "Through hole socket strip") @@ -1047,13 +1008,79 @@ ) ) - (gr_text 5V (at 217.17 128.905) (layer F.SilkS) + (module Socket_Strip_Straight_2x04 (layer F.Cu) (tedit 56D78AAB) (tstamp 56D78CC7) + (at 205.74 130.81) + (descr "Through hole socket strip") + (tags "socket strip") + (path /56D7FED9) + (fp_text reference P103 (at 1.27 -1.905) (layer F.SilkS) + (effects (font (size 0.762 0.762) (thickness 0.10922))) + ) + (fp_text value CONN_02X04 (at 0 -3.1) (layer F.Fab) hide + (effects (font (size 1 1) (thickness 0.15))) + ) + (fp_line (start -1.75 -1.75) (end -1.75 4.3) (layer F.CrtYd) (width 0.05)) + (fp_line (start 9.4 -1.75) (end 9.4 4.3) (layer F.CrtYd) (width 0.05)) + (fp_line (start -1.75 -1.75) (end 9.4 -1.75) (layer F.CrtYd) (width 0.05)) + (fp_line (start -1.75 4.3) (end 9.4 4.3) (layer F.CrtYd) (width 0.05)) + (fp_line (start 1.27 -1.27) (end 8.89 -1.27) (layer F.SilkS) (width 0.15)) + (fp_line (start 8.89 -1.27) (end 8.89 3.81) (layer F.SilkS) (width 0.15)) + (fp_line (start 8.89 3.81) (end -1.27 3.81) (layer F.SilkS) (width 0.15)) + (fp_line (start -1.27 3.81) (end -1.27 1.27) (layer F.SilkS) (width 0.15)) + (fp_line (start 0 -1.55) (end -1.55 -1.55) (layer F.SilkS) (width 0.15)) + (fp_line (start -1.27 1.27) (end 1.27 1.27) (layer F.SilkS) (width 0.15)) + (fp_line (start 1.27 1.27) (end 1.27 -1.27) (layer F.SilkS) (width 0.15)) + (fp_line (start -1.55 -1.55) (end -1.55 0) (layer F.SilkS) (width 0.15)) + (pad 1 thru_hole rect (at 0 0) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask F.SilkS)) + (pad 2 thru_hole oval (at 0 2.54) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask F.SilkS) + (net 19 /Cout2)) + (pad 3 thru_hole oval (at 2.54 0) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask F.SilkS)) + (pad 4 thru_hole oval (at 2.54 2.54) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask F.SilkS)) + (pad 5 thru_hole oval (at 5.08 0) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask F.SilkS) + (net 20 /Cout1)) + (pad 6 thru_hole oval (at 5.08 2.54) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask F.SilkS)) + (pad 7 thru_hole oval (at 7.62 0) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask F.SilkS) + (net 6 GND)) + (pad 8 thru_hole oval (at 7.62 2.54) (size 1.7272 1.7272) (drill 1.016) (layers *.Cu *.Mask F.SilkS) + (net 6 GND)) + (model Socket_Strips.3dshapes/Socket_Strip_Straight_2x04.wrl + (at (xyz 0.15 -0.05 0)) + (scale (xyz 1 1 1)) + (rotate (xyz 0 0 180)) + ) + ) + + (dimension 15.875 (width 0.381) (layer Cmts.User) + (gr_text "0.6250 in" (at 226.568 126.6825 270) (layer Cmts.User) + (effects (font (size 2.032 1.524) (thickness 0.381))) + ) + (feature1 (pts (xy 219.075 134.62) (xy 228.346 134.62))) + (feature2 (pts (xy 219.075 118.745) (xy 228.346 118.745))) + (crossbar (pts (xy 224.79 118.745) (xy 224.79 134.62))) + (arrow1a (pts (xy 224.79 134.62) (xy 224.203579 133.493496))) + (arrow1b (pts (xy 224.79 134.62) (xy 225.376421 133.493496))) + (arrow2a (pts (xy 224.79 118.745) (xy 224.203579 119.871504))) + (arrow2b (pts (xy 224.79 118.745) (xy 225.376421 119.871504))) + ) + (dimension 27.305 (width 0.381) (layer Cmts.User) + (gr_text "1.0750 in" (at 205.4225 113.792) (layer Cmts.User) + (effects (font (size 2.032 1.524) (thickness 0.381))) + ) + (feature1 (pts (xy 219.075 118.745) (xy 219.075 112.014))) + (feature2 (pts (xy 191.77 118.745) (xy 191.77 112.014))) + (crossbar (pts (xy 191.77 115.57) (xy 219.075 115.57))) + (arrow1a (pts (xy 219.075 115.57) (xy 217.948496 116.156421))) + (arrow1b (pts (xy 219.075 115.57) (xy 217.948496 114.983579))) + (arrow2a (pts (xy 191.77 115.57) (xy 192.896504 116.156421))) + (arrow2b (pts (xy 191.77 115.57) (xy 192.896504 114.983579))) + ) + (gr_text 5V (at 218.44 133.35 90) (layer F.SilkS) (effects (font (size 0.762 0.762) (thickness 0.10922))) ) (gr_line (start 191.77 128.905) (end 191.77 118.745) (angle 90) (layer Edge.Cuts) (width 0.254)) - (gr_line (start 209.55 128.905) (end 191.77 128.905) (angle 90) (layer Edge.Cuts) (width 0.254)) - (gr_line (start 209.55 134.62) (end 209.55 128.905) (angle 90) (layer Edge.Cuts) (width 0.254)) - (gr_line (start 219.075 134.62) (end 209.55 134.62) (angle 90) (layer Edge.Cuts) (width 0.254)) + (gr_line (start 204.47 128.905) (end 191.77 128.905) (angle 90) (layer Edge.Cuts) (width 0.254)) + (gr_line (start 204.47 134.62) (end 204.47 128.905) (angle 90) (layer Edge.Cuts) (width 0.254)) + (gr_line (start 219.075 134.62) (end 204.47 134.62) (angle 90) (layer Edge.Cuts) (width 0.254)) (gr_line (start 219.075 118.745) (end 219.075 134.62) (angle 90) (layer Edge.Cuts) (width 0.254)) (gr_line (start 191.77 118.745) (end 219.075 118.745) (angle 90) (layer Edge.Cuts) (width 0.254)) (dimension 22.225 (width 0.381) (layer Cmts.User) @@ -1068,17 +1095,17 @@ (arrow2a (pts (xy 184.785 118.745) (xy 184.198579 119.871504))) (arrow2b (pts (xy 184.785 118.745) (xy 185.371421 119.871504))) ) - (gr_text "rusEfi.com V 0.1" (at 198.12 144.145) (layer B.SilkS) + (gr_text "rusEfi.com\nV 0.1" (at 212.09 123.825) (layer B.SilkS) (effects (font (size 2.032 1.524) (thickness 0.381)) (justify mirror)) ) - (gr_text VR3 (at 215.265 119.634) (layer F.SilkS) + (gr_text COUT2 (at 216.535 119.38) (layer F.SilkS) (effects (font (size 0.762 0.762) (thickness 0.10922))) ) - (gr_text VR4 (at 214.63 127.889) (layer F.SilkS) + (gr_text COUT1 (at 216.535 128.27) (layer F.SilkS) (effects (font (size 0.762 0.762) (thickness 0.10922))) ) - (zone (net 8) (net_name GND) (layer F.Cu) (tstamp 56D4F349) (hatch edge 0.508) + (zone (net 6) (net_name GND) (layer F.Cu) (tstamp 56D4F349) (hatch edge 0.508) (connect_pads (clearance 0.508)) (min_thickness 0.254) (fill (arc_segments 16) (thermal_gap 0.508) (thermal_bridge_width 0.508)) @@ -1088,7 +1115,7 @@ ) ) ) - (zone (net 8) (net_name GND) (layer B.Cu) (tstamp 56D4F34A) (hatch edge 0.508) + (zone (net 6) (net_name GND) (layer B.Cu) (tstamp 56D4F34A) (hatch edge 0.508) (connect_pads (clearance 0.508)) (min_thickness 0.254) (fill (arc_segments 16) (thermal_gap 0.508) (thermal_bridge_width 0.508)) diff --git a/hardware/VR_Board/vrs_io_1.net b/hardware/VR_Board/vrs_io_1.net index 735e4c1a66..2480de4155 100644 --- a/hardware/VR_Board/vrs_io_1.net +++ b/hardware/VR_Board/vrs_io_1.net @@ -1,7 +1,7 @@ (export (version D) (design (source C:/Users/Vista_64_D630/Desktop/Jared/code/Hardware/trunk/rusefi.com/VR_Board/vrs_io_1.sch) - (date "3/1/2016 5:25:30 AM") + (date "3/2/2016 7:57:49 PM") (tool "Eeschema 4.0.1-stable") (sheet (number 1) (name /) (tstamps /) (title_block @@ -254,18 +254,18 @@ (libsource (lib KICAD_Older_Version) (part CONN_4)) (sheetpath (names /) (tstamps /)) (tstamp 56D5985E)) - (comp (ref P103) - (value CONN_02X02) - (footprint Socket_Strip_Straight_2x02) - (libsource (lib conn) (part CONN_02X02)) - (sheetpath (names /) (tstamps /)) - (tstamp 56D6232B)) (comp (ref P105) (value CONN_01X01) (footprint Socket_Strip_Straight_1x01) (libsource (lib conn) (part CONN_01X01)) (sheetpath (names /) (tstamps /)) - (tstamp 56D641A2))) + (tstamp 56D641A2)) + (comp (ref P103) + (value CONN_02X04) + (footprint Socket_Strip_Straight_2x04) + (libsource (lib conn) (part CONN_02X04)) + (sheetpath (names /) (tstamps /)) + (tstamp 56D7FED9))) (libparts (libpart (lib KICAD_Older_Version) (part C) (footprints @@ -290,21 +290,25 @@ (field (name Value) CONN_01X01)) (pins (pin (num 1) (name P1) (type passive)))) - (libpart (lib conn) (part CONN_02X02) - (description "Connector 02x02") + (libpart (lib conn) (part CONN_02X04) + (description "Connector 02x04") (footprints - (fp Pin_Header_Straight_2X02) - (fp Pin_Header_Angled_2X02) - (fp Socket_Strip_Straight_2X02) - (fp Socket_Strip_Angled_2X02)) + (fp Pin_Header_Straight_2X04) + (fp Pin_Header_Angled_2X04) + (fp Socket_Strip_Straight_2X04) + (fp Socket_Strip_Angled_2X04)) (fields (field (name Reference) P) - (field (name Value) CONN_02X02)) + (field (name Value) CONN_02X04)) (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 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)))) (libpart (lib KICAD_Older_Version) (part CONN_4) (fields (field (name Reference) P) @@ -378,98 +382,106 @@ (library (logical conn) (uri "C:\\Program Files\\KiCad\\share\\kicad\\library\\conn.lib"))) (nets - (net (code 1) (name /5V) - (node (ref C104) (pin 1)) - (node (ref D802) (pin 1)) - (node (ref D801) (pin 1)) - (node (ref U101) (pin 14)) - (node (ref P105) (pin 1)) - (node (ref C103) (pin 2)) - (node (ref R137) (pin 1)) - (node (ref R141) (pin 1))) - (net (code 2) (name GND) - (node (ref P103) (pin 3)) + (net (code 1) (name GND) + (node (ref P103) (pin 8)) (node (ref C104) (pin 2)) - (node (ref R802) (pin 1)) - (node (ref P103) (pin 4)) (node (ref U101) (pin 11)) - (node (ref U101) (pin 1)) + (node (ref U101) (pin 6)) (node (ref C103) (pin 1)) (node (ref U101) (pin 12)) (node (ref U101) (pin 8)) - (node (ref U101) (pin 6)) - (node (ref U101) (pin 3)) + (node (ref P103) (pin 7)) (node (ref U101) (pin 13)) + (node (ref U101) (pin 3)) + (node (ref R802) (pin 1)) + (node (ref U101) (pin 1)) (node (ref R801) (pin 1))) - (net (code 3) (name "Net-(R137-Pad2)") - (node (ref W1002) (pin 2)) + (net (code 2) (name "Net-(R137-Pad2)") (node (ref R801) (pin 2)) - (node (ref R137) (pin 2))) - (net (code 4) (name "Net-(R141-Pad2)") - (node (ref W1003) (pin 2)) + (node (ref R137) (pin 2)) + (node (ref W1002) (pin 2))) + (net (code 3) (name "Net-(R141-Pad2)") + (node (ref R141) (pin 2)) (node (ref R802) (pin 2)) - (node (ref R141) (pin 2))) - (net (code 5) (name "Net-(D801-Pad2)") - (node (ref R113) (pin 1)) - (node (ref D801) (pin 2))) - (net (code 7) (name /CRK2+) - (node (ref P104) (pin 1)) - (node (ref R103) (pin 1))) - (net (code 8) (name /CRANK) - (node (ref U101) (pin 4)) - (node (ref R113) (pin 2)) - (node (ref P103) (pin 2))) - (net (code 9) (name /CAM) - (node (ref U101) (pin 5)) + (node (ref W1003) (pin 2))) + (net (code 5) (name /5V) + (node (ref U101) (pin 14)) + (node (ref D801) (pin 1)) + (node (ref D802) (pin 1)) + (node (ref P105) (pin 1)) + (node (ref R141) (pin 1)) + (node (ref R137) (pin 1)) + (node (ref C104) (pin 1)) + (node (ref C103) (pin 2))) + (net (code 6) (name /Cout2) (node (ref R114) (pin 1)) - (node (ref P103) (pin 1))) - (net (code 10) (name /CRK2-) - (node (ref R102) (pin 1)) - (node (ref P104) (pin 2)) - (node (ref W1002) (pin 1))) - (net (code 11) (name /CAM-) - (node (ref P104) (pin 3)) - (node (ref W1003) (pin 1)) - (node (ref R106) (pin 1))) - (net (code 12) (name /CAM+) + (node (ref U101) (pin 5)) + (node (ref P103) (pin 2))) + (net (code 7) (name /CAM+) (node (ref P104) (pin 4)) (node (ref R104) (pin 1))) - (net (code 13) (name "Net-(D802-Pad2)") + (net (code 8) (name /CRK2-) + (node (ref R102) (pin 1)) + (node (ref W1002) (pin 1)) + (node (ref P104) (pin 2))) + (net (code 9) (name /CRK2+) + (node (ref R103) (pin 1)) + (node (ref P104) (pin 1))) + (net (code 10) (name "Net-(P103-Pad1)") + (node (ref P103) (pin 1))) + (net (code 11) (name "Net-(P103-Pad3)") + (node (ref P103) (pin 3))) + (net (code 12) (name "Net-(P103-Pad4)") + (node (ref P103) (pin 4))) + (net (code 13) (name /Cout1) + (node (ref U101) (pin 4)) + (node (ref R113) (pin 2)) + (node (ref P103) (pin 5))) + (net (code 14) (name "Net-(P103-Pad6)") + (node (ref P103) (pin 6))) + (net (code 15) (name /CAM-) + (node (ref R106) (pin 1)) + (node (ref P104) (pin 3)) + (node (ref W1003) (pin 1))) + (net (code 16) (name "Net-(D801-Pad2)") + (node (ref D801) (pin 2)) + (node (ref R113) (pin 1))) + (net (code 17) (name "Net-(D802-Pad2)") (node (ref D802) (pin 2)) (node (ref R114) (pin 2))) - (net (code 14) (name "Net-(R102-Pad2)") + (net (code 18) (name "Net-(R102-Pad2)") (node (ref R107) (pin 1)) (node (ref R102) (pin 2))) - (net (code 15) (name "Net-(R104-Pad2)") + (net (code 19) (name "Net-(R104-Pad2)") (node (ref R109) (pin 1)) (node (ref R104) (pin 2))) - (net (code 16) (name "Net-(U101-Pad7)") + (net (code 20) (name "Net-(U101-Pad7)") (node (ref U101) (pin 7))) - (net (code 17) (name "Net-(U101-Pad2)") + (net (code 21) (name "Net-(U101-Pad2)") (node (ref U101) (pin 2))) - (net (code 18) (name "Net-(R103-Pad2)") + (net (code 22) (name "Net-(R103-Pad2)") (node (ref R108) (pin 1)) (node (ref R103) (pin 2))) - (net (code 19) (name "Net-(R106-Pad2)") + (net (code 23) (name "Net-(R106-Pad2)") (node (ref R106) (pin 2)) (node (ref R110) (pin 1))) - (net (code 20) (name "Net-(C101-Pad2)") - (node (ref R111) (pin 2)) - (node (ref U101) (pin 15)) - (node (ref R107) (pin 2)) - (node (ref C101) (pin 2))) - (net (code 21) (name "Net-(C101-Pad1)") - (node (ref C101) (pin 1)) + (net (code 24) (name "Net-(C102-Pad2)") + (node (ref R112) (pin 2)) + (node (ref R109) (pin 2)) + (node (ref C102) (pin 2)) + (node (ref U101) (pin 9))) + (net (code 25) (name "Net-(C101-Pad1)") (node (ref R111) (pin 1)) (node (ref R108) (pin 2)) + (node (ref C101) (pin 1)) (node (ref U101) (pin 16))) - (net (code 22) (name "Net-(C102-Pad1)") - (node (ref R110) (pin 2)) - (node (ref R112) (pin 1)) + (net (code 26) (name "Net-(C101-Pad2)") + (node (ref R107) (pin 2)) + (node (ref C101) (pin 2)) + (node (ref R111) (pin 2)) + (node (ref U101) (pin 15))) + (net (code 27) (name "Net-(C102-Pad1)") + (node (ref C102) (pin 1)) (node (ref U101) (pin 10)) - (node (ref C102) (pin 1))) - (net (code 23) (name "Net-(C102-Pad2)") - (node (ref R109) (pin 2)) - (node (ref R112) (pin 2)) - (node (ref U101) (pin 9)) - (node (ref C102) (pin 2))))) \ No newline at end of file + (node (ref R112) (pin 1)) + (node (ref R110) (pin 2))))) \ No newline at end of file diff --git a/hardware/VR_Board/vrs_io_1.sch b/hardware/VR_Board/vrs_io_1.sch index ecc3b85117..12d7e259d2 100644 --- a/hardware/VR_Board/vrs_io_1.sch +++ b/hardware/VR_Board/vrs_io_1.sch @@ -771,7 +771,7 @@ A5 59 F5 B1 ED D5 9C E8 08 07 C1 10 44 1D F4 AD 07 F1 EE 83 D4 9E 31 37 D1 64 C2 91 A1 43 C2 7E 0D F2 19 C8 78 B5 F5 02 22 D3 58 57 2B CC D7 85 6C 4C FF 31 A8 98 C5 16 50 F4 35 41 15 35 A0 12 56 8D 98 62 CC A4 7E EE 36 1A 96 19 07 03 43 5B C1 32 E3 60 60 68 37 58 F4 62 60 68 2B 58 F4 62 60 68 2B 58 F4 62 60 68 2B 38 8D 7C DE 00 03 03 43 3D D8 D8 8B 81 A1 AD FC 1F C1 -73 C1 3C 5D 72 1D 52 00 00 00 00 49 45 4E 44 AE 42 60 82 0A +73 C1 3C 5D 72 1D 52 00 00 00 00 49 45 4E 44 AE 42 60 82 00 EndData $EndBitmap $Bitmap @@ -1595,12 +1595,10 @@ Wire Notes Line 11550 1800 12100 1600 Wire Notes Line 12300 3500 12650 3650 -Text Notes 15250 2025 0 60 ~ 0 -FIRMWARE PINOUT +Text Label 15925 2050 0 60 ~ 0 +Cout2 Text Label 15425 2250 2 60 ~ 0 -CAM -Text Label 15925 2250 0 60 ~ 0 -CRANK +Cout1 $Comp L CONN_4 P104 U 1 1 56D5985E @@ -1626,9 +1624,9 @@ $EndComp Wire Wire Line 15425 2350 15375 2350 Text Label 15150 2700 2 60 ~ 0 -CRANK +Cout1 Text Label 15150 3200 2 60 ~ 0 -CAM +Cout2 Wire Wire Line 10225 3425 10650 3425 Wire Wire Line @@ -1650,17 +1648,6 @@ Wire Wire Line Wire Wire Line 10650 2725 10650 2625 $Comp -L CONN_02X02 P103 -U 1 1 56D6232B -P 15675 2300 -F 0 "P103" H 15675 2450 50 0000 C CNN -F 1 "CONN_02X02" H 15675 2150 50 0000 C CNN -F 2 "Socket_Strip_Straight_2x02" H 15675 1100 50 0001 C CNN -F 3 "" H 15675 1100 50 0000 C CNN - 1 15675 2300 - 1 0 0 -1 -$EndComp -$Comp L GND #PWR08 U 1 1 56D625BF P 15975 2350 @@ -1685,4 +1672,19 @@ F 3 "" H 14425 1925 50 0000 C CNN 0 -1 -1 0 $EndComp Connection ~ 14425 2125 +$Comp +L CONN_02X04 P103 +U 1 1 56D7FED9 +P 15675 2200 +F 0 "P103" H 15675 2450 50 0000 C CNN +F 1 "CONN_02X04" H 15675 1950 50 0000 C CNN +F 2 "Socket_Strip_Straight_2x04" H 15675 1000 50 0000 C CNN +F 3 "" H 15675 1000 50 0000 C CNN + 1 15675 2200 + 1 0 0 -1 +$EndComp +NoConn ~ 15925 2250 +NoConn ~ 15925 2150 +NoConn ~ 15425 2050 +NoConn ~ 15425 2150 $EndSCHEMATC diff --git a/java_console/models/src/com/autsia/bracer/test/BracerParserTest.java b/java_console/models/src/com/autsia/bracer/test/BracerParserTest.java index 74559beb93..5380d32675 100644 --- a/java_console/models/src/com/autsia/bracer/test/BracerParserTest.java +++ b/java_console/models/src/com/autsia/bracer/test/BracerParserTest.java @@ -99,6 +99,9 @@ public class BracerParserTest { bracerParser.parse("(time_since_boot <= 4) OR (rpm > 0)"); assertEquals("time_since_boot 4 <= rpm 0 > OR", bracerParser.getRusEfi()); + + bracerParser.parse("(self and (rpm > 4800)) OR (rpm > 5000)"); + assertEquals("self rpm 4800 > & rpm 5000 > OR", bracerParser.getRusEfi()); } @Test