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

Merge remote-tracking branch 'origin' into mergeax5100+ms300

Browse Source 
get actuall master.
This commit is contained in:
dbraun1981
2021-11-26 17:22:57 +01:00
parent c84b372fba 3a25fc9cd5
commit 58f95f468f
22 changed files with 1286 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
src/lcec_conf.c
View File

@@ -33,6 +33,9 @@
#include "lcec_stmds5k.h"
#include "lcec_el6900.h"
#include "lcec_el1918_logic.h"
#include "lcec_el70x1.h"
#include "lcec_el7411.h"
typedef struct {
const char *name;
@@ -63,9 +66,49 @@ static const LCEC_CONF_MODPARAM_DESC_T slaveEL6900Params[] = {
{ NULL }
};
static const LCEC_CONF_MODPARAM_DESC_T slaveEL1918_LOGICParams[] = {
{ "fsoeSlaveIdx", LCEC_EL1918_LOGIC_PARAM_SLAVEID, HAL_U32, LCEC_EL1918_LOGIC_PARAM_SLAVEID_PDOS } ,
{ "stdInCount", LCEC_EL1918_LOGIC_PARAM_STDINCOUNT, HAL_U32, LCEC_EL1918_LOGIC_PARAM_STDINCOUNT_PDOS } ,
{ "stdOutCount", LCEC_EL1918_LOGIC_PARAM_STDOUTCOUNT, HAL_U32, LCEC_EL1918_LOGIC_PARAM_STDOUTCOUNT_PDOS } ,
{ NULL }
};
static const LCEC_CONF_MODPARAM_DESC_T slaveEL70x1Params[] = {
{ "maxCurrent", LCEC_EL70x1_PARAM_MAX_CURR, HAL_U32, 0 } ,
{ "redCurrent", LCEC_EL70x1_PARAM_RED_CURR, HAL_U32, 0 } ,
{ "nomVoltage", LCEC_EL70x1_PARAM_NOM_VOLT, HAL_U32, 0 } ,
{ "coilRes", LCEC_EL70x1_PARAM_COIL_RES, HAL_U32, 0 } ,
{ "motorEMF", LCEC_EL70x1_PARAM_MOTOR_EMF, HAL_U32, 0 } ,
{ NULL }
};
static const LCEC_CONF_MODPARAM_DESC_T slaveEL7411Params[] = {
{ "dcLinkNominal", LCEC_EL7411_PARAM_DCLINK_NOM, HAL_U32, 0 } ,
{ "dcLinkMin", LCEC_EL7411_PARAM_DCLINK_MIN, HAL_U32, 0 } ,
{ "dcLinkMax", LCEC_EL7411_PARAM_DCLINK_MAX, HAL_U32, 0 } ,
{ "maxCurrent", LCEC_EL7411_PARAM_MAX_CURR, HAL_U32, 0 } ,
{ "ratedCurrent", LCEC_EL7411_PARAM_RATED_CURR, HAL_U32, 0 } ,
{ "ratedVoltage", LCEC_EL7411_PARAM_RATED_VOLT, HAL_U32, 0 } ,
{ "polePairs", LCEC_EL7411_PARAM_POLE_PAIRS, HAL_U32, 0 } ,
{ "coilRes", LCEC_EL7411_PARAM_RESISTANCE, HAL_U32, 0 } ,
{ "coilInd", LCEC_EL7411_PARAM_INDUCTANCE, HAL_U32, 0 } ,
{ "torqueConst", LCEC_EL7411_PARAM_TOURQUE_CONST, HAL_U32, 0 } ,
{ "voltageConst", LCEC_EL7411_PARAM_VOLTAGE_CONST, HAL_U32, 0 } ,
{ "rotorInertia", LCEC_EL7411_PARAM_ROTOR_INERTIA, HAL_U32, 0 } ,
{ "maxSpeed", LCEC_EL7411_PARAM_MAX_SPEED, HAL_U32, 0 } ,
{ "ratedSpeed", LCEC_EL7411_PARAM_RATED_SPEED, HAL_U32, 0 } ,
{ "thermalTimeConst", LCEC_EL7411_PARAM_TH_TIME_CONST, HAL_U32, 0 } ,
{ "hallVoltage", LCEC_EL7411_PARAM_HALL_VOLT, HAL_U32, 0 } ,
{ "hallAdjust", LCEC_EL7411_PARAM_HALL_ADJUST, HAL_S32, 0 } ,
{ NULL }
};
static const LCEC_CONF_TYPELIST_T slaveTypes[] = {
// bus coupler
{ "EK1100", lcecSlaveTypeEK1100, NULL },
{ "EK1101", lcecSlaveTypeEK1101, NULL },
{ "EK1110", lcecSlaveTypeEK1110, NULL },
{ "EK1122", lcecSlaveTypeEK1122, NULL },
@@ -115,6 +158,7 @@ static const LCEC_CONF_TYPELIST_T slaveTypes[] = {
{ "EL2612", lcecSlaveTypeEL2612, NULL },
{ "EL2622", lcecSlaveTypeEL2622, NULL },
{ "EL2634", lcecSlaveTypeEL2634, NULL },
{ "EL2652", lcecSlaveTypeEL2652, NULL },
{ "EL2808", lcecSlaveTypeEL2808, NULL },
{ "EL2798", lcecSlaveTypeEL2798, NULL },
{ "EL2809", lcecSlaveTypeEL2809, NULL },
@@ -177,24 +221,32 @@ static const LCEC_CONF_TYPELIST_T slaveTypes[] = {
{ "EL2521", lcecSlaveTypeEL2521, NULL },
// stepper
{ "EL7031", lcecSlaveTypeEL7031, slaveEL70x1Params },
{ "EL7041-0052", lcecSlaveTypeEL7041_0052, slaveEL70x1Params },
{ "EL7041-1000", lcecSlaveTypeEL7041_1000, NULL },
// ac servo
{ "EL7201-9014", lcecSlaveTypeEL7201_9014, NULL },
{ "EL7211", lcecSlaveTypeEL7211, NULL },
{ "EL7221", lcecSlaveTypeEL7221, NULL },
// dc servo
{ "EL7342", lcecSlaveTypeEL7342, NULL },
// BLDC
{ "EL7411", lcecSlaveTypeEL7411, slaveEL7411Params },
// power suppply
{ "EL9505", lcecSlaveTypeEL9505, NULL },
{ "EL9508", lcecSlaveTypeEL9508, NULL },
{ "EL9510", lcecSlaveTypeEL9510, NULL },
{ "EL9512", lcecSlaveTypeEL9512, NULL },
{ "EL9515", lcecSlaveTypeEL9515, NULL },
{ "EL9576", lcecSlaveTypeEL9576, NULL },
// FSoE devices
{ "EL6900", lcecSlaveTypeEL6900, slaveEL6900Params },
{ "EL1918_LOGIC", lcecSlaveTypeEL1918_LOGIC, slaveEL1918_LOGICParams },
{ "EL1904", lcecSlaveTypeEL1904, NULL },
{ "EL2904", lcecSlaveTypeEL2904, NULL },