From 9ad6ec2382d70854ce5ae82ed13e8570080349ab Mon Sep 17 00:00:00 2001 From: rusefillc Date: Sat, 22 Apr 2023 11:57:07 -0400 Subject: [PATCH] only:mre_f4 --- firmware/config/engines/custom_engine.cpp | 2 ++ .../algo/defaults/default_base_engine.cpp | 7 +++++++ firmware/controllers/lua/examples/honda-bcm.txt | 14 +++++++------- 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/firmware/config/engines/custom_engine.cpp b/firmware/config/engines/custom_engine.cpp index 8f8d2e531c..f96c0eb831 100644 --- a/firmware/config/engines/custom_engine.cpp +++ b/firmware/config/engines/custom_engine.cpp @@ -688,6 +688,8 @@ void mreBCM() { } void mreSecondaryCan() { + engineConfiguration->triggerInputPins[0] = Gpio::Unassigned; + engineConfiguration->tps1_1AdcChannel = EFI_ADC_NONE; engineConfiguration->tps2_1AdcChannel = EFI_ADC_NONE; engineConfiguration->clt.adcChannel = EFI_ADC_NONE; diff --git a/firmware/controllers/algo/defaults/default_base_engine.cpp b/firmware/controllers/algo/defaults/default_base_engine.cpp index b280537afa..eb2410df2e 100644 --- a/firmware/controllers/algo/defaults/default_base_engine.cpp +++ b/firmware/controllers/algo/defaults/default_base_engine.cpp @@ -44,6 +44,13 @@ void setDefaultBaseEngine() { engineConfiguration->failedMapFallback = 60; engineConfiguration->enableMapEstimationTableFallback = false; + engineConfiguration->totalGearsCount = 5; + engineConfiguration->gearRatio[0] = 3.35f; + engineConfiguration->gearRatio[1] = 1.99f; + engineConfiguration->gearRatio[2] = 1.33f; + engineConfiguration->gearRatio[3] = 1.00f; + engineConfiguration->gearRatio[4] = 0.72f; + engineConfiguration->ALSMinRPM = 400; engineConfiguration->ALSMaxRPM = 3200; engineConfiguration->ALSMaxDuration = 3.5; diff --git a/firmware/controllers/lua/examples/honda-bcm.txt b/firmware/controllers/lua/examples/honda-bcm.txt index d6ad7b24d8..579032753e 100644 --- a/firmware/controllers/lua/examples/honda-bcm.txt +++ b/firmware/controllers/lua/examples/honda-bcm.txt @@ -3,8 +3,8 @@ setTickRate(300) timeout = 3000 -rpmSensor = Sensor.new("rpm") -rpmSensor : setTimeout(timeout) +--rpmSensor = Sensor.new("rpm") +--rpmSensor : setTimeout(timeout) ppsSensor = Sensor.new("AcceleratorPedal") ppsSensor : setTimeout(timeout) @@ -53,16 +53,16 @@ function onPOWERTRAIN_DATA(bus, id, dlc, data) ppsSensor : set(ppsValue) rpmValue = getTwoBytesMSB(data, 2, 1) - rpmSensor : set(rpmValue) - print('onPOWERTRAIN_DATA ' .. rpmValue .. rpmValue) + --rpmSensor : set(rpmValue) +-- print('onPOWERTRAIN_DATA ' .. rpmValue .. ' pedal ' .. ppsValue) end -function onPOWERTRAIN_DATA(bus, id, dlc, data) +function onCAR_SPEED(bus, id, dlc, data) speedKph = getTwoBytesLSB(data, 1, 0.01) - print('onPOWERTRAIN_DATA ' .. speedKph) + print('onCAR_SPEED ' .. speedKph) speedSensor : set(speedKph) - print('onPOWERTRAIN_DATA ratio' .. (speedKph / rpmValue)) + print('onPOWERTRAIN_DATA speed' .. speedKph .. ' ratio ' .. (speedKph / rpmValue)) end