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

refactoring: better file name

This commit is contained in:
rusefi 2019-07-06 20:15:49 -04:00
parent 44276daa13
commit cdac02429c
25 changed files with 41 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/console/console_io.cpp
View File

@ -21,7 +21,7 @@
#include "global.h" #include "global.h"
#include "engine.h" #include "engine.h"
#include "console_io.h" #include "console_io.h"
#include "rfiutil.h" #include "os_util.h"
#include "tunerstudio.h" #include "tunerstudio.h"
#if EFI_SIMULATOR #if EFI_SIMULATOR

2
firmware/console/status_loop.cpp
View File

@ -51,7 +51,7 @@
#include "spark_logic.h" #include "spark_logic.h"
#include "idle_thread.h" #include "idle_thread.h"
#include "engine_configuration.h" #include "engine_configuration.h"
#include "rfiutil.h" #include "os_util.h"
#include "svnversion.h" #include "svnversion.h"
#include "engine.h" #include "engine.h"
#include "lcd_controller.h" #include "lcd_controller.h"

3
firmware/controllers/algo/advance_map.cpp
View File

@ -2,7 +2,7 @@
* @file advance_map.cpp * @file advance_map.cpp
* *
* @date Mar 27, 2013 * @date Mar 27, 2013
* @author Andrey Belomutskiy, (c) 2012-2018 * @author Andrey Belomutskiy, (c) 2012-2019
* *
* This file is part of rusEfi - see http://rusefi.com * This file is part of rusEfi - see http://rusefi.com
* *
@ -23,7 +23,6 @@
#include "engine.h" #include "engine.h"
#include "advance_map.h" #include "advance_map.h"
#include "interpolation.h" #include "interpolation.h"
#include "rfiutil.h"
#include "engine_math.h" #include "engine_math.h"
#include "tps.h" #include "tps.h"
#include "idle_thread.h" #include "idle_thread.h"

2
firmware/controllers/algo/engine.cpp
View File

@ -19,7 +19,7 @@
#include "advance_map.h" #include "advance_map.h"
#include "speed_density.h" #include "speed_density.h"
#include "advance_map.h" #include "advance_map.h"
#include "rfiutil.h" #include "os_util.h"
#include "settings.h" #include "settings.h"
#include "aux_valves.h" #include "aux_valves.h"
#include "map_averaging.h" #include "map_averaging.h"

2
firmware/controllers/engine_controller.cpp
View File

@ -41,7 +41,7 @@
#include "tunerstudio.h" #include "tunerstudio.h"
#endif #endif
#include "injector_central.h" #include "injector_central.h"
#include "rfiutil.h" #include "os_util.h"
#include "engine_math.h" #include "engine_math.h"
#if EFI_WAVE_ANALYZER #if EFI_WAVE_ANALYZER
#include "wave_analyzer.h" #include "wave_analyzer.h"

2
firmware/controllers/scheduling/event_queue.cpp
View File

@ -15,7 +15,7 @@
#include "os_access.h" #include "os_access.h"
#include "event_queue.h" #include "event_queue.h"
#include "efitime.h" #include "efitime.h"
#include "rfiutil.h" #include "os_util.h"
uint32_t maxSchedulingPrecisionLoss = 0; uint32_t maxSchedulingPrecisionLoss = 0;

2
firmware/controllers/scheduling/single_timer_executor.cpp
View File

@ -30,7 +30,7 @@
#include "microsecond_timer.h" #include "microsecond_timer.h"
#include "tunerstudio_configuration.h" #include "tunerstudio_configuration.h"
#include "rfiutil.h" #include "os_util.h"
#include "engine.h" #include "engine.h"
EXTERN_ENGINE; EXTERN_ENGINE;

2
firmware/controllers/trigger/main_trigger_callback.cpp
View File

@ -48,7 +48,7 @@
#include "engine_controller.h" #include "engine_controller.h"
#include "efi_gpio.h" #include "efi_gpio.h"
#if EFI_PROD_CODE #if EFI_PROD_CODE
#include "rfiutil.h" #include "os_util.h"
#endif /* EFI_HISTOGRAMS */ #endif /* EFI_HISTOGRAMS */
#include "local_version_holder.h" #include "local_version_holder.h"
#include "event_queue.h" #include "event_queue.h"

