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

better conditional compilation

This commit is contained in:
rusefi 2019-01-04 00:16:08 -05:00
parent 7582f8d8cf
commit e6ac26bf2b
14 changed files with 45 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
firmware/console/status_loop.cpp
View File

@ -58,6 +58,7 @@
#include "lcd_controller.h" #include "lcd_controller.h"
#include "settings.h" #include "settings.h"
#include "can_hw.h" #include "can_hw.h"
#include "cdm_ion_sense.h"
extern afr_Map3D_t afrMap; extern afr_Map3D_t afrMap;
extern bool main_loop_started; extern bool main_loop_started;
@ -101,6 +102,7 @@ extern int maxTriggerReentraint;
extern uint32_t maxLockedDuration; extern uint32_t maxLockedDuration;
#define FULL_LOGGING_KEY "fl" #define FULL_LOGGING_KEY "fl"
static char LOGGING_BUFFER[1800] CCM_OPTIONAL; static char LOGGING_BUFFER[1800] CCM_OPTIONAL;
static Logging logger("status loop", LOGGING_BUFFER, sizeof(LOGGING_BUFFER)); static Logging logger("status loop", LOGGING_BUFFER, sizeof(LOGGING_BUFFER));
@ -666,13 +668,13 @@ extern int invalidHip9011ResponsesCount;
void updateTunerStudioState(TunerStudioOutputChannels *tsOutputChannels DECLARE_ENGINE_PARAMETER_SUFFIX) { void updateTunerStudioState(TunerStudioOutputChannels *tsOutputChannels DECLARE_ENGINE_PARAMETER_SUFFIX) {
#if EFI_SHAFT_POSITION_INPUT || defined(__DOXYGEN__) #if EFI_SHAFT_POSITION_INPUT || defined(__DOXYGEN__)
int rpm = getRpmE(engine); int rpm = getRpmE(engine);
#else #else /* EFI_SHAFT_POSITION_INPUT */
int rpm = 0; int rpm = 0;
#endif #endif /* EFI_SHAFT_POSITION_INPUT */
#if EFI_PROD_CODE || defined(__DOXYGEN__) #if EFI_PROD_CODE || defined(__DOXYGEN__)
executorStatistics(); executorStatistics();
#endif #endif /* EFI_PROD_CODE */
float tps = getTPS(PASS_ENGINE_PARAMETER_SIGNATURE); float tps = getTPS(PASS_ENGINE_PARAMETER_SIGNATURE);
float coolant = getCoolantTemperature(PASS_ENGINE_PARAMETER_SIGNATURE); float coolant = getCoolantTemperature(PASS_ENGINE_PARAMETER_SIGNATURE);
@ -845,6 +847,9 @@ void updateTunerStudioState(TunerStudioOutputChannels *tsOutputChannels DECLARE_
tsOutputChannels->debugFloatField2 = instantRpm / GET_RPM(); tsOutputChannels->debugFloatField2 = instantRpm / GET_RPM();
} }
break; break;
case DBG_ION:
//ionPostState(tsOutputChannels);
break;
default: default:
; ;
} }

2
firmware/hw_layer/HIP9011.h
View File

@ -3,7 +3,7 @@
* @brief HIP9011/TPIC8101 driver * @brief HIP9011/TPIC8101 driver
* *
* @date Nov 27, 2013 * @date Nov 27, 2013
* @author Andrey Belomutskiy, (c) 2012-2017 * @author Andrey Belomutskiy, (c) 2012-2019
*/ */
#ifndef HIP9011_H_ #ifndef HIP9011_H_

4
firmware/hw_layer/board_test.cpp
View File

@ -23,7 +23,7 @@
#include "global.h" #include "global.h"
#if EFI_PROD_CODE || EFI_SIMULATOR #if EFI_PROD_CODE
#include "engine.h" #include "engine.h"
#include "board_test.h" #include "board_test.h"
#include "pin_repository.h" #include "pin_repository.h"
@ -231,4 +231,4 @@ void initBoardTest(void) {
chThdSleepSeconds(1); chThdSleepSeconds(1);
} }
} }
#endif /* EFI_PROD_CODE || EFI_SIMULATOR */ #endif /* EFI_PROD_CODE */

5
firmware/hw_layer/digital_input_exti.cpp
View File

