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

auto-sync

This commit is contained in:
rusEfi 2014-11-18 14:03:13 -06:00
parent 3c1f1043f5
commit 40791c86e4
4 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
firmware/controllers/core/logic_expression.cpp
View File

@ -200,6 +200,7 @@ void LEElementPool::reset() {
LEElement *LEElementPool::next() { LEElement *LEElementPool::next() {
if (index == size - 1) { if (index == size - 1) {
// todo: this should not be a fatal error, just an error
firmwareError("LE_ELEMENT_POOL_SIZE overflow"); firmwareError("LE_ELEMENT_POOL_SIZE overflow");
return NULL; return NULL;
} }
@ -283,3 +284,15 @@ LEElement * parseExpression(LEElementPool *pool, const char * line) {
} }
return first; return first;
} }
#if (EFI_PROD_CODE || EFI_SIMULATOR)
static void eval(char *line, Engine *engine) {
}
void initEval(Engine *engine) {
addConsoleActionSP("evan", (VoidCharPtrVoidPtr)eval, engine);
}
#endif

1
firmware/controllers/core/logic_expression.h
View File

@ -100,5 +100,6 @@ const char *getNextToken(const char *line, char *buffer);
bool isNumeric(const char* line); bool isNumeric(const char* line);
le_action_e parseAction(const char * line); le_action_e parseAction(const char * line);
LEElement * parseExpression(LEElementPool *pool, const char * line); LEElement * parseExpression(LEElementPool *pool, const char * line);
void initEval(Engine *engine);
#endif /* LOGIC_EXPRESSION_H_ */ #endif /* LOGIC_EXPRESSION_H_ */

10
firmware/util/cli_registry.c
View File

@ -89,6 +89,10 @@ void addConsoleActionS(const char *token, VoidCharPtr callback) {
doAddAction(token, STRING_PARAMETER, (Void) callback, NULL); doAddAction(token, STRING_PARAMETER, (Void) callback, NULL);
} }
void addConsoleActionSP(const char *token, VoidCharPtrVoidPtr callback, void *param) {
doAddAction(token, STRING_PARAMETER_P, (Void) callback, NULL);
}
void addConsoleActionSS(const char *token, VoidCharPtrCharPtr callback) { void addConsoleActionSS(const char *token, VoidCharPtrCharPtr callback) {
doAddAction(token, STRING2_PARAMETER, (Void) callback, NULL); doAddAction(token, STRING2_PARAMETER, (Void) callback, NULL);
} }
@ -204,6 +208,12 @@ void handleActionWithParameter(TokenCallback *current, char *parameter) {
return; return;
} }
if (current->parameterType == STRING_PARAMETER_P) {
VoidCharPtrVoidPtr callbackS = (VoidCharPtrVoidPtr) current->callback;
(*callbackS)(parameter, current->param);
return;
}
// todo: refactor this hell! // todo: refactor this hell!
if (current->parameterType == STRING2_PARAMETER || current->parameterType == STRING2_PARAMETER_P) { if (current->parameterType == STRING2_PARAMETER || current->parameterType == STRING2_PARAMETER_P) {
int spaceIndex = findEndOfToken(parameter); int spaceIndex = findEndOfToken(parameter);

3
firmware/util/cli_registry.h
View File

@ -24,6 +24,7 @@ typedef enum {
FLOAT_PARAMETER, FLOAT_PARAMETER,
FLOAT_PARAMETER_P, FLOAT_PARAMETER_P,
STRING_PARAMETER, STRING_PARAMETER,
STRING_PARAMETER_P,
STRING2_PARAMETER, STRING2_PARAMETER,
STRING2_PARAMETER_P, STRING2_PARAMETER_P,
STRING3_PARAMETER, STRING3_PARAMETER,
@ -89,7 +90,7 @@ void addConsoleActionFF(const char *token, VoidFloatFloat callback);
void addConsoleActionFFP(const char *token, VoidFloatFloatVoidPtr callback, void *param); void addConsoleActionFFP(const char *token, VoidFloatFloatVoidPtr callback, void *param);
void addConsoleActionS(const char *token, VoidCharPtr callback); void addConsoleActionS(const char *token, VoidCharPtr callback);
void addConsoleActionSP(const char *token, VoidCharPtrVoidPtr callback); void addConsoleActionSP(const char *token, VoidCharPtrVoidPtr callback, void *param);
void addConsoleActionSS(const char *token, VoidCharPtrCharPtr callback); void addConsoleActionSS(const char *token, VoidCharPtrCharPtr callback);
void addConsoleActionSSP(const char *token, VoidCharPtrCharPtrVoidPtr callback, void *param); void addConsoleActionSSP(const char *token, VoidCharPtrCharPtrVoidPtr callback, void *param);