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

progress - reducing code duplication

This commit is contained in:
Andrey 2021-07-12 21:31:40 -04:00
parent 6a8e5d23b0
commit 813fe94ac2
14 changed files with 1096 additions and 4501 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1076
firmware/config/boards/hellen/cypress/config/controllers/algo/auto_generated_enums.cpp
View File

File diff suppressed because it is too large Load Diff

50
firmware/config/boards/hellen/cypress/config/controllers/algo/auto_generated_enums.h
View File

@ -1,59 +1,11 @@
// was generated automatically by rusEFI tool from rusefi_hw_enums.h // was generated automatically by rusEFI tool from rusefi_enums.h // by enum2string.jar tool on Thu Jul 08 03:47:45 UTC 2021
// was generated automatically by rusEFI tool from rusefi_hw_enums.h // by enum2string.jar tool on Mon Jul 12 21:09:56 EDT 2021
// see also gen_config_and_enums.bat
#include "rusefi_enums.h"
#include "rusefi_hw_enums.h"
#pragma once
const char *getInjectorNonlinearMode(InjectorNonlinearMode value);
const char *getPidAutoTune_AutoTunerState(PidAutoTune_AutoTunerState value);
const char *getPidAutoTune_Peak(PidAutoTune_Peak value);
const char *getAdc_channel_e(adc_channel_e value);
const char *getAdc_channel_mode_e(adc_channel_mode_e value);
const char *getAfr_override_e(afr_override_e value);
const char *getAir_pressure_sensor_type_e(air_pressure_sensor_type_e value);
const char *getAntiLagActivationMode_e(antiLagActivationMode_e value);
const char *getBoostType_e(boostType_e value);
const char *getBrain_pin_diag_e(brain_pin_diag_e value);
const char *getBrain_pin_e(brain_pin_e value);
const char *getCan_baudrate_e(can_baudrate_e value);
const char *getCan_nbc_e(can_nbc_e value);
const char *getCan_vss_nbc_e(can_vss_nbc_e value);
const char *getChamber_style_e(chamber_style_e value);
const char *getCranking_ignition_mode_e(cranking_ignition_mode_e value);
const char *getDebug_mode_e(debug_mode_e value);
const char *getDisplay_mode_e(display_mode_e value);
const char *getEgo_sensor_e(ego_sensor_e value);
const char *getEngine_load_mode_e(engine_load_mode_e value);
const char *getEngine_type_e(engine_type_e value);
const char *getEtb_function_e(etb_function_e value);
const char *getGear_e(gear_e value);
const char *getGppwm_channel_e(gppwm_channel_e value);
const char *getGppwm_compare_mode_e(gppwm_compare_mode_e value);
const char *getIdle_mode_e(idle_mode_e value);
const char *getIdle_state_e(idle_state_e value);
const char *getIgnition_mode_e(ignition_mode_e value);
const char *getInjection_mode_e(injection_mode_e value);
const char *getInjector_compensation_mode_e(injector_compensation_mode_e value);
const char *getInjector_pressure_type_e(injector_pressure_type_e value);
const char *getLaunchActivationMode_e(launchActivationMode_e value);
const char *getLog_format_e(log_format_e value);
const char *getMaf_sensor_type_e(maf_sensor_type_e value);
const char *getOperation_mode_e(operation_mode_e value);
const char *getPin_input_mode_e(pin_input_mode_e value);
const char *getPin_mode_e(pin_mode_e value);
const char *getPin_output_mode_e(pin_output_mode_e value);
const char *getSensor_chart_e(sensor_chart_e value);
const char *getSpi_device_e(spi_device_e value);
const char *getSpi_speed_e(spi_speed_e value);
const char *getTChargeMode_e(tChargeMode_e value);
const char *getTiming_mode_e(timing_mode_e value);
const char *getTle8888_mode_e(tle8888_mode_e value);
const char *getTrigger_event_e(trigger_event_e value);
const char *getTrigger_type_e(trigger_type_e value);
const char *getTrigger_value_e(trigger_value_e value);
const char *getTrigger_wheel_e(trigger_wheel_e value);
const char *getUart_device_e(uart_device_e value);
const char *getVe_override_e(ve_override_e value);
const char *getVvt_mode_e(vvt_mode_e value);

