merge fixes

This commit is contained in:
Frank Haverland
2024-04-28 19:56:50 +02:00
parent 488ae174a4
commit 295038a881
2 changed files with 7 additions and 2 deletions

View File

@@ -206,7 +206,7 @@ int ClassFlowCNNGeneral::PointerEvalHybridNew(float number, float number_of_pred
// number can still be x.6 - x.7.
// Preceding (else - branch) does not already happen from 9.
if (((Digital_Transition_Area_Forward>=number_of_predecessors) && (eval_predecessors == (int)number_of_predecessors))
|| result_after_decimal_point >= 4)
|| result_after_decimal_point >= 4) {
// The current digit, like the previous digit, does not yet have a zero crossing.
result = result_before_decimal_point % 10;
}

View File

@@ -138,6 +138,11 @@ void task_UnityTesting(void *pvParameter)
RUN_TEST(test_doFlowPP3);
printf("---------------------------------------------------------------------------\n");
RUN_TEST(test_doFlowPP4);
printf("---------------------------------------------------------------------------\n");
RUN_TEST(test_doFlowPP_rainman110);
printf("---------------------------------------------------------------------------\n");
RUN_TEST(test_doFlowPP_rainman110_transition);
UNITY_END();
while(1);
@@ -155,7 +160,7 @@ extern "C" void app_main()
UNITY_BEGIN();
RUN_TEST(testNegative_Issues);
RUN_TEST(testNegative);
RUN_TEST(testNegative);
RUN_TEST(test_analogToDigit_Standard);
RUN_TEST(test_analogToDigit_Transition);