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 2016-05-28 19:02:28 -04:00
parent 5ef27861a2
commit 31f3cf8722
4 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
firmware/controllers/engine_controller.cpp
View File

@ -535,6 +535,10 @@ void commonInitEngineController(Logging *sharedLogger DECLARE_ENGINE_PARAMETER_S
initSignalExecutor(); initSignalExecutor();
#endif #endif
#if EFI_SENSOR_CHART || defined(__DOXYGEN__)
initSensorChart();
#endif /* EFI_SENSOR_CHART */
#if EFI_PROD_CODE || EFI_SIMULATOR #if EFI_PROD_CODE || EFI_SIMULATOR
// todo: this is a mess, remove code duplication with simulator // todo: this is a mess, remove code duplication with simulator
initSettings(engineConfiguration); initSettings(engineConfiguration);
@ -572,10 +576,6 @@ void initEngineContoller(Logging *sharedLogger DECLARE_ENGINE_PARAMETER_S) {
initPwmGenerator(); initPwmGenerator();
#endif #endif
#if EFI_SENSOR_CHART || defined(__DOXYGEN__)
initSensorChart();
#endif /* EFI_SENSOR_CHART */
initAlgo(sharedLogger, engineConfiguration); initAlgo(sharedLogger, engineConfiguration);
#if EFI_WAVE_ANALYZER || defined(__DOXYGEN__) #if EFI_WAVE_ANALYZER || defined(__DOXYGEN__)

10
firmware/development/sensor_chart.cpp
View File

@ -9,17 +9,15 @@
#include "main.h" #include "main.h"
#include "engine.h" #include "engine.h"
#include "rpm_calculator.h" #include "rpm_calculator.h"
#if EFI_PROD_CODE || defined(__DOXYGEN__)
#include "status_loop.h"
#endif
#if EFI_SENSOR_CHART || defined(__DOXYGEN__) #if EFI_SENSOR_CHART || defined(__DOXYGEN__)
#include "status_loop.h"
static char LOGGING_BUFFER[5000]; static char LOGGING_BUFFER[5000];
static Logging logging("analog chart", LOGGING_BUFFER, sizeof(LOGGING_BUFFER)); static Logging logging("analog chart", LOGGING_BUFFER, sizeof(LOGGING_BUFFER));
static int pendingData = FALSE; static int pendingData = false;
static int initialized = FALSE; static int initialized = false;
extern engine_configuration_s *engineConfiguration; extern engine_configuration_s *engineConfiguration;
@ -49,11 +47,9 @@ void scAddData(float angle, float value) {
// message terminator // message terminator
appendPrintf(&logging, DELIMETER); appendPrintf(&logging, DELIMETER);
// output pending data // output pending data
#if EFI_PROD_CODE || defined(__DOXYGEN__)
if (getFullLog()) { if (getFullLog()) {
scheduleLogging(&logging); scheduleLogging(&logging);
} }
#endif
pendingData = false; pendingData = false;
} }
return; return;

3
java_console/io/src/com/rusefi/binaryprotocol/BinaryProtocol.java
View File

@ -313,7 +313,8 @@ public class BinaryProtocol {
byte[] response = executeCommand(packet, "load image offset=" + offset, false); byte[] response = executeCommand(packet, "load image offset=" + offset, false);
if (!checkResponseCode(response, RESPONSE_OK) || response.length != requestSize + 1) { if (!checkResponseCode(response, RESPONSE_OK) || response.length != requestSize + 1) {
String info = response == null ? "null" : ("code " + response[0] + " size " + response.length); String code = (response == null || response.length == 0) ? "empty" : "code " + response[0];
String info = response == null ? "null" : (code + " size " + response.length);
logger.error("readImage: Something is wrong, retrying... " + info); logger.error("readImage: Something is wrong, retrying... " + info);
continue; continue;
} }

2
java_console/ui/src/com/rusefi/Launcher.java
View File

@ -36,7 +36,7 @@ import static com.rusefi.ui.storage.PersistentConfiguration.getConfig;
* @see EngineSnifferPanel * @see EngineSnifferPanel
*/ */
public class Launcher { public class Launcher {
public static final int CONSOLE_VERSION = 20160523; public static final int CONSOLE_VERSION = 20160528;
public static final boolean SHOW_STIMULATOR = false; public static final boolean SHOW_STIMULATOR = false;
private static final String TAB_INDEX = "main_tab"; private static final String TAB_INDEX = "main_tab";
protected static final String PORT_KEY = "port"; protected static final String PORT_KEY = "port";