a.binder 5 lat temu
rodzic
commit
44085b07e4

+ 19 - 0
SE/stuff/P5_Automation_can-dev-res/_ROTTARY_SW_loop.h

@@ -6,4 +6,23 @@
      //Adafruit_PWMServoDriver_0X40.setPWM(1, 0, map(encoderPos, 0, 180, SERVOMIN, SERVOMAX));
      Adafruit_PWMServoDriver_0X40.setPWM(2, encoderPos * 5, encoderPos * 5);
 
+
+
+ DISPLAY__print(
+                          DISPLAY_A ,
+                          DISPLAY_T_ARDUINO_ATTR_ARRAY_A , 
+                          DISPLAY_PHYSICAL_CHAR_A, 
+                           DISPLAY_pos_seq_A_NEXT,
+                            DISPLAY_array16_I( "OUT I2C 0X40[2]" + encoderPos * 5 , 2), //message,
+                            DISPLAY_TARGET_DISPLAY128,
+                           millis() , // time_seq_id_T time_seq_id_A;
+                           millis(), //time_min_run_T time_min_run_A;
+                          //queue
+                         Slave_Ports_Status_QUEUE_A,
+                         TASK_TYPE_T_Slave_Ports_broadcast____  ,  //TASK_TYPE_A,
+                         {  } //TASK_PORT_ASSOC_A Slave_Ports_Status_A[i].Port_ID
+                         
+                         ); 
+
+
   }

+ 1 - 0
SE/stuff/P5_Automation_can-dev-res/_Slave_Ports_Status_func.h

@@ -67,6 +67,7 @@
     Slave_Ports_Status_A[i].Broadcast_state = Broadcast_state ;
     Slave_Ports_Status_A[i].I2C_port = I2C_port ;
     Slave_Ports_Status_A[i].I2C_driver = I2C_driver ;
