nic/linuxcnc-ethercat
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into mergeax5100+ms300

Browse Source
This commit is contained in:
Sascha Ittner
2021-12-02 14:02:01 +01:00
parent 7339f4c10f 9637b94210
commit 6343cf8e45
10 changed files with 369 additions and 1896 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/lcec_dems300.c
View File

@@ -215,14 +215,14 @@ void lcec_dems300_read(struct lcec_slave *slave, long period) {
int32_t speed_raw;
double rpm;
//read current;
*(hal_data->act_current) = (double)EC_READ_U16(&pd[hal_data->current_pdo_os]) /1000;
//read temp;
*(hal_data->drive_temp) = (double)EC_READ_U16(&pd[hal_data->temp_pdo_os]) /100;
//read warn and error code ;
error = EC_READ_U16(&pd[hal_data->warn_err_pdo_os]);
*(hal_data->error_code) = error & 0xff; //low byte
*(hal_data->warn_code) = error >> 8; //high byte
// read current;
*(hal_data->act_current) = (double)EC_READ_U16(&pd[hal_data->current_pdo_os]) /1000;
// read temp;
*(hal_data->drive_temp) = (double)EC_READ_U16(&pd[hal_data->temp_pdo_os]) /100;
// read warn and error code ;
error = EC_READ_U16(&pd[hal_data->warn_err_pdo_os]);
*(hal_data->error_code) = error & 0xff; //low byte
*(hal_data->warn_code) = error >> 8; //high byte
// wait for slave to be operational
if (!slave->state.operational) {