3
firmware/config/boards/hellen/cypress/config/hellen_cypress_gen_enum_to_string.sh
View File

@ -1,12 +1,11 @@
#!/bin/bash
# This batch files reads rusefi_enums.h and produses auto_generated_enums.* files
# This batch files reads rusefi_hw_enums.h and produses auto_generated_enums.* files
cd ../../../../..
java -DSystemOut.name=gen_enum_to_string_hellen_cypress \
-jar ../java_tools/enum2string.jar \
-outputPath config/boards/hellen/cypress/config/controllers/algo \
-enumInputFile controllers/algo/rusefi_enums.h \
-enumInputFile config/boards/hellen/cypress/rusefi_hw_enums.h

1076
firmware/config/boards/kinetis/config/controllers/algo/auto_generated_enums.cpp
View File

File diff suppressed because it is too large Load Diff

50
firmware/config/boards/kinetis/config/controllers/algo/auto_generated_enums.h
View File

@ -1,59 +1,11 @@
// was generated automatically by rusEFI tool from rusefi_hw_enums.h // was generated automatically by rusEFI tool from rusefi_enums.h // by enum2string.jar tool on Thu Jul 08 03:47:44 UTC 2021
// was generated automatically by rusEFI tool from rusefi_hw_enums.h // by enum2string.jar tool on Mon Jul 12 21:09:56 EDT 2021
// see also gen_config_and_enums.bat
#include "rusefi_enums.h"
#include "rusefi_hw_enums.h"
#pragma once
const char *getInjectorNonlinearMode(InjectorNonlinearMode value);
const char *getPidAutoTune_AutoTunerState(PidAutoTune_AutoTunerState value);
const char *getPidAutoTune_Peak(PidAutoTune_Peak value);
const char *getAdc_channel_e(adc_channel_e value);
const char *getAdc_channel_mode_e(adc_channel_mode_e value);
const char *getAfr_override_e(afr_override_e value);
const char *getAir_pressure_sensor_type_e(air_pressure_sensor_type_e value);
const char *getAntiLagActivationMode_e(antiLagActivationMode_e value);
const char *getBoostType_e(boostType_e value);
const char *getBrain_pin_diag_e(brain_pin_diag_e value);
const char *getBrain_pin_e(brain_pin_e value);
const char *getCan_baudrate_e(can_baudrate_e value);
const char *getCan_nbc_e(can_nbc_e value);
const char *getCan_vss_nbc_e(can_vss_nbc_e value);
const char *getChamber_style_e(chamber_style_e value);
const char *getCranking_ignition_mode_e(cranking_ignition_mode_e value);
const char *getDebug_mode_e(debug_mode_e value);
const char *getDisplay_mode_e(display_mode_e value);
const char *getEgo_sensor_e(ego_sensor_e value);
const char *getEngine_load_mode_e(engine_load_mode_e value);
const char *getEngine_type_e(engine_type_e value);
const char *getEtb_function_e(etb_function_e value);
const char *getGear_e(gear_e value);
const char *getGppwm_channel_e(gppwm_channel_e value);
const char *getGppwm_compare_mode_e(gppwm_compare_mode_e value);
const char *getIdle_mode_e(idle_mode_e value);
const char *getIdle_state_e(idle_state_e value);
const char *getIgnition_mode_e(ignition_mode_e value);
const char *getInjection_mode_e(injection_mode_e value);
const char *getInjector_compensation_mode_e(injector_compensation_mode_e value);
const char *getInjector_pressure_type_e(injector_pressure_type_e value);
const char *getLaunchActivationMode_e(launchActivationMode_e value);
const char *getLog_format_e(log_format_e value);
const char *getMaf_sensor_type_e(maf_sensor_type_e value);
const char *getOperation_mode_e(operation_mode_e value);
const char *getPin_input_mode_e(pin_input_mode_e value);
const char *getPin_mode_e(pin_mode_e value);
const char *getPin_output_mode_e(pin_output_mode_e value);
const char *getSensor_chart_e(sensor_chart_e value);
const char *getSpi_device_e(spi_device_e value);
const char *getSpi_speed_e(spi_speed_e value);
const char *getTChargeMode_e(tChargeMode_e value);
const char *getTiming_mode_e(timing_mode_e value);
const char *getTle8888_mode_e(tle8888_mode_e value);
const char *getTrigger_event_e(trigger_event_e value);
const char *getTrigger_type_e(trigger_type_e value);
const char *getTrigger_value_e(trigger_value_e value);
const char *getTrigger_wheel_e(trigger_wheel_e value);
const char *getUart_device_e(uart_device_e value);
const char *getVe_override_e(ve_override_e value);
const char *getVvt_mode_e(vvt_mode_e value);

