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

firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h

@@ -1271,16 +1271,25 @@
 #define triggerSimulatorPins1_offset 736
 #define triggerSimulatorPins2_offset 737
 #define triggerSimulatorPins3_offset 738
+#define TS_BURN_COMMAND 'B'
+#define TS_CHUNK_WRITE_COMMAND 'C'
+#define TS_COMMAND_F 'F'
 #define TS_CRC_CHECK_COMMAND 'k'
 #define TS_EXECUTE 'E'
 #define TS_FILE_VERSION 20200310
 #define TS_GET_COMPOSITE_BUFFER_DONE_DIFFERENTLY '8'
+#define TS_GET_CONFIG_ERROR 'e'
+#define TS_GET_FIRMWARE_VERSION 'V'
 #define TS_GET_LOGGER_GET_BUFFER 'L'
 #define TS_GET_STRUCT '9'
 #define TS_GET_TEXT 'G'
 #define TS_HELLO_COMMAND 'S'
+#define TS_IO_TEST_COMMAND 'w'
 #define TS_OUTPUT_COMMAND 'O'
 #define TS_OUTPUT_SIZE 244
+#define TS_PAGE_COMMAND 'P'
+#define TS_PERF_TRACE_BEGIN 'r'
+#define TS_PERF_TRACE_GET_BUFFER 'b'
 #define TS_READ_COMMAND 'R'
 #define TS_SET_LOGGER_SWITCH 'l'
 #define ts_show_analog_divider true
@@ -1302,6 +1311,7 @@
 #define ts_show_trigger_comparator true
 #define ts_show_tunerstudio_port true
 #define TS_SIGNATURE "rusEFI v1.2020.4"
+#define TS_SINGLE_WRITE_COMMAND 'W'
 #define tunerStudioSerialSpeed_offset 728
 #define twoWireBatchIgnition_offset 1476
 #define twoWireBatchInjection_offset 1476

firmware/console/binary/tunerstudio_io.h