+    Slave_Ports_Status_A[i].IS_Local_A = IS_Local_A;
   //  Slave_Ports_Status_A[Slave_Ports_Status_T_ARDUINO_ARRAY_COUNT_A + 1].I2C_driver = I2C_driver_F(I2C_driver) ;
             ARDUINO_ATTR_ARRAY_S__commit_added_element(
                           Slave_Ports_Status_T_ARDUINO_ATTR_ARRAY_A , 

+ 53 - 11
SE/stuff/P5_Automation_can-dev-res/_Slave_Ports_broadcast_func.h

@@ -26,12 +26,12 @@
    DISPLAY_PHYSICAL_CHAR_T &DISPLAY_PHYSICAL_CHAR_A
    */
   ) {
-        Serial.println("#251 _Slave_Ports_broadcast_POP");
+        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("] ");
           int i;
           for(i=ARDUINO_ARRAY_INDEX_FIRST;i<=Slave_Ports_Status_T_ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_INDEX_CURRENT_A;i++) {
             if(Slave_Ports_Status_A[i].Broadcast_state == Broadcast_state_TO_REFRESH and Slave_Ports_Status_A[i].IS_Local_A == IS_Local_TRUE) {
-            #ifdef DEBUG
-                if(DEBUG > 5) {
+            #if defined(DEBUG)
+                if(DEBUG > 4) {
                     Serial.print(" ind:"); Serial.print(i);  Serial.print("] IS_Local_A:");
                     Serial.print(Slave_Ports_Status_A[i].IS_Local_A);
                     Serial.print(" , ID:"); 
@@ -63,8 +63,8 @@
                          { Slave_Ports_Status_A[i].Port_ID } //TASK_PORT_ASSOC_A
                          
                          ); 
-                     Serial.println(" Prepared data");
-                        #if defined(HAS_LCD1602)                              
+                     Serial.println("#66A Prepared data");
+                      /*  todo #if defined(HAS_LCD1602)                              
                              String LCDarray1 = "L[";
                              LCDarray1.concat(Slave_Ports_Status_A[i].IS_Local_A); LCDarray1.concat("] ID["); LCDarray1.concat(String(Slave_Ports_Status_A[i].Port_ID, HEX)); LCDarray1.concat("] T["); LCDarray1.concat(String(Slave_Ports_Status_A[i].PortTypes, HEX));
                             // lcd.print(LCDarray1);
@@ -72,6 +72,7 @@
                                  LCDarray2.concat(String(Slave_Ports_Status_A[i].Exp_state_ttl, HEX)) ; LCDarray2.concat("]") ;
                                  LCD_print(LCDarray1, LCDarray2, LCDtim / 2 ) ;
                         #endif
+                        */
                         //                        (0)           (1)           (2)                       (3)                         (4)                         (5)                     (6)                   
                       byte data[8] = {Slave_Ports_Status_A[i].Address,  0x04, Slave_Ports_Status_A[i].LocalPort, Slave_Ports_Status_A[i].PortTypes, Slave_Ports_Status_A[i].LocalPort, Slave_Ports_Status_A[i].Exp_state, Slave_Ports_Status_A[i].Exp_state_ttl, 0x07};
                      // byte data[8] = {element.Address,          0x04, element.LocalPort,          element.PortTypes,                element.LocalPort,         element.Exp_state,         element.Exp_state_ttl, 0x07};
@@ -81,17 +82,43 @@
                  byte sndStat = CAN0.sendMsgBuf(Slave_Ports_Status_A[i].Port_ID, 0, 8, data);
               //    byte sndStat ;
                           if(sndStat == CAN_OK){
-                            Serial.println("Message Sent Successfully!");
-                             String LCDarray1 = "Message Sent";
-                             String LCDarray2 = "Successfully";
+                            Serial.println("#921 Message Sent Successfully!");
+                             //String LCDarray1 = "Message Sent";
+                             //String LCDarray2 = "Successfully";
+                              DISPLAY__print( DISPLAY_A ,
+                                               DISPLAY_T_ARDUINO_ATTR_ARRAY_A , 
+                                               DISPLAY_PHYSICAL_CHAR_A, 
+                                                DISPLAY_pos_seq_A_NEXT,
+                                                 DISPLAY_array16_I( "#92MSG Sent OK " + char( Slave_Ports_Status_A[i].Port_ID  ) , 2), //message,
+                                                 DISPLAY_TARGET_DISPLAY128,
+                                                millis() , // time_seq_id_T time_seq_id_A;
+                                                millis(), //time_min_run_T time_min_run_A;
+                                               //queue
+                                              Slave_Ports_Status_QUEUE_A,
+                                              TASK_TYPE_T_Slave_Ports_broadcast____  ,  //TASK_TYPE_A,
+                                              { Slave_Ports_Status_A[i].Port_ID } //TASK_PORT_ASSOC_A
+                                              ); 
                           } else {
                             Serial.println("Error Sending Message...");
-                            String LCDarray1 = "Error Sending";
-                            String LCDarray2 = "Message...";
+                            DISPLAY__print( DISPLAY_A ,
+                                               DISPLAY_T_ARDUINO_ATTR_ARRAY_A , 
+                                               DISPLAY_PHYSICAL_CHAR_A, 
+                                                DISPLAY_pos_seq_A_NEXT,
+                                                 DISPLAY_array16_I( "#107MSG ERROR " + char( Slave_Ports_Status_A[i].Port_ID  ) , 2), //message,
+                                                 DISPLAY_TARGET_DISPLAY128,
+                                                millis() , // time_seq_id_T time_seq_id_A;
+                                                millis(), //time_min_run_T time_min_run_A;
+                                               //queue
+                                              Slave_Ports_Status_QUEUE_A,
+                                              TASK_TYPE_T_Slave_Ports_broadcast____  ,  //TASK_TYPE_A,
+                                              { Slave_Ports_Status_A[i].Port_ID } //TASK_PORT_ASSOC_A
+                                              ); 
+                            //String LCDarray1 = "Error Sending";
+                            //String LCDarray2 = "Message...";
                           }
 
                             #if defined(HAS_LCD1602)
-                                    LCD_print(LCDarray1,LCDarray2,LCDtim);
+                                  //  LCD_print(LCDarray1,LCDarray2,LCDtim);
                                   /*
                                    delay(LCDtim * 5);  
                                     //lcd.setCursor(0,1); 
@@ -114,6 +141,21 @@
                                //   #endif
 
                                   //    delay(5000);   // send data per 100ms
+                } else {
+                 #if defined(DEBUG)
+                if(DEBUG > 4) {
+                    Serial.print("#147 BCAST NOT SENT  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:");
+                    Serial.print(Slave_Ports_Status_A[i].PortTypes, HEX); Serial.print(" , Addr:"); Serial.print(Slave_Ports_Status_A[i].Address, HEX);
+                    Serial.print(" , Local:"); Serial.print(Slave_Ports_Status_A[i].LocalPort);
+                    Serial.print(" , Exp state:"); Serial.print(Slave_Ports_Status_A[i].Exp_state);
+                    Serial.print(" , Exp_state_ttl"); Serial.println(Slave_Ports_Status_A[i].Exp_state_ttl);  
+                    Serial.print("#2111 *_TEST_GLOBAL"); Serial.print(*_TEST_GLOBAL); Serial.println("]");
+                   }
+            #endif
+                
                 }