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

ETB duty cycle jitter #4833

This commit is contained in:
rusefillc 2022-11-29 13:54:28 -05:00
parent 51ea23db68
commit 5c02e5b496
3 changed files with 30 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
firmware/console/binary/generated/live_data_ids.h
View File

@ -24,3 +24,24 @@ LDS_ignition_state,
LDS_electronic_throttle,
LDS_wideband_state,
} live_data_e;
#define OUTPUT_CHANNELS_BASE_ADDRESS 0
#define KNOCK_CONTROLLER_BASE_ADDRESS 748
#define HIGH_PRESSURE_FUEL_PUMP_BASE_ADDRESS 764
#define INJECTOR_MODEL_BASE_ADDRESS 788
#define FUEL_COMPUTER_BASE_ADDRESS 800
#define LAUNCH_CONTROL_STATE_BASE_ADDRESS 820
#define BOOST_CONTROL_BASE_ADDRESS 828
#define AC_CONTROL_BASE_ADDRESS 848
#define FAN_CONTROL_BASE_ADDRESS 860
#define FUEL_PUMP_CONTROL_BASE_ADDRESS 864
#define MAIN_RELAY_BASE_ADDRESS 868
#define ENGINE_STATE_BASE_ADDRESS 872
#define TPS_ACCEL_STATE_BASE_ADDRESS 1028
#define TRIGGER_CENTRAL_BASE_ADDRESS 1076
#define TRIGGER_STATE_BASE_ADDRESS 1124
#define TRIGGER_STATE_PRIMARY_BASE_ADDRESS 1148
#define WALL_FUEL_STATE_BASE_ADDRESS 1152
#define IDLE_STATE_BASE_ADDRESS 1160
#define IGNITION_STATE_BASE_ADDRESS 1200
#define ELECTRONIC_THROTTLE_BASE_ADDRESS 1216
#define WIDEBAND_STATE_BASE_ADDRESS 1260

BIN
java_tools/ConfigDefinition.jar
View File

Binary file not shown.

14
java_tools/configuration_definition/src/main/java/com/rusefi/ldmp/LiveDataProcessor.java
View File

@ -22,11 +22,15 @@ public class LiveDataProcessor {
private final static String header = "// generated by gen_live_documentation.sh / LiveDataProcessor.java\n";
private final static String enumContentFileName = "console/binary/generated/live_data_ids.h";
private final StringBuilder enumContent = new StringBuilder(header +
"#pragma once\n" +
"\n" +
"typedef enum {\n");
private final StringBuilder baseAddressCHeader = new StringBuilder();
private final StringBuilder totalSensors = new StringBuilder();
private final StringBuilder fancyNewStuff = new StringBuilder();
@ -92,6 +96,8 @@ public class LiveDataProcessor {
int startingPosition = javaSensorsConsumer.sensorTsPosition;
log.info("Starting " + name + " at " + startingPosition);
baseAddressCHeader.append("#define " + name.toUpperCase() + "_BASE_ADDRESS " + startingPosition + "\n");
ReaderState state = new ReaderState();
state.setDefinitionInputFile(folder + File.separator + name + ".txt");
state.withC_Defines = withCDefines;
@ -127,8 +133,6 @@ public class LiveDataProcessor {
};
ArrayList<LinkedHashMap> liveDocs = (ArrayList<LinkedHashMap>) data.get("Usages");
for (LinkedHashMap entry : liveDocs) {
@ -196,9 +200,9 @@ public class LiveDataProcessor {
}
private void writeFiles() throws IOException {
String liveDataIdsHeader = "console/binary/generated/live_data_ids.h";
try (FileWriter fw = new FileWriter(liveDataIdsHeader)) {
try (FileWriter fw = new FileWriter(enumContentFileName)) {
fw.write(enumContent.toString());
fw.write(baseAddressCHeader.toString());
}
try (FileWriter fw = new FileWriter("console/binary/generated/live_data_fragments.h")) {
@ -206,7 +210,7 @@ public class LiveDataProcessor {
}
String outputPath = "../java_console/io/src/main/java/com/rusefi/enums";
InvokeReader request = new InvokeReader(outputPath, Collections.singletonList(liveDataIdsHeader));
InvokeReader request = new InvokeReader(outputPath, Collections.singletonList(enumContentFileName));
EnumToString.handleRequest(request);
}
}