diff --git a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h index beaffd8ff9..a9d2ffaafa 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -579,6 +579,7 @@ #define GAUGE_NAME_TIME "Time" #define GAUGE_NAME_TIMING_ADVANCE "timing" #define GAUGE_NAME_TPS "TPS" +#define GAUGE_NAME_TRG_ERR "trg err" #define GAUGE_NAME_VBAT "VBatt" #define GAUGE_NAME_VERSION "firmware" #define GAUGE_NAME_VVS "Vehicle Speed" diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h index fe8e59bd58..95bd71f595 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -579,6 +579,7 @@ #define GAUGE_NAME_TIME "Time" #define GAUGE_NAME_TIMING_ADVANCE "timing" #define GAUGE_NAME_TPS "TPS" +#define GAUGE_NAME_TRG_ERR "trg err" #define GAUGE_NAME_VBAT "VBatt" #define GAUGE_NAME_VERSION "firmware" #define GAUGE_NAME_VVS "Vehicle Speed" diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index 61d7daa1e1..7c0b7df74d 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -1433,6 +1433,7 @@ end_struct #define GAUGE_NAME_VERSION "firmware" +#define GAUGE_NAME_TRG_ERR "trg err" #define GAUGE_NAME_VVT "VVT position" #define GAUGE_NAME_TIMING_ADVANCE "timing" #define GAUGE_NAME_VVS "Vehicle Speed" diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input index 6f3ae5c736..88f0f0f65e 100644 --- a/firmware/tunerstudio/rusefi.input +++ b/firmware/tunerstudio/rusefi.input @@ -1127,7 +1127,7 @@ gaugeCategory = Sensors - Raw entry = massAirFlowValue,@@GAUGE_NAME_AIR_FLOW@@, float, "%.3f" entry = chargeAirMass, @@GAUGE_NAME_AIR_MASS@@, float, "%.3f" entry = throttlePedalPosition, @@GAUGE_NAME_THROTTLE_PEDAL@@, float, "%.3f" - entry = totalTriggerErrorCounter, "trg err",int, "%d" + entry = totalTriggerErrorCounter, @@GAUGE_NAME_TRG_ERR@@,int, "%d" entry = idleAirValvePosition, @@GAUGE_NAME_IAC@@, float, "%.3f" diff --git a/java_console/models/src/com/rusefi/config/generated/Fields.java b/java_console/models/src/com/rusefi/config/generated/Fields.java index 7601955f84..8d03c8db71 100644 --- a/java_console/models/src/com/rusefi/config/generated/Fields.java +++ b/java_console/models/src/com/rusefi/config/generated/Fields.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Sun Jun 14 17:00:00 EDT 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Sun Jun 14 18:37:49 EDT 2020 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -574,6 +574,7 @@ public class Fields { public static final String GAUGE_NAME_TIME = "Time"; public static final String GAUGE_NAME_TIMING_ADVANCE = "timing"; public static final String GAUGE_NAME_TPS = "TPS"; + public static final String GAUGE_NAME_TRG_ERR = "trg err"; public static final String GAUGE_NAME_VBAT = "VBatt"; public static final String GAUGE_NAME_VERSION = "firmware"; public static final String GAUGE_NAME_VVS = "Vehicle Speed"; diff --git a/java_console/shared_ui/src/com/rusefi/tools/online/Online.java b/java_console/shared_ui/src/com/rusefi/tools/online/Online.java index 869ed72a6b..0e7090680c 100644 --- a/java_console/shared_ui/src/com/rusefi/tools/online/Online.java +++ b/java_console/shared_ui/src/com/rusefi/tools/online/Online.java @@ -21,11 +21,11 @@ import static com.rusefi.ui.AuthTokenPanel.TOKEN_WARNING; public class Online { private static final String url = "https://rusefi.com/online/upload.php"; - public static void upload(File xmlFile, String authTokenValue) throws IOException { + public static void upload(File fileName, String authTokenValue) throws IOException { HttpClient httpclient = new DefaultHttpClient(); HttpPost httpPost = new HttpPost(url); - FileBody uploadFilePart = new FileBody(xmlFile); + FileBody uploadFilePart = new FileBody(fileName); MultipartEntity reqEntity = new MultipartEntity(); reqEntity.addPart("upload-file", uploadFilePart); reqEntity.addPart("rusefi_token", new StringBody(authTokenValue)); diff --git a/java_console/ui/src/main/java/com/rusefi/sensor_logs/BinarySensorLogRestarter.java b/java_console/ui/src/main/java/com/rusefi/sensor_logs/BinarySensorLogRestarter.java new file mode 100644 index 0000000000..08b14b3e45 --- /dev/null +++ b/java_console/ui/src/main/java/com/rusefi/sensor_logs/BinarySensorLogRestarter.java @@ -0,0 +1,4 @@ +package com.rusefi.sensor_logs; + +public class BinarySensorLogRestarter { +}