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

rename (#2136) 

Co-authored-by: Matthew Kennedy <makenne@microsoft.com>
This commit is contained in:
Matthew Kennedy 2020-12-25 05:40:54 -08:00 committed by GitHub
parent 3727233e11
commit 17554539d1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
firmware/controllers/core/fsio_core.cpp
View File

@ -140,7 +140,7 @@ void LECalculator::push(le_action_e action, float value) {
}
}
static FsioValue doBinaryBoolean(le_action_e action, float lhs, float rhs) {
static FsioResult doBinaryBoolean(le_action_e action, float lhs, float rhs) {
bool v1 = float2bool(lhs);
bool v2 = float2bool(rhs);
@ -154,7 +154,7 @@ static FsioValue doBinaryBoolean(le_action_e action, float lhs, float rhs) {
}
}
static FsioValue doBinaryNumeric(le_action_e action, float v1, float v2) {
static FsioResult doBinaryNumeric(le_action_e action, float v1, float v2) {
// Process based on the action type
switch (action) {
case LE_OPERATOR_ADDITION:
@ -185,7 +185,7 @@ static FsioValue doBinaryNumeric(le_action_e action, float v1, float v2) {
/**
* @return true in case of error, false otherwise
*/
FsioValue LECalculator::processElement(LEElement *element DECLARE_ENGINE_PARAMETER_SUFFIX) {
FsioResult LECalculator::processElement(LEElement *element DECLARE_ENGINE_PARAMETER_SUFFIX) {
#if EFI_PROD_CODE
efiAssert(CUSTOM_ERR_ASSERT, getCurrentRemainingStack() > 64, "FSIO logic", unexpected);
#endif
@ -303,7 +303,7 @@ float LECalculator::getValue(float selfValue DECLARE_ENGINE_PARAMETER_SUFFIX) {
if (element->action == LE_METHOD_SELF) {
push(element->action, selfValue);
} else {
FsioValue result = processElement(element PASS_ENGINE_PARAMETER_SUFFIX);
FsioResult result = processElement(element PASS_ENGINE_PARAMETER_SUFFIX);
if (!result) {
// error already reported

4
firmware/controllers/core/fsio_core.h
View File

@ -64,7 +64,7 @@ typedef enum {
} le_action_e;
using FsioValue = expected<float>;
using FsioResult = expected<float>;
class LEElement {
public:
@ -116,7 +116,7 @@ public:
int currentCalculationLogPosition;
private:
void push(le_action_e action, float value);
FsioValue processElement(LEElement *element DECLARE_ENGINE_PARAMETER_SUFFIX);
FsioResult processElement(LEElement *element DECLARE_ENGINE_PARAMETER_SUFFIX);
float pop(le_action_e action);
LEElement *first;
calc_stack_t stack;

2
firmware/controllers/core/fsio_impl.cpp
View File

@ -114,7 +114,7 @@ static LEElement * mainRelayLogic;
static Logging *logger;
#if EFI_PROD_CODE || EFI_SIMULATOR
FsioValue getEngineValue(le_action_e action DECLARE_ENGINE_PARAMETER_SUFFIX) {
FsioResult getEngineValue(le_action_e action DECLARE_ENGINE_PARAMETER_SUFFIX) {
efiAssert(CUSTOM_ERR_ASSERT, engine!=NULL, "getLEValue", unexpected);
switch (action) {
case LE_METHOD_FAN:

2
unit_tests/tests/test_logic_expression.cpp
View File

@ -15,7 +15,7 @@
#define TEST_POOL_SIZE 256
FsioValue getEngineValue(le_action_e action DECLARE_ENGINE_PARAMETER_SUFFIX) {
FsioResult getEngineValue(le_action_e action DECLARE_ENGINE_PARAMETER_SUFFIX) {
switch(action) {
case LE_METHOD_FAN:
return engine->fsioState.mockFan;