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

implemented read/write functions for complex pins

Browse Source 
fixed config issues
This commit is contained in:
Sascha Ittner
2015-03-11 16:52:54 +01:00
parent ccc8c29443
commit c32b03b497
5 changed files with 148 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/lcec_conf.c
View File

@@ -161,7 +161,8 @@ LCEC_CONF_SLAVE_T *currSlave;
LCEC_CONF_SYNCMANAGER_T *currSyncManager;
LCEC_CONF_PDO_T *currPdo;
LCEC_CONF_SDOCONF_T *currSdoConf;
LCEC_CONF_PDOENTRY_T *currSdoEntry;
LCEC_CONF_PDOENTRY_T *currPdoEntry;
uint8_t currComplexBitOffset;
int shmem_id;
@@ -271,7 +272,8 @@ int main(int argc, char **argv) {
currSyncManager = NULL;
currPdo = NULL;
currSdoConf = NULL;
currSdoEntry = NULL;
currPdoEntry = NULL;
currComplexBitOffset = 0;
for (done=0; !done;) {
// read block
int len = fread(buffer, 1, BUFFSIZE, file);
@@ -1035,7 +1037,7 @@ void parsePdoEntryAttrs(const char **attr) {
// parse bitLen
if (strcmp(name, "bitLen") == 0) {
tmp = atoi(val);
if (tmp <= 0 || tmp > LCEC_CONF_GENERIC_MAX_SUBPINS) {
if (tmp <= 0 || tmp > LCEC_CONF_GENERIC_MAX_BITLEN) {
fprintf(stderr, "%s: ERROR: Invalid pdoEntry bitLen %d\n", modname, tmp);
XML_StopParser(parser, 0);
return;
@@ -1145,7 +1147,8 @@ void parsePdoEntryAttrs(const char **attr) {
(currSlave->pdoMappingCount)++;
}
(currPdo->pdoEntryCount)++;
currSdoEntry = p;
currPdoEntry = p;
currComplexBitOffset = 0;
}
void parseComplexEntryAttrs(const char **attr) {
@@ -1158,6 +1161,7 @@ void parseComplexEntryAttrs(const char **attr) {
floatReq = 0;
p->confType = lcecConfTypeComplexEntry;
p->bitOffset = currComplexBitOffset;
p->floatScale = 1.0;
while (*attr) {
const char *name = *(attr++);
@@ -1171,6 +1175,11 @@ void parseComplexEntryAttrs(const char **attr) {
XML_StopParser(parser, 0);
return;
}
if ((currComplexBitOffset + tmp) > currPdoEntry->bitLength) {
fprintf(stderr, "%s: ERROR: complexEntry bitLen sum exceeded pdoEntry bitLen %d\n", modname, currPdoEntry->bitLength);
XML_StopParser(parser, 0);
return;
}
p->bitLength = tmp;
continue;
}
@@ -1247,6 +1256,11 @@ void parseComplexEntryAttrs(const char **attr) {
XML_StopParser(parser, 0);
return;
}
if (p->halPin[0] != 0) {
(currSlave->pdoMappingCount)++;
}
currComplexBitOffset += p->bitLength;
}
int parseSyncCycle(const char *nptr) {