Mercurial Mercurial > canfestival / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | bz2 | zip | gz | help
Removed some dead generated C code in gen_cfile.py, about callbacks.
authoretisserant
Fri, 21 Mar 2008 14:02:18 +0100
changeset 432 b4d313998bee
parent 431 166037b8f2ed
child 433 df0bdfa1e463
Removed some dead generated C code in gen_cfile.py, about callbacks.
examples/DS401_Master/TestMaster.h file | annotate | diff | comparison | revisions
examples/DS401_Slave_Gui/ObjDict.h file | annotate | diff | comparison | revisions
examples/TestMasterMicroMod/TestMaster.h file | annotate | diff | comparison | revisions
examples/TestMasterSlave/TestSlave.h file | annotate | diff | comparison | revisions
objdictgen/gen_cfile.py file | annotate | diff | comparison | revisions 
--- a/examples/DS401_Master/TestMaster.h	Fri Mar 21 10:27:42 2008 +0100
+++ b/examples/DS401_Master/TestMaster.h	Fri Mar 21 14:02:18 2008 +0100
@@ -12,8 +12,6 @@
 
 /* Master node data struct */
 extern CO_Data TestMaster_Data;
-extern ODCallback_t Transmit_PDO_1_Parameter_callbacks[];		/* Callbacks of index0x1800 */
-extern ODCallback_t Transmit_PDO_2_Parameter_callbacks[];		/* Callbacks of index0x1801 */
 extern UNS8 DO;		/* Mapped at index 0x2000, subindex 0x00*/
 extern INTEGER16 AO1;		/* Mapped at index 0x2001, subindex 0x00*/
 extern INTEGER16 AO2;		/* Mapped at index 0x2002, subindex 0x00*/
--- a/examples/DS401_Slave_Gui/ObjDict.h	Fri Mar 21 10:27:42 2008 +0100
+++ b/examples/DS401_Slave_Gui/ObjDict.h	Fri Mar 21 14:02:18 2008 +0100
@@ -12,9 +12,6 @@
 
 /* Master node data struct */
 extern CO_Data ObjDict_Data;
-extern ODCallback_t Transmit_PDO_1_Parameter_callbacks[];		/* Callbacks of index0x1800 */
-extern ODCallback_t Transmit_PDO_2_Parameter_callbacks[];		/* Callbacks of index0x1801 */
-extern ODCallback_t Transmit_PDO_3_Parameter_callbacks[];		/* Callbacks of index0x1802 */
 extern UNS8 Read_Inputs_8_Bit[1];		/* Mapped at index 0x6000, subindex 0x01 - 0x01 */
 extern UNS8 Polarity_Input_8_Bit[1];		/* Mapped at index 0x6002, subindex 0x01 - 0x01 */
 extern UNS8 Write_Outputs_8_Bit[1];		/* Mapped at index 0x6200, subindex 0x01 - 0x01 */
--- a/examples/TestMasterMicroMod/TestMaster.h	Fri Mar 21 10:27:42 2008 +0100
+++ b/examples/TestMasterMicroMod/TestMaster.h	Fri Mar 21 14:02:18 2008 +0100
@@ -12,7 +12,6 @@
 
 /* Master node data struct */
 extern CO_Data TestMaster_Data;
-extern ODCallback_t Transmit_PDO_1_Parameter_callbacks[];		/* Callbacks of index0x1800 */
 extern UNS8 DO;		/* Mapped at index 0x2000, subindex 0x00*/
 extern UNS8 DI1;		/* Mapped at index 0x200F, subindex 0x00*/
 extern UNS8 DI2;		/* Mapped at index 0x2010, subindex 0x00*/
--- a/examples/TestMasterSlave/TestSlave.h	Fri Mar 21 10:27:42 2008 +0100
+++ b/examples/TestMasterSlave/TestSlave.h	Fri Mar 21 14:02:18 2008 +0100
@@ -12,13 +12,6 @@
 
 /* Master node data struct */
 extern CO_Data TestSlave_Data;
