mirror of https://github.com/rusefi/rusefi-1.git
auto-sync
This commit is contained in:
rusEfi
parent
9f5b82ed91
commit
e11345f6a3
|
|
@ -69,6 +69,7 @@
|
|||
<listOptionValue builtIn="false" value=""../controllers/sensors""/>
|
||||
<listOptionValue builtIn="false" value=""../controllers/system""/>
|
||||
<listOptionValue builtIn="false" value=""../controllers/math""/>
|
||||
<listOptionValue builtIn="false" value=""../console_util""/>
|
||||
<listOptionValue builtIn="false" value=""../development""/>
|
||||
<listOptionValue builtIn="false" value=""../development/test""/>
|
||||
<listOptionValue builtIn="false" value=""../development/hw_layer""/>
|
||||
|
|
@ -122,6 +123,7 @@
|
|||
<listOptionValue builtIn="false" value=""../controllers/sensors""/>
|
||||
<listOptionValue builtIn="false" value=""../controllers/system""/>
|
||||
<listOptionValue builtIn="false" value=""../controllers/math""/>
|
||||
<listOptionValue builtIn="false" value=""../console_util""/>
|
||||
<listOptionValue builtIn="false" value=""../development""/>
|
||||
<listOptionValue builtIn="false" value=""../development/test""/>
|
||||
<listOptionValue builtIn="false" value=""../development/hw_layer""/>
|
||||
|
|
@ -345,6 +347,7 @@
|
|||
<listOptionValue builtIn="false" value=""../controllers/sensors""/>
|
||||
<listOptionValue builtIn="false" value=""../controllers/system""/>
|
||||
<listOptionValue builtIn="false" value=""../controllers/math""/>
|
||||
<listOptionValue builtIn="false" value=""../console_util""/>
|
||||
<listOptionValue builtIn="false" value=""../development""/>
|
||||
<listOptionValue builtIn="false" value=""../development/test""/>
|
||||
<listOptionValue builtIn="false" value=""../development/hw_layer""/>
|
||||
|
|
@ -393,6 +396,7 @@
|
|||
<listOptionValue builtIn="false" value=""../controllers/sensors""/>
|
||||
<listOptionValue builtIn="false" value=""../controllers/system""/>
|
||||
<listOptionValue builtIn="false" value=""../controllers/math""/>
|
||||
<listOptionValue builtIn="false" value=""../console_util""/>
|
||||
<listOptionValue builtIn="false" value=""../development""/>
|
||||
<listOptionValue builtIn="false" value=""../development/test""/>
|
||||
<listOptionValue builtIn="false" value=""../development/hw_layer""/>
|
||||
|
|
@ -515,6 +519,7 @@
|
|||
<listOptionValue builtIn="false" value=""../controllers/sensors""/>
|
||||
<listOptionValue builtIn="false" value=""../controllers/system""/>
|
||||
<listOptionValue builtIn="false" value=""../controllers/math""/>
|
||||
<listOptionValue builtIn="false" value=""../console_util""/>
|
||||
<listOptionValue builtIn="false" value=""../development""/>
|
||||
<listOptionValue builtIn="false" value=""../development/test""/>
|
||||
<listOptionValue builtIn="false" value=""../development/hw_layer""/>
|
||||
|
|
@ -632,6 +637,7 @@
|
|||
<listOptionValue builtIn="false" value=""../controllers/sensors""/>
|
||||
<listOptionValue builtIn="false" value=""../controllers/system""/>
|
||||
<listOptionValue builtIn="false" value=""../controllers/math""/>
|
||||
<listOptionValue builtIn="false" value=""../console_util""/>
|
||||
<listOptionValue builtIn="false" value=""../development""/>
|
||||
<listOptionValue builtIn="false" value=""../development/test""/>
|
||||
<listOptionValue builtIn="false" value=""../development/hw_layer""/>
|
||||
|
|
@ -685,6 +691,7 @@
|
|||
<listOptionValue builtIn="false" value=""../controllers/sensors""/>
|
||||
<listOptionValue builtIn="false" value=""../controllers/system""/>
|
||||
<listOptionValue builtIn="false" value=""../controllers/math""/>
|
||||
<listOptionValue builtIn="false" value=""../console_util""/>
|
||||
<listOptionValue builtIn="false" value=""../development""/>
|
||||
<listOptionValue builtIn="false" value=""../development/test""/>
|
||||
<listOptionValue builtIn="false" value=""../development/hw_layer""/>
|
||||
|
|
|
|||
|
|
@ -112,6 +112,7 @@ include $(PROJECT_DIR)/controllers/sensors/sensors.mk
|
|||
include $(PROJECT_DIR)/controllers/system/system.mk
|
||||
include $(PROJECT_DIR)/controllers/trigger/trigger.mk
|
||||
include $(PROJECT_DIR)/console/console.mk
|
||||
include $(PROJECT_DIR)/console_util/console_util.mk
|
||||
|
||||
|
||||
# Define linker script file here
|
||||
|
|
@ -128,6 +129,7 @@ CSRC = $(PORTSRC) \
|
|||
$(UTILSRC) \
|
||||
$(ENGINES_SRC) \
|
||||
$(CONSOLESRC) \
|
||||
$(CONSOLEUTILSRC) \
|
||||
$(HALSRC) \
|
||||
$(DEV_SRC) \
|
||||
$(HW_LAYER_EMS) \
|
||||
|
|
@ -196,6 +198,7 @@ INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \
|
|||
ext \
|
||||
ext_algo \
|
||||
util \
|
||||
console_util \
|
||||
console \
|
||||
console/binary \
|
||||
hw_layer \
|
||||
|
|
|
|||
|
|
@ -0,0 +1,2 @@
|
|||
|
||||
CONSOLEUTILSRC = $(PROJECT_DIR)/console_util/rfiutil.c
|
||||
|
|
@ -0,0 +1,73 @@
|
|||
/**
|
||||
* @file rfiutil.c
|
||||
* @brief Number to string conversion code
|
||||
*
|
||||
* @date Nov 15, 2012
|
||||
* @author Andrey Belomutskiy, (c) 2012-2016
|
||||
*
|
||||
* This file is part of rusEfi - see http://rusefi.com
|
||||
*
|
||||
* rusEfi is free software; you can redistribute it and/or modify it under the terms of
|
||||
* the GNU General Public License as published by the Free Software Foundation; either
|
||||
* version 3 of the License, or (at your option) any later version.
|
||||
*
|
||||
* rusEfi is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
|
||||
* even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License along with this program.
|
||||
* If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include <string.h>
|
||||
#include "main.h"
|
||||
#include "rfiutil.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;
|
||||
}
|
||||
*/
|
||||
|
||||
void chVTSetAny(virtual_timer_t *vtp, systime_t time, vtfunc_t vtfunc, void *par) {
|
||||
bool wasLocked = lockAnyContext();
|
||||
|
||||
/**
|
||||
* todo: this could be simplified once we migrate to ChibiOS 3.0
|
||||
* See http://www.chibios.org/dokuwiki/doku.php?id=chibios:howtos:porting_from_2_to_3
|
||||
*/
|
||||
if (chVTIsArmedI(vtp)) {
|
||||
chVTResetI(vtp);
|
||||
}
|
||||
|
||||
chVTSetI(vtp, time, vtfunc, par);
|
||||
if (!wasLocked) {
|
||||
unlockAnyContext();
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,37 @@
|
|||
/*
|
||||
* @file rfiutil.h
|
||||
* @brief Number to string conversion header
|
||||
*
|
||||
* @date Nov 15, 2012
|
||||
* @author Andrey Belomutskiy, (c) 2012-2016
|
||||
*/
|
||||
|
||||
#ifndef RFIUTIL_H_
|
||||
#define RFIUTIL_H_
|
||||
|
||||
#include "global.h"
|
||||
#include "histogram.h"
|
||||
|
||||
#define isLocked() (dbg_lock_cnt > 0)
|
||||
|
||||
/**
|
||||
* Unfortunately ChibiOS has two versions of methods for different
|
||||
* contexts.
|
||||
*/
|
||||
|
||||
#define isIsrContext() (dbg_isr_cnt > 0)
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C"
|
||||
{
|
||||
#endif /* __cplusplus */
|
||||
|
||||
//char hexC(int v);
|
||||
void chVTSetAny(virtual_timer_t *vtp, systime_t time, vtfunc_t vtfunc, void *par);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
void printHistogram(Logging *logging, histogram_s *histogram);
|
||||
#endif /* __cplusplus */
|
||||
|
||||
#endif /* RFIUTIL_H_ */
|
||||
|
|
@ -372,9 +372,7 @@ void initHardware(Logging *l) {
|
|||
initVehicleSpeed(sharedLogger);
|
||||
#endif
|
||||
|
||||
#if HAL_USE_EXT || defined(__DOXYGEN__)
|
||||
initJoystick(sharedLogger);
|
||||
#endif
|
||||
|
||||
calcFastAdcIndexes();
|
||||
engine->addConfigurationListener(adcConfigListener);
|
||||
|
|
|
|||
|
|
@ -329,6 +329,7 @@
|
|||
<state>$PROJ_DIR$\..\config\engines</state>
|
||||
<state>$PROJ_DIR$\..\config\stm32f4ems</state>
|
||||
<state>$PROJ_DIR$\..\console\binary</state>
|
||||
<state>$PROJ_DIR$\..\console_util</state>
|
||||
<state>$PROJ_DIR$\..\development</state>
|
||||
<state>$PROJ_DIR$\..\development\test</state>
|
||||
<state>$PROJ_DIR$\..\development\hw_layer</state>
|
||||
|
|
@ -2172,6 +2173,15 @@
|
|||
<name>$PROJ_DIR$\..\console\status_loop.h</name>
|
||||
</file>
|
||||
</group>
|
||||
<group>
|
||||
<name>console_util</name>
|
||||
<file>
|
||||
<name>$PROJ_DIR$\..\console_util\rfiutil.c</name>
|
||||
</file>
|
||||
<file>
|
||||
<name>$PROJ_DIR$\..\console_util\rfiutil.h</name>
|
||||
</file>
|
||||
</group>
|
||||
<group>
|
||||
<name>controllers</name>
|
||||
<group>
|
||||
|
|
@ -2255,7 +2265,7 @@
|
|||
<name>$PROJ_DIR$\..\controllers\algo\main_trigger_callback.h</name>
|
||||
</file>
|
||||
<file>
|
||||
<name>$PROJ_DIR$\..\controllers\algo\malfunction_central.cpp</name>
|
||||
<name>$PROJ_DIR$\..\controllers\algo\malfunction_central.c</name>
|
||||
</file>
|
||||
<file>
|
||||
<name>$PROJ_DIR$\..\controllers\algo\malfunction_central.h</name>
|
||||
|
|
@ -3323,12 +3333,6 @@
|
|||
</group>
|
||||
<group>
|
||||
<name>util</name>
|
||||
<file>
|
||||
<name>$PROJ_DIR$\..\util\rfiutil.c</name>
|
||||
</file>
|
||||
<file>
|
||||
<name>$PROJ_DIR$\..\util\rfiutil.h</name>
|
||||
</file>
|
||||
<file>
|
||||
<name>$PROJ_DIR$\..\util\cli_registry.cpp</name>
|
||||
</file>
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
// This file was generated by Version2Header
|
||||
// Thu Feb 11 19:42:49 EST 2016
|
||||
// Thu Feb 11 14:16:47 EST 2016
|
||||
#ifndef VCS_VERSION
|
||||
#define VCS_VERSION "9550"
|
||||
#define VCS_VERSION "9535"
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
|
||||
UTIL_TEST_SRC = $(PROJECT_DIR)/util/crc.c \
|
||||
$(PROJECT_DIR)/rfiutil.c \
|
||||
$(PROJECT_DIR)/util/data_buffer.c \
|
||||
$(PROJECT_DIR)/util/histogram.c
|
||||
|
||||
|
|
|
|||
|
|
@ -80,6 +80,7 @@ include $(PROJECT_DIR)/controllers/trigger/trigger.mk
|
|||
include $(PROJECT_DIR)/controllers/system/system.mk
|
||||
include $(PROJECT_DIR)/console/console.mk
|
||||
include $(PROJECT_DIR)/console/binary/tunerstudio.mk
|
||||
include $(PROJECT_DIR)/console_util/console_util.mk
|
||||
include $(PROJECT_DIR)/development/development.mk
|
||||
|
||||
include $(CHIBIOS)/boards/simulator/board.mk
|
||||
|
|
@ -102,6 +103,7 @@ CSRC = ${PORTSRC} \
|
|||
$(TRIGGER_SRC) \
|
||||
$(SYSTEMSRC) \
|
||||
$(CONSOLESRC) \
|
||||
$(CONSOLEUTILSRC) \
|
||||
$(CONTROLLERS_ALGO_SRC) \
|
||||
$(CONTROLLERS_CORE_SRC) \
|
||||
$(CONTROLLERS_MATH_SRC) \
|
||||
|
|
@ -165,6 +167,7 @@ $(PORTINC) $(KERNINC) $(TESTINC) \
|
|||
$(PROJECT_DIR)/util \
|
||||
$(PROJECT_DIR)/console \
|
||||
$(PROJECT_DIR)/console/binary \
|
||||
$(PROJECT_DIR)/console_util \
|
||||
$(PROJECT_DIR)/config/engines \
|
||||
$(PROJECT_DIR)/ext_algo \
|
||||
$(PROJECT_DIR)/controllers \
|
||||
|
|
|
|||
Loading…
Reference in New Issue