a.binder 5 년 전
부모
커밋
f0278ce21f

+ 4 - 4
SE/stuff/P5_Automation_can-dev-res/_Slave_Ports_I2C_func.h

@@ -76,10 +76,10 @@
             #endif
       if(Slave_Ports_Status_A[i].PortTypes & PortTypes_I2C) { //{2 BIN TEST
             if(Slave_Ports_Status_A[i].Exp_state_ttl >= Exp_state_ttl_FRESH ) {
-            #if defined(DEBUG) || defined(DEBUG_I2C_driver_Adafruit_PWMServoDrive)
-                Serial.print("#71PWC[");  Serial.print(Slave_Ports_Status_A[i].I2C_port);   Serial.print("]TTL--[");  Serial.print(Slave_Ports_Status_A[i].Exp_state_ttl);
-            #endif
-            Slave_Ports_Status_A[i].Exp_state_ttl = Slave_Ports_Status_A[i].Exp_state_ttl - 20 ; 
+                    #if defined(DEBUG) || defined(DEBUG_I2C_driver_Adafruit_PWMServoDrive)
+                        Serial.print("#71PWC[");  Serial.print(Slave_Ports_Status_A[i].I2C_port);   Serial.print("]TTL--[");  Serial.print(Slave_Ports_Status_A[i].Exp_state_ttl);
+                    #endif
+            Slave_Ports_Status_A[i].Exp_state_ttl = Slave_Ports_Status_A[i].Exp_state_ttl - (TASK_TYPE_T_Slave_Ports_set_I2C______time_min_run_MIN_A_INCREMENT_A / 1000 ) ; 
             } else if(Slave_Ports_Status_A[i].Exp_state_ttl <= Exp_state_ttl_FRESH ) { //{3
              #if defined(DEBUG) || defined(DEBUG_I2C_driver_Adafruit_PWMServoDrive)
                 if(DEBUG > 4) { //{4

+ 13 - 13
SE/stuff/P5_Automation_can-dev-res/_Slave_Ports_Status_func.h

@@ -223,9 +223,9 @@
                  message.concat(" ");
                
                    message2 = message  ; message2.concat(" ");//E:
-                   String Exp_state_s  = BIN8_to_STRING(Slave_Ports_Status_A[i].Exp_state) ; // ="";    
+                   //String Exp_state_s  = BIN8_to_STRING(Slave_Ports_Status_A[i].Exp_state) ; // ="";    
                     //message2.concat(Exp_state_s.substring(1,8));
-                    message2.concat(Exp_state_s);
+                   // message2.concat(Exp_state_s);
 
                    /*
                    if(Slave_Ports_Status_A[i].Exp_state & Exp_state_ERROR ) {
@@ -237,24 +237,24 @@
                    }
                    */
                    message2.concat(" ");// B:
-                     if(Slave_Ports_Status_A[i].Exp_state_ttl & Exp_state_ttl_TO_REFRESH ) {
-                         message2.concat("R");// B:
-                      } else {
-                        message2.concat(""); //T:
+                     //if(Slave_Ports_Status_A[i].Exp_state_ttl & Exp_state_ttl_TO_REFRESH ) {
+                     //    message2.concat("R");// B:
+                     // } else {
+                     //   message2.concat(""); //T:
                         message2.concat(Slave_Ports_Status_A[i].Exp_state_ttl )  ;
-                        message2.concat(""); //T:
-                    }
+                     //   message2.concat(""); //T:
+                   // }
                     
                     
                     
-                    if(Slave_Ports_Status_A[i].Broadcast_state > Broadcast_state_FRESH ) {
+                   // if(Slave_Ports_Status_A[i].Broadcast_state > Broadcast_state_FRESH ) {
                          //message2.concat(" R ");// B:
-                         message2.concat("B");
-                    } else {
-                       // message2.concat(" ");// B:
+                     //    message2.concat(" B");
+                    //} else {
+                        message2.concat(" ");// B:
                          message2.concat(Slave_Ports_Status_A[i].Broadcast_state )  ;
                          //message2.concat(" ");// B:
-                    }
+                    //}
                     
                      if(Slave_Ports_Status_A[i].IS_Local_A == IS_Local_TRUE) {
                          message2.concat(" L");// B:

+ 1 - 5
SE/stuff/P5_Automation_can-dev-res/_Slave_Ports_broadcast_func.h

@@ -185,10 +185,6 @@
                         
                         
                         
-                        
-                        
-                        
-                        
                      //    byte sndStat = CAN0.sendMsgBuf(Slave_Ports_Status_A[i].Port_ID, 0, 8, data);
                          //byte CAN_broadcast_A8[8];
                           
@@ -205,7 +201,7 @@
                                                 // {0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07}
                                               //   byte CAN_broadcast_A9[8] = {0xFF, 0x101, 0x02, 0x03, 0x04, 0x05, 0x07,  0x08};
                        //  CAN_data_debug(CAN_broadcast_A9);
-                         byte sndStat = CAN0.sendMsgBuf(Active_ControllerID, 0, 8, CAN_MSG8_A);  CAN_data_debug(CAN_MSG8_A);   //CAN_MSG8_A
+                         byte sndStat = CAN0.sendMsgBuf(Active_ControllerID_HEX, 0, 8, CAN_MSG8_A);  CAN_data_debug(CAN_MSG8_A);   //CAN_MSG8_A
                          delay(200);
                       //    byte sndStat ;
                                   if(sndStat == CAN_OK){

+ 2 - 2
SE/stuff/P5_Automation_can-dev-res/___loop/___loop_init.h

@@ -18,7 +18,7 @@ register ARDUINO_FUNCT_INIT_RESULT_T ARDUINO_LOOP_INITIALIZED_A = 0;
 
 
 
-static ARDUINO_ARRAY_time_min_run_MIN_T TASK_TYPE_T_Slave_Ports_broadcast____time_min_run_MIN_A = 30000 ;
+static ARDUINO_ARRAY_time_min_run_MIN_T TASK_TYPE_T_Slave_Ports_broadcast____time_min_run_MIN_A = TASK_TYPE_T_Slave_Ports_broadcast____time_min_run_MIN_A_INCREMENT_A ;
 
-static ARDUINO_ARRAY_time_min_run_MIN_T TASK_TYPE_T_Slave_Ports_set_I2C______time_min_run_MIN_A = 20000 ;
+static ARDUINO_ARRAY_time_min_run_MIN_T TASK_TYPE_T_Slave_Ports_set_I2C______time_min_run_MIN_A = TASK_TYPE_T_Slave_Ports_set_I2C______time_min_run_MIN_A_INCREMENT_A  ;
 

+ 2 - 2
SE/stuff/P5_Automation_can-dev-res/___loop/__main_loop_top.h

@@ -93,7 +93,7 @@ if(ARDUINO_LOOP_LATENCY_COUNTER__MAIN(ARDUINO_LOOP_LATENCY__MAIN_A) <= ARDUINO_L
                         Serial.print("[ #777 time > TASK_TYPE_T_Slave_Ports_broadcast____time_min_run_MIN_A][");Serial.print(TASK_TYPE_T_Slave_Ports_broadcast____time_min_run_MIN_A);Serial.print(print_SEP_RT);
                         Serial.print("time[");Serial.print(time);Serial.print(print_SEP_RT);
                     #endif 
-                TASK_TYPE_T_Slave_Ports_broadcast____time_min_run_MIN_A = time + 30000 ;
+                TASK_TYPE_T_Slave_Ports_broadcast____time_min_run_MIN_A = time + TASK_TYPE_T_Slave_Ports_broadcast____time_min_run_MIN_A_INCREMENT_A ;
                     ARDUINO_FUNCT_INIT_RESULT_Slave_Ports_queue__add = _Slave_Ports_queue__add(  Slave_Ports_Status_QUEUE_A, Slave_Ports_Status_QUEUE_T_ARDUINO_ATTR_ARRAY_A ,
                      TASK_TYPE_T_Slave_Ports_broadcast____ ,TASK_PORT_ASSOC_EMPTY ,time, time  , ARDUINO_ARRAY_INDEX_NOT_SET ) ;  //        "_Slave_Ports_broadcast", //4
             
@@ -104,7 +104,7 @@ if(ARDUINO_LOOP_LATENCY_COUNTER__MAIN(ARDUINO_LOOP_LATENCY__MAIN_A) <= ARDUINO_L
                         Serial.print(" [ #104 time > TASK_TYPE_T_Slave_Ports_set_I2C______time_min_run_MIN_A][");Serial.print(TASK_TYPE_T_Slave_Ports_set_I2C______time_min_run_MIN_A);Serial.print(print_SEP_RT);
                         Serial.print("time[");Serial.print(time);Serial.print(print_SEP_RT);
                     #endif 
-                TASK_TYPE_T_Slave_Ports_set_I2C______time_min_run_MIN_A = time + 20000 ;
+                TASK_TYPE_T_Slave_Ports_set_I2C______time_min_run_MIN_A = time + TASK_TYPE_T_Slave_Ports_set_I2C______time_min_run_MIN_A_INCREMENT_A  ;
                 ARDUINO_FUNCT_INIT_RESULT_Slave_Ports_queue__add = _Slave_Ports_queue__add(  Slave_Ports_Status_QUEUE_A, Slave_Ports_Status_QUEUE_T_ARDUINO_ATTR_ARRAY_A ,
                      TASK_TYPE_T_Slave_Ports_set_I2C______  ,TASK_PORT_ASSOC_EMPTY ,time, time  , ARDUINO_ARRAY_INDEX_NOT_SET ) ;  //        "_Slave_Ports_broadcast", //4
             }

+ 5 - 0
SE/stuff/P5_Automation_can-dev-res/___main/__main_struct_limits.h

@@ -15,3 +15,8 @@ const ARDUINO_ARRAY_INDEX_LIMIT_T  ARDUINO_ARRAY_INDEX_LIMIT_QUEUE = 10 ; // 20
 
 const  ARDUINO_SIZE_MIN_T ARDUINO_SIZE_MIN_encoderPos = 0 ; //for display etc
 const  ARDUINO_SIZE_MAX_T ARDUINO_SIZE_MAX_encoderPos = 256 ; //for display etc
+
+
+
+ARDUINO_ARRAY_time_min_run_MIN_T TASK_TYPE_T_Slave_Ports_broadcast____time_min_run_MIN_A_INCREMENT_A = 30000 ;
+ARDUINO_ARRAY_time_min_run_MIN_T TASK_TYPE_T_Slave_Ports_set_I2C______time_min_run_MIN_A_INCREMENT_A = 20000 ;