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

Merge branch 'master' of https://github.com/rusefi/rusefi

This commit is contained in:
Andrey 2023-03-02 23:51:09 -05:00
parent db5c6661f1 43a5bac738
commit 7007d7c32a
9 changed files with 153 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
firmware/config/boards/cypress/config/controllers/algo/rusefi_generated.h
View File

@ -1211,6 +1211,17 @@
#define TriggerWheel_T_PRIMARY 0
#define TriggerWheel_T_SECONDARY 1
#define TRIM_SIZE 4
#define ts_14_command_TS_14_0 0
#define ts_14_command_TS_14_1 1
#define ts_14_command_TS_14_4 4
#define ts_14_command_TS_14_5 5
#define ts_14_command_TS_14_9 9
#define ts_14_command_TS_GRAB_PEDAL_UP 6
#define ts_14_command_TS_GRAB_PEDAL_WOT 7
#define ts_14_command_TS_GRAB_TPS_CLOSED 2
#define ts_14_command_TS_GRAB_TPS_WOT 3
#define ts_14_command_TS_RESET_TLE8888 8
#define ts_14_command_TS_WRITE_FLASH 10
#define TS_BLOCK_READ_TIMEOUT 3000
#define TS_BURN_COMMAND 'B'
#define TS_BURN_COMMAND_char B
@ -1219,24 +1230,25 @@
#define ts_command_e_TS_BENCH_CATEGORY 22
#define ts_command_e_TS_CLEAR_WARNINGS 17
#define ts_command_e_TS_COMMAND_1 1
#define ts_command_e_TS_COMMAND_10 10
#define ts_command_e_TS_COMMAND_11 11
#define ts_command_e_TS_COMMAND_12 12
#define ts_command_e_TS_COMMAND_13 13
#define ts_command_e_TS_COMMAND_14 14
#define ts_command_e_TS_COMMAND_15 15
#define ts_command_e_TS_COMMAND_16 16
#define ts_command_e_TS_COMMAND_2 2
#define ts_command_e_TS_COMMAND_3 3
#define ts_command_e_TS_COMMAND_4 4
#define ts_command_e_TS_COMMAND_5 5
#define ts_command_e_TS_COMMAND_6 6
#define ts_command_e_TS_COMMAND_7 7
#define ts_command_e_TS_COMMAND_8 8
#define ts_command_e_TS_COMMAND_9 9
#define ts_command_e_TS_DEBUG_MODE 0
#define ts_command_e_TS_GRAB_PEDAL_UP 6
#define ts_command_e_TS_GRAB_PEDAL_WOT 7
#define ts_command_e_TS_GRAB_TPS_CLOSED 2
#define ts_command_e_TS_GRAB_TPS_WOT 3
#define ts_command_e_TS_IGNITION_CATEGORY 18
#define ts_command_e_TS_INJECTOR_CATEGORY 19
#define ts_command_e_TS_LUA_OUTPUT_CATEGORY 32
#define ts_command_e_TS_RESET_TLE8888 8
#define ts_command_e_TS_SET_DEFAULT_ENGINE 31
#define ts_command_e_TS_SET_ENGINE_TYPE 30
#define ts_command_e_TS_SOLENOID_CATEGORY 25
@ -1247,7 +1259,6 @@
#define ts_command_e_TS_UNUSED_29 29
#define ts_command_e_TS_UNUSED_CJ125_CALIB 24
#define ts_command_e_TS_WIDEBAND 21
#define ts_command_e_TS_WRITE_FLASH 10
#define ts_command_e_TS_X14 20
#define TS_COMMAND_F 'F'
#define TS_COMMAND_F_char F

23
firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h
View File

