diff --git a/firmware/controllers/algo/engine_configuration_generated_structures.h b/firmware/controllers/algo/engine_configuration_generated_structures.h index 921197686f..b6b4dd6285 100644 --- a/firmware/controllers/algo/engine_configuration_generated_structures.h +++ b/firmware/controllers/algo/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Fri Feb 03 21:52:01 EST 2017 +// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sun Feb 05 11:39:34 EST 2017 // begin #ifndef ENGINE_CONFIGURATION_GENERATED_H_ #define ENGINE_CONFIGURATION_GENERATED_H_ @@ -1804,7 +1804,7 @@ typedef struct { /** * offset 2738 */ - int16_t unusedShort; + int16_t etbFreq; /** * offset 2740 */ @@ -2039,4 +2039,4 @@ typedef struct { #endif // end -// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Fri Feb 03 21:52:01 EST 2017 +// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sun Feb 05 11:39:34 EST 2017 diff --git a/firmware/controllers/algo/rusefi_generated.h b/firmware/controllers/algo/rusefi_generated.h index 7c1c7bd33d..bca81a79a0 100644 --- a/firmware/controllers/algo/rusefi_generated.h +++ b/firmware/controllers/algo/rusefi_generated.h @@ -920,7 +920,7 @@ #define fuelClosedLoopCltThreshold_offset 2732 #define fuelClosedLoopTpsThreshold_offset 2734 #define fuelClosedLoopRpmThreshold_offset 2736 -#define unusedShort_offset 2738 +#define etbFreq_offset 2738 #define fuelClosedLoopPid_offset 2740 #define fuelClosedLoopPid_pFactor_offset 2740 #define fuelClosedLoopPid_iFactor_offset 2744 diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index ab7ac61cc8..d9beca5af2 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -361,8 +361,8 @@ custom spi_device_e 4 bits,U32, @OFFSET@, [0:1], "Off", "SPI1", "SPI2", "SPI3" float globalFuelCorrection;;"coef", 1, 0.0, 0, 1000.0, 2 -int16_t pedalPositionMin; -int16_t pedalPositionMax; +int16_t pedalPositionMin;;"ADC", 1, 0, 0, 1023, 0 +int16_t pedalPositionMax;;"ADC", 1, 0, 0, 1023, 0 float maxKnockSubDeg;maximum total number of degrees to subtract from ignition advance\nwhen knocking adc_channel_e mafAdcChannel;See hasMafSensor @@ -769,7 +769,7 @@ float[MAP_ACCEL_TAPER] mapAccelTaperMult;;"mult", 1, 0, 0.0, 300, int16_t fuelClosedLoopCltThreshold;;"C", 1, 0, 0, 100, 0 int16_t fuelClosedLoopTpsThreshold;;"%", 1, 0, 0, 100, 0 int16_t fuelClosedLoopRpmThreshold;;"rpm", 1, 0, 0, 5000, 0 - int16_t unusedShort +int16_t etbFreq;;"Hz", 1, 0, 0, 500, 10 pid_s fuelClosedLoopPid; float fuelClosedLoopAfrLowThreshold;;"ratio", 1, 0, 0, 100, 1 float fuelClosedLoopAfrHighThreshold;;"ratio", 1, 0, 0, 100, 1 diff --git a/firmware/tunerstudio/rusefi.ini b/firmware/tunerstudio/rusefi.ini index cf9b74b00b..789aa3e17e 100644 --- a/firmware/tunerstudio/rusefi.ini +++ b/firmware/tunerstudio/rusefi.ini @@ -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 Fri Feb 03 21:59:07 EST 2017 +; this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sun Feb 05 11:39:34 EST 2017 pageSize = 16376 page = 1 @@ -166,8 +166,8 @@ page = 1 trigger_customUseRiseEdge = bits, U32, 560, [0:0], "false", "true" hip9011SpiDevice = bits,U32, 564, [0:1], "Off", "SPI1", "SPI2", "SPI3" globalFuelCorrection = scalar, F32, 568, "coef", 1, 0.0, 0, 1000.0, 2 -;skipping pedalPositionMin offset 572 -;skipping pedalPositionMax offset 574 + pedalPositionMin = scalar, S16, 572, "ADC", 1, 0, 0, 1023, 0 + pedalPositionMax = scalar, S16, 574, "ADC", 1, 0, 0, 1023, 0 ;skipping maxKnockSubDeg offset 576 mafAdcChannel = bits, U32, 580, [0:4] "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "Disabled", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" afr_hwChannel = bits, U32, 584, [0:4] "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "Disabled", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -647,7 +647,7 @@ page = 1 fuelClosedLoopCltThreshold = scalar, S16, 2732, "C", 1, 0, 0, 100, 0 fuelClosedLoopTpsThreshold = scalar, S16, 2734, "%", 1, 0, 0, 100, 0 fuelClosedLoopRpmThreshold = scalar, S16, 2736, "rpm", 1, 0, 0, 5000, 0 -;skipping unusedShort offset 2738 + etbFreq = scalar, S16, 2738, "Hz", 1, 0, 0, 500, 10 fuelClosedLoopPid_pFactor = scalar, F32, 2740, "value", 1, 0, -1000, 1000, 5 fuelClosedLoopPid_iFactor = scalar, F32, 2744, "value", 1, 0, -1000, 1000, 5 fuelClosedLoopPid_dFactor = scalar, F32, 2748, "value", 1, 0, -1000, 1000, 5 @@ -1399,6 +1399,7 @@ fileVersion = { 20161225 } subMenu = hipFunction, "hip9011 Settings (knock decoder)" subMenu = cj125Function, "CJ125 Settings (wbo decoder)" subMenu = spiFunction, "SPI Settings" + subMenu = etbDialog, "Electronic Thtottle Body (alpha)" menu = "Tuning" subMenu = generalSettings, "General" subMenu = monitoringSettings, "rusEfi Console Settings" @@ -1684,7 +1685,7 @@ cmd_test_idle_valve = "w\x00\x17\x00\x01" field = "AFR ADC input", afr_hwChannel field = "fuelLevelSensor", fuelLevelSensor field = "Baro ADC input", baroSensor_hwChannel - field = "pedalPositionChannel", pedalPositionChannel + field = "pedal Position Channel", pedalPositionChannel field = "Primary input channel", triggerInputPins1 field = "Secondary channel", triggerInputPins2 field = "Cam Sync/VVT input", camInput @@ -2228,6 +2229,15 @@ cmd_test_idle_valve = "w\x00\x17\x00\x01" field = "ADC #3", fsioAdc3 field = "ADC #4", fsioAdc4 + dialog = etbDialog, "Electronic Thtottle Body (alpha)" + field = "pedal Position Channel", pedalPositionChannel + field = "Pedal min", pedalPositionMin + field = "Pedal max", pedalPositionMax + field = "PWM Frequency", etbFreq + field = "Dir #1", etbDirectionPin1 + field = "Dir #2", etbDirectionPin2 + field = "Control #1", etbControlPin1 + field = "Control #2", etbControlPin2 dialog = testSpark, "Spark" commandButton = "Spark #1", cmd_test_spk1 diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input index f1a2689f35..9e1c2b956c 100644 --- a/firmware/tunerstudio/rusefi.input +++ b/firmware/tunerstudio/rusefi.input @@ -1333,6 +1333,7 @@ fileVersion = { 20161225 } subMenu = hipFunction, "hip9011 Settings (knock decoder)" subMenu = cj125Function, "CJ125 Settings (wbo decoder)" subMenu = spiFunction, "SPI Settings" + subMenu = etbDialog, "Electronic Thtottle Body (alpha)" menu = "Tuning" subMenu = generalSettings, "General" subMenu = monitoringSettings, "rusEfi Console Settings" @@ -1618,7 +1619,7 @@ cmd_test_idle_valve = "w\x00\x17\x00\x01" field = "AFR ADC input", afr_hwChannel field = "fuelLevelSensor", fuelLevelSensor field = "Baro ADC input", baroSensor_hwChannel - field = "pedalPositionChannel", pedalPositionChannel + field = "pedal Position Channel", pedalPositionChannel field = "Primary input channel", triggerInputPins1 field = "Secondary channel", triggerInputPins2 field = "Cam Sync/VVT input", camInput @@ -2162,6 +2163,15 @@ cmd_test_idle_valve = "w\x00\x17\x00\x01" field = "ADC #3", fsioAdc3 field = "ADC #4", fsioAdc4 + dialog = etbDialog, "Electronic Thtottle Body (alpha)" + field = "pedal Position Channel", pedalPositionChannel + field = "Pedal min", pedalPositionMin + field = "Pedal max", pedalPositionMax + field = "PWM Frequency", etbFreq + field = "Dir #1", etbDirectionPin1 + field = "Dir #2", etbDirectionPin2 + field = "Control #1", etbControlPin1 + field = "Control #2", etbControlPin2 dialog = testSpark, "Spark" commandButton = "Spark #1", cmd_test_spk1 diff --git a/hardware/brain_board/gerber/brain_board_STM32F407_R0.3.zip b/hardware/brain_board/gerber/brain_board_STM32F407_R0.3.zip new file mode 100644 index 0000000000..a01d5babf9 Binary files /dev/null and b/hardware/brain_board/gerber/brain_board_STM32F407_R0.3.zip differ diff --git a/hardware/frankenso/known_issues.txt b/hardware/frankenso/known_issues.txt index 020b3cb24f..f9fe5c37e3 100644 --- a/hardware/frankenso/known_issues.txt +++ b/hardware/frankenso/known_issues.txt @@ -108,7 +108,7 @@ 108) RESOLVED IN R0.5 Q1001 was Alpha,AO3401A and changed to Vishay SQ2301ES-T1-GE3 which is automotive AEC-Q101 qualified. 109) Move D12-D23 schematics from the main page to the inj12ch page 110) Part number for D19 (PB9-INJ09/PB9) as Miata Idle Valve Solenoid -111) GND and +12v rails? at least some 1.1mm holes in the prototyping area. Make holes larger for larger wires. +111) GND and +12v rails? at least some 1.1mm holes in the prototyping area. Make holes larger for larger wires. 47mil/1.2mm best 112) reduce high-side schematics confusion where H_IN1 is HL2, H_IN3 is HL1 etc.see http://rusefi.com/forum/viewtopic.php?f=4&t=569&start=240 113) RESOLVED IN R0.5 "Normal + Insert" attributes for all SIL-2 and SOD-123 footprints to fix position file generation 114) PC0 - hip9011 vs USB OTG current limiting chip STMPS2141STR conflict diff --git a/java_console/models/src/com/rusefi/config/Fields.java b/java_console/models/src/com/rusefi/config/Fields.java index 08ea53e3ae..eb9746ac8a 100644 --- a/java_console/models/src/com/rusefi/config/Fields.java +++ b/java_console/models/src/com/rusefi/config/Fields.java @@ -1,6 +1,6 @@ package com.rusefi.config; -// this file was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sat Jan 28 19:06:26 EST 2017 +// this file was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sun Feb 05 11:39:34 EST 2017 public class Fields { public static final int LE_COMMAND_LENGTH = 200; public static final int FSIO_ADC_COUNT = 4; @@ -924,7 +924,7 @@ public class Fields { public static final int fuelClosedLoopCltThreshold_offset = 2732; public static final int fuelClosedLoopTpsThreshold_offset = 2734; public static final int fuelClosedLoopRpmThreshold_offset = 2736; - public static final int unusedShort_offset = 2738; + public static final int etbFreq_offset = 2738; public static final int fuelClosedLoopPid_offset = 2740; public static final int fuelClosedLoopPid_pFactor_offset = 2740; public static final int fuelClosedLoopPid_iFactor_offset = 2744; @@ -1597,7 +1597,7 @@ public class Fields { public static final Field FUELCLOSEDLOOPCLTTHRESHOLD = Field.create("FUELCLOSEDLOOPCLTTHRESHOLD", 2732, FieldType.INT); public static final Field FUELCLOSEDLOOPTPSTHRESHOLD = Field.create("FUELCLOSEDLOOPTPSTHRESHOLD", 2734, FieldType.INT); public static final Field FUELCLOSEDLOOPRPMTHRESHOLD = Field.create("FUELCLOSEDLOOPRPMTHRESHOLD", 2736, FieldType.INT); - public static final Field UNUSEDSHORT = Field.create("UNUSEDSHORT", 2738, FieldType.INT); + public static final Field ETBFREQ = Field.create("ETBFREQ", 2738, FieldType.INT); public static final Field FUELCLOSEDLOOPPID_PFACTOR = Field.create("FUELCLOSEDLOOPPID_PFACTOR", 2740, FieldType.FLOAT); public static final Field FUELCLOSEDLOOPPID_IFACTOR = Field.create("FUELCLOSEDLOOPPID_IFACTOR", 2744, FieldType.FLOAT); public static final Field FUELCLOSEDLOOPPID_DFACTOR = Field.create("FUELCLOSEDLOOPPID_DFACTOR", 2748, FieldType.FLOAT);