debugging

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

@@ -43,28 +43,28 @@ void calc__DBG_OBJ(int idObj) {
 	#if(DBG_OBJ_LEVEL > 2)
    	for (int i = calc__get_firstAttr(idObj); i <= calc__get_lastAttr(idObj); i++) {
    		if (DB_ATTR[i][2] == idObj) {
-   		       if     (i==0) { SPFT(0); }
-   		       else if(i==1) { SPFT(1); }
-                  else if(i==2) { SPFT(2); }
-                  else if(i==3) { SPFT(3); }
-                  else if(i==4) { SPFT(4); }
-                  else if(i==5) { SPFT(5); }
-                  else if(i==6) { SPFT(6); }
-                  else if(i==7) { SPFT(7); }
-                  else if(i==8) { SPFT(8); }
-                  else if(i==9) { SPFT(9); }
-                  else if(i==10) { SPFT(10); }
-                  else if(i==11) { SPFT(11); }
-                  else if(i==12) { SPFT(12); }
-                  
-
+        		      
    			// Serial.println(printf("%d:{%d,%d,%d}, ", i, DB_ATTR[i][0], DB_ATTR[i][1], DB_ATTR[i][2]));
-   			 n=sprintf(buffer, "%d:{%d,%d,%d}, ",  i, DB_ATTR[i][0], DB_ATTR[i][1], DB_ATTR[i][2]);
+   			 n=sprintf(buffer, "a %d:{%d,%d,%d}, ",  i, DB_ATTR[i][0], DB_ATTR[i][1], DB_ATTR[i][2]);
                 Serial.println(String(buffer));
    		   //Serial.println(printf("%d:{%d,%d}, ", i, DB_ATTR[i][0], DB_ATTR[i][1]));
-   			 n=sprintf(buffer, "%d:{%d,%d}, ", i, DB_ATTR[i][0], DB_ATTR[i][1]);
-                Serial.println(String(buffer));
-                
+   			// n=sprintf(buffer, "b %d:{%d,%d}, ", i, DB_ATTR[i][0], DB_ATTR[i][1]);
+                //Serial.println(String(buffer));
+                /* if     (i==0) { SPFT(0); Serial.println(" [#46] ") ; }
+        		       else if(i==1) { SPFT(1); }
+                       else if(i==2) { SPFT(2); }
+                       else if(i==3) { SPFT(3); }
+                       else if(i==4) { SPFT(4); }
+                       else if(i==5) { SPFT(5); }
+                       else if(i==6) { SPFT(6); }
+                       else if(i==7) { SPFT(7); }
+                       else if(i==8) { SPFT(8); }
+                       else if(i==9) { SPFT(9); }
+                       else if(i==10) { SPFT(10); }
+                       else if(i==11) { SPFT(11); }
+                       else if(i==12) { SPFT(12); }
+                       else Serial.println(DB_ATTR[i][0]);
+                  */
    		}
    	};
 	// Serial.println("}\n");

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

@@ -0,0 +1,7 @@
+const    int PIN_NR = 0;
+const	int LVL_MIN = 1;
+const	int LVL_MAX = 2;
+const	int LVL_VAL = 3;
+const	int DELTA = 4;
+const	int MAX_DELTA = 5;
+const	int SWING = 6;

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

@@ -1,5 +1,6 @@
-	int idObject1 = calc__db_create_obj(); // LVL_VAL = (LVL_VAL + DELTA > LVL_MAX) ? LVL_VAL - DELTA : LVL_VAL + DELTA;
+	 idObject1 = calc__db_create_obj(); // LVL_VAL = (LVL_VAL + DELTA > LVL_MAX) ? LVL_VAL - DELTA : LVL_VAL + DELTA;
 
+#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
@@ -10,3 +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

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

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

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

@@ -1,5 +1,6 @@
+	 idObject2 = calc__db_create_obj();
 
-	int idObject2 = calc__db_create_obj();
+#if not(defined(idObject2__DISABLE))
 	//  int NEW_VAL = LVL_VAL + SWING;
 	// 	if (NEW_VAL > LVL_MAX) {
 	// 	  LVL_VAL = LVL_MAX - (NEW_VAL - LVL_MAX);
@@ -33,3 +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

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

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

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

@@ -0,0 +1,22 @@
+
+	int idObject3 = calc__db_create_obj();
+	//  int NEW_VAL = LVL_VAL + SWING;
+	// 	if (NEW_VAL > LVL_MAX) {
+	// 	  LVL_VAL = LVL_MAX - (NEW_VAL - LVL_MAX);
+	// 	  SWING = -1 * SWING;
+	//  } else {
+	//    if (NEW_VAL < LVL_MIN) {
+	// 	    LVL_VAL = LVL_MIN + (LVL_MIN - NEW_VAL);
+	// 	    SWING = -1 * SWING;
+	// 	  } else {
+	// 	    LVL_VAL = NEW_VAL;
+	// 	  }
+	// 	}
+	calc__db_conf_add1(idObject3, CALC_GET_DATA, LVL_VAL); // reg: 0  : LVL_VAL
+	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_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

@@ -0,0 +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[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/const_calc.h

@@ -32,4 +32,21 @@ FT(10, "CALC_FUNC_SUB attr[i] = { a, b }");
 const int CALC_FUNC_OPPOSITE = 11; //  attr[i] = { a, b }               // regVal[i] = -1 * regVal[a]
 FT(11, "CALC_FUNC_OPPOSITE attr[i] = { a, b }");
 const int CALC_FINISH        = 12;
-FT(12, "CALC_FINISH");
+FT(12, "CALC_FINISH");
+
+
+
+const int DB_OBJ_MAX = 10; // Object list -> Conf -> Attr
+int DB_OBJ_IDX = 0;
+
+//int DB_OBJ[DB_OBJ_MAX][4]; // idObj => { firstConf, lastConf, firstAttr, lastAttr }
+int DB_OBJ[DB_OBJ_MAX][4]; // idObj => { firstConf, lastConf, firstAttr, lastAttr }
+const int DB_CONF_MAX = 100; // Conf list
+int DB_CONF_IDX = 0;
+int DB_CONF[DB_CONF_MAX]; // idType
+const int DB_ATTR_MAX = 100; // Attr list
+int DB_ATTR_IDX = 0;
+int DB_ATTR[DB_ATTR_MAX][3]; // { relIdxConf, value, idObj }
+
+
+

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

@@ -1,15 +1,56 @@
-  #if(DBG_OBJ_LEVEL > 2)
-     int n ;
-     char buffer [50];
-     // Serial.println("DBG:loop:%d:obj1:", calcLoopCounterDBG);
-      n=sprintf(buffer, "DBG:loop:%d:obj1:", calcLoopCounterDBG);
-	  Serial.print(String(buffer));
-   #endif
+#if(DBG_OBJ_LEVEL > 2)
+        int n ;
+        char buffer [50];
+#endif
+
+
+
+        
+#if defined(idObject1__DISABLE)
+#else
+    calc__DBG_OBJ(idObject1);
+    
+     #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);
-	// Serial.println("DBG:loop:%d:obj1:END; obj1[LVL_VAL:%d] = %d", calcLoopCounterDBG, LVL_VAL, obj1[LVL_VAL]);
+    #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 defined(idObject2__DISABLE)
+    #else
+           n=sprintf(buffer, "DBG:loop:%d:obj2:", calcLoopCounterDBG);
+           Serial.println(String(buffer));
+
+	       calc__run(idObject2, obj2);
+           n=sprintf(buffer, "DBG:loop:%d:obj2:END; obj2[LVL_VAL:%d] = %d", calcLoopCounterDBG, LVL_VAL, obj2[LVL_VAL]);
+           Serial.println(String(buffer));
+
+    #endif 
+    Serial.println(" low Obj3:");
+    
+    #if defined(idObject3__DISABLE)
+    #else
+            n=sprintf(buffer, "DBG:loop:%d:obj3:", calcLoopCounterDBG);
+           Serial.println(String(buffer));
+
+	       calc__run(idObject3, obj3);
+           n=sprintf(buffer, "DBG:loop:%d:obj3:END; obj3[LVL_VAL:%d] = %d", calcLoopCounterDBG, LVL_VAL, obj3[LVL_VAL]);
+           Serial.println(String(buffer));
 
-	// Serial.println("DBG:loop:%d:obj2:", calcLoopCounterDBG);
-	calc__run(idObject2, obj2);
-	// Serial.println("DBG:loop:%d:obj2:END; obj2[LVL_VAL:%d] = %d", calcLoopCounterDBG, LVL_VAL, obj2[LVL_VAL]);
-  
+    #endif 
+      Serial.println(" EOF Obj3:");
+	

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

@@ -12,21 +12,14 @@
 // Task Object attrs - like xsd element attrs of type (int value, other object)
 
 #define  DBG_OBJ_LEVEL  3 
-
-#include "const_calc.h" //attributes avialable to calculate
+#define  idObject1__DISABLE   
+#define  idObject2__DISABLE
+//#define  idObject3__DISABLE  
 
 
-const int DB_OBJ_MAX = 10; // Object list -> Conf -> Attr
-int DB_OBJ_IDX = 0;
+#include "const_calc.h" //attributes avialable to calculate
+#include "calc_db_conf__const__variables.h"
 
-//int DB_OBJ[DB_OBJ_MAX][4]; // idObj => { firstConf, lastConf, firstAttr, lastAttr }
-int DB_OBJ[DB_OBJ_MAX][4]; // idObj => { firstConf, lastConf, firstAttr, lastAttr }
-const int DB_CONF_MAX = 50; // Conf list
-int DB_CONF_IDX = 0;
-int DB_CONF[DB_CONF_MAX]; // idType
-const int DB_ATTR_MAX = 100; // Attr list
-int DB_ATTR_IDX = 0;
-int DB_ATTR[DB_ATTR_MAX][3]; // { relIdxConf, value, idObj }
 
 #include "calc_db.h"
 #include "calc_db_conf.h"
@@ -40,8 +33,11 @@ int calcLoopCounterDBG = 0;
 const int TOTAL_ATTRS = 7;
 int obj1[TOTAL_ATTRS];
 int obj2[TOTAL_ATTRS];
+int obj3[TOTAL_ATTRS];
+
 int idObject1 = 0;
 int idObject2 = 0;
+int idObject3 = 0;
 
 void setup() {
 	Serial.begin(115200);
@@ -59,43 +55,38 @@ void setup() {
 	// char inputBuf[1];
 	// char inputChar;
 
-	int PIN_NR = 0;
-	int LVL_MIN = 1;
-	int LVL_MAX = 2;
-	int LVL_VAL = 3;
-	int DELTA = 4;
-	int MAX_DELTA = 5;
-	int SWING = 6;
-	obj1[PIN_NR] = 9; // const
-	obj1[LVL_MIN] = 150; // const
-	obj1[LVL_MAX] = 200; // const
-	obj1[LVL_VAL] = 150; // var, default = 150
-	obj1[DELTA] = 0; // var, default 0
-	obj1[MAX_DELTA] = 10; // var, default = 10
-	obj1[SWING] = 8; // var, default = 8
-
-	obj2[PIN_NR] = 10; // const
-	obj2[LVL_MIN] = 150; // const
-	obj2[LVL_MAX] = 200; // const
-	obj2[LVL_VAL] = 150; // var, default = 150
-	obj2[DELTA] = 0; // var, default 0
-	obj2[MAX_DELTA] = 10; // var, default = 10
-	obj2[SWING] = 30; // var, default = 8
+	
+	
 
+	
+	#include "calc_db_conf__setup__idObject1__variables.h"
+	#include "calc_db_conf__setup__idObject2__variables.h"
+    #include "calc_db_conf__setup__idObject3__variables.h"
+	
 	calc__db_init();
 	#include "calc_db_conf__setup__idObject1.h"
+	
 	#include "calc_db_conf__setup__idObject2.h"
-
-	calc__DBG_OBJ(idObject1);
-	calc__DBG_OBJ(idObject2);
+	#include "calc_db_conf__setup__idObject3.h"
+
+     #if not(defined(idObject1__DISABLE))
+	   calc__DBG_OBJ(idObject1);
+	 #endif
+	 #if not(defined(idObject2__DISABLE))
+	   calc__DBG_OBJ(idObject2);
+	 #endif
+	 #if not(defined(idObject3__DISABLE))
+	   calc__DBG_OBJ(idObject3);
+	 #endif
 }
 
 void loop() {
-    
+    	Serial.println("\n[LOOP]");
+	//#include "calc_db_conf__setup__variables.h"
+
     //debugign changes that occurs to test calculation
-    calc__DBG_OBJ(idObject1); 
 
   #include "loop.h"
 	Serial.println("Test calc db: End");
-  delay(500);
+  delay(3500);
 }