diff --git a/firmware/controllers/algo/engine_configuration_generated_structures.h b/firmware/controllers/algo/engine_configuration_generated_structures.h index 053c07df08..3babfc9f6f 100644 --- a/firmware/controllers/algo/engine_configuration_generated_structures.h +++ b/firmware/controllers/algo/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sun Sep 11 22:19:47 EDT 2016 +// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Mon Sep 12 21:38:15 EDT 2016 // begin #ifndef ENGINE_CONFIGURATION_GENERATED_H_ #define ENGINE_CONFIGURATION_GENERATED_H_ @@ -1274,6 +1274,7 @@ typedef struct { bool isManualSpinningMode : 1; /** * This is needed if batched injection and individual injector wiring + * enable two_wire_batch_injection offset 1500 bit 13 */ bool twoWireBatchInjection : 1; /** @@ -1930,4 +1931,4 @@ typedef struct { #endif // end -// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sun Sep 11 22:19:47 EDT 2016 +// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Mon Sep 12 21:38:15 EDT 2016 diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index 48d35b33d2..4d12630e0d 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -598,7 +598,7 @@ custom idle_mode_e 4 bits, U32, @OFFSET@, [0:0], "false", "true" bit isIdleThreadEnabled bit isPrintTriggerSynchDetails bit isManualSpinningMode;Usually if we have no trigger events that means engine is stopped\nUnless we are troubleshooting and spinning the engine by hand - this case a longer\ndelay is needed - bit twoWireBatchInjection;+This is needed if batched injection and individual injector wiring + bit twoWireBatchInjection;+This is needed if batched injection and individual injector wiring\nenable two_wire_batch_injection bit useOnlyRisingEdgeForTrigger;+VR sensors are only precise on rising front bit twoWireBatchIgnition;+This is needed if batched igniton (waster spark) and individual coil wiring diff --git a/firmware/tunerstudio/rusefi.ini b/firmware/tunerstudio/rusefi.ini index 6b0f7fd54d..72327aba81 100644 --- a/firmware/tunerstudio/rusefi.ini +++ b/firmware/tunerstudio/rusefi.ini @@ -42,7 +42,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Sun Sep 11 22:19:47 EDT 2016 +; this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Mon Sep 12 21:38:15 EDT 2016 pageSize = 16376 page = 1 @@ -706,7 +706,7 @@ page = 1 vvtCamSensorUseRise = "Use rise or fall signal front" sensorChartMode = "rusEfi console Sensor Sniffer mode" isCylinderCleanupEnabled = "If TPS above 95% no fuel would be injected during cranking" - twoWireBatchInjection = "This is needed if batched injection and individual injector wiring" + twoWireBatchInjection = "This is needed if batched injection and individual injector wiring\nenable two_wire_batch_injection" useOnlyRisingEdgeForTrigger = "VR sensors are only precise on rising front" twoWireBatchIgnition = "This is needed if batched igniton (waster spark) and individual coil wiring" ignMathCalculateAtIndex = "At what trigger index should some ignition-related math be executed? This is a performance trick to reduce load on synchronization trigger callback." diff --git a/java_console/ui/src/com/rusefi/ui/FormulasPane.java b/java_console/ui/src/com/rusefi/ui/FormulasPane.java index 01227dd959..bf066b5e6c 100644 --- a/java_console/ui/src/com/rusefi/ui/FormulasPane.java +++ b/java_console/ui/src/com/rusefi/ui/FormulasPane.java @@ -1,6 +1,7 @@ package com.rusefi.ui; import com.rusefi.ConfigurationImage; +import com.rusefi.FileLog; import com.rusefi.binaryprotocol.BinaryProtocol; import com.rusefi.config.Fields; import com.rusefi.core.Sensor; @@ -32,6 +33,16 @@ public class FormulasPane { centerProxy.add(new JLabel("Waiting for data..."), BorderLayout.CENTER); + JButton saveImage = UiUtils.createSaveImageButton(); + saveImage.addActionListener(new ActionListener() { + @Override + public void actionPerformed(ActionEvent e) { + String fileName = FileLog.getDate() + "_formulas.png"; + + UiUtils.saveImageWithPrompt(fileName, centerProxy, centerProxy); + } + }); + final JButton pauseButton = UiUtils.createPauseButton(); pauseButton.addActionListener(new ActionListener() { @Override @@ -41,6 +52,7 @@ public class FormulasPane { } }); JPanel top = new JPanel(new FlowLayout()); + top.add(saveImage); top.add(pauseButton); content.add(top, BorderLayout.NORTH);