2
firmware/controllers/trigger/rpm_calculator.cpp
View File

@ -20,7 +20,7 @@
#include "engine_math.h" #include "engine_math.h"
#if EFI_PROD_CODE #if EFI_PROD_CODE
#include "rfiutil.h" #include "os_util.h"
#include "engine.h" #include "engine.h"
#endif #endif

3
firmware/controllers/trigger/spark_logic.cpp
View File

@ -2,7 +2,7 @@
* @file spark_logic.cpp * @file spark_logic.cpp
* *
* @date Sep 15, 2016 * @date Sep 15, 2016
* @author Andrey Belomutskiy, (c) 2012-2018 * @author Andrey Belomutskiy, (c) 2012-2019
*/ */
#include "global.h" #include "global.h"
@ -11,7 +11,6 @@
#include "utlist.h" #include "utlist.h"
#include "event_queue.h" #include "event_queue.h"
#include "rfiutil.h"
#if EFI_TUNER_STUDIO #if EFI_TUNER_STUDIO
#include "tunerstudio_configuration.h" #include "tunerstudio_configuration.h"

32
firmware/controllers/trigger/trigger_central.cpp
View File

@ -3,7 +3,7 @@
* Here we have a bunch of higher-level methods which are not directly related to actual signal decoding * Here we have a bunch of higher-level methods which are not directly related to actual signal decoding
* *
* @date Feb 23, 2014 * @date Feb 23, 2014
* @author Andrey Belomutskiy, (c) 2012-2018 * @author Andrey Belomutskiy, (c) 2012-2019
*/ */
#include "global.h" #include "global.h"
@ -25,6 +25,20 @@
#include "rpm_calculator.h" #include "rpm_calculator.h"
#if EFI_PROD_CODE
#include "pin_repository.h"
#endif /* EFI_PROD_CODE */
#if EFI_TUNER_STUDIO
#include "tunerstudio.h"
extern TunerStudioOutputChannels tsOutputChannels;
#endif /* EFI_TUNER_STUDIO */
#if EFI_ENGINE_SNIFFER
#include "engine_sniffer.h"
WaveChart waveChart;
#endif /* EFI_ENGINE_SNIFFER */
trigger_central_s::trigger_central_s() : hwEventCounters() { trigger_central_s::trigger_central_s() : hwEventCounters() {
} }
@ -50,22 +64,6 @@ int TriggerCentral::getHwEventCounter(int index) const {
#if EFI_SHAFT_POSITION_INPUT #if EFI_SHAFT_POSITION_INPUT
#if EFI_PROD_CODE
#include "rfiutil.h"
#include "pin_repository.h"
#endif /* EFI_PROD_CODE */
#if EFI_TUNER_STUDIO
#include "tunerstudio.h"
extern TunerStudioOutputChannels tsOutputChannels;
#endif /* EFI_TUNER_STUDIO */
#if EFI_ENGINE_SNIFFER
#include "engine_sniffer.h"
WaveChart waveChart;
#endif /* EFI_ENGINE_SNIFFER */
EXTERN_ENGINE; EXTERN_ENGINE;
#if EFI_HISTOGRAMS #if EFI_HISTOGRAMS

4
firmware/controllers/trigger/trigger_decoder.cpp
View File

@ -2,7 +2,7 @@
* @file trigger_decoder.cpp * @file trigger_decoder.cpp
* *
* @date Dec 24, 2013 * @date Dec 24, 2013
* @author Andrey Belomutskiy, (c) 2012-2018 * @author Andrey Belomutskiy, (c) 2012-2019
* *
* This file is part of rusEfi - see http://rusefi.com * This file is part of rusEfi - see http://rusefi.com
* *
@ -21,7 +21,6 @@
#include "global.h" #include "global.h"
#include "os_access.h" #include "os_access.h"
#include "obd_error_codes.h" #include "obd_error_codes.h"
#include "trigger_decoder.h" #include "trigger_decoder.h"
#include "cyclic_buffer.h" #include "cyclic_buffer.h"
@ -30,7 +29,6 @@
#include "engine_math.h" #include "engine_math.h"
#include "trigger_central.h" #include "trigger_central.h"
#include "trigger_simulator.h" #include "trigger_simulator.h"
#include "rfiutil.h"
#if EFI_SENSOR_CHART #if EFI_SENSOR_CHART
#include "sensor_chart.h" #include "sensor_chart.h"

2
firmware/development/engine_sniffer.cpp
View File

@ -38,7 +38,7 @@
#define CHART_DELIMETER '!' #define CHART_DELIMETER '!'
#if EFI_HISTOGRAMS #if EFI_HISTOGRAMS
#include "rfiutil.h" #include "os_util.h"
#include "histogram.h" #include "histogram.h"
static histogram_s engineSnifferHisto; static histogram_s engineSnifferHisto;
#endif /* EFI_HISTOGRAMS */ #endif /* EFI_HISTOGRAMS */

2
firmware/development/wave_analyzer.cpp
View File

@ -21,7 +21,7 @@
#include "signal_executor.h" #include "signal_executor.h"
#include "engine_configuration.h" #include "engine_configuration.h"
#include "trigger_central.h" #include "trigger_central.h"
#include "rfiutil.h" #include "os_util.h"
#include "engine_math.h" #include "engine_math.h"
#include "engine.h" #include "engine.h"
#include "rpm_calculator.h" #include "rpm_calculator.h"

2
firmware/hw_layer/drivers/gpio/tle6240.c
View File

@ -24,7 +24,7 @@
#include "gpio/gpio_ext.h" #include "gpio/gpio_ext.h"
#include "gpio/tle6240.h" #include "gpio/tle6240.h"
#include "pin_repository.h" #include "pin_repository.h"
#include "rfiutil.h" #include "os_util.h"
#if (BOARD_TLE6240_COUNT > 0) #if (BOARD_TLE6240_COUNT > 0)

2
firmware/hw_layer/drivers/gpio/tle8888.c
View File

@ -38,7 +38,7 @@
#include "hardware.h" #include "hardware.h"
#include "gpio/gpio_ext.h" #include "gpio/gpio_ext.h"
#include "pin_repository.h" #include "pin_repository.h"
#include "rfiutil.h" #include "os_util.h"
/* to be removed */ /* to be removed */
#if EFI_TUNER_STUDIO #if EFI_TUNER_STUDIO

2
firmware/hw_layer/hardware.cpp
View File

@ -17,7 +17,7 @@
#include "can_hw.h" #include "can_hw.h"
#include "hardware.h" #include "hardware.h"
#include "rtc_helper.h" #include "rtc_helper.h"
#include "rfiutil.h" #include "os_util.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"

2
firmware/hw_layer/microsecond_timer.cpp
View File

@ -15,7 +15,7 @@
#include "os_access.h" #include "os_access.h"
#include "microsecond_timer.h" #include "microsecond_timer.h"
#include "scheduler.h" #include "scheduler.h"
#include "rfiutil.h" #include "os_util.h"
// https://my.st.com/public/STe2ecommunities/mcu/Lists/cortex_mx_stm32/Flat.aspx?RootFolder=https%3a%2f%2fmy.st.com%2fpublic%2fSTe2ecommunities%2fmcu%2fLists%2fcortex_mx_stm32%2fInterrupt%20on%20CEN%20bit%20setting%20in%20TIM7&FolderCTID=0x01200200770978C69A1141439FE559EB459D7580009C4E14902C3CDE46A77F0FFD06506F5B&currentviews=474 // https://my.st.com/public/STe2ecommunities/mcu/Lists/cortex_mx_stm32/Flat.aspx?RootFolder=https%3a%2f%2fmy.st.com%2fpublic%2fSTe2ecommunities%2fmcu%2fLists%2fcortex_mx_stm32%2fInterrupt%20on%20CEN%20bit%20setting%20in%20TIM7&FolderCTID=0x01200200770978C69A1141439FE559EB459D7580009C4E14902C3CDE46A77F0FFD06506F5B&currentviews=474

2
firmware/hw_layer/ports/stm32/stm32f4/mpu_util.cpp
View File

@ -15,7 +15,7 @@
#include "engine.h" #include "engine.h"
#include "pin_repository.h" #include "pin_repository.h"
#include "stm32f4xx_hal_flash.h" #include "stm32f4xx_hal_flash.h"
#include "rfiutil.h" #include "os_util.h"
EXTERN_ENGINE; EXTERN_ENGINE;

2
firmware/hw_layer/ports/stm32/stm32f7/mpu_util.cpp
View File

@ -12,7 +12,7 @@
#include "engine.h" #include "engine.h"
#include "pin_repository.h" #include "pin_repository.h"
#include "stm32f7xx_hal_flash.h" #include "stm32f7xx_hal_flash.h"
#include "rfiutil.h" #include "os_util.h"
EXTERN_ENGINE; EXTERN_ENGINE;

2
firmware/hw_layer/rtc_helper.cpp
View File

@ -10,7 +10,7 @@
#include <time.h> #include <time.h>
#include "global.h" #include "global.h"
#include "os_access.h" #include "os_access.h"
#include "rfiutil.h" #include "os_util.h"
#include "rtc_helper.h" #include "rtc_helper.h"
#if EFI_RTC #if EFI_RTC

2
firmware/util/datalogging.cpp
View File

@ -37,7 +37,7 @@
#include "chmtx.h" #include "chmtx.h"
#include "memstreams.h" #include "memstreams.h"
#include "console_io.h" #include "console_io.h"
#include "rfiutil.h" #include "os_util.h"
static MemoryStream intermediateLoggingBuffer; static MemoryStream intermediateLoggingBuffer;
static uint8_t intermediateLoggingBufferData[INTERMEDIATE_LOGGING_BUFFER_SIZE] CCM_OPTIONAL; static uint8_t intermediateLoggingBufferData[INTERMEDIATE_LOGGING_BUFFER_SIZE] CCM_OPTIONAL;

41
firmware/util/rfiutil.c → firmware/util/os_util.c
View File

@ -1,9 +1,9 @@
/** /**
* @file rfiutil.c * @file os_util.c
* @brief Number to string conversion code * @brief Utility methods related to operating system usage
* *
* @date Nov 15, 2012 * @date Nov 15, 2012
* @author Andrey Belomutskiy, (c) 2012-2018 * @author Andrey Belomutskiy, (c) 2012-2019
* *
* This file is part of rusEfi - see http://rusefi.com * This file is part of rusEfi - see http://rusefi.com
* *
@ -19,44 +19,11 @@
* If not, see <http://www.gnu.org/licenses/>. * If not, see <http://www.gnu.org/licenses/>.
*/ */
#include <string.h>
#include "global.h" #include "global.h"
/*
not used, not sure if we still need it. I guess we will remove it in 2015
int mylog10(int param) {
if (param < 10)
return 0;
if (param < 100)
return 1;
if (param < 1000)
return 2;
if (param < 10000)
return 3;
if (param < 100000)
return 4;
if (param < 1000000)
return 5;
if (param < 10000000)
return 6;
if (param < 100000000)
return 7;
#warning This would be better without recursion
return mylog10(param / 10) + 1;
}
*/
/*
char hexChar(int v) {
v = v & 0xF;
if (v < 10)
return (char)('0' + v);
return 'A' - 10 + v;
}
*/
#if !EFI_UNIT_TEST #if !EFI_UNIT_TEST
#include "os_access.h" #include "os_access.h"
#include "rfiutil.h" #include "os_util.h"
void chVTSetAny(virtual_timer_t *vtp, systime_t time, vtfunc_t vtfunc, void *par) { void chVTSetAny(virtual_timer_t *vtp, systime_t time, vtfunc_t vtfunc, void *par) {
bool wasLocked = lockAnyContext(); bool wasLocked = lockAnyContext();

0
firmware/util/rfiutil.h → firmware/util/os_util.h
View File

2
firmware/util/util.mk
View File

@ -3,7 +3,7 @@ UTIL_DIR=$(PROJECT_DIR)/util
UTILSRC = \ UTILSRC = \
$(UTIL_DIR)/containers/data_buffer.c \ $(UTIL_DIR)/containers/data_buffer.c \
$(UTIL_DIR)/math/crc.c \ $(UTIL_DIR)/math/crc.c \
$(UTIL_DIR)/rfiutil.c \ $(UTIL_DIR)/os_util.c \
$(UTIL_DIR)/histogram.c $(UTIL_DIR)/histogram.c
UTILSRC_CPP = \ UTILSRC_CPP = \