1
firmware/config/boards/kinetis/config/kinetis_gen_enum_to_string.sh
View File

@ -5,7 +5,6 @@ cd ../../../..
java -DSystemOut.name=gen_enum_to_string_kinetis \
-jar ../java_tools/enum2string.jar \
-outputPath config/boards/kinetis/config/controllers/algo \
-enumInputFile controllers/algo/rusefi_enums.h \
-enumInputFile config/boards/kinetis/rusefi_hw_enums.h

1076
firmware/config/boards/subaru_eg33/config/controllers/algo/auto_generated_enums.cpp
View File

File diff suppressed because it is too large Load Diff

50
firmware/config/boards/subaru_eg33/config/controllers/algo/auto_generated_enums.h
View File

@ -1,59 +1,11 @@
// was generated automatically by rusEFI tool from rusefi_hw_enums.h // was generated automatically by rusEFI tool from rusefi_enums.h // by enum2string.jar tool on Thu Jul 08 03:47:45 UTC 2021
// was generated automatically by rusEFI tool from rusefi_hw_enums.h // by enum2string.jar tool on Mon Jul 12 21:09:56 EDT 2021
// see also gen_config_and_enums.bat
#include "rusefi_enums.h"
#include "rusefi_hw_enums.h"
#pragma once
const char *getInjectorNonlinearMode(InjectorNonlinearMode value);
const char *getPidAutoTune_AutoTunerState(PidAutoTune_AutoTunerState value);
const char *getPidAutoTune_Peak(PidAutoTune_Peak value);
const char *getAdc_channel_e(adc_channel_e value);
const char *getAdc_channel_mode_e(adc_channel_mode_e value);
const char *getAfr_override_e(afr_override_e value);
const char *getAir_pressure_sensor_type_e(air_pressure_sensor_type_e value);
const char *getAntiLagActivationMode_e(antiLagActivationMode_e value);
const char *getBoostType_e(boostType_e value);
const char *getBrain_pin_diag_e(brain_pin_diag_e value);
const char *getBrain_pin_e(brain_pin_e value);
const char *getCan_baudrate_e(can_baudrate_e value);
const char *getCan_nbc_e(can_nbc_e value);
const char *getCan_vss_nbc_e(can_vss_nbc_e value);
const char *getChamber_style_e(chamber_style_e value);
const char *getCranking_ignition_mode_e(cranking_ignition_mode_e value);
const char *getDebug_mode_e(debug_mode_e value);
const char *getDisplay_mode_e(display_mode_e value);
const char *getEgo_sensor_e(ego_sensor_e value);
const char *getEngine_load_mode_e(engine_load_mode_e value);
const char *getEngine_type_e(engine_type_e value);
const char *getEtb_function_e(etb_function_e value);
const char *getGear_e(gear_e value);
const char *getGppwm_channel_e(gppwm_channel_e value);
const char *getGppwm_compare_mode_e(gppwm_compare_mode_e value);
const char *getIdle_mode_e(idle_mode_e value);
const char *getIdle_state_e(idle_state_e value);
const char *getIgnition_mode_e(ignition_mode_e value);
const char *getInjection_mode_e(injection_mode_e value);
const char *getInjector_compensation_mode_e(injector_compensation_mode_e value);
const char *getInjector_pressure_type_e(injector_pressure_type_e value);
const char *getLaunchActivationMode_e(launchActivationMode_e value);
const char *getLog_format_e(log_format_e value);
const char *getMaf_sensor_type_e(maf_sensor_type_e value);
const char *getOperation_mode_e(operation_mode_e value);
const char *getPin_input_mode_e(pin_input_mode_e value);
const char *getPin_mode_e(pin_mode_e value);
const char *getPin_output_mode_e(pin_output_mode_e value);
const char *getSensor_chart_e(sensor_chart_e value);
const char *getSpi_device_e(spi_device_e value);
const char *getSpi_speed_e(spi_speed_e value);
const char *getTChargeMode_e(tChargeMode_e value);
const char *getTiming_mode_e(timing_mode_e value);
const char *getTle8888_mode_e(tle8888_mode_e value);
const char *getTrigger_event_e(trigger_event_e value);
const char *getTrigger_type_e(trigger_type_e value);
const char *getTrigger_value_e(trigger_value_e value);
const char *getTrigger_wheel_e(trigger_wheel_e value);
const char *getUart_device_e(uart_device_e value);
const char *getVe_override_e(ve_override_e value);
const char *getVvt_mode_e(vvt_mode_e value);