@ -1211,6 +1211,17 @@
#define TriggerWheel_T_PRIMARY 0
#define TriggerWheel_T_SECONDARY 1
#define TRIM_SIZE 4
#define ts_14_command_TS_14_0 0
#define ts_14_command_TS_14_1 1
#define ts_14_command_TS_14_4 4
#define ts_14_command_TS_14_5 5
#define ts_14_command_TS_14_9 9
#define ts_14_command_TS_GRAB_PEDAL_UP 6
#define ts_14_command_TS_GRAB_PEDAL_WOT 7
#define ts_14_command_TS_GRAB_TPS_CLOSED 2
#define ts_14_command_TS_GRAB_TPS_WOT 3
#define ts_14_command_TS_RESET_TLE8888 8
#define ts_14_command_TS_WRITE_FLASH 10
#define TS_BLOCK_READ_TIMEOUT 3000
#define TS_BURN_COMMAND 'B'
#define TS_BURN_COMMAND_char B
@ -1219,24 +1230,25 @@
#define ts_command_e_TS_BENCH_CATEGORY 22
#define ts_command_e_TS_CLEAR_WARNINGS 17
#define ts_command_e_TS_COMMAND_1 1
#define ts_command_e_TS_COMMAND_10 10
#define ts_command_e_TS_COMMAND_11 11
#define ts_command_e_TS_COMMAND_12 12
#define ts_command_e_TS_COMMAND_13 13
#define ts_command_e_TS_COMMAND_14 14
#define ts_command_e_TS_COMMAND_15 15
#define ts_command_e_TS_COMMAND_16 16
#define ts_command_e_TS_COMMAND_2 2
#define ts_command_e_TS_COMMAND_3 3
#define ts_command_e_TS_COMMAND_4 4
#define ts_command_e_TS_COMMAND_5 5
#define ts_command_e_TS_COMMAND_6 6
#define ts_command_e_TS_COMMAND_7 7
#define ts_command_e_TS_COMMAND_8 8
#define ts_command_e_TS_COMMAND_9 9
#define ts_command_e_TS_DEBUG_MODE 0
#define ts_command_e_TS_GRAB_PEDAL_UP 6
#define ts_command_e_TS_GRAB_PEDAL_WOT 7
#define ts_command_e_TS_GRAB_TPS_CLOSED 2
#define ts_command_e_TS_GRAB_TPS_WOT 3
#define ts_command_e_TS_IGNITION_CATEGORY 18
#define ts_command_e_TS_INJECTOR_CATEGORY 19
#define ts_command_e_TS_LUA_OUTPUT_CATEGORY 32
#define ts_command_e_TS_RESET_TLE8888 8
#define ts_command_e_TS_SET_DEFAULT_ENGINE 31
#define ts_command_e_TS_SET_ENGINE_TYPE 30
#define ts_command_e_TS_SOLENOID_CATEGORY 25
@ -1247,7 +1259,6 @@
#define ts_command_e_TS_UNUSED_29 29
#define ts_command_e_TS_UNUSED_CJ125_CALIB 24
#define ts_command_e_TS_WIDEBAND 21
#define ts_command_e_TS_WRITE_FLASH 10
#define ts_command_e_TS_X14 20
#define TS_COMMAND_F 'F'
#define TS_COMMAND_F_char F

23
firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h
View File

