unifying_file_naming

This commit is contained in:
rusefi 2019-03-29 09:11:13 -04:00
parent 5626a8c82a
commit bd2b992918
96 changed files with 77 additions and 77 deletions

View File

@ -1,6 +1,6 @@
#include "global.h"
#include "hardware.h"
#include "efiGpio.h"
#include "efi_gpio.h"
#include "flash.h"

View File

@ -1,7 +1,7 @@
#include "global.h"
#include "hardware.h"
#include "efiGpio.h"
#include "efi_gpio.h"
#ifdef __cplusplus
extern "C"

View File

@ -1,10 +1,10 @@
#include "global.h"
#include "hardware.h"
#include "efiGpio.h"
#include "efi_gpio.h"
/*
* We need only a small portion of code from rusEFI codebase in the bootloader.
* Mostly it's tunerstudio_io.cpp. And other files like efiGpio.cpp etc. needed only to make it work.
* Mostly it's tunerstudio_io.cpp. And other files like efi_gpio.cpp etc. needed only to make it work.
* And stubs needed just to settle down compiler errors.
* The whole idea of bootloader is to make it as small as possible. And reasonably independent.
*/

View File

@ -37,7 +37,7 @@
#include "trigger_central.h"
#include "engine_state.h"
#include "io_pins.h"
#include "efiGpio.h"
#include "efi_gpio.h"
#include "mmc_card.h"
#include "console_io.h"
#include "malfunction_central.h"
@ -57,7 +57,7 @@
#include "lcd_controller.h"
#include "settings.h"
#include "can_hw.h"
#include "PeriodicController.h"
#include "periodic_controller.h"
#include "cdm_ion_sense.h"
extern afr_Map3D_t afrMap;
@ -72,7 +72,7 @@ extern bool main_loop_started;
#include "flash_main.h"
#include "max31855.h"
#include "vehicle_speed.h"
#include "SingleTimerExecutor.h"
#include "single_timer_executor.h"
#endif /* EFI_PROD_CODE */
#if EFI_CJ125 || defined(__DOXYGEN__)

View File

@ -17,7 +17,7 @@
#include "fsio_impl.h"
#include "engine_math.h"
#include "pin_repository.h"
#include "PeriodicController.h"
#include "periodic_controller.h"
EXTERN_ENGINE
;

View File

@ -12,7 +12,7 @@
#include "global.h"
#include "engine.h"
#include "engine_state.h"
#include "efiGpio.h"
#include "efi_gpio.h"
#include "trigger_central.h"
#include "fuel_math.h"
#include "engine_math.h"

View File

@ -20,7 +20,7 @@
#if EFI_SIGNAL_EXECUTOR_ONE_TIMER
// PROD real firmware uses this implementation
#include "SingleTimerExecutor.h"
#include "single_timer_executor.h"
#endif /* EFI_SIGNAL_EXECUTOR_ONE_TIMER */
#if EFI_SIGNAL_EXECUTOR_SLEEP
#include "signal_executor_sleep.h"

View File