1
firmware/config/boards/subaru_eg33/config/gen_enum_to_string.sh
View File

@ -11,5 +11,4 @@ java -DSystemOut.name=gen_enum_to_string \
-jar ../java_tools/enum2string.jar \
-inputPath . \
-outputPath config/boards/${BOARD}/config/controllers/algo \
-enumInputFile controllers/algo/rusefi_enums.h \
-enumInputFile config/boards/${BOARD}/rusefi_hw_enums.h

1
firmware/controllers/algo/algo.mk
View File

@ -3,6 +3,7 @@ CONTROLLERS_ALGO_SRC =
CONTROLLERS_ALGO_SRC_CPP = $(PROJECT_DIR)/controllers/algo/advance_map.cpp \
$(PROJECT_DIR)/controllers/algo/malfunction_central.cpp \
$(GENERATED_ENUMS_DIR)/auto_generated_enums.cpp \
$(GENERATED_ENUMS_DIR)/auto_generated_commonenum.cpp \
$(PROJECT_DIR)/controllers/algo/fuel_math.cpp \
$(PROJECT_DIR)/controllers/algo/accel_enrichment.cpp \
$(PROJECT_DIR)/controllers/algo/launch_control.cpp \

1080
firmware/controllers/algo/auto_generated_commonenum.cpp Normal file
View File

File diff suppressed because it is too large Load Diff

1076
firmware/controllers/algo/auto_generated_enums.cpp
View File

File diff suppressed because it is too large Load Diff

50
firmware/controllers/algo/auto_generated_enums.h
View File