@ -1162,6 +1162,17 @@
#define TriggerWheel_T_PRIMARY 0
#define TriggerWheel_T_SECONDARY 1
#define TRIM_SIZE 4
#define ts_14_command_TS_14_0 0
#define ts_14_command_TS_14_1 1
#define ts_14_command_TS_14_4 4
#define ts_14_command_TS_14_5 5
#define ts_14_command_TS_14_9 9
#define ts_14_command_TS_GRAB_PEDAL_UP 6
#define ts_14_command_TS_GRAB_PEDAL_WOT 7
#define ts_14_command_TS_GRAB_TPS_CLOSED 2
#define ts_14_command_TS_GRAB_TPS_WOT 3
#define ts_14_command_TS_RESET_TLE8888 8
#define ts_14_command_TS_WRITE_FLASH 10
#define TS_BLOCK_READ_TIMEOUT 300
#define TS_BURN_COMMAND 'B'
#define TS_BURN_COMMAND_char B
@ -1170,24 +1181,25 @@
#define ts_command_e_TS_BENCH_CATEGORY 22
#define ts_command_e_TS_CLEAR_WARNINGS 17
#define ts_command_e_TS_COMMAND_1 1
#define ts_command_e_TS_COMMAND_10 10
#define ts_command_e_TS_COMMAND_11 11
#define ts_command_e_TS_COMMAND_12 12
#define ts_command_e_TS_COMMAND_13 13
#define ts_command_e_TS_COMMAND_14 14
#define ts_command_e_TS_COMMAND_15 15
#define ts_command_e_TS_COMMAND_16 16
#define ts_command_e_TS_COMMAND_2 2
#define ts_command_e_TS_COMMAND_3 3
#define ts_command_e_TS_COMMAND_4 4
#define ts_command_e_TS_COMMAND_5 5
#define ts_command_e_TS_COMMAND_6 6
#define ts_command_e_TS_COMMAND_7 7
#define ts_command_e_TS_COMMAND_8 8
#define ts_command_e_TS_COMMAND_9 9
#define ts_command_e_TS_DEBUG_MODE 0
#define ts_command_e_TS_GRAB_PEDAL_UP 6
#define ts_command_e_TS_GRAB_PEDAL_WOT 7
#define ts_command_e_TS_GRAB_TPS_CLOSED 2
#define ts_command_e_TS_GRAB_TPS_WOT 3
#define ts_command_e_TS_IGNITION_CATEGORY 18
#define ts_command_e_TS_INJECTOR_CATEGORY 19
#define ts_command_e_TS_LUA_OUTPUT_CATEGORY 32
#define ts_command_e_TS_RESET_TLE8888 8
#define ts_command_e_TS_SET_DEFAULT_ENGINE 31
#define ts_command_e_TS_SET_ENGINE_TYPE 30
#define ts_command_e_TS_SOLENOID_CATEGORY 25
@ -1198,7 +1210,6 @@
#define ts_command_e_TS_UNUSED_29 29
#define ts_command_e_TS_UNUSED_CJ125_CALIB 24
#define ts_command_e_TS_WIDEBAND 21
#define ts_command_e_TS_WRITE_FLASH 10
#define ts_command_e_TS_X14 20
#define TS_COMMAND_F 'F'
#define TS_COMMAND_F_char F

53
firmware/controllers/algo/auto_generated_enginetypes.cpp
View File

