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

only:EPIC: Improve toolset for default tune canned tune generation #4871

This commit is contained in:
rusefillc 2023-12-25 01:54:28 -05:00
parent d8c626dc7a
commit c6e35563ee
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
java_tools/tune-tools/src/main/java/com/rusefi/tools/tune/WriteSimulatorConfiguration.java
View File

@ -25,13 +25,16 @@ public class WriteSimulatorConfiguration {
public static void main(String[] args) throws IOException, InterruptedException, JAXBException {
System.out.println("ROOT_FOLDER=" + ROOT_FOLDER);
try {
writeTune(Fields.SIMULATOR_TUNE_BIN_FILE_NAME, TuneCanTool.DEFAULT_TUNE);
readBinaryWriteXmlTune(Fields.SIMULATOR_TUNE_BIN_FILE_NAME, TuneCanTool.DEFAULT_TUNE);
for (int type : new int[]{
// see 'rusEfiFunctionalTest.cpp' which exports default tunes into binary files for us
Fields.engine_type_e_MRE_M111,
Fields.engine_type_e_HONDA_K,
Fields.engine_type_e_HELLEN_154_HYUNDAI_COUPE_BK1,
Fields.engine_type_e_HELLEN_154_HYUNDAI_COUPE_BK2,
Fields.engine_type_e_HYUNDAI_PB,
Fields.engine_type_e_MAVERICK_X3,
Fields.engine_type_e_HARLEY,
}) {
writeSpecificEngineType(type);
}
@ -47,14 +50,14 @@ public class WriteSimulatorConfiguration {
private static void writeSpecificEngineType(int engineType) {
String engine = "_" + engineType;
try {
writeTune(Fields.SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX + engine + Fields.SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX,
readBinaryWriteXmlTune(Fields.SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX + engine + Fields.SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX,
TuneCanTool.SIMULATED_PREFIX + engine + TuneCanTool.SIMULATED_SUFFIX);
} catch (Throwable e) {
throw new IllegalStateException("With " + engineType, e);
}
}
private static void writeTune(String tuneBinFileName, String outputXmlFileName) throws JAXBException, IOException {
private static void readBinaryWriteXmlTune(String tuneBinFileName, String outputXmlFileName) throws JAXBException, IOException {
byte[] fileContent = Files.readAllBytes(new File(ROOT_FOLDER + tuneBinFileName).toPath());
System.out.println("Got " + fileContent.length + " from " + tuneBinFileName + " while expecting " + Fields.TOTAL_CONFIG_SIZE);
if (fileContent.length != Fields.TOTAL_CONFIG_SIZE)

9
simulator/simulator/rusEfiFunctionalTest.cpp
View File

@ -183,12 +183,13 @@ void rusEfiFunctionalTest(void) {
initFlash();
for (auto const type : {
engine_type_e::MRE_M111,
engine_type_e::HONDA_K,
engine_type_e::HELLEN_154_HYUNDAI_COUPE_BK1,
engine_type_e::HELLEN_154_HYUNDAI_COUPE_BK2,
engine_type_e::MRE_M111,
engine_type_e::HYUNDAI_PB,
engine_type_e::HONDA_K,
engine_type_e::MAVERICK_X3,
engine_type_e::HARLEY,
} ) {
writeEngineTypeDefaultConfig(type);
}
@ -335,7 +336,7 @@ void handleWrapCan(TsChannelBase* tsChannel, char *data, int incomingPacketSize)
CANTxFrame f = txCanBuffer.get();
// filter out CAN packets
for (int eid : responseEids) {
if (f.EID == eid) {
if (f.EID == eid) {
void *frame = (void *)&f;
memcpy((void*)(wrapOutBuffer + outputSize), frame, sizeof(CANTxFrame));
outputSize += sizeof(CANTxFrame);