@ -5,10 +5,11 @@
* @author Andrey Belomutskiy, (c) 2012-2018 * @author Andrey Belomutskiy, (c) 2012-2018
*/ */
#include "digital_input_exti.h" #include "global.h"
#include "efiGpio.h"
#if HAL_USE_EXT || defined(__DOXYGEN__) #if HAL_USE_EXT || defined(__DOXYGEN__)
#include "digital_input_exti.h"
#include "efiGpio.h"
/** /**
* EXTI is a funny thing: you can only use same pin on one port. For example, you can use * EXTI is a funny thing: you can only use same pin on one port. For example, you can use

2
firmware/hw_layer/digital_input_hw.cpp
View File

@ -25,11 +25,11 @@
*/ */
#include "digital_input_hw.h" #include "digital_input_hw.h"
#include "mpu_util.h"
#include "fl_stack.h" #include "fl_stack.h"
#if EFI_ICU_INPUTS || defined(__DOXYGEN__) #if EFI_ICU_INPUTS || defined(__DOXYGEN__)
#include "mpu_util.h"
#include "eficonsole.h" #include "eficonsole.h"
#include "pin_repository.h" #include "pin_repository.h"

21
firmware/hw_layer/hardware.cpp
View File

@ -7,26 +7,27 @@
*/ */
#include "global.h" #include "global.h"
#include "trigger_input.h"
#include "servo.h"
#if EFI_PROD_CODE
#include "adc_inputs.h" #include "adc_inputs.h"
#include "can_hw.h" #include "can_hw.h"
#include "console_io.h"
#include "hardware.h" #include "hardware.h"
#include "io_pins.h" #include "io_pins.h"
#include "pin_repository.h"
#include "rtc_helper.h" #include "rtc_helper.h"
#include "rfiutil.h" #include "rfiutil.h"
#include "injector_central.h" #include "injector_central.h"
#include "vehicle_speed.h" #include "vehicle_speed.h"
#include "yaw_rate_sensor.h" #include "yaw_rate_sensor.h"
#include "pin_repository.h"
#include "trigger_input.h"
#include "eficonsole.h"
#include "max31855.h" #include "max31855.h"
#include "mpu_util.h"
#include "accelerometer.h" #include "accelerometer.h"
#include "servo.h" #include "eficonsole.h"
#include "console_io.h"
#if EFI_PROD_CODE #include "mpu_util.h"
//#include "usb_msd.h" //#include "usb_msd.h"
#include "AdcConfiguration.h" #include "AdcConfiguration.h"
@ -45,7 +46,7 @@
#include "svnversion.h" #include "svnversion.h"
#include "engine_configuration.h" #include "engine_configuration.h"
#include "aux_pid.h" #include "aux_pid.h"
#endif /* EFI_PROD_CODE */
#if EFI_SPEED_DENSITY #if EFI_SPEED_DENSITY
#include "map_averaging.h" #include "map_averaging.h"
@ -499,3 +500,5 @@ void initHardware(Logging *l) {
} }
#endif /* EFI_PROD_CODE */ #endif /* EFI_PROD_CODE */
#endif /* EFI_PROD_CODE || EFI_SIMULATOR */

4
firmware/hw_layer/io_pins.cpp
View File

@ -7,8 +7,9 @@
* @author Andrey Belomutskiy, (c) 2012-2018 * @author Andrey Belomutskiy, (c) 2012-2018
*/ */
//#include "board.h"
#include "global.h" #include "global.h"
#if EFI_PROD_CODE
#include "io_pins.h" #include "io_pins.h"
#include "efiGpio.h" #include "efiGpio.h"
@ -88,3 +89,4 @@ void efiIcuStart(ICUDriver *icup, const ICUConfig *config) {
icuStart(icup, config); icuStart(icup, config);
} }
#endif /* HAL_USE_ICU */ #endif /* HAL_USE_ICU */
#endif

4
firmware/hw_layer/joystick.cpp
View File

@ -17,12 +17,12 @@
*/ */
#include "engine.h" #include "engine.h"
#if HAL_USE_EXT || defined(__DOXYGEN__)
#include "joystick.h" #include "joystick.h"
#include "pin_repository.h" #include "pin_repository.h"
#include "digital_input_exti.h" #include "digital_input_exti.h"
#if HAL_USE_EXT || defined(__DOXYGEN__)
EXTERN_ENGINE EXTERN_ENGINE
; ;

2
firmware/hw_layer/max31855.cpp
View File

