From 0d2e09cd6263cb91f6e1153b32f997de13b66ad0 Mon Sep 17 00:00:00 2001 From: rusEfi Date: Wed, 18 Feb 2015 08:04:22 -0600 Subject: [PATCH] auto-sync --- firmware/console/status_loop.cpp | 1 + .../controllers/algo/engine_configuration.cpp | 1 + firmware/controllers/settings.cpp | 18 ++++---------- firmware/rusefi.cpp | 2 +- .../runConfigurations/Launcher_COM19.xml | 24 +++++++++++++++++++ 5 files changed, 32 insertions(+), 14 deletions(-) create mode 100644 java_console/.idea/runConfigurations/Launcher_COM19.xml diff --git a/firmware/console/status_loop.cpp b/firmware/console/status_loop.cpp index ce4a3618d2..0e5cf6ff07 100644 --- a/firmware/console/status_loop.cpp +++ b/firmware/console/status_loop.cpp @@ -397,6 +397,7 @@ static void showFuelInfo2(float rpm, float engineLoad, Engine *engine) { engineConfiguration->globalFuelCorrection); #if EFI_ENGINE_CONTROL + scheduleMsg(&logger, "base cranking fuel %f", engineConfiguration->cranking.baseFuel); scheduleMsg(&logger2, "cranking fuel: %f", getCrankingFuel(engine)); if (engine->rpmCalculator.isRunning()) { diff --git a/firmware/controllers/algo/engine_configuration.cpp b/firmware/controllers/algo/engine_configuration.cpp index ed45f20cfe..184ce41a14 100644 --- a/firmware/controllers/algo/engine_configuration.cpp +++ b/firmware/controllers/algo/engine_configuration.cpp @@ -325,6 +325,7 @@ void setDefaultConfiguration(engine_configuration_s *engineConfiguration, board_ engineConfiguration->hasMafSensor = true; engineConfiguration->hasTpsSensor = true; engineConfiguration->hasAfrSensor = true; + engineConfiguration->hasIatSensor = true; engineConfiguration->hasCltSensor = true; engineConfiguration->hasBaroSensor = false; engineConfiguration->isDigitalChartEnabled = true; diff --git a/firmware/controllers/settings.cpp b/firmware/controllers/settings.cpp index 09c0f1b553..9db0cba04d 100644 --- a/firmware/controllers/settings.cpp +++ b/firmware/controllers/settings.cpp @@ -351,16 +351,12 @@ static void printThermistor(const char *msg, Thermistor *thermistor) { float t = getTemperatureC(thermistor); scheduleMsg(&logger, "%s v=%f C=%f R=%f on channel %d", msg, voltage, t, r, adcChannel); - scheduleMsg(&logger, "bias=%f A=%f B=%f C=%f", thermistor->config->bias_resistor, thermistor->config->s_h_a, - thermistor->config->s_h_b, thermistor->config->s_h_c); -#if EFI_ANALOG_INPUTS scheduleMsg(&logger, "@%s", getPinNameByAdcChannel(adcChannel, pinNameBuffer)); - - float value = getResistance(thermistor); - - scheduleMsg(&logger, "%s R=%f on channel %d@%s", msg, value, adcChannel, - getPinNameByAdcChannel(adcChannel, pinNameBuffer)); -#endif + scheduleMsg(&logger, "bias=%f A=%..100000f B=%..100000f C=%..100000f", thermistor->config->bias_resistor, thermistor->config->s_h_a, + thermistor->config->s_h_b, thermistor->config->s_h_c); +//#if EFI_ANALOG_INPUTS + scheduleMsg(&logger, "=============================="); +//#endif } #if EFI_PROD_CODE @@ -417,10 +413,6 @@ static void printTemperatureInfo(void) { scheduleMsg(&logger, "A/C relay=%s @ %s", boolToString(enginePins.acRelay.getLogicValue()), hwPortname(boardConfiguration->acRelayPin)); - -#if EFI_ANALOG_INPUTS - scheduleMsg(&logger, "base cranking fuel %f", engineConfiguration->cranking.baseFuel); -#endif /* EFI_ANALOG_INPUTS */ #endif } diff --git a/firmware/rusefi.cpp b/firmware/rusefi.cpp index 9291c03e8e..b18c494383 100644 --- a/firmware/rusefi.cpp +++ b/firmware/rusefi.cpp @@ -278,5 +278,5 @@ int getRusEfiVersion(void) { return 1; // this is here to make the compiler happy about the unused array if (UNUSED_CCM_SIZE == 0) return 1; // this is here to make the compiler happy about the unused array - return 20150217; + return 20150218; } diff --git a/java_console/.idea/runConfigurations/Launcher_COM19.xml b/java_console/.idea/runConfigurations/Launcher_COM19.xml new file mode 100644 index 0000000000..f5b0efa44c --- /dev/null +++ b/java_console/.idea/runConfigurations/Launcher_COM19.xml @@ -0,0 +1,24 @@ + + + + \ No newline at end of file