rusefi
/
custom-board-bundle-sample-fork-of-rusefi
mirror of https://github.com/rusefi/custom-board-bundle-sample-fork-of-rusefi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

auto-sync

This commit is contained in:
rusEfi 2016-05-24 22:02:13 -04:00
parent 65d8321ccf
commit 7a8a7fe5c4
3 changed files with 14 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/controllers/tachometer.cpp
View File

@ -2,6 +2,8 @@
* @file tachometer.cpp * @file tachometer.cpp
* @brief This is about driving external analog tachometers * @brief This is about driving external analog tachometers
* *
* todo: these is a bit of duplication with dizzySparkOutputPin
*
* @date Aug 18, 2015 * @date Aug 18, 2015
* @author Andrey Belomutskiy, (c) 2012-2016 * @author Andrey Belomutskiy, (c) 2012-2016
*/ */

22
firmware/tunerstudio/rusefi.ini
View File

@ -827,7 +827,7 @@ fileVersion = { 20160430 }
yBins = injector_battLagCorr yBins = injector_battLagCorr
gauge = VBattGauge gauge = VBattGauge
curve = mafDecodingCurve, "MAF decoding" curve = mafDecodingCurve, "MAF Sensor Settings"
columnLabel = "Voltage", "kg/hour" columnLabel = "Voltage", "kg/hour"
xAxis = -1, 6, 10 xAxis = -1, 6, 10
yAxis = -30, 1300, 10 yAxis = -30, 1300, 10
@ -902,7 +902,7 @@ fileVersion = { 20160430 }
gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees.
upDownLabel = "(RICHER)", "(LEANER)" upDownLabel = "(RICHER)", "(LEANER)"
table = tpsTpsAccelTbl, tpsTpsAccelMap, "TPS acceleration", 1 table = tpsTpsAccelTbl, tpsTpsAccelMap, "TPS/TPS acceleration Multiplier", 1
xBins = tpsTpsAccelFromRpmBins, TPS xBins = tpsTpsAccelFromRpmBins, TPS
yBins = tpsTpsAccelToRpmBins, TPS yBins = tpsTpsAccelToRpmBins, TPS
zBins = tpsTpsAccelTable zBins = tpsTpsAccelTable
@ -937,7 +937,7 @@ fileVersion = { 20160430 }
gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees. gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees.
upDownLabel = "(RICHER)", "(LEANER)" upDownLabel = "(RICHER)", "(LEANER)"
table = ignitionIatCorrTableTbl, ignitionIatCorrTableMap, "Ignition Iat Corr Table", 1 table = ignitionIatCorrTableTbl, ignitionIatCorrTableMap, "Ignition Intake Air Temp correction", 1
; constant, variable ; constant, variable
xBins = ignitionIatCorrRpmBins, rpm xBins = ignitionIatCorrRpmBins, rpm
yBins = ignitionIatCorrLoadBins, intake yBins = ignitionIatCorrLoadBins, intake
@ -956,7 +956,7 @@ fileVersion = { 20160430 }
upDownLabel = "(RICHER)", "(LEANER)" upDownLabel = "(RICHER)", "(LEANER)"
table = injPhaseTableTbl, injPhaseTableMap, "Injection Phase Table", 1 table = injPhaseTableTbl, injPhaseTableMap, "Injection Phase", 1
; constant, variable ; constant, variable
xBins = injPhaseRpmBins, rpm xBins = injPhaseRpmBins, rpm
yBins = injPhaseLoadBins, engineLoad yBins = injPhaseLoadBins, engineLoad
@ -1166,6 +1166,7 @@ fileVersion = { 20160430 }
subMenu = injectionSettings, "Injection Settings" subMenu = injectionSettings, "Injection Settings"
subMenu = ignitionSettings, "Ignition Settings" subMenu = ignitionSettings, "Ignition Settings"
subMenu = std_separator subMenu = std_separator
subMenu = analogInputs, "Analog inputs"
subMenu = cltSensor, "CLT Sensor Settings" subMenu = cltSensor, "CLT Sensor Settings"
subMenu = iatSensor, "IAT Sensor Settings" subMenu = iatSensor, "IAT Sensor Settings"
subMenu = mapSettings, "MAP Sensor Settings" subMenu = mapSettings, "MAP Sensor Settings"
@ -1174,8 +1175,7 @@ fileVersion = { 20160430 }
subMenu = egtInputs, "EGT inputs" subMenu = egtInputs, "EGT inputs"
subMenu = energySystems, "Battery and Alternator Settings" subMenu = energySystems, "Battery and Alternator Settings"
subMenu = speedSensor, "Speed Sensor Settings" subMenu = speedSensor, "Speed Sensor Settings"
subMenu = tachSettings, "Tach output" subMenu = tachSettings, "Tachometer output"
subMenu = analogInputs, "Other inputs"
subMenu = std_separator subMenu = std_separator
subMenu = fanSetting, "Fan Settings" subMenu = fanSetting, "Fan Settings"
subMenu = idleSettings, "Idle Settings" subMenu = idleSettings, "Idle Settings"
@ -1186,7 +1186,7 @@ fileVersion = { 20160430 }
subMenu = spiFunction, "SPI Settings" subMenu = spiFunction, "SPI Settings"
menu = "Tuning" menu = "Tuning"
subMenu = generalSettings, "General" subMenu = generalSettings, "General"
subMenu = monitoringSettings, "Console Monitoring" subMenu = monitoringSettings, "rusEfi Console Settings"
subMenu = std_separator subMenu = std_separator
subMenu = crankingDialog, "Cranking" subMenu = crankingDialog, "Cranking"
subMenu = crankingCltCurve, "Cranking Coolant Temp Multiplier" subMenu = crankingCltCurve, "Cranking Coolant Temp Multiplier"
@ -1598,12 +1598,14 @@ cmd_test_idle_valve = "w\x00\x17\x00\x01"
dialog = analogInputs, "Analog inputs" dialog = analogInputs, "Analog inputs"
field = "!ECU reboot needed to apply these settings" field = "!ECU reboot needed to apply these settings"
field = "TPS ADC input", tpsAdcChannel field = "TPS ADC input", tpsAdcChannel
field = "!todo: move MAF channel to maf curve dialog"
field = "MAF ADC input", mafAdcChannel field = "MAF ADC input", mafAdcChannel
field = "Baro ADC input", baroSensor_hwChannel field = "Baro ADC input", baroSensor_hwChannel
field = "Analog divider", analogInputDividerCoefficient field = "Analog divider", analogInputDividerCoefficient
field = "Smoothing factor", slowAdcAlpha field = "Smoothing factor", slowAdcAlpha
dialog = tachSettings, "Analog tachometer output" dialog = tachSettings, "Tachometer output"
field = "!See also dizzySparkOutputPin"
field = "pin", tachOutputPin field = "pin", tachOutputPin
field = "pin mode", tachOutputPinMode field = "pin mode", tachOutputPinMode
field = "rise at trigger index", tachPulseTriggerIndex field = "rise at trigger index", tachPulseTriggerIndex
@ -1654,8 +1656,8 @@ cmd_test_idle_valve = "w\x00\x17\x00\x01"
panel = lcdScreen, East panel = lcdScreen, East
panel = connectRight, West panel = connectRight, West
dialog = monitoringSettings, "Monitoring Settings" dialog = monitoringSettings, "rusEfi Console Settings"
field = "Sensor chart", sensorChartMode field = "Sensor Sniffer", sensorChartMode
field = " Threshold", sensorSnifferRpmThreshold field = " Threshold", sensorSnifferRpmThreshold
field = " Each X cycle", sensorChartFrequency field = " Each X cycle", sensorChartFrequency
field = "Engine Sniffer", isEngineChartEnabled field = "Engine Sniffer", isEngineChartEnabled

10
firmware/util/efilib.h
View File

@ -43,17 +43,7 @@ int indexOf(const char *string, char ch);
float atoff(const char *string); float atoff(const char *string);
int atoi(const char *string); int atoi(const char *string);
/**
* there is some BS related to isnan in MinGW, so let's have all the issues in one place
* JMT - Screw that, isnan is isnan, if mingw cant make it goes in the naughty bin.
* This should probably be guarded by an STM32F4 specific macro as well.
*/
#ifdef __MINGW32__
#define cisnan(f) (*(((int*) (&f))) == 0x7FC00000) #define cisnan(f) (*(((int*) (&f))) == 0x7FC00000)
#else
#define cisnan isnan
#endif
#define UNUSED(x) (void)(x) #define UNUSED(x) (void)(x)
int absI(int32_t value); int absI(int32_t value);