Mirrors_Framework/ethercat
1
0
Fork 0
mirror of https://gitlab.com/etherlab.org/ethercat.git synced 2026-09-22 10:03:51 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

merge -c1604 branches/stable-1.4: Fixed spelling of EtherCAT terms.

Browse Source
This commit is contained in:
Florian Pose
2009-01-26 11:45:30 +00:00
parent 5ca3d24337
commit 826ae37b26
69 changed files with 879 additions and 878 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/mini/mini.c
+12 -12
View File
@@ -75,7 +75,7 @@ static uint8_t *domain1_pd; // process data memory
#define Beckhoff_EL3152 0x00000002, 0x0c503052
#define Beckhoff_EL4102 0x00000002, 0x10063052
// offsets for Pdo entries
// offsets for PDO entries
static unsigned int off_ana_in;
static unsigned int off_ana_out;
static unsigned int off_dig_out;
@@ -255,12 +255,12 @@ void read_sdo(void)
printk(KERN_INFO PFX "Still busy...\n");
break;
case EC_REQUEST_SUCCESS:
printk(KERN_INFO PFX "Sdo value: 0x%04X\n",
printk(KERN_INFO PFX "SDO value: 0x%04X\n",
EC_READ_U16(ecrt_sdo_request_data(sdo)));
ecrt_sdo_request_read(sdo); // trigger next read
break;
case EC_REQUEST_ERROR:
printk(KERN_INFO PFX "Failed to read Sdo!\n");
printk(KERN_INFO PFX "Failed to read SDO!\n");
ecrt_sdo_request_read(sdo); // retry reading
break;
}
@@ -320,7 +320,7 @@ void cyclic_task(unsigned long data)
check_slave_config_states();
#if SDO_ACCESS
// read process data Sdo
// read process data SDO
read_sdo();
#endif
@@ -394,9 +394,9 @@ int __init init_mini_module(void)
}
#if CONFIGURE_PDOS
printk(KERN_INFO PFX "Configuring Pdos...\n");
printk(KERN_INFO PFX "Configuring PDOs...\n");
if (ecrt_slave_config_pdos(sc_ana_in, EC_END, el3152_syncs)) {
printk(KERN_ERR PFX "Failed to configure Pdos.\n");
printk(KERN_ERR PFX "Failed to configure PDOs.\n");
goto out_release_master;
}
@@ -407,7 +407,7 @@ int __init init_mini_module(void)
}
if (ecrt_slave_config_pdos(sc, EC_END, el4102_syncs)) {
printk(KERN_ERR PFX "Failed to configure Pdos.\n");
printk(KERN_ERR PFX "Failed to configure PDOs.\n");
goto out_release_master;
}
@@ -418,15 +418,15 @@ int __init init_mini_module(void)
}
if (ecrt_slave_config_pdos(sc, EC_END, el2004_syncs)) {
printk(KERN_ERR PFX "Failed to configure Pdos.\n");
printk(KERN_ERR PFX "Failed to configure PDOs.\n");
goto out_release_master;
}
#endif
#if SDO_ACCESS
printk(KERN_INFO PFX "Creating Sdo requests...\n");
printk(KERN_INFO PFX "Creating SDO requests...\n");
if (!(sdo = ecrt_slave_config_create_sdo_request(sc_ana_in, 0x3102, 2, 2))) {
printk(KERN_ERR PFX "Failed to create Sdo request.\n");
printk(KERN_ERR PFX "Failed to create SDO request.\n");
goto out_release_master;
}
ecrt_sdo_request_timeout(sdo, 500); // ms
@@ -440,9 +440,9 @@ int __init init_mini_module(void)
}
#endif
printk(KERN_INFO PFX "Registering Pdo entries...\n");
printk(KERN_INFO PFX "Registering PDO entries...\n");
if (ecrt_domain_reg_pdo_entry_list(domain1, domain1_regs)) {
printk(KERN_ERR PFX "Pdo entry registration failed!\n");
printk(KERN_ERR PFX "PDO entry registration failed!\n");
goto out_release_master;
}
examples/rtai/rtai_sample.c
+6 -6
View File
@@ -80,7 +80,7 @@ static uint8_t *domain1_pd; // process data memory
#define Beckhoff_EL2004 0x00000002, 0x07D43052
#define Beckhoff_EL3162 0x00000002, 0x0C5A3052
static unsigned int off_ana_in; // offsets for Pdo entries
static unsigned int off_ana_in; // offsets for PDO entries
static unsigned int off_dig_out;
const static ec_pdo_entry_reg_t domain1_regs[] = {
@@ -297,9 +297,9 @@ int __init init_mod(void)
}
#ifdef CONFIGURE_PDOS
printk(KERN_INFO PFX "Configuring Pdos...\n");
printk(KERN_INFO PFX "Configuring PDOs...\n");
if (ecrt_slave_config_pdos(sc_ana_in, EC_END, el3162_syncs)) {
printk(KERN_ERR PFX "Failed to configure Pdos.\n");
printk(KERN_ERR PFX "Failed to configure PDOs.\n");
goto out_release_master;
}
@@ -309,14 +309,14 @@ int __init init_mod(void)
}
if (ecrt_slave_config_pdos(sc, EC_END, el2004_syncs)) {
printk(KERN_ERR PFX "Failed to configure Pdos.\n");
printk(KERN_ERR PFX "Failed to configure PDOs.\n");
goto out_release_master;
}
#endif
printk(KERN_INFO PFX "Registering Pdo entries...\n");
printk(KERN_INFO PFX "Registering PDO entries...\n");
if (ecrt_domain_reg_pdo_entry_list(domain1, domain1_regs)) {
printk(KERN_ERR PFX "Pdo entry registration failed!\n");
printk(KERN_ERR PFX "PDO entry registration failed!\n");
goto out_release_master;
}
examples/user/main.c
+6 -6
View File
@@ -78,7 +78,7 @@ static uint8_t *domain1_pd = NULL;
#define Beckhoff_EL3152 0x00000002, 0x0c503052
#define Beckhoff_EL4102 0x00000002, 0x10063052
// offsets for Pdo entries
// offsets for PDO entries
static unsigned int off_ana_in_status;
static unsigned int off_ana_in_value;
static unsigned int off_ana_out;
@@ -293,9 +293,9 @@ int main(int argc, char **argv)
}
#if CONFIGURE_PDOS
printf("Configuring Pdos...\n");
printf("Configuring PDOs...\n");
if (ecrt_slave_config_pdos(sc_ana_in, EC_END, el3152_syncs)) {
fprintf(stderr, "Failed to configure Pdos.\n");
fprintf(stderr, "Failed to configure PDOs.\n");
return -1;
}
@@ -306,7 +306,7 @@ int main(int argc, char **argv)
}
if (ecrt_slave_config_pdos(sc, EC_END, el4102_syncs)) {
fprintf(stderr, "Failed to configure Pdos.\n");
fprintf(stderr, "Failed to configure PDOs.\n");
return -1;
}
@@ -317,7 +317,7 @@ int main(int argc, char **argv)
}
if (ecrt_slave_config_pdos(sc, EC_END, el2004_syncs)) {
fprintf(stderr, "Failed to configure Pdos.\n");
fprintf(stderr, "Failed to configure PDOs.\n");
return -1;
}
#endif
@@ -328,7 +328,7 @@ int main(int argc, char **argv)
return -1;
if (ecrt_domain_reg_pdo_entry_list(domain1, domain1_regs)) {
fprintf(stderr, "Pdo entry registration failed!\n");
fprintf(stderr, "PDO entry registration failed!\n");
return -1;
}