auto-sync

This commit is contained in:
rusEfi 2017-02-05 23:04:55 -05:00
parent 45f03cdab4
commit d7767261be
15 changed files with 214 additions and 176 deletions

View File

@ -207,7 +207,6 @@ void setCitroenBerlingoTU3JPConfiguration(DECLARE_ENGINE_PARAMETER_F) {
* Speed Sensor * Speed Sensor
*/ */
boardConfiguration->vehicleSpeedSensorInputPin = GPIOA_8; boardConfiguration->vehicleSpeedSensorInputPin = GPIOA_8;
engineConfiguration->hasVehicleSpeedSensor = true;
/** /**
* Other * Other
*/ */
@ -218,6 +217,4 @@ void setCitroenBerlingoTU3JPConfiguration(DECLARE_ENGINE_PARAMETER_F) {
engineConfiguration->dizzySparkOutputPin = GPIOE_3; engineConfiguration->dizzySparkOutputPin = GPIOE_3;
engineConfiguration->dizzySparkOutputPinMode = OM_INVERTED; engineConfiguration->dizzySparkOutputPinMode = OM_INVERTED;
} }

View File

@ -472,7 +472,6 @@ void setDodgeNeonNGCEngineConfiguration(DECLARE_ENGINE_PARAMETER_F) {
#endif #endif
boardConfiguration->vehicleSpeedSensorInputPin = GPIOA_8; boardConfiguration->vehicleSpeedSensorInputPin = GPIOA_8;
engineConfiguration->hasVehicleSpeedSensor = true;
engineConfiguration->fanOnTemperature = 92; engineConfiguration->fanOnTemperature = 92;
engineConfiguration->fanOffTemperature = 89; engineConfiguration->fanOffTemperature = 89;

View File

@ -253,17 +253,14 @@ static void printSensors(Logging *log, bool fileFormat) {
reportSensorI(log, fileFormat, "version", "#", getRusEfiVersion()); reportSensorI(log, fileFormat, "version", "#", getRusEfiVersion());
} }
if (engineConfiguration->hasVehicleSpeedSensor) {
#if EFI_VEHICLE_SPEED || defined(__DOXYGEN__) #if EFI_VEHICLE_SPEED || defined(__DOXYGEN__)
if (hasVehicleSpeedSensor()) {
float vehicleSpeed = getVehicleSpeed(); float vehicleSpeed = getVehicleSpeed();
#else
float vehicleSpeed = 0;
#endif /* EFI_PROD_CODE */
reportSensorF(log, fileFormat, "vss", "kph", vehicleSpeed, 2); reportSensorF(log, fileFormat, "vss", "kph", vehicleSpeed, 2);
float sp2rpm = rpm == 0 ? 0 : vehicleSpeed / rpm; float sp2rpm = rpm == 0 ? 0 : vehicleSpeed / rpm;
reportSensorF(log, fileFormat, "sp2rpm", "x", sp2rpm, 2); reportSensorF(log, fileFormat, "sp2rpm", "x", sp2rpm, 2);
} }
#endif /* EFI_PROD_CODE */
reportSensorF(log, fileFormat, "knck_c", "count", engine->knockCount, 0); reportSensorF(log, fileFormat, "knck_c", "count", engine->knockCount, 0);
reportSensorF(log, fileFormat, "knck_v", "v", engine->knockVolts, 2); reportSensorF(log, fileFormat, "knck_v", "v", engine->knockVolts, 2);

View File

