jest bug na obj3 liczy na 185 zamiast 180

SE/stuff/P5_Automation_can-dev-res-working-1930/___SUBMODULES___/testing_calc_db/calc_db_conf__setup__idObject1.h

@@ -1,6 +1,6 @@
 	 idObject1 = calc__db_create_obj(); // LVL_VAL = (LVL_VAL + DELTA > LVL_MAX) ? LVL_VAL - DELTA : LVL_VAL + DELTA;
-
-#if not(defined(idObject1__DISABLE))
+Serial.println("C[");Serial.print(idObject1);Serial.print("] ");
+//#if not(defined(idObject1__DISABLE))
     calc__db_conf_add1(idObject1, CALC_GET_DATA, LVL_VAL);    // reg: 0
 	calc__db_conf_add1(idObject1, CALC_DEFINE, 35);           // reg: 1
 	calc__db_conf_add1(idObject1, CALC_GET_DATA, LVL_MAX);    // reg: 2
@@ -11,4 +11,4 @@
 	calc__db_conf_add0(idObject1, CALC_FINISH);               // reg: 7
 	calc__db_conf_add2(idObject1, CALC_SET_DATA, LVL_VAL, 3); // reg: 8 : LVL_VAL = ( ... ) ? ... : LVL_VAL + DELTA
 	calc__db_conf_add0(idObject1, CALC_FINISH);               // reg: 9
-#endif
+//#endif

SE/stuff/P5_Automation_can-dev-res-working-1930/___SUBMODULES___/testing_calc_db/calc_db_conf__setup__idObject2.h

@@ -1,6 +1,6 @@
 	 idObject2 = calc__db_create_obj();
-
-#if not(defined(idObject2__DISABLE))
+Serial.print("C2[");Serial.print(idObject2);Serial.print("] ");
+//#if not(defined(idObject2__DISABLE))
 	//  int NEW_VAL = LVL_VAL + SWING;
 	// 	if (NEW_VAL > LVL_MAX) {
 	// 	  LVL_VAL = LVL_MAX - (NEW_VAL - LVL_MAX);
@@ -34,4 +34,4 @@
 	calc__db_conf_add0(idObject2, CALC_FINISH);               // reg: 18
 	calc__db_conf_add2(idObject2, CALC_SET_DATA, LVL_VAL, 4); // reg: 19 : LVL_VAL = NEW_VAL;
 	calc__db_conf_add0(idObject2, CALC_FINISH);               // reg: 20
-#endif
+//#endif

SE/stuff/P5_Automation_can-dev-res-working-1930/___SUBMODULES___/testing_calc_db/calc_db_conf__setup__idObject3.h

@@ -1,5 +1,6 @@
 
 	int idObject3 = calc__db_create_obj();
+	Serial.print("C3[");Serial.print(idObject3);Serial.print("] ");
 	//  int NEW_VAL = LVL_VAL + SWING;
 	// 	if (NEW_VAL > LVL_MAX) {
 	// 	  LVL_VAL = LVL_MAX - (NEW_VAL - LVL_MAX);
@@ -16,7 +17,7 @@
 	calc__db_conf_add1(idObject3, CALC_GET_DATA, SWING);   // reg: 1  : SWING
 	calc__db_conf_add1(idObject3, CALC_DEFINE, 150);       // reg: 2  : LVL_MIN
 	calc__db_conf_add1(idObject3, CALC_DEFINE, 200);       // reg: 3  : LVL_MAX
-    calc__db_conf_add2(idObject3, CALC_FUNC_ADD, 0, 1);    // reg: 4  : NEW_VAL = LVL_VAL + SWING;
+    calc__db_conf_add2(idObject3, CALC_FUNC_ADD, 2, 3);    // reg: 4  : NEW_VAL = LVL_VAL + SWING;
 	calc__db_conf_add2(idObject3, CALC_SET_DATA, LVL_VAL, 4); // reg: 8  : LVL_VAL = LVL_MAX - (NEW_VAL - LVL_MAX);
 
 	calc__db_conf_add0(idObject3, CALC_FINISH);               // reg: 20

SE/stuff/P5_Automation_can-dev-res-working-1930/___SUBMODULES___/testing_calc_db/calc_db_conf__setup__idObject3__variables.h