-extern ODCallback_t Store_parameters_callbacks[];		/* Callbacks of index0x1010 */
-extern ODCallback_t Restore_Default_Parameters_callbacks[];		/* Callbacks of index0x1011 */
-extern ODCallback_t Transmit_PDO_1_Parameter_callbacks[];		/* Callbacks of index0x1800 */
-extern ODCallback_t Transmit_PDO_2_Parameter_callbacks[];		/* Callbacks of index0x1801 */
-extern ODCallback_t Transmit_PDO_3_Parameter_callbacks[];		/* Callbacks of index0x1802 */
-extern ODCallback_t Transmit_PDO_4_Parameter_callbacks[];		/* Callbacks of index0x1803 */
-extern ODCallback_t Transmit_PDO_5_Parameter_callbacks[];		/* Callbacks of index0x1804 */
 extern UNS8 SlaveMap1;		/* Mapped at index 0x2000, subindex 0x00*/
 extern UNS8 SlaveMap2;		/* Mapped at index 0x2001, subindex 0x00*/
 extern UNS8 SlaveMap3;		/* Mapped at index 0x2002, subindex 0x00*/
--- a/objdictgen/gen_cfile.py	Fri Mar 21 10:27:42 2008 +0100
+++ b/objdictgen/gen_cfile.py	Fri Mar 21 14:02:18 2008 +0100
@@ -190,8 +190,6 @@
             if index in variablelist:
                 texts["name"] = FormatName(subentry_infos["name"])
                 strDeclareHeader += "extern %(subIndexType)s %(name)s%(suffixe)s;\t\t/* Mapped at index 0x%(index)04X, subindex 0x00*/\n"%texts
-                if callbacks:
-                    strDeclareHeader += "extern ODCallback_t %(name)s_callbacks[];\t\t/* Callbacks of index0x%(index)04X */\n"%texts
                 mappedVariableContent += "%(subIndexType)s %(name)s%(suffixe)s = %(value)s;\t\t/* Mapped at index 0x%(index)04X, subindex 0x00 */\n"%texts
             else:
                 strIndex += "                    %(subIndexType)s %(NodeName)s_obj%(index)04X%(suffixe)s = %(value)s;%(comment)s\n"%texts
@@ -221,8 +219,6 @@
                 if index in variablelist:
                     texts["name"] = FormatName(entry_infos["name"])
                     strDeclareHeader += "extern %(subIndexType)s %(name)s[%(length)d]%(suffixe)s;\t\t/* Mapped at index 0x%(index)04X, subindex 0x01 - 0x%(length)02X */\n"%texts
-                    if callbacks:
-                        strDeclareHeader += "extern ODCallback_t %(name)s_callbacks[];\t\t/* Callbacks of index0x%(index)04X */\n"%texts
                     mappedVariableContent += "%(subIndexType)s %(name)s[] =\t\t/* Mapped at index 0x%(index)04X, subindex 0x01 - 0x%(length)02X */\n  {\n"%texts
                     for subIndex, value in enumerate(values):
                         sep = ","
@@ -286,8 +282,6 @@
                             mappedVariableContent += "%(subIndexType)s %(parent)s_%(name)s%(suffixe)s = %(value)s;\t\t/* Mapped at index 0x%(index)04X, subindex 0x%(subIndex)02X */\n"%texts
                         else:
                             strIndex += "                    %(subIndexType)s %(NodeName)s_obj%(index)04X_%(name)s%(suffixe)s = %(value)s;%(comment)s\n"%texts
-                if callbacks:
-                    strDeclareHeader += "extern ODCallback_t %(parent)s_callbacks[];\t\t/* Callbacks of index0x%(index)04X */\n"%texts
         
         # Generating Dictionary C++ entry
         if callbacks:
canfestival