@ -24,7 +24,7 @@
#include "global.h"
#include "signal_executor.h"
#include "efiGpio.h"
#include "efi_gpio.h"
#include "engine.h"
/**
@ -39,7 +39,7 @@ EXTERN_ENGINE;
extern WaveChart waveChart;
#endif /* EFI_ENGINE_SNIFFER */
#include "efiGpio.h"
#include "efi_gpio.h"
InjectionSignalPair::InjectionSignalPair() {
isScheduled = false;

View File

@ -11,7 +11,7 @@
#include "global.h"
#include "scheduler.h"
#include "efiGpio.h"
#include "efi_gpio.h"
#if EFI_SIGNAL_EXECUTOR_SLEEP
#include "signal_executor_sleep.h"

View File

@ -13,7 +13,7 @@
#include "voltage.h"
#include "pid.h"
#include "LocalVersionHolder.h"
#include "PeriodicController.h"
#include "periodic_controller.h"
#if EFI_ALTERNATOR_CONTROL || defined(__DOXYGEN__)
#include "pwm_generator.h"

View File

@ -8,7 +8,7 @@ CONTROLLERS_SRC_CPP = $(PROJECT_DIR)/controllers/settings.cpp \
$(PROJECT_DIR)/controllers/flash_main.cpp \
$(PROJECT_DIR)/controllers/injector_central.cpp \
$(PROJECT_DIR)/controllers/idle_thread.cpp \
$(PROJECT_DIR)/controllers/PwmTester.cpp \
$(PROJECT_DIR)/controllers/pwm_tester.cpp \
$(PROJECT_DIR)/controllers/obd2.cpp \
$(PROJECT_DIR)/controllers/malfunction_indicator.cpp \
$(PROJECT_DIR)/controllers/alternatorController.cpp \

View File

@ -1,5 +1,5 @@
CONTROLLERS_CORE_SRC_CPP = $(PROJECT_DIR)/controllers/core/EfiWave.cpp \
CONTROLLERS_CORE_SRC_CPP = $(PROJECT_DIR)/controllers/core/efi_wave.cpp \
$(PROJECT_DIR)/controllers/core/avg_values.cpp \
$(PROJECT_DIR)/controllers/core/table_helper.cpp \
$(PROJECT_DIR)/controllers/core/fsio_core.cpp \

View File

@ -6,7 +6,7 @@
*/
#include "global.h"
#include "EfiWave.h"
#include "efi_wave.h"
#include "trigger_structure.h"
SingleWave::SingleWave() {

View File

@ -1,5 +1,5 @@
/**
* @file EfiWave.h
* @file efi_wave.h
*
* @date May 18, 2014
* @author Andrey Belomutskiy, (c) 2012-2017

View File

@ -17,7 +17,7 @@
#include "settings.h"
#include "allsensors.h"
#include "rpm_calculator.h"
#include "efiGpio.h"
#include "efi_gpio.h"
#include "pwm_generator_logic.h"
/**

View File

@ -72,14 +72,14 @@
#include "pwm_generator_logic.h"
#include "pid.h"
#include "engine_controller.h"
#include "PeriodicController.h"
#include "periodic_controller.h"
#define ETB_MAX_COUNT 2
#if EFI_ELECTRONIC_THROTTLE_BODY || defined(__DOXYGEN__)
#include "pin_repository.h"
#include "pwm_generator.h"
#include "DcMotor.h"
#include "dc_motor.h"
#include "pid_auto_tune.h"
#if EFI_TUNER_STUDIO || defined(__DOXYGEN__)
extern TunerStudioOutputChannels tsOutputChannels;

View File

@ -67,7 +67,7 @@
#include "pwm_generator.h"
#include "adc_inputs.h"
#include "efilib2.h"
#include "PwmTester.h"
#include "pwm_tester.h"
#include "pwm_generator.h"
#include "lcd_controller.h"
#include "pin_repository.h"

View File

@ -31,7 +31,7 @@
#include "idle_thread.h"
#include "pin_repository.h"
#include "engine.h"
#include "PeriodicController.h"
#include "periodic_controller.h"
#include "stepper.h"
#if EFI_IDLE_CONTROL || defined(__DOXYGEN__)

View File

@ -31,10 +31,10 @@
#include "main_trigger_callback.h"
#include "engine_configuration.h"
#include "pin_repository.h"
#include "efiGpio.h"
#include "efi_gpio.h"
#include "settings.h"
#include "idle_thread.h"
#include "PeriodicController.h"
#include "periodic_controller.h"
EXTERN_ENGINE
;

View File

@ -27,7 +27,7 @@
#include "engine.h"
#include "rtc_helper.h"
#include "io_pins.h"
#include "efiGpio.h"
#include "efi_gpio.h"
#include "svnversion.h"
#include "joystick.h"
#include "utlist.h"

View File

@ -29,8 +29,8 @@
#include "io_pins.h"
#include "malfunction_central.h"
#include "malfunction_indicator.h"
#include "efiGpio.h"
#include "PeriodicController.h"
#include "efi_gpio.h"
#include "periodic_controller.h"
#if EFI_MALFUNCTION_INDICATOR || defined(__DOXYGEN__)

View File

@ -25,7 +25,7 @@
#include "interpolation.h"
#include "allsensors.h"
#include "event_registry.h"
#include "efiGpio.h"
#include "efi_gpio.h"
#include "fuel_math.h"
#include "advance_map.h"
#include "config_engine_specs.h"

View File

@ -10,8 +10,8 @@
#if EFI_PWM_TESTER || defined(__DOXYGEN__)
#include "PwmTester.h"
#include "EfiWave.h"
#include "pwm_tester.h"
#include "efi_wave.h"
#include "pwm_generator_logic.h"
#include "engine.h"
#include "pwm_generator.h"

View File

@ -1,5 +1,5 @@
/**
* @file PwmTester.h
* @file pwm_tester.h
*
* @date Apr 29, 2014
* @author Andrey Belomutskiy, (c) 2012-2017

View File

@ -20,7 +20,7 @@
#include "trigger_decoder.h"
#include "console_io.h"
#include "engine.h"
#include "efiGpio.h"
#include "efi_gpio.h"
#include "engine_math.h"
#include "alternatorController.h"
#include "idle_thread.h"

View File

@ -1,5 +1,5 @@
/**
* @file ControllerBase.h
* @file controller_base.h
*
* @date Jan 5, 2019
* @author Matthew Kennedy, (c) 2019

View File

@ -6,7 +6,7 @@
* @author Matthew Kennedy
*/
#include "DcMotor.h"
#include "dc_motor.h"
TwoPinDcMotor::TwoPinDcMotor(SimplePwm* pwm, OutputPin* dir1, OutputPin* dir2)
: m_pwm(pwm)

View File

@ -1,5 +1,5 @@
/**
* @file DcMotor.h
* @file dc_motor.h
*
* @date Dec 22, 2018
* @author Matthew Kennedy, (c) 2018

View File

@ -1,5 +1,5 @@
/**
* @file efiGpio.cpp
* @file efi_gpio.cpp
* @brief EFI-related GPIO code
*
* @date Sep 26, 2014
@ -8,7 +8,7 @@
#include "global.h"
#include "engine.h"
#include "efiGpio.h"
#include "efi_gpio.h"
#if EFI_GPIO_HARDWARE || defined(__DOXYGEN__)
#include "pin_repository.h"

View File

@ -1,13 +1,13 @@
/**
* @file efiGpio.h
* @file efi_gpio.h
* @brief EFI-related GPIO code
*
*
* @date Sep 26, 2014
* @author Andrey Belomutskiy, (c) 2012-2017
*/
#ifndef EFIGPIO_H_
#define EFIGPIO_H_
#ifndef efi_gpio_H_
#define efi_gpio_H_
#include "io_pins.h"
#include "global.h"
@ -170,4 +170,4 @@ const char *portname(ioportid_t GPIOx);
brain_pin_e parseBrainPin(const char *str);
const char *hwPortname(brain_pin_e brainPin);
#endif /* EFIGPIO_H_ */
#endif /* efi_gpio_H_ */

View File

@ -1,5 +1,5 @@
/**
* @file PeriodicController.h
* @file periodic_controller.h
*
* @date Jan 5, 2019
* @author Matthew Kennedy, (c) 2019
@ -7,7 +7,7 @@
#pragma once
#include "ThreadController.h"
#include "thread_controller.h"
#include "efitime.h"

View File

@ -9,9 +9,9 @@
#define PWM_GENERATOR_LOGIC_H_
#include "global.h"
#include "EfiWave.h"
#include "efi_wave.h"
#include "scheduler.h"
#include "efiGpio.h"
#include "efi_gpio.h"
#define NAN_FREQUENCY_SLEEP_PERIOD_MS 100

View File

@ -29,7 +29,7 @@
#if EFI_SIMULATOR || defined(__DOXYGEN__)
// this is about debugging
#include "efiGpio.h"
#include "efi_gpio.h"
#endif /* EFI_SIMULATOR */
#if EFI_SIGNAL_EXECUTOR_SLEEP || defined(__DOXYGEN__)

View File

@ -17,7 +17,7 @@
* @author Andrey Belomutskiy, (c) 2012-2018
*/
#include "SingleTimerExecutor.h"
#include "single_timer_executor.h"
#include "efitime.h"
#include "efilib2.h"

View File

@ -1,5 +1,5 @@
/**
* @file SingleTimerExecutor.h
* @file single_timer_executor.h
*
* @date: Apr 18, 2014
* @author Andrey Belomutskiy, (c) 2012-2017

View File

@ -4,6 +4,6 @@ SYSTEMSRC =
SYSTEMSRC_CPP = $(PROJECT_DIR)/controllers/system/pwm_generator_logic.cpp \
$(PROJECT_DIR)/controllers/system/signal_executor_sleep.cpp \
$(PROJECT_DIR)/controllers/system/event_queue.cpp \
$(PROJECT_DIR)/controllers/system/efiGpio.cpp \
$(PROJECT_DIR)/controllers/system/DcMotor.cpp \
$(PROJECT_DIR)/controllers/system/SingleTimerExecutor.cpp
$(PROJECT_DIR)/controllers/system/efi_gpio.cpp \
$(PROJECT_DIR)/controllers/system/dc_motor.cpp \
$(PROJECT_DIR)/controllers/system/single_timer_executor.cpp

View File

@ -1,5 +1,5 @@
/**
* @file ThreadController.h
* @file thread_controller.h
*
* @date Jan 5, 2019
* @author Matthew Kennedy, (c) 2019
@ -7,7 +7,7 @@
#pragma once
#include "ControllerBase.h"
#include "controller_base.h"
#include "ch.h"

View File

@ -10,7 +10,7 @@
#include "global.h"
#include "engine_configuration_generated_structures.h"
#include "EfiWave.h"
#include "efi_wave.h"
#include "globalaccess.h"
#define FOUR_STROKE_ENGINE_CYCLE 720

View File

@ -29,7 +29,7 @@
#if (EFI_ENGINE_CONTROL && EFI_SHAFT_POSITION_INPUT) || defined(__DOXYGEN__)
#include "main_trigger_callback.h"
#include "efiGpio.h"
#include "efi_gpio.h"
#include "engine_math.h"
#include "trigger_central.h"
#include "spark_logic.h"
@ -44,7 +44,7 @@
#include "fuel_math.h"
#include "histogram.h"
#include "engine_controller.h"
#include "efiGpio.h"
#include "efi_gpio.h"
#if EFI_PROD_CODE || defined(__DOXYGEN__)
#include "rfiutil.h"
#endif /* EFI_HISTOGRAMS */

View File

@ -23,7 +23,7 @@
#include "obd_error_codes.h"
#include "trigger_decoder.h"
#include "cyclic_buffer.h"
#include "efiGpio.h"
#include "efi_gpio.h"
#include "engine.h"
#include "engine_math.h"
#include "trigger_central.h"

View File

@ -14,7 +14,7 @@
* @author Andrey Belomutskiy, (c) 2012-2018
*/
#include "global.h"
#include "EfiWave.h"
#include "efi_wave.h"
int getPreviousIndex(const int currentIndex, const int size) {
return (currentIndex + size - 1) % size;

View File

@ -12,7 +12,7 @@
#include "eficonsole.h"
#include "time.h"
#include "efiGpio.h"
#include "efi_gpio.h"
#include "efilib2.h"
#include "console_io.h"
#include "engine.h"

View File

@ -24,7 +24,7 @@ EXTERN_ENGINE;
#if EFI_MEMS || defined(__DOXYGEN__)
#include "mpu_util.h"
#include "lis302dl.h"
#include "PeriodicController.h"
#include "periodic_controller.h"
static SPIDriver *driver;

View File

@ -9,7 +9,7 @@
#define BACKUP_RAM_H_
#include "global.h"
#include "efiGpio.h"
#include "efi_gpio.h"
typedef enum {
/**

View File

@ -27,7 +27,7 @@
#include "engine.h"
#include "board_test.h"
#include "pin_repository.h"
#include "efiGpio.h"
#include "efi_gpio.h"
#include "adc_inputs.h"
#include "AdcConfiguration.h"

View File

@ -9,7 +9,7 @@
#if HAL_USE_PAL && EFI_PROD_CODE || defined(__DOXYGEN__)
#include "digital_input_exti.h"
#include "efiGpio.h"
#include "efi_gpio.h"
/**
* EXTI is a funny thing: you can only use same pin on one port. For example, you can use

View File

@ -22,8 +22,8 @@ HW_LAYER_EMS_CPP = $(HW_LAYER_EGT_CPP) \
$(PROJECT_DIR)/hw_layer/board_test.cpp \
$(PROJECT_DIR)/hw_layer/pwm_generator.cpp \
$(PROJECT_DIR)/hw_layer/trigger_input.cpp \
$(PROJECT_DIR)/hw_layer/HIP9011.cpp \
$(PROJECT_DIR)/hw_layer/HIP9011_logic.cpp \
$(PROJECT_DIR)/hw_layer/hip9011.cpp \
$(PROJECT_DIR)/hw_layer/hip9011_logic.cpp \
$(PROJECT_DIR)/hw_layer/vehicle_speed.cpp \
$(PROJECT_DIR)/hw_layer/joystick.cpp \
$(PROJECT_DIR)/hw_layer/stepper.cpp \

View File

@ -11,7 +11,7 @@
#if EFI_PROD_CODE
#include "io_pins.h"
#include "efiGpio.h"
#include "efi_gpio.h"
#include "pin_repository.h"
#include "status_loop.h"

View File

@ -20,7 +20,7 @@
#if (EFI_PROD_CODE && HAL_USE_GPT) || defined(__DOXYGEN__)
#include "efilib2.h"
#include "PeriodicController.h"
#include "periodic_controller.h"
/**
* Maximum duration of complete timer callback, all pending events together

View File

@ -15,7 +15,7 @@
#include "io_pins.h"
#ifdef __cplusplus
#include "efiGpio.h"
#include "efi_gpio.h"
class PinRepository {
public:

View File

@ -13,7 +13,7 @@
#define DEBUG_PWM FALSE
#include "efiGpio.h"
#include "efi_gpio.h"
void initPwmGenerator(void);

View File

@ -8,7 +8,7 @@
#define STEPPER_H_
#include "global.h"
#include "efiGpio.h"
#include "efi_gpio.h"
#include "backup_ram.h"
class StepperMotor {

View File

@ -108,7 +108,7 @@
#include "trigger_structure.h"
#include "hardware.h"
#include "engine_controller.h"
#include "efiGpio.h"
#include "efi_gpio.h"
#include "rfi_perftest.h"
#include "rusefi.h"

View File

@ -12,7 +12,7 @@ cd firmware
call clean.bat
cd ..
cho Compiling F746
cd firmware\config\boards\NUCLEO_F746
cd firmware\config\boards\nucleo_f746
call !compile-nucleo_f746.bat
cd ..
pwd
@ -25,7 +25,7 @@ cd firmware
call clean.bat
cd ..
echo Compiling F767
cd firmware\config\boards\NUCLEO_F767
cd firmware\config\boards\nucleo_f767
call !compile-nucleo_f767.bat
cd ..
pwd
@ -37,7 +37,7 @@ cd firmware
call clean.bat
cd ..
echo Compiling F767
cd firmware\config\boards\NUCLEO_F767
cd firmware\config\boards\nucleo_f767
call !compile-f767.bat
cd ..
pwd

View File

@ -13,7 +13,7 @@
#include "engine_math.h"
#include "trigger_decoder.h"
#include "engine_test_helper.h"
#include "efiGpio.h"
#include "efi_gpio.h"
#include "advance_map.h"
extern float testMafValue;

View File

@ -22,7 +22,7 @@
#include "crc.h"
#include "fl_stack.h"
#include "io_pins.h"
#include "efiGpio.h"
#include "efi_gpio.h"
#include "efilib.h"
#include "gtest/gtest.h"