@ -1,6 +1,6 @@
#include "global.h"
#include "engine_types.h"
// was generated automatically by rusEFI tool from engine_types.h // by enum2string.jar tool on Tue Feb 21 20:12:14 UTC 2023
// was generated automatically by rusEFI tool from engine_types.h // by enum2string.jar tool on Fri Mar 03 04:44:49 UTC 2023
// see also gen_config_and_enums.bat
@ -517,6 +517,33 @@ case TT_VVT_TOYOTA_4_1:
}
return NULL;
}
const char *getTs_14_command(ts_14_command value){
switch(value) {
case TS_14_0:
return "TS_14_0";
case TS_14_1:
return "TS_14_1";
case TS_14_4:
return "TS_14_4";
case TS_14_5:
return "TS_14_5";
case TS_14_9:
return "TS_14_9";
case TS_GRAB_PEDAL_UP:
return "TS_GRAB_PEDAL_UP";
case TS_GRAB_PEDAL_WOT:
return "TS_GRAB_PEDAL_WOT";
case TS_GRAB_TPS_CLOSED:
return "TS_GRAB_TPS_CLOSED";
case TS_GRAB_TPS_WOT:
return "TS_GRAB_TPS_WOT";
case TS_RESET_TLE8888:
return "TS_RESET_TLE8888";
case TS_WRITE_FLASH:
return "TS_WRITE_FLASH";
}
return NULL;
}
const char *getTs_command_e(ts_command_e value){
switch(value) {
case TS_BENCH_CATEGORY:
@ -525,6 +552,8 @@ case TS_CLEAR_WARNINGS:
return "TS_CLEAR_WARNINGS";
case TS_COMMAND_1:
return "TS_COMMAND_1";
case TS_COMMAND_10:
return "TS_COMMAND_10";
case TS_COMMAND_11:
return "TS_COMMAND_11";
case TS_COMMAND_12:
@ -537,30 +566,30 @@ case TS_COMMAND_15:
return "TS_COMMAND_15";
case TS_COMMAND_16:
return "TS_COMMAND_16";
case TS_COMMAND_2:
return "TS_COMMAND_2";
case TS_COMMAND_3:
return "TS_COMMAND_3";
case TS_COMMAND_4:
return "TS_COMMAND_4";
case TS_COMMAND_5:
return "TS_COMMAND_5";
case TS_COMMAND_6:
return "TS_COMMAND_6";
case TS_COMMAND_7:
return "TS_COMMAND_7";
case TS_COMMAND_8:
return "TS_COMMAND_8";
case TS_COMMAND_9:
return "TS_COMMAND_9";
case TS_DEBUG_MODE:
return "TS_DEBUG_MODE";
case TS_GRAB_PEDAL_UP:
return "TS_GRAB_PEDAL_UP";
case TS_GRAB_PEDAL_WOT:
return "TS_GRAB_PEDAL_WOT";
case TS_GRAB_TPS_CLOSED:
return "TS_GRAB_TPS_CLOSED";
case TS_GRAB_TPS_WOT:
return "TS_GRAB_TPS_WOT";
case TS_IGNITION_CATEGORY:
return "TS_IGNITION_CATEGORY";
case TS_INJECTOR_CATEGORY:
return "TS_INJECTOR_CATEGORY";
case TS_LUA_OUTPUT_CATEGORY:
return "TS_LUA_OUTPUT_CATEGORY";
case TS_RESET_TLE8888:
return "TS_RESET_TLE8888";
case TS_SET_DEFAULT_ENGINE:
return "TS_SET_DEFAULT_ENGINE";
case TS_SET_ENGINE_TYPE:
@ -581,8 +610,6 @@ case TS_UNUSED_CJ125_CALIB:
return "TS_UNUSED_CJ125_CALIB";
case TS_WIDEBAND:
return "TS_WIDEBAND";
case TS_WRITE_FLASH:
return "TS_WRITE_FLASH";
case TS_X14:
return "TS_X14";
}

3
firmware/controllers/algo/auto_generated_enginetypes.h
View File

@ -1,4 +1,4 @@
// was generated automatically by rusEFI tool from engine_types.h // by enum2string.jar tool on Wed Nov 10 20:00:37 EST 2021
// was generated automatically by rusEFI tool from engine_types.h // by enum2string.jar tool on Fri Mar 03 04:44:49 UTC 2023
// see also gen_config_and_enums.bat
@ -9,4 +9,5 @@ const char *getBench_mode_e(bench_mode_e value);
const char *getDebug_mode_e(debug_mode_e value);
const char *getEngine_type_e(engine_type_e value);
const char *getTrigger_type_e(trigger_type_e value);
const char *getTs_14_command(ts_14_command value);
const char *getTs_command_e(ts_command_e value);

23
firmware/controllers/generated/rusefi_generated.h
View File

@ -1211,6 +1211,17 @@
#define TriggerWheel_T_PRIMARY 0
#define TriggerWheel_T_SECONDARY 1
#define TRIM_SIZE 4
#define ts_14_command_TS_14_0 0
#define ts_14_command_TS_14_1 1
#define ts_14_command_TS_14_4 4
#define ts_14_command_TS_14_5 5
#define ts_14_command_TS_14_9 9
#define ts_14_command_TS_GRAB_PEDAL_UP 6
#define ts_14_command_TS_GRAB_PEDAL_WOT 7
#define ts_14_command_TS_GRAB_TPS_CLOSED 2
#define ts_14_command_TS_GRAB_TPS_WOT 3
#define ts_14_command_TS_RESET_TLE8888 8
#define ts_14_command_TS_WRITE_FLASH 10
#define TS_BLOCK_READ_TIMEOUT 3000
#define TS_BURN_COMMAND 'B'
#define TS_BURN_COMMAND_char B
@ -1219,24 +1230,25 @@
#define ts_command_e_TS_BENCH_CATEGORY 22
#define ts_command_e_TS_CLEAR_WARNINGS 17
#define ts_command_e_TS_COMMAND_1 1
#define ts_command_e_TS_COMMAND_10 10
#define ts_command_e_TS_COMMAND_11 11
#define ts_command_e_TS_COMMAND_12 12
#define ts_command_e_TS_COMMAND_13 13
#define ts_command_e_TS_COMMAND_14 14
#define ts_command_e_TS_COMMAND_15 15
#define ts_command_e_TS_COMMAND_16 16
#define ts_command_e_TS_COMMAND_2 2
#define ts_command_e_TS_COMMAND_3 3
#define ts_command_e_TS_COMMAND_4 4
#define ts_command_e_TS_COMMAND_5 5
#define ts_command_e_TS_COMMAND_6 6
#define ts_command_e_TS_COMMAND_7 7
#define ts_command_e_TS_COMMAND_8 8
#define ts_command_e_TS_COMMAND_9 9
#define ts_command_e_TS_DEBUG_MODE 0
#define ts_command_e_TS_GRAB_PEDAL_UP 6
#define ts_command_e_TS_GRAB_PEDAL_WOT 7
#define ts_command_e_TS_GRAB_TPS_CLOSED 2
#define ts_command_e_TS_GRAB_TPS_WOT 3
#define ts_command_e_TS_IGNITION_CATEGORY 18
#define ts_command_e_TS_INJECTOR_CATEGORY 19
#define ts_command_e_TS_LUA_OUTPUT_CATEGORY 32
#define ts_command_e_TS_RESET_TLE8888 8
#define ts_command_e_TS_SET_DEFAULT_ENGINE 31
#define ts_command_e_TS_SET_ENGINE_TYPE 30
#define ts_command_e_TS_SOLENOID_CATEGORY 25
@ -1247,7 +1259,6 @@
#define ts_command_e_TS_UNUSED_29 29
#define ts_command_e_TS_UNUSED_CJ125_CALIB 24
#define ts_command_e_TS_WIDEBAND 21
#define ts_command_e_TS_WRITE_FLASH 10
#define ts_command_e_TS_X14 20
#define TS_COMMAND_F 'F'
#define TS_COMMAND_F_char F

19
java_console/io/src/main/java/com/rusefi/enums/ts_14_command.java Normal file
View File

@ -0,0 +1,19 @@
package com.rusefi.enums;
// based on ./controllers/algo/engine_types.h
//auto-generated by ToJavaEnum.java
public enum ts_14_command {
TS_14_0,
TS_14_1,
TS_GRAB_TPS_CLOSED,
TS_GRAB_TPS_WOT,
TS_14_4,
TS_14_5,
TS_GRAB_PEDAL_UP,
TS_GRAB_PEDAL_WOT,
TS_RESET_TLE8888,
TS_14_9,
TS_WRITE_FLASH,
}

12
java_console/io/src/main/java/com/rusefi/enums/ts_command_e.java
View File

@ -7,15 +7,15 @@ package com.rusefi.enums;
public enum ts_command_e {
TS_DEBUG_MODE,
TS_COMMAND_1,
TS_GRAB_TPS_CLOSED,
TS_GRAB_TPS_WOT,
TS_COMMAND_2,
TS_COMMAND_3,
TS_COMMAND_4,
TS_COMMAND_5,
TS_GRAB_PEDAL_UP,
TS_GRAB_PEDAL_WOT,
TS_RESET_TLE8888,
TS_COMMAND_6,
TS_COMMAND_7,
TS_COMMAND_8,
TS_COMMAND_9,
TS_WRITE_FLASH,
TS_COMMAND_10,
TS_COMMAND_11,
TS_COMMAND_12,
TS_COMMAND_13,

25
java_console/models/src/main/java/com/rusefi/config/generated/Fields.java
View File

@ -1,6 +1,6 @@
package com.rusefi.config.generated;
// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Mar 03 02:31:40 UTC 2023
// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Mar 03 04:45:35 UTC 2023
// by class com.rusefi.output.FileJavaFieldsConsumer
import com.rusefi.config.*;
@ -1141,30 +1141,42 @@ public class Fields {
public static final int TriggerWheel_T_PRIMARY = 0;
public static final int TriggerWheel_T_SECONDARY = 1;
public static final int TRIM_SIZE = 4;
public static final int ts_14_command_TS_14_0 = 0;
public static final int ts_14_command_TS_14_1 = 1;
public static final int ts_14_command_TS_14_4 = 4;
public static final int ts_14_command_TS_14_5 = 5;
public static final int ts_14_command_TS_14_9 = 9;
public static final int ts_14_command_TS_GRAB_PEDAL_UP = 6;
public static final int ts_14_command_TS_GRAB_PEDAL_WOT = 7;
public static final int ts_14_command_TS_GRAB_TPS_CLOSED = 2;
public static final int ts_14_command_TS_GRAB_TPS_WOT = 3;
public static final int ts_14_command_TS_RESET_TLE8888 = 8;
public static final int ts_14_command_TS_WRITE_FLASH = 10;
public static final int TS_BLOCK_READ_TIMEOUT = 3000;
public static final char TS_BURN_COMMAND = 'B';
public static final char TS_CHUNK_WRITE_COMMAND = 'C';
public static final int ts_command_e_TS_BENCH_CATEGORY = 22;
public static final int ts_command_e_TS_CLEAR_WARNINGS = 17;
public static final int ts_command_e_TS_COMMAND_1 = 1;
public static final int ts_command_e_TS_COMMAND_10 = 10;
public static final int ts_command_e_TS_COMMAND_11 = 11;
public static final int ts_command_e_TS_COMMAND_12 = 12;
public static final int ts_command_e_TS_COMMAND_13 = 13;
public static final int ts_command_e_TS_COMMAND_14 = 14;
public static final int ts_command_e_TS_COMMAND_15 = 15;
public static final int ts_command_e_TS_COMMAND_16 = 16;
public static final int ts_command_e_TS_COMMAND_2 = 2;
public static final int ts_command_e_TS_COMMAND_3 = 3;
public static final int ts_command_e_TS_COMMAND_4 = 4;
public static final int ts_command_e_TS_COMMAND_5 = 5;
public static final int ts_command_e_TS_COMMAND_6 = 6;
public static final int ts_command_e_TS_COMMAND_7 = 7;
public static final int ts_command_e_TS_COMMAND_8 = 8;
public static final int ts_command_e_TS_COMMAND_9 = 9;
public static final int ts_command_e_TS_DEBUG_MODE = 0;
public static final int ts_command_e_TS_GRAB_PEDAL_UP = 6;
public static final int ts_command_e_TS_GRAB_PEDAL_WOT = 7;
public static final int ts_command_e_TS_GRAB_TPS_CLOSED = 2;
public static final int ts_command_e_TS_GRAB_TPS_WOT = 3;
public static final int ts_command_e_TS_IGNITION_CATEGORY = 18;
public static final int ts_command_e_TS_INJECTOR_CATEGORY = 19;
public static final int ts_command_e_TS_LUA_OUTPUT_CATEGORY = 32;
public static final int ts_command_e_TS_RESET_TLE8888 = 8;
public static final int ts_command_e_TS_SET_DEFAULT_ENGINE = 31;
public static final int ts_command_e_TS_SET_ENGINE_TYPE = 30;
public static final int ts_command_e_TS_SOLENOID_CATEGORY = 25;
@ -1175,7 +1187,6 @@ public class Fields {
public static final int ts_command_e_TS_UNUSED_29 = 29;
public static final int ts_command_e_TS_UNUSED_CJ125_CALIB = 24;
public static final int ts_command_e_TS_WIDEBAND = 21;
public static final int ts_command_e_TS_WRITE_FLASH = 10;
public static final int ts_command_e_TS_X14 = 20;
public static final char TS_COMMAND_F = 'F';
public static final int TS_COMPOSITE_DISABLE = 2;