a.binder 5 лет назад
Родитель
Сommit
5248646504

+ 1 - 1
SE/stuff/P5_Automation_can-dev-res/P5_Automation_can-dev-res.ino

@@ -91,7 +91,7 @@
 //#define DEBUG_ARDUINO_ATTR_ARRAY_S__commit_added_element_QUEUE
 //#define DEBUG_ARDUINO_ARRAY_INDEX_NEXT_LOCK
 //#define HAS__PCINT_setup //to allow interrupts
-//#define DEBUG_TASK_TYPE_T_Slave_Ports_broadcast____
+#define DEBUG_TASK_TYPE_T_Slave_Ports_broadcast____
 //#define DEBUG_TASK_TYPE_T_DISPLAY_queue_pop________
 //#define DEBUG_TASK_TYPE_T_Slave_Ports_set_I2C______
 //#define DEBUG_QUEUE_ASSERT todo not working

+ 1 - 1
SE/stuff/P5_Automation_can-dev-res/_Port_Broadcast_state_struct.h

@@ -7,5 +7,5 @@ const Broadcast_state_T  Broadcast_state_TO_REFRESH = 1; //0x01 ;
 const Broadcast_state_T  Broadcast_state_FRESH = 30 ;// 0x30 ;
 
 
-const Broadcast_state_T  Broadcast_state_FULL_FRESH = 254; //0xFF ;
+const Broadcast_state_T  Broadcast_state_FULL_FRESH = 250; //0xFF ;
 

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

@@ -90,7 +90,7 @@
                     #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 ) ; 
+            Slave_Ports_Status_A[i].Exp_state_ttl = Slave_Ports_Status_A[i].Exp_state_ttl - 10; //todo  (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

+ 8 - 7
SE/stuff/P5_Automation_can-dev-res/_Slave_Ports_broadcast_func.h

@@ -28,19 +28,20 @@
    */
   ) {
         #if defined(DEBUG_TASK_TYPE_T_Slave_Ports_broadcast____)
-            Serial.print("#251 _Slave_Ports_broadcast_POP INDEX_CURRENT_A["); Serial.print(Slave_Ports_Status_T_ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_INDEX_CURRENT_A); Serial.println("] ");
+            Serial.print("#251 _Slave_Ports_broadcast_POP INDEX_CURRENT_A["); Serial.print(Slave_Ports_Status_T_ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_INDEX_CURRENT_A); Serial.println("] "); 
+            
         #endif 
           int i;
           for(i=ARDUINO_ARRAY_INDEX_FIRST;i<= Slave_Ports_Status_T_ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_INDEX_CURRENT_A ;i++) { //Slave_Ports_Status_T_ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_INDEX_CURRENT_A // ARDUINO_ARRAY_INDEX_LIMIT_PORTS
             if(Slave_Ports_Status_A[i].IS_Local_A == IS_Local_TRUE) {  
-            
+            Serial.print(" Broadcast_state[");Serial.print(Slave_Ports_Status_A[i].Broadcast_state);Serial.print("] ");
             
             if(Slave_Ports_Status_A[i].Broadcast_state <= Broadcast_state_FRESH) {
                     
                     
                     #if defined(DEBUG) || defined(DEBUG_CAN) ||  defined(DEBUG_TASK_TYPE_T_Slave_Ports_broadcast____)
                         //if(DEBUG > 4) {
-                            Serial.print(" ind:"); Serial.print(i);  Serial.print("] IS_Local_A:");
+                            Serial.print("#43 ind:"); Serial.print(i);  Serial.print("] IS_Local_A:");
                             Serial.print(Slave_Ports_Status_A[i].IS_Local_A);
                             Serial.print(" , ID:"); 
                             Serial.print(Slave_Ports_Status_A[i].Port_ID, HEX); Serial.print(" , PortTypes:");
@@ -124,7 +125,7 @@
                                                 CAN_broadcast_A.PortTypes = Slave_Ports_Status_A[i].PortTypes ; 
                                                 CAN_broadcast_A.Exp_state = Slave_Ports_Status_A[i].Exp_state ;  
                                                 CAN_broadcast_A.Exp_state_ttl = Slave_Ports_Status_A[i].Exp_state_ttl ;
-                                                CAN_broadcast_A.Broadcast_state = Broadcast_state_FULL_FRESH ; //FORCED //Slave_Ports_Status_A[i].Broadcast_state ;
+                                                CAN_broadcast_A.Broadcast_state = Broadcast_state_FULL_FRESH ; //Slave_Ports_Status_A[i].Broadcast_state ;
                                                // CAN_broadcast_A._CAN_8 = TASK_TYPE_T_Slave_Ports_broadcast____ ;
                                    
                                      // CAN_broadcast_A._CAN_8 = _CAN_8_EMPTY ;
@@ -316,7 +317,7 @@
                                     
                         } else if(Slave_Ports_Status_A[i].Broadcast_state > Broadcast_state_TO_REFRESH)  { //if Bcast to refresh
                                  
-                                Serial.print("#238[BCAST]--"); 
+                                Serial.print("#238[BCAST]--[");Serial.print(Slave_Ports_Status_A[i].Broadcast_state);Serial.print("] "); 
                                 
                                 Slave_Ports_Status_A[i].Broadcast_state =  Slave_Ports_Status_A[i].Broadcast_state - (TASK_TYPE_T_Slave_Ports_broadcast____time_min_run_MIN_A_INCREMENT_A / 1000) ;
                         
@@ -327,9 +328,9 @@
                     Serial.print(Slave_Ports_Status_A[i].IS_Local_A);
                     Serial.print("] ");  Serial.print("[DELETE PORT?]");
                     
-                    if(Slave_Ports_Status_A[i].Broadcast_state - ( TASK_TYPE_T_Slave_Ports_broadcast____time_min_run_MIN_A_INCREMENT_A / 1000 ) < 0 )
+                    if((Slave_Ports_Status_A[i].Broadcast_state - 10) < 0 ) //( TASK_TYPE_T_Slave_Ports_broadcast____time_min_run_MIN_A_INCREMENT_A / 1000 )
                         Slave_Ports_Status_A[i].IS_gone_A = IS_gone_TRUE ;
-                    Slave_Ports_Status_A[i].Broadcast_state = Slave_Ports_Status_A[i].Broadcast_state - ( TASK_TYPE_T_Slave_Ports_broadcast____time_min_run_MIN_A_INCREMENT_A / 1000 ) ;
+                    Slave_Ports_Status_A[i].Broadcast_state = Slave_Ports_Status_A[i].Broadcast_state - 10 ; //
                 
                 } else { //if(Slave_Ports_Status_A[i].IS_Local_A == IS_Local_TRUE) {
                  #if defined(DEBUG) //|| defined(DEBUG_CAN) || defined(DEBUG_TASK_TYPE_T_Slave_Ports_broadcast____)