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

auto-sync

This commit is contained in:
rusEfi 2016-01-14 23:03:17 -05:00
parent e3c461f407
commit 0ab8210cd2
9 changed files with 102 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
firmware/controllers/algo/engine_configuration.cpp
View File

@ -124,8 +124,8 @@ void setConstantDwell(floatms_t dwellMs DECLARE_ENGINE_PARAMETER_S) {
void setMap(fuel_table_t table, float value) { void setMap(fuel_table_t table, float value) {
for (int l = 0; l < FUEL_LOAD_COUNT; l++) { for (int l = 0; l < FUEL_LOAD_COUNT; l++) {
for (int r = 0; r < FUEL_RPM_COUNT; r++) { for (int rpmIndex = 0; rpmIndex < FUEL_RPM_COUNT; rpmIndex++) {
table[l][r] = value; table[l][rpmIndex] = value;
} }
} }
} }
@ -906,17 +906,17 @@ void setFrankenso0_1_joystick(engine_configuration_s *engineConfiguration) {
} }
void copyFuelTable(fuel_table_t const source, fuel_table_t destination) { void copyFuelTable(fuel_table_t const source, fuel_table_t destination) {
for (int k = 0; k < FUEL_LOAD_COUNT; k++) { for (int loadIndex = 0; loadIndex < FUEL_LOAD_COUNT; loadIndex++) {
for (int r = 0; r < FUEL_RPM_COUNT; r++) { for (int rpmIndex = 0; rpmIndex < FUEL_RPM_COUNT; rpmIndex++) {
destination[k][r] = source[k][r]; destination[loadIndex][rpmIndex] = source[loadIndex][rpmIndex];
} }
} }
} }
void copyTimingTable(ignition_table_t const source, ignition_table_t destination) { void copyTimingTable(ignition_table_t const source, ignition_table_t destination) {
for (int k = 0; k < IGN_LOAD_COUNT; k++) { for (int k = 0; k < IGN_LOAD_COUNT; k++) {
for (int r = 0; r < IGN_RPM_COUNT; r++) { for (int rpmIndex = 0; rpmIndex < IGN_RPM_COUNT; rpmIndex++) {
destination[k][r] = source[k][r]; destination[k][rpmIndex] = source[k][rpmIndex];
} }
} }
} }

5
firmware/controllers/math/engine_math.cpp
View File

