andreika-git
/
rusefi
mirror of https://github.com/andreika-git/rusefi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

use shared txt instead of parsing full rusefi_config (#59) 

(cherry picked from commit fbb90f2c040442bc10787b9d722e477a7572d75c)
This commit is contained in:
Matthew Kennedy 2023-03-02 14:52:36 -05:00 committed by rusefillc
parent dcf0a641c3
commit 93fc5b2ceb
7 changed files with 215 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/console/binary/output_channels.txt
View File

@ -317,7 +317,7 @@ uint16_t rpmAcceleration;dRPM;"RPM/s",1, 0, 0, 5, 2
uint16_t ISSValue;@@GAUGE_NAME_ISS@@;"RPM",1, 0, 0, 8000, 0
int16_t[LUA_DIGITAL_INPUT_COUNT iterate] autoscale rawAnalogInput;;"V",{1/@@PACK_MULT_VOLTAGE@@}, 0, 0, 5, 3
int16_t[LUA_ANALOG_INPUT_COUNT iterate] autoscale rawAnalogInput;;"V",{1/@@PACK_MULT_VOLTAGE@@}, 0, 0, 5, 3
uint8_t[4 iterate] autoscale gppwmOutput;GPPWM Output;"%", 0.5, 0, 0, 100, 2
int16_t[4 iterate] autoscale gppwmXAxis;;"", 1, 0, -30000, 30000, 0
int16_t[4 iterate] autoscale gppwmYAxis;;"", 0.1, 0, -1000, 1000, 1

4
firmware/console/status_loop.cpp
View File

@ -484,9 +484,9 @@ static void updateRawSensors() {
engine->outputChannels.luaGauges[0] = Sensor::getOrZero(SensorType::LuaGauge1);
engine->outputChannels.luaGauges[1] = Sensor::getOrZero(SensorType::LuaGauge2);
for (int i = 0;i<LUA_ANALOG_INPUT_COUNT;i++) {
for (int i = 0; i < LUA_ANALOG_INPUT_COUNT; i++) {
adc_channel_e ch = engineConfiguration->auxAnalogInputs[i];
if (ch != EFI_ADC_NONE) {
if (isAdcChannelValid(ch)) {
engine->outputChannels.rawAnalogInput[i] = getVoltageDivided("raw aux", ch);
}
}

1
firmware/gen_config_common.sh
View File

@ -21,6 +21,7 @@ COMMON_GEN_CONFIG="
-signature tunerstudio/generated/signature_${SHORT_BOARDNAME}.txt \
-signature_destination controllers/generated/signature_${SHORT_BOARDNAME}.h \
-ts_output_name generated/${INI} \
-prepend integration/rusefi_config_shared.txt \
-prepend ${BOARD_DIR}/prepend.txt \
-board ${BOARD_DIR} \
-definition integration/rusefi_config.txt"

24
firmware/integration/LiveData.yaml
View File

@ -17,19 +17,19 @@ Usages:
- name: output_channels
java: TsOutputs.java
folder: console/binary
prepend: integration/rusefi_config.txt
prepend: integration/rusefi_config_shared.txt
constexpr: "engine->outputChannels"
- name: fuel_computer
java: FuelComputer.java
folder: controllers/algo/fuel
prepend: integration/rusefi_config.txt
prepend: integration/rusefi_config_shared.txt
constexpr: "engine->fuelComputer"
- name: ignition_state
java: IgnitionState.java
folder: controllers/algo
prepend: integration/rusefi_config.txt
prepend: integration/rusefi_config_shared.txt
constexpr: "engine->ignitionState"
- name: knock_controller
@ -53,13 +53,13 @@ Usages:
- name: antilag_system_state
java: AntilagSystem.java
folder: controllers/algo
prepend: integration/rusefi_config.txt
prepend: integration/rusefi_config_shared.txt
output_name: als
- name: boost_control
java: BoostControl.java
folder: controllers/actuators
prepend: integration/rusefi_config.txt
prepend: integration/rusefi_config_shared.txt
output_name: boost
constexpr: "engine->boostController"
conditional_compilation: "EFI_BOOST_CONTROL"
@ -67,7 +67,7 @@ Usages:
- name: ac_control
java: AcControl.java
folder: controllers/actuators
prepend: integration/rusefi_config.txt
prepend: integration/rusefi_config_shared.txt
output_name: ac
- name: fan_control
@ -93,7 +93,7 @@ Usages:
- name: engine_state
java: EngineState.java
folder: controllers/algo
prepend: integration/rusefi_config.txt
prepend: integration/rusefi_config_shared.txt
constexpr: "engine->engineState"
- name: tps_accel_state
@ -111,13 +111,13 @@ Usages:
- name: trigger_state
java: TriggerState.java
folder: controllers/trigger
prepend: integration/rusefi_config.txt
prepend: integration/rusefi_config_shared.txt
output_name: [ "trg", "vvt1i", "vvt1e", "vvt2i", "vvt2e" ]
- name: trigger_state_primary
java: TriggerStatePrimary.java
folder: controllers/trigger
prepend: integration/rusefi_config.txt
prepend: integration/rusefi_config_shared.txt
- name: wall_fuel_state
java: WallFuelState.java
@ -131,7 +131,7 @@ Usages:
- name: electronic_throttle
java: ElectronicThrottle.java
folder: controllers/actuators
prepend: integration/rusefi_config.txt
prepend: integration/rusefi_config_shared.txt
output_name: [ "etb1", "etb2" ]
- name: wideband_state
@ -142,10 +142,10 @@ Usages:
- name: dc_motors
java: DcMotors.java
folder: controllers/actuators
prepend: integration/rusefi_config.txt
prepend: integration/rusefi_config_shared.txt
constexpr: "engine->dc_motors"
- name: sent_state
java: SentState.java
folder: controllers/sensors/
prepend: integration/rusefi_config.txt
prepend: integration/rusefi_config_shared.txt

32
firmware/integration/rusefi_config.txt
View File

@ -113,21 +113,11 @@ struct_no_prefix engine_configuration_s
#define SENT_INPUT_COUNT 1
#define LUA_PWM_COUNT 8
#define LUA_ANALOG_INPUT_COUNT 8
#define LUA_DIGITAL_INPUT_COUNT 8
#define LUA_GAUGE_COUNT 2
! V engines or flat engines would have pairs of shafts with same trigger shape and target position
#define BANKS_COUNT 2
#define CAMS_PER_BANK 2
#define GEARS_COUNT 8
#define VSS_FILTER_MIN 3
#define VSS_FILTER_MAX 200
#define CAM_INPUTS_COUNT @@BANKS_COUNT@@*@@CAMS_PER_BANK@@
! https://github.com/rusefi/rusefi/issues/2010 shows the corner case wheel with huge depth requirement
#define GAP_TRACKING_LENGTH 18
@ -228,25 +218,8 @@ struct_no_prefix engine_configuration_s
#define VOLTAGE_1_BYTE_PACKING_DIV 0.02
#define PERCENT_TRIM_BYTE_PACKING_DIV 0.02
! These are used currently only for output channels - but could be for config as well
#define PACK_MULT_PRESSURE 30
#define PACK_MULT_HIGH_PRESSURE 10
#define PACK_MULT_PERCENT 100
#define PACK_MULT_TEMPERATURE 100
#define PACK_ADD_TEMPERATURE 40
#define PACK_MULT_MS 300
#define PACK_MULT_VSS 100
#define PACK_MULT_AFR 1000
#define PACK_MULT_LAMBDA 10000
#define PACK_MULT_ANGLE 50
#define PACK_MULT_VOLTAGE 1000
#define PACK_MULT_MASS_FLOW 10
#define TPS_2_BYTE_PACKING_MULT 100
#define PACK_MULT_AFR_CFG 10
#define PACK_MULT_LAMBDA_CFG 147
#define PACK_MULT_FUEL_MASS 100
#define PACK_PERCENT_BYTE_MULT 100.0
#define PACK_MULT_FUEL_FLOW 200
#define SCRIPT_TABLE_8 8
#define SCRIPT_CURVE_8 8
@ -1782,10 +1755,7 @@ struct blend_table_s
uint8_t[8] autoscale blendValues;;"%", 0.5, 0, 0, 100, 1
end_struct
#define IGN_BLEND_COUNT 4
blend_table_s[IGN_BLEND_COUNT iterate] ignBlends
#define VE_BLEND_COUNT 4
blend_table_s[VE_BLEND_COUNT iterate] veBlends
end_struct

198
firmware/integration/rusefi_config_shared.txt Normal file
View File

@ -0,0 +1,198 @@
! These definitions are shared between both output channels/live data and config layout
#define PACK_MULT_PRESSURE 30
#define PACK_MULT_HIGH_PRESSURE 10
#define PACK_MULT_PERCENT 100
#define PACK_MULT_TEMPERATURE 100
#define PACK_ADD_TEMPERATURE 40
#define PACK_MULT_MS 300
#define PACK_MULT_AFR 1000
#define PACK_MULT_LAMBDA 10000
#define PACK_MULT_ANGLE 50
#define PACK_MULT_VOLTAGE 1000
#define PACK_MULT_MASS_FLOW 10
#define TPS_2_BYTE_PACKING_MULT 100
#define PACK_MULT_AFR_CFG 10
#define PACK_MULT_LAMBDA_CFG 147
#define PACK_MULT_FUEL_MASS 100
#define PACK_PERCENT_BYTE_MULT 100.0
#define PACK_MULT_FUEL_FLOW 200
#define GEARS_COUNT 8
#define EGT_CHANNEL_COUNT 8
! V engines or flat engines would have pairs of shafts with same trigger shape and target position
#define BANKS_COUNT 2
#define CAMS_PER_BANK 2
#define CAM_INPUTS_COUNT @@BANKS_COUNT@@*@@CAMS_PER_BANK@@
#define LUA_ANALOG_INPUT_COUNT 8
#define IGN_BLEND_COUNT 4
#define VE_BLEND_COUNT 4
#define LUA_GAUGE_COUNT 2
#define GAUGE_NAME_VERSION "firmware"
#define GAUGE_NAME_UPTIME "Uptime"
#define GAUGE_NAME_TRG_ERR "Trigger Error Counter"
#define GAUGE_NAME_TRG_GAP "Trigger Sync Latest Ratio"
#define GAUGE_CATEGORY_TIMING "Timing"
#define GAUGE_CATEGORY_FUEL_MATH "Fuel: math"
#define GAUGE_CATEGORY_BOOST_CONTROL "Boost Control"
#define GAUGE_CATEGORY_ETB "ETB more"
#define GAUGE_NAME_VVT_B1I "VVT: bank 1 intake"
#define GAUGE_NAME_VVT_B1E "VVT: bank 1 exhaust"
#define GAUGE_NAME_VVT_B2I "VVT: bank 2 intake"
#define GAUGE_NAME_VVT_B2E "VVT: bank 2 exhaust"
#define GAUGE_NAME_VVT_TARGET_B1I "VVT: bank 1 intake target"
#define GAUGE_NAME_VVT_TARGET_B1E "VVT: bank 1 exhaust target"
#define GAUGE_NAME_VVT_TARGET_B2I "VVT: bank 2 intake target"
#define GAUGE_NAME_VVT_TARGET_B2E "VVT: bank 2 exhaust target"
#define GAUGE_NAME_DESIRED_GEAR "Desired Gear"
#define GAUGE_NAME_CURRENT_GEAR "Current Gear"
#define GAUGE_NAME_ISS "Input Shaft Speed"
#define GAUGE_NAME_TC_RATIO "Torque Converter Ratio"
#define GAUGE_NAME_TIMING_ADVANCE "timing"
#define GAUGE_NAME_VVS "Vehicle Speed"
#define GAUGE_NAME_GEAR_RATIO "Gearbox Ratio"
#define GAUGE_NAME_DETECTED_GEAR "Detected Gear"
#define GAUGE_NAME_TURBO_SPEED "Turbocharger Speed"
#define GAUGE_NAME_VBAT "VBatt"
#define GAUGE_NAME_TIME "Time"
#define GAUGE_NAME_RPM "RPM"
#define GAUGE_NAME_CLT "CLT"
#define GAUGE_NAME_IAT "IAT"
#define GAUGE_NAME_AUX_TEMP1 "Aux temp 1"
#define GAUGE_NAME_AUX_TEMP2 "Aux temp 2"
#define GAUGE_NAME_TPS "TPS"
#define GAUGE_NAME_TPS2 "TPS2"
#define GAUGE_NAME_MAP "MAP"
#define GAUGE_NAME_MAF "MAF"
#define GAUGE_NAME_CPU_TEMP "CPU Temperature"
#define GAUGE_NAME_ETB_TARGET "ETB position target"
#define GAUGE_NAME_WG_POSITION "Wastegate position sensor"
#define GAUGE_NAME_ETB_ERROR "ETB position error"
#define GAUGE_NAME_ETB_DUTY "ETB Duty"
#define GAUGE_NAME_IDLE_POSITION "Idle position sensor"
#define GAUGE_NAME_WARNING_COUNT "Warning count"
#define GAUGE_NAME_LAST_ERROR "Last error"
#define GAUGE_NAME_TUNE_CRC16 "Tune CRC16"
#define GAUGE_NAME_ENGINE_CRC16 "Engine CRC16"
#define GAUGE_NAME_FW_VERSION "ECU Software Version"
#define GAUGE_NAME_RAW_FUEL_PRESSURE_LOW "Fuel pressure raw (low)"
#define GAUGE_NAME_FUEL_PRESSURE_LOW "Fuel pressure (low)"
#define GAUGE_NAME_FUEL_PRESSURE_LOW_UNITS "kPa"
#define GAUGE_NAME_RAW_FUEL_PRESSURE_HIGH "Fuel pressure raw (high)"
#define GAUGE_NAME_FUEL_PRESSURE_HIGH "Fuel pressure (high)"
#define GAUGE_NAME_FUEL_PRESSURE_HIGH_UNITS "bar"
#define GAUGE_NAME_FLEX "Flex Ethanol %"
#define GAUGE_NAME_ACCEL_X "Acceleration: X"
#define GAUGE_NAME_ACCEL_Y "Acceleration: Y"
#define GAUGE_NAME_ACCEL_Z "Acceleration: Z"
#define GAUGE_NAME_ACCEL_ROLL "Acceleration: Roll"
#define GAUGE_NAME_ACCEL_YAW "Acceleration: Yaw"
#define GAUGE_NAME_BARO_PRESSURE "Barometric pressure"
#define GAUGE_NAME_OIL_PRESSURE "Oil Pressure"
#define GAUGE_NAME_OIL_PRESSURE_UNITS "kPa"
#define GAUGE_NAME_ECU_TEMPERATURE "ECU temperature"
#define GAUGE_NAME_AUX_LINEAR_1 "Aux Linear #1"
#define GAUGE_NAME_AUX_LINEAR_2 "Aux Linear #2"
#define GAUGE_NAME_BOOST_OUTPUT "Boost Output"
#define GAUGE_NAME_BOOST_CLOSED_LOOP "Boost Closed Loop"
#define GAUGE_NAME_BOOST_OPEN_LOOP "Boost Open Loop"
#define GAUGE_NAME_BOOST_TARGET "Boost Target"
#define INDICATOR_NAME_CLUTCH_UP "clutch: up"
#define INDICATOR_NAME_CLUTCH_DOWN "clutch: down"
#define INDICATOR_NAME_BRAKE_DOWN "brake: down"
#define INDICATOR_NAME_AC_SWITCH "AC switch"
#define GAUGE_NAME_AIR_FLOW_MEASURED "MAF"
#define GAUGE_NAME_AIR_FLOW_MEASURED_2 "MAF #2"
#define GAUGE_NAME_AIR_FLOW_ESTIMATE "MAF estimate"
#define GAUGE_NAME_AIR_MASS "air mass"
#define GAUGE_NAME_WARNING_LAST "warning: last"
#define GAUGE_NAME_WARNING_COUNTER "warning: counter"
#define GAUGE_NAME_FUEL_LEVEL "fuel level"
#define GAUGE_NAME_KNOCK_LEVEL "knock: current level"
#define GAUGE_NAME_KNOCK_COUNTER "knock: count"
#define GAUGE_NAME_KNOCK_RETARD "knock: retard"
#define GAUGE_NAME_KNOCK_1 "knock 1"
#define GAUGE_NAME_KNOCK_2 "knock 2"
#define GAUGE_NAME_KNOCK_3 "knock 3"
#define GAUGE_NAME_KNOCK_4 "knock 4"
#define GAUGE_NAME_KNOCK_5 "knock 5"
#define GAUGE_NAME_KNOCK_6 "knock 6"
#define GAUGE_NAME_KNOCK_7 "knock 7"
#define GAUGE_NAME_KNOCK_8 "knock 8"
#define GAUGE_NAME_KNOCK_9 "knock 9"
#define GAUGE_NAME_KNOCK_10 "knock 10"
#define GAUGE_NAME_KNOCK_11 "knock 11"
#define GAUGE_NAME_KNOCK_12 "knock 12"
#define GAUGE_NAME_FUEL_BARO_CORR "fuel: Barometric pressure mult"
#define GAUGE_NAME_THROTTLE_PEDAL "Throttle pedal position"
#define GAUGE_NAME_INJECTOR_LAG "fuel: injector lag"
#define GAUGE_NAME_FUEL_TPS_ROC "fuel: TPS change"
#define GAUGE_NAME_FUEL_CHARGE_TEMP "fuel: Estimated charge temperature"
#define GAUGE_NAME_FUEL_TPS_EXTRA "fuel: TPS acceleration add fuel ms"
#define GAUGE_NAME_FUEL_EL_EXTRA "fuel: engine load acceleration extra fuel"
#define GAUGE_NAME_FUEL_CLT_CORR "fuel: CLT correction"
#define GAUGE_NAME_FUEL_IAT_CORR "fuel: IAT correction"
#define GAUGE_NAME_FUEL_VE "fuel: VE"
#define GAUGE_NAME_FUEL_CRANKING "fuel: cranking"
#define GAUGE_NAME_FUEL_RUNNING "fuel: running"
#define GAUGE_NAME_FUEL_LAST_INJECTION "fuel: Last injection"
#define GAUGE_NAME_FUEL_BASE "fuel: base mass"
#define GAUGE_NAME_FUEL_TRIM "fuel: fuel trim"
#define GAUGE_NAME_FUEL_TRIM_2 "fuel: fuel trim 2"
#define GAUGE_NAME_FUEL_WALL_AMOUNT "fuel: wall amount"
#define GAUGE_NAME_FUEL_WALL_CORRECTION "fuel: wall correction"
#define GAUGE_NAME_FUEL_LOAD "fuel: load"
#define GAUGE_NAME_FUEL_CONSUMPTION "fuel: Total consumed"
#define GAUGE_NAME_FUEL_FLOW "fuel: Flow rate"
#define GAUGE_NAME_FUEL_INJ_DUTY "fuel: injector duty cycle"
#define GAUGE_NAME_TCHARGE "fuel: SD tCharge"
#define GAUGE_NAME_TARGET_AFR "fuel: target AFR"
#define GAUGE_NAME_TARGET_LAMBDA "fuel: target lambda"
#define GAUGE_NAME_AFR "Air/Fuel Ratio"
#define GAUGE_NAME_AFR2 "Air/Fuel Ratio 2"
#define GAUGE_NAME_LAMBDA "Lambda"
#define GAUGE_NAME_LAMBDA2 "Lambda 2"
#define GAUGE_NAME_IAC "Idle Air Valve"
#define GAUGE_NAME_DWELL_DUTY "dwell: coil duty cycle"
#define GAUGE_COIL_DWELL_TIME "dwell: coil charge time"
#define GAUGE_NAME_IGNITION_LOAD "ign: load"
#define GAUGE_NAME_DEBUG_F1 "debug f1"
#define GAUGE_NAME_DEBUG_F2 "debug f2: iTerm"
#define GAUGE_NAME_DEBUG_F3 "debug f3: prevError"
#define GAUGE_NAME_DEBUG_F4 "debug f4: iParam"
#define GAUGE_NAME_DEBUG_F5 "debug f5: dParam"
#define GAUGE_NAME_DEBUG_F6 "debug f6: dTerm"
#define GAUGE_NAME_DEBUG_F7 "debug f7"
#define GAUGE_NAME_DEBUG_I1 "debug i1: pParam"
#define GAUGE_NAME_DEBUG_I2 "debug i2: offset"
#define GAUGE_NAME_DEBUG_I3 "debug i3"
#define GAUGE_NAME_DEBUG_I4 "debug i4"
#define GAUGE_NAME_DEBUG_I5 "debug i5"

16
firmware/integration/trigger_api.txt
View File

@ -1,16 +0,0 @@
!
! temporary copy-paste
! todo: see Split ConfigGenerator around trigger_defines.txt #5051
!
#define TRIGGERS_FILE_NAME "triggers.txt"
#define TRIGGER_IS_CRANK_KEY "crankBased"
#define TRIGGER_CYCLE_DURATION "cycleDuration"
#define TRIGGER_IS_SECOND_WHEEL_CAM "isSecondWheelCam"
#define TRIGGER_HAS_SECOND_CHANNEL "hasSecondChannel"
#define TRIGGER_HARDCODED_OPERATION_MODE "knownOperationMode"
#define TRIGGER_COMMENT "#"
#define TRIGGER_GAPS_COUNT "gapsCount"
#define TRIGGER_GAP_FROM "gapFrom"
#define TRIGGER_GAP_TO "gapTo"
#define TRIGGER_WITH_SYNC "isSynchronizationNeeded"