extracing constant & more information for HW CI

This commit is contained in:
rusefi 2019-11-29 21:57:59 -05:00
parent 73e3edc3d8
commit ff3fbffd80
9 changed files with 16 additions and 10 deletions

View File

@ -1,4 +1,4 @@
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/rusefi_config.txt Fri Nov 29 16:20:29 EST 2019
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/rusefi_config.txt Fri Nov 29 21:57:01 EST 2019
// by class com.rusefi.output.CHeaderConsumer
// begin
#ifndef CONFIG_BOARDS_KINETIS_CONFIG_CONTROLLERS_ALGO_ENGINE_CONFIGURATION_GENERATED_STRUCTURES_H
@ -381,6 +381,7 @@
#define CMD_ENABLE "enable"
#define CMD_ENGINE_TYPE "engine_type"
#define CMD_ETB_DUTY "set_etb_duty"
#define CMD_PINS "pins"
#define CMD_REBOOT "reboot"
#define CMD_REBOOT_DFU "reboot_dfu"
#define CMD_TRIGGER_HW_INPUT "trigger_hw_input"
@ -4961,4 +4962,4 @@ typedef struct persistent_config_s persistent_config_s;
#endif
// end
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/rusefi_config.txt Fri Nov 29 16:20:29 EST 2019
// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/rusefi_config.txt Fri Nov 29 21:57:01 EST 2019

View File

@ -379,6 +379,7 @@
#define CMD_ENABLE "enable"
#define CMD_ENGINE_TYPE "engine_type"
#define CMD_ETB_DUTY "set_etb_duty"
#define CMD_PINS "pins"
#define CMD_REBOOT "reboot"
#define CMD_REBOOT_DFU "reboot_dfu"
#define CMD_TRIGGER_HW_INPUT "trigger_hw_input"

View File

@ -379,6 +379,7 @@
#define CMD_ENABLE "enable"
#define CMD_ENGINE_TYPE "engine_type"
#define CMD_ETB_DUTY "set_etb_duty"
#define CMD_PINS "pins"
#define CMD_REBOOT "reboot"
#define CMD_REBOOT_DFU "reboot_dfu"
#define CMD_TRIGGER_HW_INPUT "trigger_hw_input"

View File

@ -139,7 +139,7 @@ void initPinRepository(void) {
initialized = true;
addConsoleAction("pins", reportPins);
addConsoleAction(CMD_PINS, reportPins);
}
bool brain_pin_is_onchip(brain_pin_e brainPin)

View File

@ -1274,6 +1274,7 @@ end_struct
#define GAUGE_NAME_DEBUG_I5 "debug i5"
#define CMD_PINS "pins"
#define CMD_CALIBRATE_PEDAL_UP "calibrate_pedal_up"
#define CMD_CALIBRATE_PEDAL_DOWN "calibrate_pedal_down"
#define CMD_ETB_DUTY "set_etb_duty"

View File

@ -85,7 +85,7 @@ enable2ndByteCanID = false
; see PAGE_0_SIZE in C source code
; CONFIG_DEFINITION_START
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/rusefi_config.txt Fri Nov 29 16:20:29 EST 2019
; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on integration/rusefi_config.txt Fri Nov 29 21:57:01 EST 2019
pageSize = 20000
page = 1
@ -3488,16 +3488,15 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00"
field = "Pause ETB control", pauseEtbControl
field = "Throttle Pedal Up", throttlePedalUpVoltage
field = "Throttle Pedal Wide Open", throttlePedalWOTVoltage
field = "Two-wire mode", etb_use_two_wires, {throttlePedalPositionAdcChannel != 16}
field = "PWM Frequency", etbFreq, {throttlePedalPositionAdcChannel != 16}
field = etbCalibrationOnStart, etbCalibrationOnStart
field = "No1 Direction #1", etb1_directionPin1, {throttlePedalPositionAdcChannel != 16}
field = "No1 Direction #2", etb1_directionPin2, {throttlePedalPositionAdcChannel != 16}
field = "Two-wire mode", etb1_use_two_wires, {throttlePedalPositionAdcChannel != 16}
field = "No1 Control #1", etb1_controlPin1, {throttlePedalPositionAdcChannel != 16 && etb1_use_two_wires == 0}
field = "No1 Control #1", etb1_controlPin1, {throttlePedalPositionAdcChannel != 16 && etb_use_two_wires == 0}
field = "No2 Direction #1", etb2_directionPin1, {throttlePedalPositionAdcChannel != 16}
field = "No2 Direction #2", etb2_directionPin2, {throttlePedalPositionAdcChannel != 16}
field = "Two-wire mode", etb2_use_two_wires, {throttlePedalPositionAdcChannel != 16}
field = "No2 Control #1", etb2_controlPin1, {throttlePedalPositionAdcChannel != 16 && etb2_use_two_wires == 0}
field = "No2 Control #1", etb2_controlPin1, {throttlePedalPositionAdcChannel != 16 && etb_use_two_wires == 0}
panel = etbPidDialog
dialog = etbDialogRight

View File

@ -15,6 +15,7 @@ import com.rusefi.waves.EngineReport;
import static com.rusefi.IoUtil.sleep;
import static com.rusefi.TestingUtils.*;
import static com.rusefi.config.generated.Fields.CMD_PINS;
import static com.rusefi.config.generated.Fields.MOCK_MAF_COMMAND;
import static com.rusefi.io.CommandQueue.disableCommand;
import static com.rusefi.waves.EngineReport.isCloseEnough;
@ -135,6 +136,7 @@ public class AutoTest {
}
static void setEngineType(int type) {
sendCommand(CMD_PINS);
currentEngineType = type;
sendCommand("set " + Fields.CMD_ENGINE_TYPE + " " + type, COMPLEX_COMMAND_RETRY, 30);
sleep(10);

View File

@ -1,6 +1,6 @@
package com.rusefi.config.generated;
// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Fri Nov 29 16:19:44 EST 2019
// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on integration\rusefi_config.txt Fri Nov 29 21:56:48 EST 2019
// by class com.rusefi.output.FileJavaFieldsConsumer
import com.rusefi.config.*;
@ -245,6 +245,7 @@ public class Fields {
public static final String CMD_ENABLE = "enable";
public static final String CMD_ENGINE_TYPE = "engine_type";
public static final String CMD_ETB_DUTY = "set_etb_duty";
public static final String CMD_PINS = "pins";
public static final String CMD_REBOOT = "reboot";
public static final String CMD_REBOOT_DFU = "reboot_dfu";
public static final String CMD_TRIGGER_HW_INPUT = "trigger_hw_input";

View File

@ -49,7 +49,7 @@ import static com.rusefi.ui.storage.PersistentConfiguration.getConfig;
* @see EngineSnifferPanel
*/
public class Launcher {
public static final int CONSOLE_VERSION = 20191125;
public static final int CONSOLE_VERSION = 20191129;
public static final String INI_FILE_PATH = System.getProperty("ini_file_path", "..");
public static final String INPUT_FILES_PATH = System.getProperty("input_files_path", "..");
public static final String TOOLS_PATH = System.getProperty("tools_path", ".");