@ -1,4 +1,4 @@
// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sun Feb 05 11:39:34 EST 2017 // this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sun Feb 05 22:20:28 EST 2017
// begin // begin
#ifndef ENGINE_CONFIGURATION_GENERATED_H_ #ifndef ENGINE_CONFIGURATION_GENERATED_H_
#define ENGINE_CONFIGURATION_GENERATED_H_ #define ENGINE_CONFIGURATION_GENERATED_H_
@ -1211,7 +1211,7 @@ typedef struct {
bool canWriteEnabled : 1; bool canWriteEnabled : 1;
/** /**
offset 1488 bit 10 */ offset 1488 bit 10 */
bool hasVehicleSpeedSensor : 1; bool unusedBit_123 : 1;
/** /**
offset 1488 bit 11 */ offset 1488 bit 11 */
bool unusedbit_9 : 1; bool unusedbit_9 : 1;
@ -2039,4 +2039,4 @@ typedef struct {
#endif #endif
// end // end
// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sun Feb 05 11:39:34 EST 2017 // this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sun Feb 05 22:20:28 EST 2017

View File

@ -625,7 +625,7 @@
#define unusedBit__2_offset 1488 #define unusedBit__2_offset 1488
#define canReadEnabled_offset 1488 #define canReadEnabled_offset 1488
#define canWriteEnabled_offset 1488 #define canWriteEnabled_offset 1488
#define hasVehicleSpeedSensor_offset 1488 #define unusedBit_123_offset 1488
#define unusedbit_9_offset 1488 #define unusedbit_9_offset 1488
#define unusedbit_10_offset 1488 #define unusedbit_10_offset 1488
#define isAlternatorControlEnabled_offset 1488 #define isAlternatorControlEnabled_offset 1488

View File

@ -35,7 +35,7 @@ void setMockVehicleSpeed(float speedKPH) {
float getVehicleSpeed(void) { float getVehicleSpeed(void) {
if (mockVehicleSpeed != DEFAULT_MOCK_SPEED) if (mockVehicleSpeed != DEFAULT_MOCK_SPEED)
return mockVehicleSpeed; return mockVehicleSpeed;
if (!engineConfiguration->hasVehicleSpeedSensor) if (!hasVehicleSpeedSensor())
return 0; return 0;
efitick_t nowNt = getTimeNowNt(); efitick_t nowNt = getTimeNowNt();
if (nowNt - lastSignalTimeNt > US2NT(US_PER_SECOND_LL)) if (nowNt - lastSignalTimeNt > US2NT(US_PER_SECOND_LL))
@ -52,7 +52,7 @@ static void vsAnaWidthCallback(void) {
} }
static void speedInfo(void) { static void speedInfo(void) {
scheduleMsg(logger, "VSS %s at %s", boolToString(engineConfiguration->hasVehicleSpeedSensor), scheduleMsg(logger, "VSS at %s",
hwPortname(boardConfiguration->vehicleSpeedSensorInputPin)); hwPortname(boardConfiguration->vehicleSpeedSensorInputPin));
scheduleMsg(logger, "c=%f eventCounter=%d speed=%f", scheduleMsg(logger, "c=%f eventCounter=%d speed=%f",
@ -63,10 +63,14 @@ static void speedInfo(void) {
} }
bool hasVehicleSpeedSensor() {
return boardConfiguration->vehicleSpeedSensorInputPin != GPIO_UNASSIGNED;
}
void initVehicleSpeed(Logging *l) { void initVehicleSpeed(Logging *l) {
logger = l; logger = l;
addConsoleAction("speedinfo", speedInfo); addConsoleAction("speedinfo", speedInfo);
if (boardConfiguration->vehicleSpeedSensorInputPin == GPIO_UNASSIGNED) if (!hasVehicleSpeedSensor())
return; return;
digital_input_s* vehicleSpeedInput = initWaveAnalyzerDriver("VSS", boardConfiguration->vehicleSpeedSensorInputPin); digital_input_s* vehicleSpeedInput = initWaveAnalyzerDriver("VSS", boardConfiguration->vehicleSpeedSensorInputPin);
startInputDriver(vehicleSpeedInput, true); startInputDriver(vehicleSpeedInput, true);

View File

@ -16,5 +16,6 @@
float getVehicleSpeed(void); float getVehicleSpeed(void);
void initVehicleSpeed(Logging *logger); void initVehicleSpeed(Logging *logger);
void setMockVehicleSpeed(float speedKPH); void setMockVehicleSpeed(float speedKPH);
bool hasVehicleSpeedSensor();
#endif /* HW_LAYER_VEHICLE_SPEED_H_ */ #endif /* HW_LAYER_VEHICLE_SPEED_H_ */

View File

@ -583,7 +583,7 @@ bit vvtDisplayInverted
bit unusedBit__2 bit unusedBit__2
bit canReadEnabled bit canReadEnabled
bit canWriteEnabled bit canWriteEnabled
bit hasVehicleSpeedSensor bit unusedBit_123
bit unusedbit_9 bit unusedbit_9
bit unusedbit_10 bit unusedbit_10
bit isAlternatorControlEnabled bit isAlternatorControlEnabled

View File

@ -249,5 +249,5 @@ int getRusEfiVersion(void) {
return 123; // this is here to make the compiler happy about the unused array return 123; // this is here to make the compiler happy about the unused array
if (UNUSED_CCM_SIZE[0] * 0 != 0) if (UNUSED_CCM_SIZE[0] * 0 != 0)
return 3211; // this is here to make the compiler happy about the unused array return 3211; // this is here to make the compiler happy about the unused array
return 20170129; return 20170205;
} }

View File

@ -42,7 +42,7 @@ enable2ndByteCanID = false
; see PAGE_0_SIZE in C source code ; see PAGE_0_SIZE in C source code
; CONFIG_DEFINITION_START ; CONFIG_DEFINITION_START
; this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sun Feb 05 11:39:34 EST 2017 ; this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sun Feb 05 22:42:11 EST 2017
pageSize = 16376 pageSize = 16376
page = 1 page = 1
@ -431,7 +431,7 @@ page = 1
unusedBit__2 = bits, U32, 1488, [7:7], "false", "true" unusedBit__2 = bits, U32, 1488, [7:7], "false", "true"
canReadEnabled = bits, U32, 1488, [8:8], "false", "true" canReadEnabled = bits, U32, 1488, [8:8], "false", "true"
canWriteEnabled = bits, U32, 1488, [9:9], "false", "true" canWriteEnabled = bits, U32, 1488, [9:9], "false", "true"
hasVehicleSpeedSensor = bits, U32, 1488, [10:10], "false", "true" unusedBit_123 = bits, U32, 1488, [10:10], "false", "true"
unusedbit_9 = bits, U32, 1488, [11:11], "false", "true" unusedbit_9 = bits, U32, 1488, [11:11], "false", "true"
unusedbit_10 = bits, U32, 1488, [12:12], "false", "true" unusedbit_10 = bits, U32, 1488, [12:12], "false", "true"
isAlternatorControlEnabled= bits, U32, 1488, [13:13], "false", "true" isAlternatorControlEnabled= bits, U32, 1488, [13:13], "false", "true"
@ -1689,7 +1689,7 @@ cmd_test_idle_valve = "w\x00\x17\x00\x01"
field = "Primary input channel", triggerInputPins1 field = "Primary input channel", triggerInputPins1
field = "Secondary channel", triggerInputPins2 field = "Secondary channel", triggerInputPins2
field = "Cam Sync/VVT input", camInput field = "Cam Sync/VVT input", camInput
field = "VVT Input pin", vehicleSpeedSensorInputPin field = "Vehicle Speed Input pin", vehicleSpeedSensorInputPin
field = "clutchDownPin", clutchDownPin field = "clutchDownPin", clutchDownPin
field = "clutchUpPin", clutchUpPin field = "clutchUpPin", clutchUpPin
@ -1702,6 +1702,10 @@ cmd_test_idle_valve = "w\x00\x17\x00\x01"
field = "Idle Stepper Step", idle_stepperStepPin field = "Idle Stepper Step", idle_stepperStepPin
field = "Idle Stepper Enable", stepperEnablePin field = "Idle Stepper Enable", stepperEnablePin
field = "Fuel Pump Pin", fuelPumpPin field = "Fuel Pump Pin", fuelPumpPin
field = "ETB Dir #1", etbDirectionPin1
field = "ETB Dir #2", etbDirectionPin2
field = "ETB Control #1", etbControlPin1
field = "ETB Control #2", etbControlPin2
dialog = allPins3 dialog = allPins3
field = "Injection Pin 1", injectionPins1 field = "Injection Pin 1", injectionPins1
@ -1730,14 +1734,30 @@ cmd_test_idle_valve = "w\x00\x17\x00\x01"
field = "Ignition Pin 11", ignitionPins11 field = "Ignition Pin 11", ignitionPins11
field = "Ignition Pin 12", ignitionPins12 field = "Ignition Pin 12", ignitionPins12
dialog = allPins4
field = "FSIO dig inp #1", fsioDigitalInputs1
field = "FSIO dig inp #2", fsioDigitalInputs2
field = "FSIO dig inp #3", fsioDigitalInputs3
field = "FSIO dig inp #4", fsioDigitalInputs4
field = "FSIO dig inp #5", fsioDigitalInputs5
field = "FSIO dig inp #6", fsioDigitalInputs6
field = "FSIO dig inp #7", fsioDigitalInputs7
field = "FSIO dig inp #8", fsioDigitalInputs8
field = "FSIO dig inp #9", fsioDigitalInputs9
dialog = allPins1_2, "", xAxis dialog = allPins1_2, "", xAxis
panel = allPins1 panel = allPins1
panel = allPins2 panel = allPins2
dialog = allPins3_4, "", xAxis
panel = allPins3
panel = allPins4
dialog = allPins, "All Pins", xAxis dialog = allPins, "All Pins", xAxis
panel = allPins1_2 panel = allPins1_2
panel = allPins3 panel = allPins3_4
; Engine->CLT Thermistor Settings ; Engine->CLT Thermistor Settings
@ -2004,9 +2024,8 @@ cmd_test_idle_valve = "w\x00\x17\x00\x01"
; Engine->Speed Sensor ; Engine->Speed Sensor
dialog = speedSensor, "Speed Sensor Settings" dialog = speedSensor, "Speed Sensor Settings"
field = "Enabled", hasVehicleSpeedSensor field = "Input pin", vehicleSpeedSensorInputPin
field = "Input pin", vehicleSpeedSensorInputPin, {hasVehicleSpeedSensor == 1} field = "revolution to speed mult", vehicleSpeedCoef
field = "revolution to speed mult", vehicleSpeedCoef, {hasVehicleSpeedSensor == 1}
; Engine->Other inputs ; Engine->Other inputs
dialog = analogInputs, "Analog inputs" dialog = analogInputs, "Analog inputs"

View File

@ -1623,7 +1623,7 @@ cmd_test_idle_valve = "w\x00\x17\x00\x01"
field = "Primary input channel", triggerInputPins1 field = "Primary input channel", triggerInputPins1
field = "Secondary channel", triggerInputPins2 field = "Secondary channel", triggerInputPins2
field = "Cam Sync/VVT input", camInput field = "Cam Sync/VVT input", camInput
field = "VVT Input pin", vehicleSpeedSensorInputPin field = "Vehicle Speed Input pin", vehicleSpeedSensorInputPin
field = "clutchDownPin", clutchDownPin field = "clutchDownPin", clutchDownPin
field = "clutchUpPin", clutchUpPin field = "clutchUpPin", clutchUpPin
@ -1636,6 +1636,10 @@ cmd_test_idle_valve = "w\x00\x17\x00\x01"
field = "Idle Stepper Step", idle_stepperStepPin field = "Idle Stepper Step", idle_stepperStepPin
field = "Idle Stepper Enable", stepperEnablePin field = "Idle Stepper Enable", stepperEnablePin
field = "Fuel Pump Pin", fuelPumpPin field = "Fuel Pump Pin", fuelPumpPin
field = "ETB Dir #1", etbDirectionPin1
field = "ETB Dir #2", etbDirectionPin2
field = "ETB Control #1", etbControlPin1
field = "ETB Control #2", etbControlPin2
dialog = allPins3 dialog = allPins3
field = "Injection Pin 1", injectionPins1 field = "Injection Pin 1", injectionPins1
@ -1664,14 +1668,30 @@ cmd_test_idle_valve = "w\x00\x17\x00\x01"
field = "Ignition Pin 11", ignitionPins11 field = "Ignition Pin 11", ignitionPins11
field = "Ignition Pin 12", ignitionPins12 field = "Ignition Pin 12", ignitionPins12
dialog = allPins4
field = "FSIO dig inp #1", fsioDigitalInputs1
field = "FSIO dig inp #2", fsioDigitalInputs2
field = "FSIO dig inp #3", fsioDigitalInputs3
field = "FSIO dig inp #4", fsioDigitalInputs4
field = "FSIO dig inp #5", fsioDigitalInputs5
field = "FSIO dig inp #6", fsioDigitalInputs6
field = "FSIO dig inp #7", fsioDigitalInputs7
field = "FSIO dig inp #8", fsioDigitalInputs8
field = "FSIO dig inp #9", fsioDigitalInputs9
dialog = allPins1_2, "", xAxis dialog = allPins1_2, "", xAxis
panel = allPins1 panel = allPins1
panel = allPins2 panel = allPins2
dialog = allPins3_4, "", xAxis
panel = allPins3
panel = allPins4
dialog = allPins, "All Pins", xAxis dialog = allPins, "All Pins", xAxis
panel = allPins1_2 panel = allPins1_2
panel = allPins3 panel = allPins3_4
; Engine->CLT Thermistor Settings ; Engine->CLT Thermistor Settings
@ -1938,9 +1958,8 @@ cmd_test_idle_valve = "w\x00\x17\x00\x01"
; Engine->Speed Sensor ; Engine->Speed Sensor
dialog = speedSensor, "Speed Sensor Settings" dialog = speedSensor, "Speed Sensor Settings"
field = "Enabled", hasVehicleSpeedSensor field = "Input pin", vehicleSpeedSensorInputPin
field = "Input pin", vehicleSpeedSensorInputPin, {hasVehicleSpeedSensor == 1} field = "revolution to speed mult", vehicleSpeedCoef
field = "revolution to speed mult", vehicleSpeedCoef, {hasVehicleSpeedSensor == 1}
; Engine->Other inputs ; Engine->Other inputs
dialog = analogInputs, "Analog inputs" dialog = analogInputs, "Analog inputs"

View File

@ -30,7 +30,7 @@
(37 F.SilkS user) (37 F.SilkS user)
(38 B.Mask user) (38 B.Mask user)
(39 F.Mask user) (39 F.Mask user)
(40 Dwgs.User user hide) (40 Dwgs.User user)
(41 Cmts.User user) (41 Cmts.User user)
(42 Eco1.User user) (42 Eco1.User user)
(43 Eco2.User user) (43 Eco2.User user)
@ -324,6 +324,130 @@
(add_net "Net-(R1-Pad1)") (add_net "Net-(R1-Pad1)")
) )
(module Pin_Headers:Pin_Header_Angled_1x03 (layer B.Cu) (tedit 5897F299) (tstamp 5861095A)
(at 147.066 148.082)
(descr "Through hole pin header")
(tags "pin header")
(path /58619400)
(fp_text reference P6 (at 0.127 2.413) (layer B.SilkS)
(effects (font (size 1 1) (thickness 0.15)) (justify mirror))
)
(fp_text value CONN_01X03 (at 0 3.1) (layer B.Fab) hide
(effects (font (size 1 1) (thickness 0.15)) (justify mirror))
)
(fp_line (start -1.5 1.75) (end -1.5 -6.85) (layer B.CrtYd) (width 0.05))
(fp_line (start 10.65 1.75) (end 10.65 -6.85) (layer B.CrtYd) (width 0.05))
(fp_line (start -1.5 1.75) (end 10.65 1.75) (layer B.CrtYd) (width 0.05))
(fp_line (start -1.5 -6.85) (end 10.65 -6.85) (layer B.CrtYd) (width 0.05))
(fp_line (start -1.3 1.55) (end -1.3 0) (layer B.SilkS) (width 0.15))
(fp_line (start 0 1.55) (end -1.3 1.55) (layer B.SilkS) (width 0.15))
(fp_line (start 4.191 0.127) (end 10.033 0.127) (layer Dwgs.User) (width 0.15))
(fp_line (start 10.033 0.127) (end 10.033 -0.127) (layer Dwgs.User) (width 0.15))
(fp_line (start 10.033 -0.127) (end 4.191 -0.127) (layer Dwgs.User) (width 0.15))
(fp_line (start 4.191 -0.127) (end 4.191 0) (layer Dwgs.User) (width 0.15))
(fp_line (start 4.191 0) (end 10.033 0) (layer Dwgs.User) (width 0.15))
(fp_line (start 1.524 0.254) (end 1.143 0.254) (layer B.SilkS) (width 0.15))
(fp_line (start 1.524 -0.254) (end 1.143 -0.254) (layer B.SilkS) (width 0.15))
(fp_line (start 1.524 -2.286) (end 1.143 -2.286) (layer B.SilkS) (width 0.15))
(fp_line (start 1.524 -2.794) (end 1.143 -2.794) (layer B.SilkS) (width 0.15))
(fp_line (start 1.524 -4.826) (end 1.143 -4.826) (layer B.SilkS) (width 0.15))
(fp_line (start 1.524 -5.334) (end 1.143 -5.334) (layer B.SilkS) (width 0.15))
(fp_line (start 4.064 -1.27) (end 4.064 1.27) (layer Dwgs.User) (width 0.15))
(fp_line (start 10.16 -0.254) (end 4.064 -0.254) (layer Dwgs.User) (width 0.15))
(fp_line (start 10.16 0.254) (end 10.16 -0.254) (layer Dwgs.User) (width 0.15))
(fp_line (start 4.064 0.254) (end 10.16 0.254) (layer Dwgs.User) (width 0.15))
(fp_line (start 1.524 -1.27) (end 4.064 -1.27) (layer Dwgs.User) (width 0.15))
(fp_line (start 1.524 1.27) (end 1.524 -1.27) (layer B.SilkS) (width 0.15))
(fp_line (start 1.524 1.27) (end 4.064 1.27) (layer Dwgs.User) (width 0.15))
(fp_line (start 1.524 -3.81) (end 4.064 -3.81) (layer Dwgs.User) (width 0.15))
(fp_line (start 1.524 -3.81) (end 1.524 -6.35) (layer B.SilkS) (width 0.15))
(fp_line (start 4.064 -4.826) (end 10.16 -4.826) (layer Dwgs.User) (width 0.15))
(fp_line (start 10.16 -4.826) (end 10.16 -5.334) (layer Dwgs.User) (width 0.15))
(fp_line (start 10.16 -5.334) (end 4.064 -5.334) (layer Dwgs.User) (width 0.15))
(fp_line (start 4.064 -6.35) (end 4.064 -3.81) (layer Dwgs.User) (width 0.15))
(fp_line (start 4.064 -3.81) (end 4.064 -1.27) (layer Dwgs.User) (width 0.15))
(fp_line (start 10.16 -2.794) (end 4.064 -2.794) (layer Dwgs.User) (width 0.15))
(fp_line (start 10.16 -2.286) (end 10.16 -2.794) (layer Dwgs.User) (width 0.15))
(fp_line (start 4.064 -2.286) (end 10.16 -2.286) (layer Dwgs.User) (width 0.15))
(fp_line (start 1.524 -3.81) (end 4.064 -3.81) (layer Dwgs.User) (width 0.15))
(fp_line (start 1.524 -1.27) (end 1.524 -3.81) (layer B.SilkS) (width 0.15))
(fp_line (start 1.524 -1.27) (end 4.064 -1.27) (layer Dwgs.User) (width 0.15))
(fp_line (start 1.524 -6.35) (end 4.064 -6.35) (layer Dwgs.User) (width 0.15))
(pad 1 thru_hole rect (at 0 0) (size 2.032 1.7272) (drill 1.016) (layers *.Cu *.Mask)
(net 85 GND))
(pad 2 thru_hole oval (at 0 -2.54) (size 2.032 1.7272) (drill 1.016) (layers *.Cu *.Mask)
(net 62 /PD4))
(pad 3 thru_hole oval (at 0 -5.08) (size 2.032 1.7272) (drill 1.016) (layers *.Cu *.Mask)
(net 31 /PB3))
(model Pin_Headers.3dshapes/Pin_Header_Angled_1x03.wrl
(at (xyz 0 -0.1 0))
(scale (xyz 1 1 1))
(rotate (xyz 0 0 90))
)
)
(module Pin_Headers:Pin_Header_Angled_1x03 (layer B.Cu) (tedit 5897F1E6) (tstamp 5861092D)
(at 147.066 122.682)
(descr "Through hole pin header")
(tags "pin header")
(path /58618F13)
(fp_text reference P5 (at 0.127 2.54) (layer B.SilkS)
(effects (font (size 1 1) (thickness 0.15)) (justify mirror))
)
(fp_text value CONN_01X03 (at 0 3.1) (layer B.Fab) hide
(effects (font (size 1 1) (thickness 0.15)) (justify mirror))
)
(fp_line (start -1.5 1.75) (end -1.5 -6.85) (layer B.CrtYd) (width 0.05))
(fp_line (start 10.65 1.75) (end 10.65 -6.85) (layer B.CrtYd) (width 0.05))
(fp_line (start -1.5 1.75) (end 10.65 1.75) (layer B.CrtYd) (width 0.05))
(fp_line (start -1.5 -6.85) (end 10.65 -6.85) (layer B.CrtYd) (width 0.05))
(fp_line (start -1.3 1.55) (end -1.3 0) (layer B.SilkS) (width 0.15))
(fp_line (start 0 1.55) (end -1.3 1.55) (layer B.SilkS) (width 0.15))
(fp_line (start 4.191 0.127) (end 10.033 0.127) (layer Dwgs.User) (width 0.15))
(fp_line (start 10.033 0.127) (end 10.033 -0.127) (layer Dwgs.User) (width 0.15))
(fp_line (start 10.033 -0.127) (end 4.191 -0.127) (layer Dwgs.User) (width 0.15))
(fp_line (start 4.191 -0.127) (end 4.191 0) (layer Dwgs.User) (width 0.15))
(fp_line (start 4.191 0) (end 10.033 0) (layer Dwgs.User) (width 0.15))
(fp_line (start 1.524 0.254) (end 1.143 0.254) (layer B.SilkS) (width 0.15))
(fp_line (start 1.524 -0.254) (end 1.143 -0.254) (layer B.SilkS) (width 0.15))
(fp_line (start 1.524 -2.286) (end 1.143 -2.286) (layer B.SilkS) (width 0.15))
(fp_line (start 1.524 -2.794) (end 1.143 -2.794) (layer B.SilkS) (width 0.15))
(fp_line (start 1.524 -4.826) (end 1.143 -4.826) (layer B.SilkS) (width 0.15))
(fp_line (start 1.524 -5.334) (end 1.143 -5.334) (layer B.SilkS) (width 0.15))
(fp_line (start 4.064 -1.27) (end 4.064 1.27) (layer Dwgs.User) (width 0.15))
(fp_line (start 10.16 -0.254) (end 4.064 -0.254) (layer Dwgs.User) (width 0.15))
(fp_line (start 10.16 0.254) (end 10.16 -0.254) (layer Dwgs.User) (width 0.15))
(fp_line (start 4.064 0.254) (end 10.16 0.254) (layer Dwgs.User) (width 0.15))
(fp_line (start 1.524 -1.27) (end 4.064 -1.27) (layer Dwgs.User) (width 0.15))
(fp_line (start 1.524 1.27) (end 1.524 -1.27) (layer B.SilkS) (width 0.15))
(fp_line (start 1.524 1.27) (end 4.064 1.27) (layer Dwgs.User) (width 0.15))
(fp_line (start 1.524 -3.81) (end 4.064 -3.81) (layer Dwgs.User) (width 0.15))
(fp_line (start 1.524 -3.81) (end 1.524 -6.35) (layer B.SilkS) (width 0.15))
(fp_line (start 4.064 -4.826) (end 10.16 -4.826) (layer Dwgs.User) (width 0.15))
(fp_line (start 10.16 -4.826) (end 10.16 -5.334) (layer Dwgs.User) (width 0.15))
(fp_line (start 10.16 -5.334) (end 4.064 -5.334) (layer Dwgs.User) (width 0.15))
(fp_line (start 4.064 -6.35) (end 4.064 -3.81) (layer Dwgs.User) (width 0.15))
(fp_line (start 4.064 -3.81) (end 4.064 -1.27) (layer Dwgs.User) (width 0.15))
(fp_line (start 10.16 -2.794) (end 4.064 -2.794) (layer Dwgs.User) (width 0.15))
(fp_line (start 10.16 -2.286) (end 10.16 -2.794) (layer Dwgs.User) (width 0.15))
(fp_line (start 4.064 -2.286) (end 10.16 -2.286) (layer Dwgs.User) (width 0.15))
(fp_line (start 1.524 -3.81) (end 4.064 -3.81) (layer Dwgs.User) (width 0.15))
(fp_line (start 1.524 -1.27) (end 1.524 -3.81) (layer B.SilkS) (width 0.15))
(fp_line (start 1.524 -1.27) (end 4.064 -1.27) (layer Dwgs.User) (width 0.15))
(fp_line (start 1.524 -6.35) (end 4.064 -6.35) (layer Dwgs.User) (width 0.15))
(pad 1 thru_hole rect (at 0 0) (size 2.032 1.7272) (drill 1.016) (layers *.Cu *.Mask)
(net 32 /PB4))
(pad 2 thru_hole oval (at 0 -2.54) (size 2.032 1.7272) (drill 1.016) (layers *.Cu *.Mask)
(net 33 /PB5))
(pad 3 thru_hole oval (at 0 -5.08) (size 2.032 1.7272) (drill 1.016) (layers *.Cu *.Mask)
(net 84 /VDD))
(model Pin_Headers.3dshapes/Pin_Header_Angled_1x03.wrl
(at (xyz 0 -0.1 0))
(scale (xyz 1 1 1))
(rotate (xyz 0 0 90))
)
)
(module BATT_CR2032_MPD (layer B.Cu) (tedit 51C8CC80) (tstamp 52ED0A85) (module BATT_CR2032_MPD (layer B.Cu) (tedit 51C8CC80) (tstamp 52ED0A85)
(at 117.983 116.713 90) (at 117.983 116.713 90)
(path /52CFBA3E) (path /52CFBA3E)
@ -726,130 +850,6 @@
(net 12 /PA13)) (net 12 /PA13))
) )
(module Pin_Headers:Pin_Header_Angled_1x03 (layer B.Cu) (tedit 58616A15) (tstamp 5861092D)
(at 147.066 122.682)
(descr "Through hole pin header")
(tags "pin header")
(path /58618F13)
(fp_text reference P5 (at 0.127 2.54) (layer B.SilkS)
(effects (font (size 1 1) (thickness 0.15)) (justify mirror))
)
(fp_text value CONN_01X03 (at 0 3.1) (layer B.Fab) hide
(effects (font (size 1 1) (thickness 0.15)) (justify mirror))
)
(fp_line (start -1.5 1.75) (end -1.5 -6.85) (layer B.CrtYd) (width 0.05))
(fp_line (start 10.65 1.75) (end 10.65 -6.85) (layer B.CrtYd) (width 0.05))
(fp_line (start -1.5 1.75) (end 10.65 1.75) (layer B.CrtYd) (width 0.05))
(fp_line (start -1.5 -6.85) (end 10.65 -6.85) (layer B.CrtYd) (width 0.05))
(fp_line (start -1.3 1.55) (end -1.3 0) (layer B.SilkS) (width 0.15))
(fp_line (start 0 1.55) (end -1.3 1.55) (layer B.SilkS) (width 0.15))
(fp_line (start 4.191 0.127) (end 10.033 0.127) (layer B.SilkS) (width 0.15))
(fp_line (start 10.033 0.127) (end 10.033 -0.127) (layer B.SilkS) (width 0.15))
(fp_line (start 10.033 -0.127) (end 4.191 -0.127) (layer B.SilkS) (width 0.15))
(fp_line (start 4.191 -0.127) (end 4.191 0) (layer B.SilkS) (width 0.15))
(fp_line (start 4.191 0) (end 10.033 0) (layer B.SilkS) (width 0.15))
(fp_line (start 1.524 0.254) (end 1.143 0.254) (layer B.SilkS) (width 0.15))
(fp_line (start 1.524 -0.254) (end 1.143 -0.254) (layer B.SilkS) (width 0.15))
(fp_line (start 1.524 -2.286) (end 1.143 -2.286) (layer B.SilkS) (width 0.15))
(fp_line (start 1.524 -2.794) (end 1.143 -2.794) (layer B.SilkS) (width 0.15))
(fp_line (start 1.524 -4.826) (end 1.143 -4.826) (layer B.SilkS) (width 0.15))
(fp_line (start 1.524 -5.334) (end 1.143 -5.334) (layer B.SilkS) (width 0.15))
(fp_line (start 4.064 -1.27) (end 4.064 1.27) (layer B.SilkS) (width 0.15))
(fp_line (start 10.16 -0.254) (end 4.064 -0.254) (layer B.SilkS) (width 0.15))
(fp_line (start 10.16 0.254) (end 10.16 -0.254) (layer B.SilkS) (width 0.15))
(fp_line (start 4.064 0.254) (end 10.16 0.254) (layer B.SilkS) (width 0.15))
(fp_line (start 1.524 -1.27) (end 4.064 -1.27) (layer B.SilkS) (width 0.15))
(fp_line (start 1.524 1.27) (end 1.524 -1.27) (layer B.SilkS) (width 0.15))
(fp_line (start 1.524 1.27) (end 4.064 1.27) (layer B.SilkS) (width 0.15))
(fp_line (start 1.524 -3.81) (end 4.064 -3.81) (layer B.SilkS) (width 0.15))
(fp_line (start 1.524 -3.81) (end 1.524 -6.35) (layer B.SilkS) (width 0.15))
(fp_line (start 4.064 -4.826) (end 10.16 -4.826) (layer B.SilkS) (width 0.15))
(fp_line (start 10.16 -4.826) (end 10.16 -5.334) (layer B.SilkS) (width 0.15))
(fp_line (start 10.16 -5.334) (end 4.064 -5.334) (layer B.SilkS) (width 0.15))
(fp_line (start 4.064 -6.35) (end 4.064 -3.81) (layer B.SilkS) (width 0.15))
(fp_line (start 4.064 -3.81) (end 4.064 -1.27) (layer B.SilkS) (width 0.15))
(fp_line (start 10.16 -2.794) (end 4.064 -2.794) (layer B.SilkS) (width 0.15))
(fp_line (start 10.16 -2.286) (end 10.16 -2.794) (layer B.SilkS) (width 0.15))
(fp_line (start 4.064 -2.286) (end 10.16 -2.286) (layer B.SilkS) (width 0.15))
(fp_line (start 1.524 -3.81) (end 4.064 -3.81) (layer B.SilkS) (width 0.15))
(fp_line (start 1.524 -1.27) (end 1.524 -3.81) (layer B.SilkS) (width 0.15))
(fp_line (start 1.524 -1.27) (end 4.064 -1.27) (layer B.SilkS) (width 0.15))
(fp_line (start 1.524 -6.35) (end 4.064 -6.35) (layer B.SilkS) (width 0.15))
(pad 1 thru_hole rect (at 0 0) (size 2.032 1.7272) (drill 1.016) (layers *.Cu *.Mask)
(net 32 /PB4))
(pad 2 thru_hole oval (at 0 -2.54) (size 2.032 1.7272) (drill 1.016) (layers *.Cu *.Mask)
(net 33 /PB5))
(pad 3 thru_hole oval (at 0 -5.08) (size 2.032 1.7272) (drill 1.016) (layers *.Cu *.Mask)
(net 84 /VDD))
(model Pin_Headers.3dshapes/Pin_Header_Angled_1x03.wrl
(at (xyz 0 -0.1 0))
(scale (xyz 1 1 1))
(rotate (xyz 0 0 90))
)
)
(module Pin_Headers:Pin_Header_Angled_1x03 (layer B.Cu) (tedit 58616A0D) (tstamp 5861095A)
(at 147.066 148.082)
(descr "Through hole pin header")
(tags "pin header")
(path /58619400)
(fp_text reference P6 (at 0.127 2.413) (layer B.SilkS)
(effects (font (size 1 1) (thickness 0.15)) (justify mirror))
)
(fp_text value CONN_01X03 (at 0 3.1) (layer B.Fab) hide
(effects (font (size 1 1) (thickness 0.15)) (justify mirror))
)
(fp_line (start -1.5 1.75) (end -1.5 -6.85) (layer B.CrtYd) (width 0.05))
(fp_line (start 10.65 1.75) (end 10.65 -6.85) (layer B.CrtYd) (width 0.05))
(fp_line (start -1.5 1.75) (end 10.65 1.75) (layer B.CrtYd) (width 0.05))
(fp_line (start -1.5 -6.85) (end 10.65 -6.85) (layer B.CrtYd) (width 0.05))
(fp_line (start -1.3 1.55) (end -1.3 0) (layer B.SilkS) (width 0.15))
(fp_line (start 0 1.55) (end -1.3 1.55) (layer B.SilkS) (width 0.15))
(fp_line (start 4.191 0.127) (end 10.033 0.127) (layer B.SilkS) (width 0.15))
(fp_line (start 10.033 0.127) (end 10.033 -0.127) (layer B.SilkS) (width 0.15))
(fp_line (start 10.033 -0.127) (end 4.191 -0.127) (layer B.SilkS) (width 0.15))
(fp_line (start 4.191 -0.127) (end 4.191 0) (layer B.SilkS) (width 0.15))
(fp_line (start 4.191 0) (end 10.033 0) (layer B.SilkS) (width 0.15))
(fp_line (start 1.524 0.254) (end 1.143 0.254) (layer B.SilkS) (width 0.15))
(fp_line (start 1.524 -0.254) (end 1.143 -0.254) (layer B.SilkS) (width 0.15))
(fp_line (start 1.524 -2.286) (end 1.143 -2.286) (layer B.SilkS) (width 0.15))
(fp_line (start 1.524 -2.794) (end 1.143 -2.794) (layer B.SilkS) (width 0.15))
(fp_line (start 1.524 -4.826) (end 1.143 -4.826) (layer B.SilkS) (width 0.15))
(fp_line (start 1.524 -5.334) (end 1.143 -5.334) (layer B.SilkS) (width 0.15))
(fp_line (start 4.064 -1.27) (end 4.064 1.27) (layer B.SilkS) (width 0.15))
(fp_line (start 10.16 -0.254) (end 4.064 -0.254) (layer B.SilkS) (width 0.15))
(fp_line (start 10.16 0.254) (end 10.16 -0.254) (layer B.SilkS) (width 0.15))
(fp_line (start 4.064 0.254) (end 10.16 0.254) (layer B.SilkS) (width 0.15))
(fp_line (start 1.524 -1.27) (end 4.064 -1.27) (layer B.SilkS) (width 0.15))
(fp_line (start 1.524 1.27) (end 1.524 -1.27) (layer B.SilkS) (width 0.15))
(fp_line (start 1.524 1.27) (end 4.064 1.27) (layer B.SilkS) (width 0.15))
(fp_line (start 1.524 -3.81) (end 4.064 -3.81) (layer B.SilkS) (width 0.15))
(fp_line (start 1.524 -3.81) (end 1.524 -6.35) (layer B.SilkS) (width 0.15))
(fp_line (start 4.064 -4.826) (end 10.16 -4.826) (layer B.SilkS) (width 0.15))
(fp_line (start 10.16 -4.826) (end 10.16 -5.334) (layer B.SilkS) (width 0.15))
(fp_line (start 10.16 -5.334) (end 4.064 -5.334) (layer B.SilkS) (width 0.15))
(fp_line (start 4.064 -6.35) (end 4.064 -3.81) (layer B.SilkS) (width 0.15))
(fp_line (start 4.064 -3.81) (end 4.064 -1.27) (layer B.SilkS) (width 0.15))
(fp_line (start 10.16 -2.794) (end 4.064 -2.794) (layer B.SilkS) (width 0.15))
(fp_line (start 10.16 -2.286) (end 10.16 -2.794) (layer B.SilkS) (width 0.15))
(fp_line (start 4.064 -2.286) (end 10.16 -2.286) (layer B.SilkS) (width 0.15))
(fp_line (start 1.524 -3.81) (end 4.064 -3.81) (layer B.SilkS) (width 0.15))
(fp_line (start 1.524 -1.27) (end 1.524 -3.81) (layer B.SilkS) (width 0.15))
(fp_line (start 1.524 -1.27) (end 4.064 -1.27) (layer B.SilkS) (width 0.15))
(fp_line (start 1.524 -6.35) (end 4.064 -6.35) (layer B.SilkS) (width 0.15))
(pad 1 thru_hole rect (at 0 0) (size 2.032 1.7272) (drill 1.016) (layers *.Cu *.Mask)
(net 85 GND))
(pad 2 thru_hole oval (at 0 -2.54) (size 2.032 1.7272) (drill 1.016) (layers *.Cu *.Mask)
(net 62 /PD4))
(pad 3 thru_hole oval (at 0 -5.08) (size 2.032 1.7272) (drill 1.016) (layers *.Cu *.Mask)
(net 31 /PB3))
(model Pin_Headers.3dshapes/Pin_Header_Angled_1x03.wrl
(at (xyz 0 -0.1 0))
(scale (xyz 1 1 1))
(rotate (xyz 0 0 90))
)
)
(module Pin_Headers:Pin_Header_Straight_1x02_Pitch2.54mm (layer F.Cu) (tedit 58800D11) (tstamp 58800DF5) (module Pin_Headers:Pin_Header_Straight_1x02_Pitch2.54mm (layer F.Cu) (tedit 58800D11) (tstamp 58800DF5)
(at 101.473 144.526) (at 101.473 144.526)
(descr "Through hole straight pin header, 1x02, 2.54mm pitch, single row") (descr "Through hole straight pin header, 1x02, 2.54mm pitch, single row")

View File

@ -3,13 +3,11 @@ projdir = .
[Options] [Options]
ExcellonLeadingZeros = 1 ExcellonLeadingZeros = 1
PanelWidth = 400 PanelWidth = 11.8
PanelHeight = 300 PanelHeight = 11.8
XSpacing = 2 XSpacing = 0.1
YSpacing = 2 YSpacing = 0.1
MeasurementUnits = mm
AllowMissingLayers = 0 AllowMissingLayers = 0
searchtimeout = 10
[MergeOutputFiles] [MergeOutputFiles]
Prefix = %(projdir)s/merged2layer Prefix = %(projdir)s/merged2layer
@ -20,10 +18,12 @@ Prefix = %(projdir)s/merged2layer
*TopSoldermask=%(prefix)s/TopMask.gbr *TopSoldermask=%(prefix)s/TopMask.gbr
*BottomSoldermask=%(prefix)s/BottomMask.gbr *BottomSoldermask=%(prefix)s/BottomMask.gbr
Drills=%(prefix)s/Drills.txt Drills=%(prefix)s/Drills.txt
holes=%(prefix)s/Drills-unplated.txt
BoardOutline=%(prefix)s/BoardOutline.gbr BoardOutline=%(prefix)s/BoardOutline.gbr
ToolList = %(prefix)s/Tools.drl ToolList = %(prefix)s/Tools.drl
Placement = %(prefix)s/Placement.txt Placement = %(prefix)s/Placement.txt
[brain100] [brain100]
Prefix=%(projdir)s/../brain_board/gerber/brain_board_STM32F407_R0.3/brain_board_STM32F407 Prefix=%(projdir)s/../brain_board/gerber/brain_board_STM32F407_R0.3/brain_board_STM32F407
*TopLayer=%(prefix)s-F.Cu.gtl *TopLayer=%(prefix)s-F.Cu.gtl
@ -35,17 +35,17 @@ Prefix=%(projdir)s/../brain_board/gerber/brain_board_STM32F407_R0.3/brain_board_
Drills=%(prefix)s_gm.drl Drills=%(prefix)s_gm.drl
BoardOutline=%(prefix)s-Edge.Cuts.gm1 BoardOutline=%(prefix)s-Edge.Cuts.gm1
Repeat = 10 Repeat = 1
[bb] [connector64]
Prefix=%(projdir)s/bb Prefix=%(projdir)s/../176122-6-connector/176122-6-mfg/176122-6-mfg_R0.2/176122-6
*TopLayer=%(prefix)s/Top.gbr *TopLayer=%(prefix)s-Front.gtl
*BottomLayer=%(prefix)s/Bottom.gbr *BottomLayer=%(prefix)s-Back.gbl
*TopSilkscreen=%(prefix)s/TopSilk.gbr *TopSilkscreen=%(prefix)s-F.SilkS.gto
*TopSoldermask=%(prefix)s/TopMask.gbr *TopSoldermask=%(prefix)s-F.Mask.gts
*BottomSilkscreen=%(prefix)s/BottomSilk.gbr *BottomSilkscreen=%(prefix)s-B.SilkS.gbo
*BottomSoldermask=%(prefix)s/BottomMask.gbr *BottomSoldermask=%(prefix)s-B.Mask.gbs
Drills=%(prefix)s/Through.drl Drills=%(prefix)s_gm.drl
BoardOutline=%(prefix)s/BoardOutline.gbr BoardOutline=%(prefix)s-Edge.Cuts.gm1
Repeat = 6 Repeat = 2

View File

@ -4,4 +4,6 @@ mkdir merged2layer
c:\Python26\python.exe ki2gm.py ../brain_board/gerber/brain_board_STM32F407_R0.3/brain_board_STM32F407.drl ../brain_board/gerber/brain_board_STM32F407_R0.3/brain_board_STM32F407_gm.drl c:\Python26\python.exe ki2gm.py ../brain_board/gerber/brain_board_STM32F407_R0.3/brain_board_STM32F407.drl ../brain_board/gerber/brain_board_STM32F407_R0.3/brain_board_STM32F407_gm.drl
c:\Python26\python.exe ki2gm.py ../176122-6-connector/176122-6-mfg/176122-6-mfg_R0.2/176122-6.drl ../176122-6-connector/176122-6-mfg/176122-6-mfg_R0.2/176122-6_gm.drl
c:\Python26\python.exe gerbmerge.py brain2layer.cfg c:\Python26\python.exe gerbmerge.py brain2layer.cfg

View File

@ -1,6 +1,6 @@
package com.rusefi.config; package com.rusefi.config;
// this file was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sun Feb 05 11:39:34 EST 2017 // this file was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sun Feb 05 22:20:28 EST 2017
public class Fields { public class Fields {
public static final int LE_COMMAND_LENGTH = 200; public static final int LE_COMMAND_LENGTH = 200;
public static final int FSIO_ADC_COUNT = 4; public static final int FSIO_ADC_COUNT = 4;
@ -629,7 +629,7 @@ public class Fields {
public static final int unusedBit__2_offset = 1488; public static final int unusedBit__2_offset = 1488;
public static final int canReadEnabled_offset = 1488; public static final int canReadEnabled_offset = 1488;
public static final int canWriteEnabled_offset = 1488; public static final int canWriteEnabled_offset = 1488;
public static final int hasVehicleSpeedSensor_offset = 1488; public static final int unusedBit_123_offset = 1488;
public static final int unusedbit_9_offset = 1488; public static final int unusedbit_9_offset = 1488;
public static final int unusedbit_10_offset = 1488; public static final int unusedbit_10_offset = 1488;
public static final int isAlternatorControlEnabled_offset = 1488; public static final int isAlternatorControlEnabled_offset = 1488;
@ -1394,7 +1394,7 @@ public class Fields {
public static final Field UNUSEDBIT__2 = Field.create("UNUSEDBIT__2", 1488, FieldType.BIT, 7); public static final Field UNUSEDBIT__2 = Field.create("UNUSEDBIT__2", 1488, FieldType.BIT, 7);
public static final Field CANREADENABLED = Field.create("CANREADENABLED", 1488, FieldType.BIT, 8); public static final Field CANREADENABLED = Field.create("CANREADENABLED", 1488, FieldType.BIT, 8);
public static final Field CANWRITEENABLED = Field.create("CANWRITEENABLED", 1488, FieldType.BIT, 9); public static final Field CANWRITEENABLED = Field.create("CANWRITEENABLED", 1488, FieldType.BIT, 9);
public static final Field HASVEHICLESPEEDSENSOR = Field.create("HASVEHICLESPEEDSENSOR", 1488, FieldType.BIT, 10); public static final Field UNUSEDBIT_123 = Field.create("UNUSEDBIT_123", 1488, FieldType.BIT, 10);
public static final Field UNUSEDBIT_9 = Field.create("UNUSEDBIT_9", 1488, FieldType.BIT, 11); public static final Field UNUSEDBIT_9 = Field.create("UNUSEDBIT_9", 1488, FieldType.BIT, 11);
public static final Field UNUSEDBIT_10 = Field.create("UNUSEDBIT_10", 1488, FieldType.BIT, 12); public static final Field UNUSEDBIT_10 = Field.create("UNUSEDBIT_10", 1488, FieldType.BIT, 12);
public static final Field ISALTERNATORCONTROLENABLED = Field.create("ISALTERNATORCONTROLENABLED", 1488, FieldType.BIT, 13); public static final Field ISALTERNATORCONTROLENABLED = Field.create("ISALTERNATORCONTROLENABLED", 1488, FieldType.BIT, 13);