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 2015-02-16 23:04:20 -06:00
parent 3bcf25c0c1
commit 4c4c17bddb
5 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
firmware/console/status_loop.cpp
View File

@ -517,6 +517,8 @@ static THD_WORKING_AREA(tsThreadStack, UTILITY_THREAD_STACK_SIZE);
#if EFI_TUNER_STUDIO #if EFI_TUNER_STUDIO
extern Map3D1616 veMap;
void updateTunerStudioState(Engine *engine, TunerStudioOutputChannels *tsOutputChannels) { void updateTunerStudioState(Engine *engine, TunerStudioOutputChannels *tsOutputChannels) {
#if EFI_SHAFT_POSITION_INPUT || defined(__DOXYGEN__) #if EFI_SHAFT_POSITION_INPUT || defined(__DOXYGEN__)
int rpm = getRpmE(engine); int rpm = getRpmE(engine);
@ -543,6 +545,7 @@ void updateTunerStudioState(Engine *engine, TunerStudioOutputChannels *tsOutputC
tsOutputChannels->throttlePositon = tps; tsOutputChannels->throttlePositon = tps;
tsOutputChannels->massAirFlowVoltage = getMaf(); tsOutputChannels->massAirFlowVoltage = getMaf();
tsOutputChannels->massAirFlowValue = getRealMaf(); tsOutputChannels->massAirFlowValue = getRealMaf();
tsOutputChannels->massAirFlowValue = veMap.getValue(getMap(), rpm);
tsOutputChannels->airFuelRatio = getAfr(); tsOutputChannels->airFuelRatio = getAfr();
tsOutputChannels->v_batt = getVBatt(engineConfiguration); tsOutputChannels->v_batt = getVBatt(engineConfiguration);
tsOutputChannels->tpsADC = getTPS10bitAdc(PASS_ENGINE_PARAMETER_F); tsOutputChannels->tpsADC = getTPS10bitAdc(PASS_ENGINE_PARAMETER_F);

7
firmware/console/tunerstudio/tunerstudio_configuration.h
View File

@ -16,10 +16,10 @@
/** /**
* this is used to confirm that firmware and TunerStudio are using the same rusefi.ini version * this is used to confirm that firmware and TunerStudio are using the same rusefi.ini version
*/ */
#define TS_FILE_VERSION 20150211 #define TS_FILE_VERSION 20150216
#define PAGE_0_SIZE 15160 #define PAGE_0_SIZE 15160
#define TS_OUTPUT_SIZE 116 #define TS_OUTPUT_SIZE 196
typedef struct { typedef struct {
uint16_t values[EGT_CHANNEL_COUNT]; uint16_t values[EGT_CHANNEL_COUNT];
@ -82,7 +82,8 @@ typedef struct {
egt_values_s egtValues; egt_values_s egtValues;
float rpmAcceleration; float rpmAcceleration;
float massAirFlowValue; float massAirFlowValue;
int unused3[1]; float veValue;
int unused3[20];
} TunerStudioOutputChannels; } TunerStudioOutputChannels;
#endif /* TUNERSTUDIO_CONFIGURATION_H_ */ #endif /* TUNERSTUDIO_CONFIGURATION_H_ */

2
firmware/controllers/math/speed_density.cpp
View File

@ -22,7 +22,7 @@
#define rpmMin 500 #define rpmMin 500
#define rpmMax 8000 #define rpmMax 8000
static Map3D1616 veMap; Map3D1616 veMap;
Map3D1616 ve2Map; Map3D1616 ve2Map;
Map3D1616 afrMap; Map3D1616 afrMap;

2
firmware/controllers/trigger/trigger_chrysler.cpp
View File

@ -18,7 +18,7 @@ void configureNeon2003TriggerShape(TriggerShape *s) {
s->gapBothDirections = true; s->gapBothDirections = true;
// are these non-default values really needed here now that the gap is finally precise? // are these non-default values really needed here now that the gap is finally precise?
s->setTriggerSynchronizationGap2(0.8 * CHRYSLER_NGC_GAP, 1.55 * CHRYSLER_NGC_GAP); s->setTriggerSynchronizationGap2(0.5 * CHRYSLER_NGC_GAP, 1.5 * CHRYSLER_NGC_GAP);
/* /*
s->addEvent(base + 26, T_PRIMARY, TV_HIGH); s->addEvent(base + 26, T_PRIMARY, TV_HIGH);

18
java_console/ui/src/com/rusefi/AnalogChartPanel.java
View File

@ -41,12 +41,18 @@ public class AnalogChartPanel {
AnalogChartCentral.addListener(new AnalogChartCentral.AnalogChartListener() { AnalogChartCentral.addListener(new AnalogChartCentral.AnalogChartListener() {
@Override @Override
public void onAnalogChart(String message) { public void onAnalogChart(final String message) {
unpackValues(values, message); // this callback is invoked from the connectivity thread, need to handle in AWT for thread-safety
if (!paused) { SwingUtilities.invokeLater(new Runnable() {
processValues(); @Override
UiUtils.trueRepaint(canvas); public void run() {
} unpackValues(values, message);
if (!paused) {
processValues();
UiUtils.trueRepaint(canvas);
}
}
});
} }
}); });