@@ -1,7 +1,7 @@
     obj3[PIN_NR] = 10; // const
 	obj3[LVL_MIN] = 150; // const
 	obj3[LVL_MAX] = 200; // const
-	obj3[LVL_VAL] = 150; // var, default = 150
+	obj3[LVL_VAL] = 1150; // var, default = 150
 	obj3[DELTA] = 0; // var, default 0
 	obj3[MAX_DELTA] = 10; // var, default = 10
 	obj3[SWING] = 30; // var, default = 8

SE/stuff/P5_Automation_can-dev-res-working-1930/___SUBMODULES___/testing_calc_db/loop.h

@@ -5,26 +5,23 @@
 
 
 
-        
-#if defined(idObject1__DISABLE)
-#else
-    calc__DBG_OBJ(idObject1);
+           
+   #if defined(idObject1__DISABLE)
+   #else
+       
+        #if(DBG_OBJ_LEVEL > 2)
+           n=sprintf(buffer, "DBG:loop:%d:obj1:", calcLoopCounterDBG);
+   	     Serial.print(String(buffer));
+        #endif
+   
+   	calc__run(idObject1, obj1);
+       #if(DBG_OBJ_LEVEL > 2)
+   	          n=sprintf(buffer, "DBG:loop:%d:obj1:END; obj1[LVL_VAL:%d] = %d", calcLoopCounterDBG, LVL_VAL, obj1[LVL_VAL]);
+                 Serial.println(String(buffer));
+       #endif
+   #endif 
+    
     
-     #if(DBG_OBJ_LEVEL > 2)
-        int n ;
-        char buffer [50];
-        n=sprintf(buffer, "DBG:loop:%d:obj1:", calcLoopCounterDBG);
-	     Serial.print(String(buffer));
-     #endif
-
-	calc__run(idObject1, obj1);
-    #if(DBG_OBJ_LEVEL > 2)
-	          n=sprintf(buffer, "DBG:loop:%d:obj1:END; obj1[LVL_VAL:%d] = %d", calcLoopCounterDBG, LVL_VAL, obj1[LVL_VAL]);
-              Serial.println(String(buffer));
-    #endif
-#endif 
- 
- 
  
  
 	
@@ -40,7 +37,7 @@
            Serial.println(String(buffer));
 
     #endif 
-    Serial.println(" low Obj3:");
+    
     
     #if defined(idObject3__DISABLE)
     #else
@@ -52,5 +49,4 @@
            Serial.println(String(buffer));
 
     #endif 
-      Serial.println(" EOF Obj3:");
 	

SE/stuff/P5_Automation_can-dev-res-working-1930/___SUBMODULES___/testing_calc_db/testing_calc_db.ino

@@ -12,8 +12,8 @@
 // Task Object attrs - like xsd element attrs of type (int value, other object)
 
 #define  DBG_OBJ_LEVEL  3 
-#define  idObject1__DISABLE   
-#define  idObject2__DISABLE
+//#define  idObject1__DISABLE   
+//#define  idObject2__DISABLE
 //#define  idObject3__DISABLE  
 
 
@@ -62,12 +62,15 @@ void setup() {
 	#include "calc_db_conf__setup__idObject1__variables.h"
 	#include "calc_db_conf__setup__idObject2__variables.h"
     #include "calc_db_conf__setup__idObject3__variables.h"
-	
+	Serial.println("ci();");
+
 	calc__db_init();
 	#include "calc_db_conf__setup__idObject1.h"
 	
 	#include "calc_db_conf__setup__idObject2.h"
 	#include "calc_db_conf__setup__idObject3.h"
+	
+	Serial.println("cD");
 
      #if not(defined(idObject1__DISABLE))
 	   calc__DBG_OBJ(idObject1);
@@ -78,11 +81,13 @@ void setup() {
 	 #if not(defined(idObject3__DISABLE))
 	   calc__DBG_OBJ(idObject3);
 	 #endif
+ 	Serial.println("S<");
+
+	 
 }
 
 void loop() {
     	Serial.println("\n[LOOP]");
-	//#include "calc_db_conf__setup__variables.h"
 
     //debugign changes that occurs to test calculation