a.binder vor 5 Jahren
Ursprung
Commit
2a957df033

+ 17 - 17
SE/stuff/P5_Automation_can-dev-res/_CAN/_CAN_func.h

@@ -22,26 +22,26 @@ void CAN_READ(
                    //     DISPLAY__print_loop(DISPLAY_CURSOR_Y_CHARS_CAN_DEBUG, "CAN RECV DATA", 13, DISPLAY__print_loop_ACTION_ADD ) ;
                         _CAN_REMOTE_ID_T _CAN_REMOTE_ID = CANrxId ;
                                              
-                         CAN_MSG8_BIT_1_T CAN_MSG8_BIT_1_A = int(CANrxBuf[1] ) ;//< 0x10
-                         CAN_MSG8_BIT_2_T CAN_MSG8_BIT_2_A = int(CANrxBuf[2] ) ;
-                         CAN_MSG8_BIT_3_T CAN_MSG8_BIT_3_A = int(CANrxBuf[3] ) ;
-                         CAN_MSG8_BIT_4_T CAN_MSG8_BIT_4_A = int(CANrxBuf[4] ) ;
-                         CAN_MSG8_BIT_5_T CAN_MSG8_BIT_5_A = int(CANrxBuf[5] ) ;
-                         CAN_MSG8_BIT_6_T CAN_MSG8_BIT_6_A = int(CANrxBuf[6] ) ;
-                         CAN_MSG8_BIT_7_T CAN_MSG8_BIT_7_A = int(CANrxBuf[7] ) ;
-                         CAN_MSG8_BIT_8_T CAN_MSG8_BIT_8_A = int(CANrxBuf[8] ) ;
+                         CAN_MSG8_BIT_1_T CAN_MSG8_BIT_1_A = int(CANrxBuf[0] , HEX) ;//< 0x10
+                         CAN_MSG8_BIT_2_T CAN_MSG8_BIT_2_A = int(CANrxBuf[1] , HEX) ;
+                         CAN_MSG8_BIT_3_T CAN_MSG8_BIT_3_A = int(CANrxBuf[2] , HEX) ;
+                         CAN_MSG8_BIT_4_T CAN_MSG8_BIT_4_A = int(CANrxBuf[3] , HEX) ;
+                         CAN_MSG8_BIT_5_T CAN_MSG8_BIT_5_A = int(CANrxBuf[4] , HEX) ;
+                         CAN_MSG8_BIT_6_T CAN_MSG8_BIT_6_A = int(CANrxBuf[5] , HEX) ;
+                         CAN_MSG8_BIT_7_T CAN_MSG8_BIT_7_A = int(CANrxBuf[6] , HEX) ;
+                         CAN_MSG8_BIT_8_T CAN_MSG8_BIT_8_A = int(CANrxBuf[7] , HEX) ;
                          
                    
                   // Serial.print();
                    
-                   Serial.print("1.REM::");Serial.print(CAN_MSG8_BIT_1_A, HEX);Serial.print(", 2.SEND:");
-                   Serial.print(CAN_MSG8_BIT_2_A, HEX);Serial.print(", PortID.3:");
-                   Serial.print(CAN_MSG8_BIT_3_A, BIN);Serial.print(", PortTyp.4:");
-                   Serial.print(CAN_MSG8_BIT_4_A, HEX);Serial.print(", ExpS.5:");
-                   Serial.print(CAN_MSG8_BIT_5_A, BIN);Serial.print(", ExpT.6:");
-                   Serial.print(CAN_MSG8_BIT_6_A, HEX);Serial.print(", BcSt.7:");
-                   Serial.print(CAN_MSG8_BIT_7_A, HEX);Serial.print(", TaskT?.8:");
-                   Serial.print(CAN_MSG8_BIT_8_A, HEX);Serial.println(" ] ");
+                   Serial.print("1.REM::");Serial.print(CAN_MSG8_BIT_1_A, HEX);
+                   Serial.print(", 2.SEND:");Serial.print(CAN_MSG8_BIT_2_A, HEX);
+                   Serial.print(", PortID.3:");Serial.print(CAN_MSG8_BIT_3_A, BIN);
+                   Serial.print(", PortTyp.4:");Serial.print(CAN_MSG8_BIT_4_A, BIN);
+                   Serial.print(", ExpS.5:");Serial.print(CAN_MSG8_BIT_5_A, BIN);
+                   Serial.print(", ExpT.6:");Serial.print(CAN_MSG8_BIT_6_A, HEX);
+                   Serial.print(", BcSt.7:");Serial.print(CAN_MSG8_BIT_7_A, HEX);
+                   Serial.print(", TaskT?.8:");Serial.print(CAN_MSG8_BIT_8_A, HEX);Serial.println(" ] ");
                    
                     
                                 Slave_Ports_Status_add_port(
@@ -64,7 +64,7 @@ void CAN_READ(
                                                                );
                                 Serial.println("64[ Debug STD]")   ;                             
                  
-                        for(int i = 0; i<=CANlen; i++)           // Print each byte of the data
+                        for(int i = 0; i<CANlen; i++)           // Print each byte of the data
                          {
                           Serial.print("[");Serial.print(i);Serial.print("]");
                            if(CANrxBuf[i] < 0x10)                // If data byte is less than 0x10, add a leading zero

+ 11 - 11
SE/stuff/P5_Automation_can-dev-res/_CAN/_Slave_Ports_Protocol_CAN_struct.h

@@ -51,7 +51,7 @@ const int _CAN_8_EMPTY = 0x07 ;
   Exp_state_T  Exp_state;    //5
   int  Exp_state_ttl;  //6
   int  Broadcast_state;  //7
-  const int _CAN_8 = int(TASK_TYPE_T_Slave_Ports_broadcast____ ) ; // _CAN_8_EMPTY  ; //0x07 ; //8 - nbot used
+  const int _CAN_8 = 0x04 ; //int(TASK_TYPE_T_Slave_Ports_broadcast____ ) ; // _CAN_8_EMPTY  ; //0x07 ; //8 - nbot used
 } ;
  
  
@@ -66,7 +66,7 @@ const int _CAN_8_EMPTY = 0x07 ;
   Exp_state_T  Exp_state;    //5
   int  Exp_state_ttl;  //6
   int  Broadcast_state;  //7
-  const int _CAN_8 = int(TASK_TYPE_T_Slave_Ports_broadcast____) ; // _CAN_8_EMPTY; //0x07 ; //8 - nbot used
+  const int _CAN_8 = 0x04; // int(TASK_TYPE_T_Slave_Ports_broadcast____) ; // _CAN_8_EMPTY; //0x07 ; //8 - nbot used
 } ;
 
  
@@ -127,7 +127,7 @@ byte CAN_broadcast_to_data(_Slave_Ports_Protocol_CAN_broadcast_T
                          _Slave_Ports_Protocol_CAN_broadcast_A.Exp_state,
                          _Slave_Ports_Protocol_CAN_broadcast_A.Exp_state_ttl,
                          _Slave_Ports_Protocol_CAN_broadcast_A.Broadcast_state,
-                         _Slave_Ports_Protocol_CAN_broadcast_A._CAN_8
+                         4 //_Slave_Ports_Protocol_CAN_broadcast_A._CAN_8
                         
                       } ;
         
@@ -158,14 +158,14 @@ void CAN_MSG8_A_ptr(_Slave_Ports_Protocol_CAN_broadcast_T
                    Serial.print(" "); Serial.print("8["); Serial.print(_Slave_Ports_Protocol_CAN_broadcast_A._CAN_8); Serial.print("]  "); 
                 Serial.println("   "); 
         // #endif
-         CAN_MSG8_A[1] = _Slave_Ports_Protocol_CAN_broadcast_A._CAN_REMOTE_ID; // 0xFF;
-         CAN_MSG8_A[2] = _Slave_Ports_Protocol_CAN_broadcast_A._CAN_SENDER_ID; // 0xFF;
-         CAN_MSG8_A[3] =_Slave_Ports_Protocol_CAN_broadcast_A.Port_ID ; //0xFF;
-          CAN_MSG8_A[4] = _Slave_Ports_Protocol_CAN_broadcast_A.PortTypes ;//0xFF;
-         CAN_MSG8_A[5] = _Slave_Ports_Protocol_CAN_broadcast_A.Exp_state; // 0xFF;
-          CAN_MSG8_A[6] =  _Slave_Ports_Protocol_CAN_broadcast_A.Exp_state_ttl ;// 0xFF;
-         CAN_MSG8_A[7] =  _Slave_Ports_Protocol_CAN_broadcast_A.Broadcast_state;// 0xFF;
-          CAN_MSG8_A[8] =  _Slave_Ports_Protocol_CAN_broadcast_A._CAN_8; // 0xFF;
+         CAN_MSG8_A[0] = _Slave_Ports_Protocol_CAN_broadcast_A._CAN_REMOTE_ID; // 0xFF;
+         CAN_MSG8_A[1] = _Slave_Ports_Protocol_CAN_broadcast_A._CAN_SENDER_ID; // 0xFF;
+         CAN_MSG8_A[2] =_Slave_Ports_Protocol_CAN_broadcast_A.Port_ID ; //0xFF;
+          CAN_MSG8_A[3] = _Slave_Ports_Protocol_CAN_broadcast_A.PortTypes ;//0xFF;
+         CAN_MSG8_A[4] = _Slave_Ports_Protocol_CAN_broadcast_A.Exp_state; // 0xFF;
+          CAN_MSG8_A[5] =  _Slave_Ports_Protocol_CAN_broadcast_A.Exp_state_ttl ;// 0xFF;
+         CAN_MSG8_A[6] =  _Slave_Ports_Protocol_CAN_broadcast_A.Broadcast_state;// 0xFF;
+          CAN_MSG8_A[7] =  _Slave_Ports_Protocol_CAN_broadcast_A._CAN_8; // 0xFF;
         
 }
 

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

@@ -31,11 +31,14 @@
     
     
     
+
+            DISPLAY__CURSOR_Y_CHARS__SET(DISPLAY_PHYSICAL_CHAR_A, 
+                                DISPLAY_CURSOR_Y_CHARS_DEBUG);
            DISPLAY__print(
                           DISPLAY_A ,
                           DISPLAY_T_ARDUINO_ATTR_ARRAY_A , 
                           DISPLAY_PHYSICAL_CHAR_A, 
-                           DISPLAY_pos_seq_A,
+                           DISPLAY_pos_seq_A | DISPLAY_pos_seq_A_IMMEDIATE,
                             DISPLAY_array16_A,
                             DISPLAY_TARGET_A,
                            time_seq_id_A,

+ 24 - 14
SE/stuff/P5_Automation_can-dev-res/_Slave_Ports_broadcast_func.h

@@ -112,18 +112,27 @@
                      #endif
                        DISPLAY_array16_T  DISPLAY_array16_AAA="" ;
                        //( "OUT I2C 0X40[2]" + encoderPos * 5 , 2), //message,          
-                       _Slave_Ports_Protocol_CAN_broadcast_T CAN_broadcast_A={};
-                            // CAN_broadcast_A._CAN_REMOTE_ID = _CAN_REMOTE_ID_BROADCAST ;
-                           //  CAN_broadcast_A._CAN_SENDER_ID = Active_ControllerID_HEX ;
-                             CAN_broadcast_A.Port_ID = Slave_Ports_Status_A[i].Port_ID ;
-                             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 = Slave_Ports_Status_A[i].Broadcast_state ;
-                
-                  // CAN_broadcast_A._CAN_8 = _CAN_8_EMPTY ;
-                
-                
+                                  _Slave_Ports_Protocol_CAN_broadcast_T CAN_broadcast_A={};
+                                       // CAN_broadcast_A._CAN_REMOTE_ID = _CAN_REMOTE_ID_BROADCAST ;
+                                      //  CAN_broadcast_A._CAN_SENDER_ID = Active_ControllerID_HEX ;
+                                        CAN_broadcast_A.Port_ID = Slave_Ports_Status_A[i].Port_ID ;
+                                        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 = 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 ;
+                             
+                  /* byte CAN_broadcast_A[8] = {_CAN_REMOTE_ID_BROADCAST, 
+                                                Active_ControllerID_HEX, 
+                                                Slave_Ports_Status_A[i].Port_ID, 
+                                                Slave_Ports_Status_A[i].PortTypes, 
+                                                Slave_Ports_Status_A[i].Exp_state , 
+                                                Slave_Ports_Status_A[i].Exp_state_ttl,
+                                                Slave_Ports_Status_A[i].Broadcast_state,
+                                                TASK_TYPE_T_Slave_Ports_broadcast____ };
+                */
                   
                     #if defined(DISABLE_TASK_TYPE_T_DISPLAY_queue_pop________)
                              #else
@@ -188,9 +197,10 @@
                  
                      
                                          //Serial.println("#135 deb CAN_broadcast_A9");
-                                         //byte CAN_broadcast_A9[8] = {0xFF, 0x101, 0x02, 0x03, 0x04, 0x05, 0x07};
+                                        // {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);  
+                 byte sndStat = CAN0.sendMsgBuf(Active_ControllerID, 0, 8, CAN_MSG8_A);  CAN_data_debug(CAN_MSG8_A);   //CAN_MSG8_A
                  delay(200);
               //    byte sndStat ;
                           if(sndStat == CAN_OK){