@ -16,9 +16,9 @@
#include "max31855.h" #include "max31855.h"
#include "hardware.h" #include "hardware.h"
#include "mpu_util.h"
#if EFI_PROD_CODE #if EFI_PROD_CODE
#include "mpu_util.h"
#include "settings.h" #include "settings.h"
#include "pin_repository.h" #include "pin_repository.h"
#endif /* EFI_PROD_CODE */ #endif /* EFI_PROD_CODE */

2
firmware/hw_layer/pin_repository.cpp
View File

@ -10,6 +10,7 @@
*/ */
#include "global.h" #include "global.h"
#if EFI_PROD_CODE
#include "pin_repository.h" #include "pin_repository.h"
#include "eficonsole.h" #include "eficonsole.h"
#include "memstreams.h" #include "memstreams.h"
@ -184,3 +185,4 @@ void unmarkPin(brain_pin_e brainPin) {
} }
} }
#endif

5
firmware/hw_layer/stm32f4/mpu_util.cpp
View File

@ -6,6 +6,9 @@
*/ */
#include "global.h" #include "global.h"
#if EFI_PROD_CODE
#include "mpu_util.h" #include "mpu_util.h"
#include "error_handling.h" #include "error_handling.h"
#include "engine.h" #include "engine.h"
@ -411,3 +414,5 @@ CANDriver * detectCanDevice(brain_pin_e pinRx, brain_pin_e pinTx) {
#endif /* EFI_CAN_SUPPORT */ #endif /* EFI_CAN_SUPPORT */
#endif /* EFI_PROD_CODE */

5
simulator/Makefile
View File

@ -141,9 +141,8 @@ CPPSRC = $(UTILSRC_CPP) \
$(CONTROLLERS_SRC_CPP) \ $(CONTROLLERS_SRC_CPP) \
$(PROJECT_DIR)/development/sensor_chart.cpp \ $(PROJECT_DIR)/development/sensor_chart.cpp \
$(PROJECT_DIR)/development/trigger_emulator.cpp \ $(PROJECT_DIR)/development/trigger_emulator.cpp \
$(PROJECT_DIR)/hw_layer/stepper.cpp \ $(HW_LAYER_EMS_CPP) \
$(PROJECT_DIR)/hw_layer/HIP9011.cpp \ $(PROJECT_DIR)/hw_layer/sensors/CJ125.cpp \
$(PROJECT_DIR)/hw_layer/sensors/CJ125.cpp \
$(TRIGGER_SRC_CPP) \ $(TRIGGER_SRC_CPP) \
$(TRIGGER_DECODERS_SRC_CPP) \ $(TRIGGER_DECODERS_SRC_CPP) \
$(SYSTEMSRC_CPP) \ $(SYSTEMSRC_CPP) \

2
simulator/simulator/efifeatures.h
View File

@ -67,6 +67,8 @@
#define EFI_MAX_31855 FALSE #define EFI_MAX_31855 FALSE
#define EFI_ELECTRONIC_THROTTLE_BODY FALSE #define EFI_ELECTRONIC_THROTTLE_BODY FALSE
#define EFI_AUX_PID FALSE #define EFI_AUX_PID FALSE
#define EFI_ICU_INPUTS FALSE
#define EFI_UART_GPS FALSE
#define EFI_HAS_RESET FALSE #define EFI_HAS_RESET FALSE
#define EXTREME_TERM_LOGGING FALSE #define EXTREME_TERM_LOGGING FALSE
#define DEBUG_FUEL FALSE #define DEBUG_FUEL FALSE

2
unit_tests/Makefile
View File

@ -120,7 +120,7 @@ CPPSRC = $(UTILSRC_CPP) \
$(TEST_SRC_CPP) \ $(TEST_SRC_CPP) \
$(SYSTEMSRC_CPP) \ $(SYSTEMSRC_CPP) \
$(PROJECT_DIR)/controllers/error_handling.cpp \ $(PROJECT_DIR)/controllers/error_handling.cpp \
$(PROJECT_DIR)/hw_layer/HIP9011.cpp \ $(HW_LAYER_EMS_CPP) \
$(PROJECT_DIR)/hw_layer/sensors/CJ125.cpp \ $(PROJECT_DIR)/hw_layer/sensors/CJ125.cpp \
$(TRIGGER_SRC_CPP) \ $(TRIGGER_SRC_CPP) \
main.cpp main.cpp