merge fixes

code/components/jomjol_flowcontroll/ClassFlowCNNGeneral.cpp

@@ -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;
     }

code/test/test_suite_flowcontroll.cpp

@@ -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);