Bladeren bron

testing output silnik

arkadiusz binder 5 jaren geleden
bovenliggende
commit
c03067b6f0

+ 1 - 1
SE/projects/bocian

@@ -1 +1 @@
-Subproject commit aa7a386ecd63833f5c10dd288b66f859a6bbe899
+Subproject commit b2da6943377d6c973952e19e448499028dd7945d

+ 28 - 6
SE/stuff/P5_Automation_can-dev-res-working-1930/___CONFIG/0x11/config_Slave_Ports_LOCAL_0x11_init.h

@@ -28,7 +28,7 @@ ARDUINO_FUNCT_INIT_RESULT_T _Slave_Ports_LOCAL_init(
                                 0x11 ,  //int  _Slave_ID,
                                 PortTypes_PWM_EXP_I2C, //int  PortTypes,
                                 0x40 ,  //int  Address,
-                                0 , //int  LocalPort,
+                                    0 , //int  LocalPort,
                                 Exp_state_OFF, //int  Exp_state,
                                 Exp_state_ttl_TO_REFRESH, //int  Exp_state_ttl,
                                 Broadcast_state_TO_REFRESH, //int  Broadcast_state,
@@ -49,7 +49,7 @@ ARDUINO_FUNCT_INIT_RESULT_T _Slave_Ports_LOCAL_init(
                                 0x11 ,  //int  _Slave_ID,
                                 PortTypes_PWM_EXP_I2C, //int  PortTypes,
                                 0x40 ,  //int  Address,
-                                1 , //int  LocalPort,
+                                    1 , //int  LocalPort,
                                 Exp_state_OFF, //int  Exp_state,
                                 Exp_state_ttl_TO_REFRESH, //int  Exp_state_ttl,
                                 Broadcast_state_TO_REFRESH, //int  Broadcast_state,
@@ -69,7 +69,7 @@ ARDUINO_FUNCT_INIT_RESULT_T _Slave_Ports_LOCAL_init(
                                 0x11 ,  //int  _Slave_ID,
                                 PortTypes_PWM_EXP_I2C, //int  PortTypes,
                                 0x40 ,  //int  Address,
-                                2 , //int  LocalPort,
+                                    2 , //int  LocalPort,
                                 Exp_state_OFF, //int  Exp_state,
                                 Exp_state_ttl_TO_REFRESH, //int  Exp_state_ttl,
                                 Broadcast_state_TO_REFRESH, //int  Broadcast_state,
@@ -88,9 +88,9 @@ ARDUINO_FUNCT_INIT_RESULT_T _Slave_Ports_LOCAL_init(
                                     Slave_Ports_Status_T_ARDUINO_ARRAY_ASSOC_TABLE_S_Port_ID_A,
                                 4,  // int  Port_ID,
                                 0x11 ,  //int  _Slave_ID,
-                                PortTypes_PWM_EXP_I2C | PortTypes_SERVO  ,// | PortTypes_SERVO //int  PortTypes,
+                                PortTypes_PWM_EXP_I2C ,// | PortTypes_SERVO  ,// | PortTypes_SERVO //int  PortTypes,
                                 0x40 ,  //int  Address,
-                                3 , //int  LocalPort,
+                                    3 , //int  LocalPort,
                                 Exp_state_OFF, //int  Exp_state,
                                 Exp_state_ttl_TO_REFRESH , //Exp_state_ttl_TO_REFRESH, //int  Exp_state_ttl,
                                 Broadcast_state_FULL_FRESH, //Broadcast_state_TO_REFRESH, //int  Broadcast_state,
@@ -100,8 +100,30 @@ ARDUINO_FUNCT_INIT_RESULT_T _Slave_Ports_LOCAL_init(
                                 0,0// time_seq_id, time_min_run
                                 );
                                 
-                                             
+                        //pwm silnik out 2                     
                                 
+                        Slave_Ports_Status_add_port(
+                                Slave_Ports_Status_A ,
+                                Slave_Ports_Status_T_ARDUINO_ATTR_ARRAY_A,
+                                    Slave_Ports_Status_T_ARDUINO_ARRAY_INDEX_TABLE_A,
+                                    Slave_Ports_Status_T_ARDUINO_ARRAY_INDEX_T_TO_DELETE_A,
+                                    Slave_Ports_Status_T_ARDUINO_ARRAY_ASSOC_TABLE_S_Port_ID_A,
+                                5,  // int  Port_ID,
+                                0x11 ,  //int  _Slave_ID,
+                                PortTypes_PWM_EXP_I2C ,// | PortTypes_SERVO  ,// | PortTypes_SERVO //int  PortTypes,
+                                0x40 ,  //int  Address,
+                                    6 , //int  LocalPort,
+                                Exp_state_OFF, //int  Exp_state,
+                                Exp_state_ttl_TO_REFRESH , //Exp_state_ttl_TO_REFRESH, //int  Exp_state_ttl,
+                                Broadcast_state_FULL_FRESH, //Broadcast_state_TO_REFRESH, //int  Broadcast_state,
+                                I2C_port_DEFAULT, //int I2C_port,
+                                I2C_driver_Adafruit_PWMServoDriver ,//int I2C_driver
+                                IS_Local_TRUE, Exp_state_level_INIT,
+                                0,0// time_seq_id, time_min_run
+                                );
+                                         
+                              
+                              
                                 
                                 
                     /*    DISPLAY__print_ANY(

+ 2 - 1
SE/stuff/P5_Automation_can-dev-res-working-1930/___CONFIG/config_Active_ControllerID.h

@@ -7,7 +7,8 @@ int EEPROM_Active_ControllerID_read ;
 EEPROM.get( EEPROM_Active_ControllerID_addr, EEPROM_Active_ControllerID_read );
 //EEPROM_Active_ControllerID_read = EEPROM.read(EEPROM_Active_ControllerID_addr);
 */
-#define Active_ControllerID 0x13
+//#define Active_ControllerID 0x13
+#define Active_ControllerID 0x11
 
 
 //if(EEPROM_Active_ControllerID_read > 0 ) //{

+ 18 - 1
SE/stuff/P5_Automation_can-dev/P5_Automation_can-dev.xpr

@@ -2,13 +2,30 @@
 <project version="22.0">
     <meta>
         <filters directoryPatterns="" filePatterns="\QP5_Automation_can-dev.xpr\E" positiveFilePatterns="" showHiddenFiles="false"/>
-        <options/>
+        <options>
+            <serialized version="22.0" xml:space="preserve">
+                <serializableOrderedMap>
+                    <entry>
+                        <String>enable.project.master.files.support</String>
+                        <Boolean>true</Boolean>
+                    </entry>
+                </serializableOrderedMap>
+            </serialized>
+        </options>
     </meta>
     <projectTree name="P5_Automation_can-dev.xpr">
         <folder name="Arduino">
             <folder path="../../../../Arduino/"/>
             <folder path="../P5_Automation-library-dev/"/>
         </folder>
+        <folder name="cncDuet">
+            <folder path="../../../../../Duet/Duet2/SD%20Card%20Contents/"/>
+            <folder path="../../../../../GcodeMacros/"/>
+            <folder path="../../../../../Google%20Drive/Arek_CNC/duet3d-2020/"/>
+        </folder>
+        <folder name="marlin">
+            <folder path="../../../../../procesy5-dita-templates-druki/Applications/MarlinFirmware/Marlin-2.0.x/Marlin/"/>
+        </folder>
         <folder path="../../../../Arduino/queue_test/"/>
         <folder path="../P5_Automation_can-dev-2/"/>
         <folder path="../P5_Automation_can-dev-3/"/>