@ -1,59 +1,11 @@
// was generated automatically by rusEFI tool from rusefi_hw_enums.h // was generated automatically by rusEFI tool from rusefi_enums.h // by enum2string.jar tool on Thu Jul 08 03:47:44 UTC 2021
// was generated automatically by rusEFI tool from rusefi_hw_enums.h // by enum2string.jar tool on Mon Jul 12 21:09:56 EDT 2021
// see also gen_config_and_enums.bat
#include "rusefi_enums.h"
#include "rusefi_hw_enums.h"
#pragma once
const char *getInjectorNonlinearMode(InjectorNonlinearMode value);
const char *getPidAutoTune_AutoTunerState(PidAutoTune_AutoTunerState value);
const char *getPidAutoTune_Peak(PidAutoTune_Peak value);
const char *getAdc_channel_e(adc_channel_e value);
const char *getAdc_channel_mode_e(adc_channel_mode_e value);
const char *getAfr_override_e(afr_override_e value);
const char *getAir_pressure_sensor_type_e(air_pressure_sensor_type_e value);
const char *getAntiLagActivationMode_e(antiLagActivationMode_e value);
const char *getBoostType_e(boostType_e value);
const char *getBrain_pin_diag_e(brain_pin_diag_e value);
const char *getBrain_pin_e(brain_pin_e value);
const char *getCan_baudrate_e(can_baudrate_e value);
const char *getCan_nbc_e(can_nbc_e value);
const char *getCan_vss_nbc_e(can_vss_nbc_e value);
const char *getChamber_style_e(chamber_style_e value);
const char *getCranking_ignition_mode_e(cranking_ignition_mode_e value);
const char *getDebug_mode_e(debug_mode_e value);
const char *getDisplay_mode_e(display_mode_e value);
const char *getEgo_sensor_e(ego_sensor_e value);
const char *getEngine_load_mode_e(engine_load_mode_e value);
const char *getEngine_type_e(engine_type_e value);
const char *getEtb_function_e(etb_function_e value);
const char *getGear_e(gear_e value);
const char *getGppwm_channel_e(gppwm_channel_e value);
const char *getGppwm_compare_mode_e(gppwm_compare_mode_e value);
const char *getIdle_mode_e(idle_mode_e value);
const char *getIdle_state_e(idle_state_e value);
const char *getIgnition_mode_e(ignition_mode_e value);
const char *getInjection_mode_e(injection_mode_e value);
const char *getInjector_compensation_mode_e(injector_compensation_mode_e value);
const char *getInjector_pressure_type_e(injector_pressure_type_e value);
const char *getLaunchActivationMode_e(launchActivationMode_e value);
const char *getLog_format_e(log_format_e value);
const char *getMaf_sensor_type_e(maf_sensor_type_e value);
const char *getOperation_mode_e(operation_mode_e value);
const char *getPin_input_mode_e(pin_input_mode_e value);
const char *getPin_mode_e(pin_mode_e value);
const char *getPin_output_mode_e(pin_output_mode_e value);
const char *getSensor_chart_e(sensor_chart_e value);
const char *getSpi_device_e(spi_device_e value);
const char *getSpi_speed_e(spi_speed_e value);
const char *getTChargeMode_e(tChargeMode_e value);
const char *getTiming_mode_e(timing_mode_e value);
const char *getTle8888_mode_e(tle8888_mode_e value);
const char *getTrigger_event_e(trigger_event_e value);
const char *getTrigger_type_e(trigger_type_e value);
const char *getTrigger_value_e(trigger_value_e value);
const char *getTrigger_wheel_e(trigger_wheel_e value);
const char *getUart_device_e(uart_device_e value);
const char *getVe_override_e(ve_override_e value);
const char *getVvt_mode_e(vvt_mode_e value);

7
firmware/gen_enum_to_string.sh
View File

@ -10,12 +10,17 @@ java -DSystemOut.name=gen_enum_to_string \
-generatedFile codes \
-enumInputFile controllers/algo/obd_error_codes.h
java -DSystemOut.name=gen_enum_to_string \
-jar ../java_tools/enum2string.jar \
-outputPath controllers/algo \
-generatedFile commonenum \
-enumInputFile controllers/algo/rusefi_enums.h
# TODO: rearrange enums so that we have WAY less duplicated generated code? at the moment too many enums are generated 4 times
java -DSystemOut.name=gen_enum_to_string \
-jar ../java_tools/enum2string.jar \
-outputPath controllers/algo \
-enumInputFile controllers/algo/rusefi_enums.h \
-enumInputFile controllers/algo/rusefi_hw_enums.h \
pwd