@ -259,8 +259,8 @@ static int findAngleIndex(float target DECLARE_ENGINE_PARAMETER_S) {
} else if (eventAngle > target) { } else if (eventAngle > target) {
right = middle - 1; right = middle - 1;
} else { } else {
// Values are equal // Values are equal
return middle; // Key found return middle; // Key found
} }
} }
return left - 1; return left - 1;
@ -268,6 +268,7 @@ static int findAngleIndex(float target DECLARE_ENGINE_PARAMETER_S) {
} }
void findTriggerPosition(event_trigger_position_s *position, angle_t angleOffset DECLARE_ENGINE_PARAMETER_S) { void findTriggerPosition(event_trigger_position_s *position, angle_t angleOffset DECLARE_ENGINE_PARAMETER_S) {
// convert engine cycle angle into trigger cycle angle
angleOffset += tdcPosition(); angleOffset += tdcPosition();
fixAngle(angleOffset); fixAngle(angleOffset);

6
firmware/controllers/trigger/trigger_structure.cpp
View File

@ -218,7 +218,7 @@ uint32_t TriggerShape::getLength() const {
return operationMode == FOUR_STROKE_CAM_SENSOR ? getSize() : 2 * getSize(); return operationMode == FOUR_STROKE_CAM_SENSOR ? getSize() : 2 * getSize();
} }
float TriggerShape::getAngle(int index) const { angle_t TriggerShape::getAngle(int index) const {
// todo: why is this check here? looks like the code below could be used universally // todo: why is this check here? looks like the code below could be used universally
if (operationMode == FOUR_STROKE_CAM_SENSOR) { if (operationMode == FOUR_STROKE_CAM_SENSOR) {
return getSwitchAngle(index); return getSwitchAngle(index);
@ -352,11 +352,11 @@ void TriggerShape::addEvent(angle_t angle, trigger_wheel_e const waveIndex, trig
wave.waves[waveIndex].pinStates[index] = state; wave.waves[waveIndex].pinStates[index] = state;
} }
int TriggerShape::getCycleDuration() const { angle_t TriggerShape::getCycleDuration() const {
return (operationMode == FOUR_STROKE_CAM_SENSOR) ? 720 : 360; return (operationMode == FOUR_STROKE_CAM_SENSOR) ? 720 : 360;
} }
float TriggerShape::getSwitchAngle(int index) const { angle_t TriggerShape::getSwitchAngle(int index) const {
return getCycleDuration() * wave.getSwitchTime(index); return getCycleDuration() * wave.getSwitchTime(index);
} }

11
firmware/controllers/trigger/trigger_structure.h
View File

@ -168,9 +168,12 @@ private:
/** /**
* These angles are in trigger DESCRIPTION coordinates - i.e. the way you add events while declaring trigger shape * These angles are in trigger DESCRIPTION coordinates - i.e. the way you add events while declaring trigger shape
*/ */
float getSwitchAngle(int index) const; angle_t getSwitchAngle(int index) const;
float previousAngle; /**
* This variable is used to confirm that events are added in the right order.
*/
angle_t previousAngle;
/** /**
* this is part of performance optimization * this is part of performance optimization
*/ */
@ -180,9 +183,9 @@ private:
* This private method should only be used to prepare the array of pre-calculated values * This private method should only be used to prepare the array of pre-calculated values
* See eventAngles array * See eventAngles array
*/ */
float getAngle(int phaseIndex) const; angle_t getAngle(int phaseIndex) const;
int getCycleDuration() const; angle_t getCycleDuration() const;
void calculateTriggerSynchPoint(TriggerState *state DECLARE_ENGINE_PARAMETER_S); void calculateTriggerSynchPoint(TriggerState *state DECLARE_ENGINE_PARAMETER_S);
}; };

2
java_console/models/src/com/rusefi/BinarySearch.java
View File

@ -1,7 +1,7 @@
package com.rusefi; package com.rusefi;
public class BinarySearch { public class BinarySearch {
public static int binarySearch(double target, double[] angles) { public static int binarySearch(double target, float[] angles) {
System.out.println("Testing " + target); System.out.println("Testing " + target);
int left = 0; int left = 0;

45
java_console/models/src/com/rusefi/autotune/FuelAutoTune.java
View File

@ -62,20 +62,30 @@ public class FuelAutoTune {
} }
public static class Result { public static class Result {
private final double[][] kgbcRES; private final float[][] kgbcRES;
public Result(double[][] kgbcRES) { public Result(float[][] kgbcRES) {
this.kgbcRES = kgbcRES; this.kgbcRES = kgbcRES;
} }
public double[][] getKgbcRES() { public float[][] getKgbcRES() {
return kgbcRES; return kgbcRES;
} }
} }
private static float[][] deepCopy(float[][] input) {
if (input == null)
return null;
float[][] result = new float[input.length][];
for (int r = 0; r < input.length; r++) {
result[r] = input[r].clone();
}
return result;
}
// void MainWindow::calckGBC(double STEP) // void MainWindow::calckGBC(double STEP)
public static Result process(boolean smooth, Collection<stDataOnline> dataECU, double STEP, double targetAFR) { public static Result process(boolean smooth, Collection<stDataOnline> dataECU, double STEP, double targetAFR, float[][] kgbcINIT) {
double kgbcSQ[][] = new double[SIZE][SIZE]; float kgbcSQ[][] = new float[SIZE][SIZE];
double kgbcSQsum = 0; double kgbcSQsum = 0;
double kgbcSQsumLast; double kgbcSQsumLast;
double minSQ; double minSQ;
@ -92,16 +102,9 @@ public class FuelAutoTune {
for (stDataOnline data : dataECU) { for (stDataOnline data : dataECU) {
bkGBC[data.PRESS_RT_32()][data.RPM_RT_32()]++; bkGBC[data.PRESS_RT_32()][data.RPM_RT_32()]++;
} }
// todo: add a comment what is this?
double kgbcRES[][] = new double[Fields.FUEL_LOAD_COUNT][Fields.FUEL_RPM_COUNT];
double kgbcINIT[][] = new double[Fields.FUEL_LOAD_COUNT][Fields.FUEL_RPM_COUNT];
for (int engineLoadIndex = 0; engineLoadIndex < Fields.FUEL_LOAD_COUNT; engineLoadIndex++) { float result[][] = deepCopy(kgbcINIT);
for (int rpmIndex = 0; rpmIndex < Fields.FUEL_RPM_COUNT; rpmIndex++) {
kgbcINIT[engineLoadIndex][rpmIndex] = 1;
kgbcRES[engineLoadIndex][rpmIndex] = 1;
}
}
// double addGbcTwatRES[] = new double[TEMP_CORR]; // double addGbcTwatRES[] = new double[TEMP_CORR];
// double addGbcTwatINIT[] = new double[TEMP_CORR]; // double addGbcTwatINIT[] = new double[TEMP_CORR];
// //
@ -152,12 +155,12 @@ public class FuelAutoTune {
} }
kgbcSQsumLast = kgbcSQsum; kgbcSQsumLast = kgbcSQsum;
countDeviation(dataECU, kgbcSQ, kgbcRES, kgbcINIT, targetAFR); countDeviation(dataECU, kgbcSQ, result, kgbcINIT, targetAFR);
kgbcSQsum = sumArray(kgbcSQ); kgbcSQsum = sumArray(kgbcSQ);
if (smooth) { if (smooth) {
kgbcSQsum = smooth(kgbcSQsum, ksq, ke, kg, kgbcRES); kgbcSQsum = smooth(kgbcSQsum, ksq, ke, kg, result);
} }
//////////////////////////////////// ////////////////////////////////////
if (kgbcSQsum >= kgbcSQsumLast) if (kgbcSQsum >= kgbcSQsumLast)
@ -166,7 +169,7 @@ public class FuelAutoTune {
/*if(bkGBC[r][c]) */ /*if(bkGBC[r][c]) */
// log("Adjusting " + step); // log("Adjusting " + step);
kgbcRES[r][c] += step; result[r][c] += step;
if (kgbcSQsum < minSQ) if (kgbcSQsum < minSQ)
minSQ = kgbcSQsum; minSQ = kgbcSQsum;
@ -189,7 +192,7 @@ public class FuelAutoTune {
//updateTablekGBC(); //updateTablekGBC();
//ui->statusBar->showMessage(QString::number(kgbcSQsum), 500); //ui->statusBar->showMessage(QString::number(kgbcSQsum), 500);
log("return " + minK); log("return " + minK);
return new Result(kgbcRES); return new Result(result);
} }
kgbcSQsumLastTotal = kgbcSQsum; kgbcSQsumLastTotal = kgbcSQsum;
//ui->statusBar->showMessage(QString::number(gbcSQsum)); //ui->statusBar->showMessage(QString::number(gbcSQsum));
@ -198,7 +201,7 @@ public class FuelAutoTune {
} }
} }
private static void countDeviation(Collection<stDataOnline> dataECU, double[][] kgbcSQ, double[][] kgbcRES, double[][] kgbcINIT, double targetAFR) { private static void countDeviation(Collection<stDataOnline> dataECU, float[][] kgbcSQ, float[][] kgbcRES, float[][] kgbcINIT, double targetAFR) {
for (stDataOnline dataPoint : dataECU) { for (stDataOnline dataPoint : dataECU) {
double corrInit = 1; // addGbcTwatINIT_190[dataPoint.twat + 40]; double corrInit = 1; // addGbcTwatINIT_190[dataPoint.twat + 40];
double corrRes = 1; //addGbcTwatRES_190[dataPoint.twat + 40]; double corrRes = 1; //addGbcTwatRES_190[dataPoint.twat + 40];
@ -216,7 +219,7 @@ public class FuelAutoTune {
} }
} }
private static double sumArray(double[][] kgbcSQ) { private static double sumArray(float[][] kgbcSQ) {
double kgbcSQsum = 0; double kgbcSQsum = 0;
for (int i = 0; i < SIZE; i++) { for (int i = 0; i < SIZE; i++) {
for (int j = 0; j < SIZE; j++) { for (int j = 0; j < SIZE; j++) {
@ -226,7 +229,7 @@ public class FuelAutoTune {
return kgbcSQsum; return kgbcSQsum;
} }
private static double smooth(double kgbcSQsum, double ksq, double ke, double kg, double[][] kgbcRES) { private static double smooth(double kgbcSQsum, double ksq, double ke, double kg, float[][] kgbcRES) {
double e; double e;
double g; double g;
kgbcSQsum = ksq * kgbcSQsum; kgbcSQsum = ksq * kgbcSQsum;

22
java_console/models/src/com/rusefi/autotune/test/FuelAutoTuneTest.java
View File

@ -1,6 +1,7 @@
package com.rusefi.autotune.test; package com.rusefi.autotune.test;
import com.rusefi.autotune.FuelAutoTune; import com.rusefi.autotune.FuelAutoTune;
import com.rusefi.config.Fields;
import org.junit.Test; import org.junit.Test;
import java.util.ArrayList; import java.util.ArrayList;
@ -18,7 +19,7 @@ public class FuelAutoTuneTest {
dataPoints.add(FuelAutoTune.stDataOnline.valueOf(13, 1200, 80)); dataPoints.add(FuelAutoTune.stDataOnline.valueOf(13, 1200, 80));
{ {
FuelAutoTune.Result r = FuelAutoTune.process(false, dataPoints, 0.1, 13); FuelAutoTune.Result r = FuelAutoTune.process(false, dataPoints, 0.1, 13, createVeTable());
printNotDefault(r.getKgbcRES(), 1); printNotDefault(r.getKgbcRES(), 1);
} }
@ -31,7 +32,7 @@ public class FuelAutoTuneTest {
dataPoints.add(FuelAutoTune.stDataOnline.valueOf(16, 1500 + i, 90)); dataPoints.add(FuelAutoTune.stDataOnline.valueOf(16, 1500 + i, 90));
{ {
FuelAutoTune.Result r = FuelAutoTune.process(false, dataPoints, 0.01, 13); FuelAutoTune.Result r = FuelAutoTune.process(false, dataPoints, 0.01, 13, createVeTable());
printNotDefault(r.getKgbcRES(), 1); printNotDefault(r.getKgbcRES(), 1);
} }
@ -39,7 +40,7 @@ public class FuelAutoTuneTest {
dataPoints.add(FuelAutoTune.stDataOnline.valueOf(15, 1500 + i, 90)); dataPoints.add(FuelAutoTune.stDataOnline.valueOf(15, 1500 + i, 90));
{ {
FuelAutoTune.Result r = FuelAutoTune.process(false, dataPoints, 0.01, 13); FuelAutoTune.Result r = FuelAutoTune.process(false, dataPoints, 0.01, 13, createVeTable());
printNotDefault(r.getKgbcRES(), 1); printNotDefault(r.getKgbcRES(), 1);
} }
@ -51,16 +52,27 @@ public class FuelAutoTuneTest {
/** /**
* this method prints all values which do not equal default value * this method prints all values which do not equal default value
*/ */
private static void printNotDefault(double[][] array, double defaultValue) { private static void printNotDefault(float[][] array, double defaultValue) {
for (int i = 0; i < array.length; i++) { for (int i = 0; i < array.length; i++) {
printNotDefault(array[i], i, defaultValue); printNotDefault(array[i], i, defaultValue);
} }
} }
private static void printNotDefault(double[] array, int index, double defaultValue) { private static void printNotDefault(float[] array, int index, double defaultValue) {
for (int i = 0; i < array.length; i++) { for (int i = 0; i < array.length; i++) {
if (array[i] != defaultValue) if (array[i] != defaultValue)
System.out.println("Found value: " + index + " " + i + ": " + array[i]); System.out.println("Found value: " + index + " " + i + ": " + array[i]);
} }
} }
private static float[][] createVeTable() {
float kgbcINIT[][] = new float[Fields.FUEL_LOAD_COUNT][Fields.FUEL_RPM_COUNT];
for (int engineLoadIndex = 0; engineLoadIndex < Fields.FUEL_LOAD_COUNT; engineLoadIndex++) {
for (int rpmIndex = 0; rpmIndex < Fields.FUEL_RPM_COUNT; rpmIndex++) {
kgbcINIT[engineLoadIndex][rpmIndex] = 1;
}
}
return kgbcINIT;
}
} }

2
java_console/models/src/com/rusefi/test/BinarySearchTest.java
View File

@ -12,7 +12,7 @@ public class BinarySearchTest extends TestCase {
public void testBinary() { public void testBinary() {
double[] angles = new double[] {0, 56, 126, 180, 236, 279, 306, 416, 486, 540, 596, 666}; float[] angles = new float[] {0, 56, 126, 180, 236, 279, 306, 416, 486, 540, 596, 666};
Arrays.sort(angles); Arrays.sort(angles);

58
java_console/ui/src/com/rusefi/ui/FuelTunePane.java
View File

@ -23,15 +23,17 @@ import java.util.List;
/** /**
* (c) Andrey Belomutskiy 2013-2016 * (c) Andrey Belomutskiy 2013-2016
* 1/9/2016 * 1/9/2016
*
* @see FuelAutoTune * @see FuelAutoTune
*/ */
public class FuelTunePane { public class FuelTunePane {
private final JPanel content = new JPanel(new BorderLayout()); private final JPanel content = new JPanel(new BorderLayout());
private final List<FuelDataPoint> incomingDataPoints = new ArrayList<>(); private final List<FuelDataPoint> incomingDataPoints = new ArrayList<>();
private final double veLoadBins[] = new double[Fields.FUEL_LOAD_COUNT]; private final float veLoadBins[] = new float[Fields.FUEL_LOAD_COUNT];
private final double veRpmBins[] = new double[Fields.FUEL_RPM_COUNT]; private final float veRpmBins[] = new float[Fields.FUEL_RPM_COUNT];
private final Table3D veTable = new Table3D(); private final Table3D veTable = new Table3D();
private final Table3D changeMap = new Table3D();
public FuelTunePane() { public FuelTunePane() {
final JLabel incomingBufferSize = new JLabel(); final JLabel incomingBufferSize = new JLabel();
@ -64,7 +66,7 @@ public class FuelTunePane {
JPanel rightPanel = new JPanel(new GridLayout(2, 1)); JPanel rightPanel = new JPanel(new GridLayout(2, 1));
rightPanel.add(new JLabel("top")); rightPanel.add(changeMap);
rightPanel.add(new JLabel("bottom")); rightPanel.add(new JLabel("bottom"));
JPanel middlePanel = new JPanel(new GridLayout(1, 2)); JPanel middlePanel = new JPanel(new GridLayout(1, 2));
@ -72,25 +74,28 @@ public class FuelTunePane {
middlePanel.add(rightPanel); middlePanel.add(rightPanel);
content.add(middlePanel, BorderLayout.CENTER); content.add(middlePanel, BorderLayout.CENTER);
initTable(veTable);
initTable(changeMap);
}
private void initTable(Table3D table) {
// todo: which one is which? // todo: which one is which?
veTable.setSizeX(Fields.FUEL_LOAD_COUNT); table.setSizeX(Fields.FUEL_LOAD_COUNT);
veTable.setSizeY(Fields.FUEL_RPM_COUNT); table.setSizeY(Fields.FUEL_RPM_COUNT);
veTable.getXAxis().setDataSize(Fields.FUEL_LOAD_COUNT); table.getXAxis().setDataSize(Fields.FUEL_LOAD_COUNT);
veTable.getYAxis().setDataSize(Fields.FUEL_RPM_COUNT); table.getYAxis().setDataSize(Fields.FUEL_RPM_COUNT);
veTable.getXAxis().setAxisParent(veTable); table.getXAxis().setAxisParent(table);
veTable.getYAxis().setAxisParent(veTable); table.getYAxis().setAxisParent(table);
veTable.setBorder(BorderFactory.createLineBorder(Color.red));
veTable.addScale(new Scale());
veTable.getXAxis().addScale(new Scale());
veTable.getYAxis().addScale(new Scale());
table.setBorder(BorderFactory.createLineBorder(Color.red));
table.addScale(new Scale());
table.getXAxis().addScale(new Scale());
table.getYAxis().addScale(new Scale());
} }
private void doJob() { private void doJob() {
double veTable[][] = new double[Fields.FUEL_LOAD_COUNT][Fields.FUEL_RPM_COUNT]; float veTable[][] = new float[Fields.FUEL_LOAD_COUNT][Fields.FUEL_RPM_COUNT];
loadMap(veTable, Fields.VETABLE.getOffset()); loadMap(veTable, Fields.VETABLE.getOffset());
List<FuelAutoTune.stDataOnline> data = new ArrayList<>(); List<FuelAutoTune.stDataOnline> data = new ArrayList<>();
@ -99,7 +104,22 @@ public class FuelTunePane {
data.add(point.asDataOnline()); data.add(point.asDataOnline());
} }
FuelAutoTune.process(false, data, 0.1, 14.7); // todo: move this away from AWT thread
FuelAutoTune.Result a = FuelAutoTune.process(false, data, 0.1, 14.7, veTable);
changeMap.setStorageAddress(0);
changeMap.setStorageType(Settings.STORAGE_TYPE_FLOAT);
changeMap.populateTable(new byte[4 * 16 * 16], 0);
for (int i = 0; i < 16; i++) {
for (int rpmIndex = 0; rpmIndex < 16; rpmIndex++) {
changeMap.get3dData()[i][rpmIndex].setBinValue(a.getKgbcRES()[i][rpmIndex]);
}
}
changeMap.drawTable();
} }
public void showContent() { public void showContent() {
@ -136,13 +156,13 @@ public class FuelTunePane {
// UiUtils.trueLayout(content.getParent()); // UiUtils.trueLayout(content.getParent());
} }
private void loadMap(double[][] map, int offset) { private void loadMap(float[][] map, int offset) {
for (int engineLoadIndex = 0;engineLoadIndex < map.length; engineLoadIndex++) { for (int engineLoadIndex = 0; engineLoadIndex < map.length; engineLoadIndex++) {
loadArray(map[engineLoadIndex], offset + engineLoadIndex * 4 * Fields.FUEL_RPM_COUNT); loadArray(map[engineLoadIndex], offset + engineLoadIndex * 4 * Fields.FUEL_RPM_COUNT);
} }
} }
private void loadArray(double[] array, int offset) { private void loadArray(float[] array, int offset) {
BinaryProtocol bp = BinaryProtocol.instance; BinaryProtocol bp = BinaryProtocol.instance;
if (bp == null) { if (bp == null) {
FileLog.MAIN.logLine("bp not ready"); FileLog.MAIN.logLine("bp not ready");