Jelajahi Sumber

todo back do 17

a.binder 5 tahun lalu
induk
melakukan
2e01052a7e

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

@@ -100,9 +100,9 @@
 #define DISPLAY_array16_T_is_DISPLAY_string_T 
 #define ENABLE_DISPLAY_MENU
 //#define DISABLE_ANY_PRINT //when uno ?
-#define DISPLAY_MENU_SELECTOR_DEBUG 
+//#define DISPLAY_MENU_SELECTOR_DEBUG 
 //#define DISPLAY__print_menu_DELAY 500 
-#define DISABLE_TASK_TYPE_T_Broadcast_state_LOW
+//#define DISABLE_TASK_TYPE_T_Broadcast_state_LOW
 
 #define Sprintln(a) (Serial.println(a))
 /*

+ 2 - 2
SE/stuff/P5_Automation_can-dev-res/__PORTS/_Port_Broadcast_state_struct.h

@@ -4,9 +4,9 @@ typedef int Broadcast_state_T ;
 const Broadcast_state_T  Broadcast_state_TO_REFRESH = 1; //0x01 ;
 
 
-const Broadcast_state_T  Broadcast_state_FRESH = 15 ;// 0x30 ;
+const Broadcast_state_T  Broadcast_state_FRESH = 30 ;// 0x30 ;
 
 const Broadcast_state_T  Broadcast_state_LOW = 3 ;// 0x30 ;
 
-const Broadcast_state_T  Broadcast_state_FULL_FRESH = 30; //0xFF ;
+const Broadcast_state_T  Broadcast_state_FULL_FRESH = 150; //0xFF ;
 

+ 12 - 2
SE/stuff/P5_Automation_can-dev-res/__QUEUE/_Slave_Ports_broadcast_func.h

@@ -1,3 +1,7 @@
+
+
+
+
 void TASK_TYPE_T_Broadcast_state_LOW(Slave_Ports_Status_T* Slave_Ports_Status_A, 
         Slave_Ports_Status_T_ARDUINO_ATTR_ARRAY_T &Slave_Ports_Status_T_ARDUINO_ATTR_ARRAY_A
         ) {
@@ -341,7 +345,8 @@ void TASK_TYPE_T_Broadcast_state_LOW(Slave_Ports_Status_T* Slave_Ports_Status_A,
                                  
                                 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)  ; //(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 - (TASK_TYPE_T_Slave_Ports_broadcast____time_min_run_MIN_A_INCREMENT_A / 1000)  ; //(TASK_TYPE_T_Slave_Ports_broadcast____time_min_run_MIN_A_INCREMENT_A / 1000)
+                                Slave_Ports_Status_A[i].Broadcast_state = BYTE_SAFE_DECREMENT_TO_LIMIT(Broadcast_state_TO_REFRESH,  Slave_Ports_Status_A[i].Broadcast_state, (TASK_TYPE_T_Slave_Ports_broadcast____time_min_run_MIN_A_INCREMENT_A / 1000) );
                         
                         }
                 } else if(Slave_Ports_Status_A[i].IS_Local_A == IS_Local_FALSE and Slave_Ports_Status_A[i]._Slave_ID > 0 and Slave_Ports_Status_A[i].Port_ID > 0 ) {
@@ -352,7 +357,8 @@ void TASK_TYPE_T_Broadcast_state_LOW(Slave_Ports_Status_T* Slave_Ports_Status_A,
                     
                     if((Slave_Ports_Status_A[i].Broadcast_state - (TASK_TYPE_T_Slave_Ports_broadcast____time_min_run_MIN_A_INCREMENT_A / 1000) ) < 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 - (TASK_TYPE_T_Slave_Ports_broadcast____time_min_run_MIN_A_INCREMENT_A / 1000)  ; //
+                    Slave_Ports_Status_A[i].Broadcast_state = BYTE_SAFE_DECREMENT_TO_LIMIT( Broadcast_state_TO_REFRESH,  Slave_Ports_Status_A[i].Broadcast_state, (TASK_TYPE_T_Slave_Ports_broadcast____time_min_run_MIN_A_INCREMENT_A / 1000)   ) ;
                 
                 } 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____)
@@ -384,4 +390,8 @@ void TASK_TYPE_T_Broadcast_state_LOW(Slave_Ports_Status_T* Slave_Ports_Status_A,
           
 
  } //EOF _Slave_Ports_broadcast_POP
+ 
+ 
+ 
+ 
  

+ 9 - 0
SE/stuff/P5_Automation_can-dev-res/___main/__main_struct_funct.h

@@ -608,3 +608,12 @@ ARDUINO_ARRAY_INDEX_T  ARDUINO_ARRAY_INDEX__next__looop(
     
 }
 
+
+
+int BYTE_SAFE_DECREMENT_TO_LIMIT(byte limit_min_with, byte curr_value, int try_decrement ) {
+        if((curr_value - try_decrement) < limit_min_with) return limit_min_with;
+        else {
+        Serial.print(" SAFE DECR detect curr["); Serial.print(curr_value); Serial.print("] decrement[");  Serial.print(try_decrement); Serial.print("]  ");
+         return (curr_value - try_decrement) ;
+         }
+}