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

auto-sync

This commit is contained in:
rusEfi 2014-12-13 18:03:15 -06:00
parent 4f0ff1b458
commit 5886b64d59
7 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -208,6 +208,7 @@ void setDodgeNeonNGCEngineConfiguration(engine_configuration_s *engineConfigurat
// I want to start with a simple Alpha-N
engineConfiguration->algorithm = LM_ALPHA_N;
// engineConfiguration->algorithm = LM_SPEED_DENSITY;
setFuelLoadBin(engineConfiguration, 0, 100);
setTimingLoadBin(engineConfiguration, 0, 100);

8
firmware/controllers/engine_controller.cpp
View File

@ -424,8 +424,10 @@ static void setUserOutput(const char *indexStr, const char *quotedLine, Engine *
showFsioInfo();
}
static void setInt(const char *offsetStr, const char *valueStr) {
static void setInt(const int offset, const int value) {
int *ptr = (int *) (&((char *) engine->engineConfiguration)[offset]);
*ptr = value;
scheduleMsg(&logger, "setting int @%d to %d", offset, value);
}
static void getInt(int offset) {
@ -577,7 +579,7 @@ void initEngineContoller(Engine *engine) {
addConsoleActionII("set_fsio_frequency", (VoidIntInt) setFsioFrequency);
addConsoleActionSS("set_float", (VoidCharPtrCharPtr) setFloat);
addConsoleActionSS("set_int", (VoidCharPtrCharPtr) setInt);
addConsoleActionII("set_int", (VoidIntInt) setInt);
addConsoleActionI("get_float", getFloat);
addConsoleActionI("get_int", getInt);

5
firmware/controllers/settings.cpp
View File

@ -95,8 +95,9 @@ static void printOutputs(engine_configuration_s *engineConfiguration, engine_con
*/
void printConfiguration(engine_configuration_s *engineConfiguration, engine_configuration2_s *engineConfiguration2) {
scheduleMsg(&logger, "Template %s/%d trigger %s", getConfigurationName(engineConfiguration->engineType),
engineConfiguration->engineType, getTrigger_type_e(engineConfiguration->triggerConfig.triggerType));
scheduleMsg(&logger, "Template %s/%d trigger %s/%s", getConfigurationName(engineConfiguration->engineType),
engineConfiguration->engineType, getTrigger_type_e(engineConfiguration->triggerConfig.triggerType),
getEngine_load_mode_e(engineConfiguration->algorithm));
scheduleMsg(&logger, "configurationVersion=%d", getGlobalConfigurationVersion());

2
firmware/rusefi.cpp
View File

@ -265,5 +265,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 20141212;
return 20141213;
}

1
firmware/tunerstudio/rusefi.ini
View File

@ -968,6 +968,7 @@ fileVersion = { 20141103 }
; Tuning->General
dialog = generalSettings, "General"
field = "tunerStudioSerialSpeed", tunerStudioSerialSpeed
field = "RPM Hard Limit", rpmHardLimit
field = ""
field = "Fuel Algorithm", fuelAlgorithm

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

@ -19,7 +19,7 @@ import javax.swing.*;
* @see WavePanel
*/
public class Launcher extends FrameHelper {
public static final int CONSOLE_VERSION = 20141210;
public static final int CONSOLE_VERSION = 20141213;
public static final boolean SHOW_STIMULATOR = true;
private final String port;

5
java_console/ui/src/com/rusefi/ui/LogViewer.java
View File

@ -15,6 +15,7 @@ import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.io.File;
import java.io.FileFilter;
import java.util.Arrays;
/**
* 7/27/13
@ -106,6 +107,8 @@ public class LogViewer extends JPanel {
throw new IllegalStateException("Not directory: " + folder);
File[] files = folder.listFiles(FILE_FILTER);
Arrays.sort(files);
fileListModel.removeAllElements();
for (File file : files)
fileListModel.addElement(getFileDesc(file));
@ -170,4 +173,4 @@ public class LogViewer extends JPanel {
WavePanel.getInstance().reloadFile();
refreshCountPanel();
}
}
}