@@ -62,21 +62,6 @@ typedef struct {
 // many commands are now defined in rusefi_config.txt see TS_* constants
 // this way we reuse between firmware and java code
 
-#define TS_PAGE_COMMAND 'P' // 0x50
-#define TS_COMMAND_F 'F' // 0x46
-#define TS_GET_FIRMWARE_VERSION 'V' // versionInfo
-#define TS_GET_CONFIG_ERROR 'e' // returns getFirmwareError(), works together with ind_hasFatalError
-
-
-// Performance tracing
-#define TS_PERF_TRACE_BEGIN 'r'
-#define TS_PERF_TRACE_GET_BUFFER 'b'
-
-#define TS_SINGLE_WRITE_COMMAND 'W' // 0x57 pageValueWrite
-#define TS_CHUNK_WRITE_COMMAND 'C' // 0x43 pageChunkWrite
-#define TS_BURN_COMMAND 'B' // 0x42 burnCommand
-#define TS_IO_TEST_COMMAND 'w' // 0x77
-
 
 #define CRC_VALUE_SIZE 4
 // todo: double-check this

firmware/controllers/generated/rusefi_generated.h

@@ -1271,16 +1271,25 @@
 #define triggerSimulatorPins1_offset 736
 #define triggerSimulatorPins2_offset 737
 #define triggerSimulatorPins3_offset 738
+#define TS_BURN_COMMAND 'B'
+#define TS_CHUNK_WRITE_COMMAND 'C'
+#define TS_COMMAND_F 'F'
 #define TS_CRC_CHECK_COMMAND 'k'
 #define TS_EXECUTE 'E'
 #define TS_FILE_VERSION 20200310
 #define TS_GET_COMPOSITE_BUFFER_DONE_DIFFERENTLY '8'
+#define TS_GET_CONFIG_ERROR 'e'
+#define TS_GET_FIRMWARE_VERSION 'V'
 #define TS_GET_LOGGER_GET_BUFFER 'L'
 #define TS_GET_STRUCT '9'
 #define TS_GET_TEXT 'G'
 #define TS_HELLO_COMMAND 'S'
+#define TS_IO_TEST_COMMAND 'w'
 #define TS_OUTPUT_COMMAND 'O'
 #define TS_OUTPUT_SIZE 244
+#define TS_PAGE_COMMAND 'P'
+#define TS_PERF_TRACE_BEGIN 'r'
+#define TS_PERF_TRACE_GET_BUFFER 'b'
 #define TS_READ_COMMAND 'R'
 #define TS_SET_LOGGER_SWITCH 'l'
 #define ts_show_analog_divider true
@@ -1302,6 +1311,7 @@
 #define ts_show_trigger_comparator false
 #define ts_show_tunerstudio_port true
 #define TS_SIGNATURE "rusEFI v1.2020.4"
+#define TS_SINGLE_WRITE_COMMAND 'W'
 #define tunerStudioSerialSpeed_offset 728
 #define twoWireBatchIgnition_offset 1476
 #define twoWireBatchInjection_offset 1476

firmware/integration/rusefi_config.txt

@@ -1580,6 +1580,30 @@ end_struct
 #define TS_GET_STRUCT '9'
 #define TS_GET_COMPOSITE_BUFFER_DONE_DIFFERENTLY '8'
 
+// Performance tracing
+#define TS_PERF_TRACE_BEGIN 'r'
+#define TS_PERF_TRACE_GET_BUFFER 'b'
+
+// 0x50
+#define TS_PAGE_COMMAND 'P'
+// 0x46
+#define TS_COMMAND_F 'F'
+// versionInfo
+#define TS_GET_FIRMWARE_VERSION 'V'
+// returns getFirmwareError(), works together with ind_hasFatalError
+#define TS_GET_CONFIG_ERROR 'e'
+
+
+// 0x57 pageValueWrite
+#define TS_SINGLE_WRITE_COMMAND 'W' 
+// 0x43 pageChunkWrite
+#define TS_CHUNK_WRITE_COMMAND 'C' 
+// 0x42 burnCommand
+#define TS_BURN_COMMAND 'B' 
+// 0x77
+#define TS_IO_TEST_COMMAND 'w'
+
+
 // Engine Sniffer time stamp unit, in microseconds
 #define ENGINE_SNIFFER_UNIT_US 10
 

hardware/readme.md

@@ -12,20 +12,20 @@ Some vehicle-specific connector boards are also pretty nice if you want to keep
 See [Connectors wiki page](http://rusefi.com/wiki/index.php?title=Hardware:OEM_connectors)
 todo: move Connectors wiki page content into git
 
-* [35 pin](MX7-C-35PL-C11-connector) Mazda TCU
-* [38 pin](NGC_38_connector) Chrysler NGC connector
-* [48 pin](breakout_48_pin_174917) Mazda Miata NA6 NOT FINISHED
-* [52 pin](172319-1_52pin-connector) Mitsubishi Galant VR4
-* [55 pin](963063-15_55_pin_connector) TE Lada
-* [55 pin](breakout_55_pin) Motronic 1.5.x BMW/GM
+* [35 pin](Breakout_35pin_MX7-C-35PL-C11-connector) Mazda TCU
+* [38 pin](Breakout_38pin_NGC-connector) Chrysler NGC connector
+* [48 pin](Breakout_48pin_174917-Connector) Mazda Miata NA6 NOT FINISHED
+* [52 pin](Breakout_52pin_172319-1-Connector) Mitsubishi Galant VR4
+* [55 pin](Breakout_55pin_963063-15-Connector) TE Lada
+* [55 pin](breakout_55pin-motronic-Connector) Motronic 1.5.x BMW/GM
 *  60 pin Ford coming soon!
-* [64 pin](176122-6-connector) Mazda Miata NA NB1, Honda Civic
-* [68 pin](966595-1_and_963356-1-connector) Volkswagen Audi VAG
-* [72 pin](1123038-2-connector) Mazda Miata NB2
-* [88 pin](Breakout_88pin_VAG) Volkswagen Audi VAG
-* [121 pin](368255-2-connector) Volkswagen Audi VAG
-* [134 pin](Breakout_134pin_7-967288-1) BWM
-* [154 pin](284617-1-connector) Volkswagen Audi VAG
+* [64 pin](Breakout_64pin_176122-6-Connector) Mazda Miata NA NB1, Honda Civic
+* [68 pin](Breakout_68pin_966595-1_and_963356-1-Connector) Volkswagen Audi VAG
+* [72 pin](Breakout_72pin_1123038-2-Connector) Mazda Miata NB2
+* [88 pin](Breakout_88pin_VAG-Connector) Volkswagen Audi VAG
+* [121 pin](Breakout_121pin_368255-2-Connector) Volkswagen Audi VAG
+* [134 pin](Breakout_134pin_7-967288-1-Connector) BWM
+* [154 pin](Breakout_154pin_284617-1-Connector) Volkswagen Audi VAG
 
 ![img](breakout_boards.jpg)
 

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 Tue May 26 01:03:51 EDT 2020
+// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Wed May 27 23:26:48 EDT 2020
 
 // by class com.rusefi.output.FileJavaFieldsConsumer
 import com.rusefi.config.*;
@@ -1252,19 +1252,29 @@ public class Fields {
 	public static final int triggerSimulatorPins1_offset = 736;
 	public static final int triggerSimulatorPins2_offset = 737;
 	public static final int triggerSimulatorPins3_offset = 738;
+	public static final char TS_BURN_COMMAND = 'B';
+	public static final char TS_CHUNK_WRITE_COMMAND = 'C';
+	public static final char TS_COMMAND_F = 'F';
 	public static final char TS_CRC_CHECK_COMMAND = 'k';
 	public static final char TS_EXECUTE = 'E';
 	public static final int TS_FILE_VERSION = 20200310;
 	public static final char TS_GET_COMPOSITE_BUFFER_DONE_DIFFERENTLY = '8';
+	public static final char TS_GET_CONFIG_ERROR = 'e';
+	public static final char TS_GET_FIRMWARE_VERSION = 'V';
 	public static final char TS_GET_LOGGER_GET_BUFFER = 'L';
 	public static final char TS_GET_STRUCT = '9';
 	public static final char TS_GET_TEXT = 'G';
 	public static final char TS_HELLO_COMMAND = 'S';
+	public static final char TS_IO_TEST_COMMAND = 'w';
 	public static final char TS_OUTPUT_COMMAND = 'O';
 	public static final int TS_OUTPUT_SIZE = 244;
+	public static final char TS_PAGE_COMMAND = 'P';
+	public static final char TS_PERF_TRACE_BEGIN = 'r';
+	public static final char TS_PERF_TRACE_GET_BUFFER = 'b';
 	public static final char TS_READ_COMMAND = 'R';
 	public static final char TS_SET_LOGGER_SWITCH = 'l';
 	public static final String TS_SIGNATURE = "rusEFI v1.2020.4";
+	public static final char TS_SINGLE_WRITE_COMMAND = 'W';
 	public static final int tunerStudioSerialSpeed_offset = 728;
 	public static final int twoWireBatchIgnition_offset = 1476;
 	public static final int twoWireBatchInjection_offset = 1476;