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

auto-sync

This commit is contained in:
rusEfi 2017-02-05 23:04:55 -05:00
parent 45f03cdab4
commit d7767261be
15 changed files with 214 additions and 176 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
firmware/config/engines/citroenBerlingoTU3JP.cpp
View File

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

1
firmware/config/engines/dodge_neon.cpp
View File

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

7
firmware/console/status_loop.cpp
View File

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

6
firmware/controllers/algo/engine_configuration_generated_structures.h
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
#ifndef ENGINE_CONFIGURATION_GENERATED_H_
#define ENGINE_CONFIGURATION_GENERATED_H_
@ -1211,7 +1211,7 @@ typedef struct {
bool canWriteEnabled : 1;
/**
offset 1488 bit 10 */
bool hasVehicleSpeedSensor : 1;
bool unusedBit_123 : 1;
/**
offset 1488 bit 11 */
bool unusedbit_9 : 1;
@ -2039,4 +2039,4 @@ typedef struct {
#endif
// 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

2
firmware/controllers/algo/rusefi_generated.h
View File

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

10
firmware/hw_layer/vehicle_speed.cpp
View File

@ -35,7 +35,7 @@ void setMockVehicleSpeed(float speedKPH) {
float getVehicleSpeed(void) {
if (mockVehicleSpeed != DEFAULT_MOCK_SPEED)
return mockVehicleSpeed;
if (!engineConfiguration->hasVehicleSpeedSensor)
if (!hasVehicleSpeedSensor())
return 0;
efitick_t nowNt = getTimeNowNt();
if (nowNt - lastSignalTimeNt > US2NT(US_PER_SECOND_LL))
@ -52,7 +52,7 @@ static void vsAnaWidthCallback(void) {
}
static void speedInfo(void) {
scheduleMsg(logger, "VSS %s at %s", boolToString(engineConfiguration->hasVehicleSpeedSensor),
scheduleMsg(logger, "VSS at %s",
hwPortname(boardConfiguration->vehicleSpeedSensorInputPin));
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) {
logger = l;
addConsoleAction("speedinfo", speedInfo);
if (boardConfiguration->vehicleSpeedSensorInputPin == GPIO_UNASSIGNED)
if (!hasVehicleSpeedSensor())
return;
digital_input_s* vehicleSpeedInput = initWaveAnalyzerDriver("VSS", boardConfiguration->vehicleSpeedSensorInputPin);
startInputDriver(vehicleSpeedInput, true);

1
firmware/hw_layer/vehicle_speed.h
View File

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

2
firmware/integration/rusefi_config.txt
View File

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

2
firmware/rusefi.cpp
View File

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

33
firmware/tunerstudio/rusefi.ini
View File

@ -42,7 +42,7 @@ enable2ndByteCanID = false
; see PAGE_0_SIZE in C source code
; 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
page = 1
@ -431,7 +431,7 @@ page = 1
unusedBit__2 = bits, U32, 1488, [7:7], "false", "true"
canReadEnabled = bits, U32, 1488, [8:8], "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_10 = bits, U32, 1488, [12:12], "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 = "Secondary channel", triggerInputPins2
field = "Cam Sync/VVT input", camInput
field = "VVT Input pin", vehicleSpeedSensorInputPin
field = "Vehicle Speed Input pin", vehicleSpeedSensorInputPin
field = "clutchDownPin", clutchDownPin
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 Enable", stepperEnablePin
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
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 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
panel = allPins1
panel = allPins2
dialog = allPins3_4, "", xAxis
panel = allPins3
panel = allPins4
dialog = allPins, "All Pins", xAxis
panel = allPins1_2
panel = allPins3
panel = allPins3_4
; Engine->CLT Thermistor Settings
@ -2004,9 +2024,8 @@ cmd_test_idle_valve = "w\x00\x17\x00\x01"
; Engine->Speed Sensor
dialog = speedSensor, "Speed Sensor Settings"
field = "Enabled", hasVehicleSpeedSensor
field = "Input pin", vehicleSpeedSensorInputPin, {hasVehicleSpeedSensor == 1}
field = "revolution to speed mult", vehicleSpeedCoef, {hasVehicleSpeedSensor == 1}
field = "Input pin", vehicleSpeedSensorInputPin
field = "revolution to speed mult", vehicleSpeedCoef
; Engine->Other inputs
dialog = analogInputs, "Analog inputs"

29
firmware/tunerstudio/rusefi.input
View File

@ -1623,7 +1623,7 @@ cmd_test_idle_valve = "w\x00\x17\x00\x01"
field = "Primary input channel", triggerInputPins1
field = "Secondary channel", triggerInputPins2
field = "Cam Sync/VVT input", camInput
field = "VVT Input pin", vehicleSpeedSensorInputPin
field = "Vehicle Speed Input pin", vehicleSpeedSensorInputPin
field = "clutchDownPin", clutchDownPin
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 Enable", stepperEnablePin
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
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 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
panel = allPins1
panel = allPins2
dialog = allPins3_4, "", xAxis
panel = allPins3
panel = allPins4
dialog = allPins, "All Pins", xAxis
panel = allPins1_2
panel = allPins3
panel = allPins3_4
; Engine->CLT Thermistor Settings
@ -1938,9 +1958,8 @@ cmd_test_idle_valve = "w\x00\x17\x00\x01"
; Engine->Speed Sensor
dialog = speedSensor, "Speed Sensor Settings"
field = "Enabled", hasVehicleSpeedSensor
field = "Input pin", vehicleSpeedSensorInputPin, {hasVehicleSpeedSensor == 1}
field = "revolution to speed mult", vehicleSpeedCoef, {hasVehicleSpeedSensor == 1}
field = "Input pin", vehicleSpeedSensorInputPin
field = "revolution to speed mult", vehicleSpeedCoef
; Engine->Other inputs
dialog = analogInputs, "Analog inputs"

250
hardware/brain_board/brain_board_STM32F407.kicad_pcb
View File

@ -30,7 +30,7 @@
(37 F.SilkS user)
(38 B.Mask user)
(39 F.Mask user)
(40 Dwgs.User user hide)
(40 Dwgs.User user)
(41 Cmts.User user)
(42 Eco1.User user)
(43 Eco2.User user)
@ -324,6 +324,130 @@
(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)
(at 117.983 116.713 90)
(path /52CFBA3E)
@ -726,130 +850,6 @@
(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)
(at 101.473 144.526)
(descr "Through hole straight pin header, 1x02, 2.54mm pitch, single row")

36
hardware/gerbmerge/brain2layer.cfg
View File

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

2
hardware/gerbmerge/run.bat
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 ../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

6
java_console/models/src/com/rusefi/config/Fields.java
View File

@ -1,6 +1,6 @@
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 static final int LE_COMMAND_LENGTH = 200;
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 canReadEnabled_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_10_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 CANREADENABLED = Field.create("CANREADENABLED", 1488, FieldType.BIT, 8);
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_10 = Field.create("UNUSEDBIT_10", 1488, FieldType.BIT, 12);
public static final Field ISALTERNATORCONTROLENABLED = Field.create("ISALTERNATORCONTROLENABLED", 1488, FieldType.BIT, 13);