From 669322311ff98c6020b6c20503e45a7d518fe458 Mon Sep 17 00:00:00 2001 From: rusefi Date: Fri, 1 May 2020 19:42:09 -0400 Subject: [PATCH] cj125 progress --- firmware/controllers/bench_test.cpp | 3 +++ firmware/hw_layer/sensors/cj125.cpp | 2 +- firmware/hw_layer/sensors/cj125.h | 1 + firmware/tunerstudio/rusefi.input | 4 ++++ 4 files changed, 9 insertions(+), 1 deletion(-) diff --git a/firmware/controllers/bench_test.cpp b/firmware/controllers/bench_test.cpp index 03910ed355..7e50e1435d 100644 --- a/firmware/controllers/bench_test.cpp +++ b/firmware/controllers/bench_test.cpp @@ -270,6 +270,9 @@ static void handleCommandX14(uint16_t index) { etbAutocal(0); return; #endif + case 0xF: + engine->directSelfStimulation = false; + return; } } diff --git a/firmware/hw_layer/sensors/cj125.cpp b/firmware/hw_layer/sensors/cj125.cpp index bed8889b6c..49f5dd2450 100644 --- a/firmware/hw_layer/sensors/cj125.cpp +++ b/firmware/hw_layer/sensors/cj125.cpp @@ -543,7 +543,7 @@ static void cjStartCalibration(void) { globalInstance.state = CJ125_CALIBRATION; } -static void cjRestart(void) { +void cjRestart(void) { if (!cjCheckConfig()) return; globalInstance.state = CJ125_INIT; diff --git a/firmware/hw_layer/sensors/cj125.h b/firmware/hw_layer/sensors/cj125.h index 0e3a7f8de6..f1ba687ac2 100644 --- a/firmware/hw_layer/sensors/cj125.h +++ b/firmware/hw_layer/sensors/cj125.h @@ -104,6 +104,7 @@ void cjPostState(TunerStudioOutputChannels *tsOutputChannels); void initCJ125(Logging *shared DECLARE_ENGINE_PARAMETER_SUFFIX); +void cjRestart(void); void cjCalibrate(void); float cjGetAfr(DECLARE_ENGINE_PARAMETER_SIGNATURE); bool cjHasAfrSensor(DECLARE_CONFIG_PARAMETER_SIGNATURE); diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input index 164246a1d7..c329cc5c64 100644 --- a/firmware/tunerstudio/rusefi.input +++ b/firmware/tunerstudio/rusefi.input @@ -1504,10 +1504,12 @@ cmd_test_starter_relay = "w\x00\x14\x00\x0B" cmd_etb_autotune = "w\x00\x14\x00\x0C" cmd_enable_self_stim = "w\x00\x14\x00\x0D" cmb_etb_auto_calibrate = "w\x00\x14\x00\x0E" +cmd_disable_self_stim = "w\x00\x14\x00\x0F" cmd_test_radiator_fan = "w\x00\x15\x00\x01" cmd_test_check_engine_light = "w\x00\x16\x00\x01" cmd_test_idle_valve = "w\x00\x17\x00\x01" +cmd_cj125_calibrate = "w\x00\x18\x00\x00" cmd_call_from_pit = "w\x00\x20\x34\x56" cmd_stop_engine = "w\x00\x79\x00\x00" @@ -2330,6 +2332,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" ; Engine->cj125 Settings dialog = cj125Function, "CJ125 Settings (wbo decoder)" field = "Enabled", isCJ125Enabled + commandButton = "Calibrate", cmd_cj125_calibrate field = "Using 4.9 sensor?", cj125isLsu49 field = "!ECU reboot needed to apply these settings" field = "ChipSelect pin", cj125CsPin, {isCJ125Enabled == 1} @@ -2899,6 +2902,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" dialog = ecuStimulator, "ECU stimulator" field = "Trigger Simulator", triggerSimulatorFrequency commandButton = "Enable Internal Trigger Simulation", cmd_enable_self_stim + commandButton = "Disable Internal Trigger Simulation", cmd_disable_self_stim field = "" field = "digipot spi", digitalPotentiometerSpiDevice field = "digipot CS #0", digitalPotentiometerChipSelect1