examples/TestMasterMicroMod/TestMaster.c
changeset 201 2966cd34162a
parent 166 b6fbc1c59a44
child 230 aa5ac69398bb
--- a/examples/TestMasterMicroMod/TestMaster.c	Mon May 14 22:46:20 2007 +0200
+++ b/examples/TestMasterMicroMod/TestMaster.c	Wed May 16 14:17:04 2007 +0200
@@ -7,19 +7,14 @@
 /* Declaration of the mapped variables                                    */
 /**************************************************************************/
 UNS8 DO = 0x0;		/* Mapped at index 0x2000, subindex 0x00 */
-UNS8 AO1 = 0x0;		/* Mapped at index 0x2001, subindex 0x00 */
-UNS8 AO2 = 0x0;		/* Mapped at index 0x2002, subindex 0x00 */
-UNS8 AO3 = 0x0;		/* Mapped at index 0x2003, subindex 0x00 */
-UNS8 DI = 0x0;		/* Mapped at index 0x2004, subindex 0x00 */
-UNS8 AI1 = 0x0;		/* Mapped at index 0x2005, subindex 0x00 */
-UNS8 AI2 = 0x0;		/* Mapped at index 0x2006, subindex 0x00 */
-UNS8 AI3 = 0x0;		/* Mapped at index 0x2007, subindex 0x00 */
-UNS8 AI4 = 0x0;		/* Mapped at index 0x2008, subindex 0x00 */
-UNS8 AI5 = 0x0;		/* Mapped at index 0x2009, subindex 0x00 */
-UNS8 AI6 = 0x0;		/* Mapped at index 0x200A, subindex 0x00 */
-UNS8 AI7 = 0x0;		/* Mapped at index 0x200B, subindex 0x00 */
-UNS8 AI8 = 0x0;		/* Mapped at index 0x200C, subindex 0x00 */
-UNS8 AO4 = 0x0;		/* Mapped at index 0x200D, subindex 0x00 */
+UNS8 DI1 = 0x0;		/* Mapped at index 0x200F, subindex 0x00 */
+UNS8 DI2 = 0x0;		/* Mapped at index 0x2010, subindex 0x00 */
+UNS8 DI3 = 0x0;		/* Mapped at index 0x2011, subindex 0x00 */
+UNS8 DI4 = 0x0;		/* Mapped at index 0x2012, subindex 0x00 */
+UNS8 DI5 = 0x0;		/* Mapped at index 0x2013, subindex 0x00 */
+UNS8 DI6 = 0x0;		/* Mapped at index 0x2014, subindex 0x00 */
+UNS8 DI7 = 0x0;		/* Mapped at index 0x2015, subindex 0x00 */
+UNS8 DI8 = 0x0;		/* Mapped at index 0x2016, subindex 0x00 */
 
 /**************************************************************************/
 /* Declaration of the value range types                                   */
@@ -123,13 +118,13 @@
                     UNS8 TestMaster_highestSubIndex_obj1280 = 3; /* number of subindex - 1*/
                     UNS32 TestMaster_obj1280_COB_ID_Client_to_Server_Transmit_SDO = 0x640;	/* 1600 */
                     UNS32 TestMaster_obj1280_COB_ID_Server_to_Client_Receive_SDO = 0x5C0;	/* 1472 */
-                    UNS32 TestMaster_obj1280_Node_ID_of_the_SDO_Server = 0x40;	/* 64 */
+                    INTEGER32 TestMaster_obj1280_Node_ID_of_the_SDO_Server = 0x40;	/* 64 */
                     subindex TestMaster_Index1280[] = 
                      {
                        { RO, uint8, sizeof (UNS8), (void*)&TestMaster_highestSubIndex_obj1280 },
                        { RW, uint32, sizeof (UNS32), (void*)&TestMaster_obj1280_COB_ID_Client_to_Server_Transmit_SDO },
                        { RW, uint32, sizeof (UNS32), (void*)&TestMaster_obj1280_COB_ID_Server_to_Client_Receive_SDO },
-                       { RW, uint32, sizeof (UNS32), (void*)&TestMaster_obj1280_Node_ID_of_the_SDO_Server }
+                       { RW, int32, sizeof (INTEGER32), (void*)&TestMaster_obj1280_Node_ID_of_the_SDO_Server }
                      };
 
 /* index 0x1400 :   Receive PDO 1 Parameter. */
@@ -137,7 +132,7 @@
                     UNS32 TestMaster_obj1400_COB_ID_used_by_PDO = 0x220;	/* 544 */
                     UNS8 TestMaster_obj1400_Transmission_Type = 0x1;	/* 1 */
                     UNS16 TestMaster_obj1400_Inhibit_Time = 0x0;	/* 0 */
-                    UNS16 TestMaster_obj1400_Compatibility_Entry = 0x0;	/* 0 */
+                    UNS8 TestMaster_obj1400_Compatibility_Entry = 0x0;	/* 0 */
                     UNS16 TestMaster_obj1400_Event_Timer = 0x0;	/* 0 */
                     subindex TestMaster_Index1400[] = 
                      {
@@ -145,90 +140,34 @@
                        { RW, uint32, sizeof (UNS32), (void*)&TestMaster_obj1400_COB_ID_used_by_PDO },
                        { RW, uint8, sizeof (UNS8), (void*)&TestMaster_obj1400_Transmission_Type },
                        { RW, uint16, sizeof (UNS16), (void*)&TestMaster_obj1400_Inhibit_Time },
-                       { RW, uint16, sizeof (UNS16), (void*)&TestMaster_obj1400_Compatibility_Entry },
+                       { RW, uint8, sizeof (UNS8), (void*)&TestMaster_obj1400_Compatibility_Entry },
                        { RW, uint16, sizeof (UNS16), (void*)&TestMaster_obj1400_Event_Timer }
                      };
 
-/* index 0x1401 :   Receive PDO 2 Parameter. */
-                    UNS8 TestMaster_highestSubIndex_obj1401 = 5; /* number of subindex - 1*/
-                    UNS32 TestMaster_obj1401_COB_ID_used_by_PDO = 0x320;	/* 800 */
-                    UNS8 TestMaster_obj1401_Transmission_Type = 0x1;	/* 1 */
-                    UNS16 TestMaster_obj1401_Inhibit_Time = 0x0;	/* 0 */
-                    UNS16 TestMaster_obj1401_Compatibility_Entry = 0x0;	/* 0 */
-                    UNS16 TestMaster_obj1401_Event_Timer = 0x0;	/* 0 */
-                    subindex TestMaster_Index1401[] = 
-                     {
-                       { RO, uint8, sizeof (UNS8), (void*)&TestMaster_highestSubIndex_obj1401 },
-                       { RW, uint32, sizeof (UNS32), (void*)&TestMaster_obj1401_COB_ID_used_by_PDO },
-                       { RW, uint8, sizeof (UNS8), (void*)&TestMaster_obj1401_Transmission_Type },
-                       { RW, uint16, sizeof (UNS16), (void*)&TestMaster_obj1401_Inhibit_Time },
-                       { RW, uint16, sizeof (UNS16), (void*)&TestMaster_obj1401_Compatibility_Entry },
-                       { RW, uint16, sizeof (UNS16), (void*)&TestMaster_obj1401_Event_Timer }
-                     };
-
-/* index 0x1402 :   Receive PDO 3 Parameter. */
-                    UNS8 TestMaster_highestSubIndex_obj1402 = 5; /* number of subindex - 1*/
-                    UNS32 TestMaster_obj1402_COB_ID_used_by_PDO = 0x420;	/* 1056 */
-                    UNS8 TestMaster_obj1402_Transmission_Type = 0x1;	/* 1 */
-                    UNS16 TestMaster_obj1402_Inhibit_Time = 0x0;	/* 0 */
-                    UNS16 TestMaster_obj1402_Compatibility_Entry = 0x0;	/* 0 */
-                    UNS16 TestMaster_obj1402_Event_Timer = 0x0;	/* 0 */
-                    subindex TestMaster_Index1402[] = 
-                     {
-                       { RO, uint8, sizeof (UNS8), (void*)&TestMaster_highestSubIndex_obj1402 },
-                       { RW, uint32, sizeof (UNS32), (void*)&TestMaster_obj1402_COB_ID_used_by_PDO },
-                       { RW, uint8, sizeof (UNS8), (void*)&TestMaster_obj1402_Transmission_Type },
-                       { RW, uint16, sizeof (UNS16), (void*)&TestMaster_obj1402_Inhibit_Time },
-                       { RW, uint16, sizeof (UNS16), (void*)&TestMaster_obj1402_Compatibility_Entry },
-                       { RW, uint16, sizeof (UNS16), (void*)&TestMaster_obj1402_Event_Timer }
-                     };
-
 /* index 0x1600 :   Receive PDO 1 Mapping. */
-                    UNS8 TestMaster_highestSubIndex_obj1600 = 1; /* number of subindex - 1*/
+                    UNS8 TestMaster_highestSubIndex_obj1600 = 8; /* number of subindex - 1*/
                     UNS32 TestMaster_obj1600[] = 
                     {
-                      0x20040008	/* 537133064 */
+                      0x200F0001,	/* 537853953 */
+                      0x20100001,	/* 537919489 */
+                      0x20110001,	/* 537985025 */
+                      0x20120001,	/* 538050561 */
+                      0x20130001,	/* 538116097 */
+                      0x20140001,	/* 538181633 */
+                      0x20150001,	/* 538247169 */
+                      0x20160001	/* 538312705 */
                     };
                     subindex TestMaster_Index1600[] = 
                      {
                        { RW, uint8, sizeof (UNS8), (void*)&TestMaster_highestSubIndex_obj1600 },
-                       { RW, uint32, sizeof (UNS32), (void*)&TestMaster_obj1600[0] }
-                     };
-
-/* index 0x1601 :   Receive PDO 2 Mapping. */
-                    UNS8 TestMaster_highestSubIndex_obj1601 = 4; /* number of subindex - 1*/
-                    UNS32 TestMaster_obj1601[] = 
-                    {
-                      0x20050008,	/* 537198600 */
-                      0x20060008,	/* 537264136 */
-                      0x20070008,	/* 537329672 */
-                      0x20080008	/* 537395208 */
-                    };
-                    subindex TestMaster_Index1601[] = 
-                     {
-                       { RW, uint8, sizeof (UNS8), (void*)&TestMaster_highestSubIndex_obj1601 },
-                       { RW, uint32, sizeof (UNS32), (void*)&TestMaster_obj1601[0] },
-                       { RW, uint32, sizeof (UNS32), (void*)&TestMaster_obj1601[1] },
-                       { RW, uint32, sizeof (UNS32), (void*)&TestMaster_obj1601[2] },
-                       { RW, uint32, sizeof (UNS32), (void*)&TestMaster_obj1601[3] }
-                     };
-
-/* index 0x1602 :   Receive PDO 3 Mapping. */
-                    UNS8 TestMaster_highestSubIndex_obj1602 = 4; /* number of subindex - 1*/
-                    UNS32 TestMaster_obj1602[] = 
-                    {
-                      0x20090008,	/* 537460744 */
-                      0x200A0008,	/* 537526280 */
-                      0x200B0008,	/* 537591816 */
-                      0x200C0008	/* 537657352 */
-                    };
-                    subindex TestMaster_Index1602[] = 
-                     {
-                       { RW, uint8, sizeof (UNS8), (void*)&TestMaster_highestSubIndex_obj1602 },
-                       { RW, uint32, sizeof (UNS32), (void*)&TestMaster_obj1602[0] },
-                       { RW, uint32, sizeof (UNS32), (void*)&TestMaster_obj1602[1] },
-                       { RW, uint32, sizeof (UNS32), (void*)&TestMaster_obj1602[2] },
-                       { RW, uint32, sizeof (UNS32), (void*)&TestMaster_obj1602[3] }
+                       { RW, uint32, sizeof (UNS32), (void*)&TestMaster_obj1600[0] },
+                       { RW, uint32, sizeof (UNS32), (void*)&TestMaster_obj1600[1] },
+                       { RW, uint32, sizeof (UNS32), (void*)&TestMaster_obj1600[2] },
+                       { RW, uint32, sizeof (UNS32), (void*)&TestMaster_obj1600[3] },
+                       { RW, uint32, sizeof (UNS32), (void*)&TestMaster_obj1600[4] },
+                       { RW, uint32, sizeof (UNS32), (void*)&TestMaster_obj1600[5] },
+                       { RW, uint32, sizeof (UNS32), (void*)&TestMaster_obj1600[6] },
+                       { RW, uint32, sizeof (UNS32), (void*)&TestMaster_obj1600[7] }
                      };
 
 /* index 0x1800 :   Transmit PDO 1 Parameter. */
@@ -236,7 +175,7 @@
                     UNS32 TestMaster_obj1800_COB_ID_used_by_PDO = 0x240;	/* 576 */
                     UNS8 TestMaster_obj1800_Transmission_Type = 0x1;	/* 1 */
                     UNS16 TestMaster_obj1800_Inhibit_Time = 0x0;	/* 0 */
-                    UNS16 TestMaster_obj1800_Compatibility_Entry = 0x0;	/* 0 */
+                    UNS8 TestMaster_obj1800_Compatibility_Entry = 0x0;	/* 0 */
                     UNS16 TestMaster_obj1800_Event_Timer = 0x0;	/* 0 */
                     subindex TestMaster_Index1800[] = 
                      {
@@ -244,27 +183,10 @@
                        { RW, uint32, sizeof (UNS32), (void*)&TestMaster_obj1800_COB_ID_used_by_PDO },
                        { RW, uint8, sizeof (UNS8), (void*)&TestMaster_obj1800_Transmission_Type },
                        { RW, uint16, sizeof (UNS16), (void*)&TestMaster_obj1800_Inhibit_Time },
-                       { RW, uint16, sizeof (UNS16), (void*)&TestMaster_obj1800_Compatibility_Entry },
+                       { RW, uint8, sizeof (UNS8), (void*)&TestMaster_obj1800_Compatibility_Entry },
                        { RW, uint16, sizeof (UNS16), (void*)&TestMaster_obj1800_Event_Timer }
                      };
 
-/* index 0x1801 :   Transmit PDO 2 Parameter. */
-                    UNS8 TestMaster_highestSubIndex_obj1801 = 5; /* number of subindex - 1*/
-                    UNS32 TestMaster_obj1801_COB_ID_used_by_PDO = 0x0;	/* 0 */
-                    UNS8 TestMaster_obj1801_Transmission_Type = 0x0;	/* 0 */
-                    UNS16 TestMaster_obj1801_Inhibit_Time = 0x0;	/* 0 */
-                    UNS16 TestMaster_obj1801_Compatibility_Entry = 0x0;	/* 0 */
-                    UNS16 TestMaster_obj1801_Event_Timer = 0x0;	/* 0 */
-                    subindex TestMaster_Index1801[] = 
-                     {
-                       { RO, uint8, sizeof (UNS8), (void*)&TestMaster_highestSubIndex_obj1801 },
-                       { RW, uint32, sizeof (UNS32), (void*)&TestMaster_obj1801_COB_ID_used_by_PDO },
-                       { RW, uint8, sizeof (UNS8), (void*)&TestMaster_obj1801_Transmission_Type },
-                       { RW, uint16, sizeof (UNS16), (void*)&TestMaster_obj1801_Inhibit_Time },
-                       { RW, uint16, sizeof (UNS16), (void*)&TestMaster_obj1801_Compatibility_Entry },
-                       { RW, uint16, sizeof (UNS16), (void*)&TestMaster_obj1801_Event_Timer }
-                     };
-
 /* index 0x1A00 :   Transmit PDO 1 Mapping. */
                     UNS8 TestMaster_highestSubIndex_obj1A00 = 1; /* number of subindex - 1*/
                     UNS32 TestMaster_obj1A00[] = 
@@ -277,106 +199,58 @@
                        { RW, uint32, sizeof (UNS32), (void*)&TestMaster_obj1A00[0] }
                      };
 
-/* index 0x1A01 :   Transmit PDO 2 Mapping. */
-                    UNS8 TestMaster_highestSubIndex_obj1A01 = 4; /* number of subindex - 1*/
-                    UNS32 TestMaster_obj1A01[] = 
-                    {
-                      0x20010008,	/* 536936456 */
-                      0x20020008,	/* 537001992 */
-                      0x20030008,	/* 537067528 */
-                      0x200D0008	/* 537722888 */
-                    };
-                    subindex TestMaster_Index1A01[] = 
-                     {
-                       { RW, uint8, sizeof (UNS8), (void*)&TestMaster_highestSubIndex_obj1A01 },
-                       { RW, uint32, sizeof (UNS32), (void*)&TestMaster_obj1A01[0] },
-                       { RW, uint32, sizeof (UNS32), (void*)&TestMaster_obj1A01[1] },
-                       { RW, uint32, sizeof (UNS32), (void*)&TestMaster_obj1A01[2] },
-                       { RW, uint32, sizeof (UNS32), (void*)&TestMaster_obj1A01[3] }
-                     };
-
 /* index 0x2000 :   Mapped variable DO */
                     subindex TestMaster_Index2000[] = 
                      {
                        { RW, uint8, sizeof (UNS8), (void*)&DO }
                      };
 
-/* index 0x2001 :   Mapped variable AO1 */
-                    subindex TestMaster_Index2001[] = 
-                     {
-                       { RW, uint8, sizeof (UNS8), (void*)&AO1 }
-                     };
-
-/* index 0x2002 :   Mapped variable AO2 */
-                    subindex TestMaster_Index2002[] = 
-                     {
-                       { RW, uint8, sizeof (UNS8), (void*)&AO2 }
-                     };
-
-/* index 0x2003 :   Mapped variable AO3 */
-                    subindex TestMaster_Index2003[] = 
-                     {
-                       { RW, uint8, sizeof (UNS8), (void*)&AO3 }
-                     };
-
-/* index 0x2004 :   Mapped variable DI */
-                    subindex TestMaster_Index2004[] = 
-                     {
-                       { RW, uint8, sizeof (UNS8), (void*)&DI }
-                     };
-
-/* index 0x2005 :   Mapped variable AI1 */
-                    subindex TestMaster_Index2005[] = 
-                     {
-                       { RW, uint8, sizeof (UNS8), (void*)&AI1 }
-                     };
-
-/* index 0x2006 :   Mapped variable AI2 */
-                    subindex TestMaster_Index2006[] = 
-                     {
-                       { RW, uint8, sizeof (UNS8), (void*)&AI2 }
-                     };
-
-/* index 0x2007 :   Mapped variable AI3 */
-                    subindex TestMaster_Index2007[] = 
-                     {
-                       { RW, uint8, sizeof (UNS8), (void*)&AI3 }
-                     };
-
-/* index 0x2008 :   Mapped variable AI4 */
-                    subindex TestMaster_Index2008[] = 
-                     {
-                       { RW, uint8, sizeof (UNS8), (void*)&AI4 }
-                     };
-
-/* index 0x2009 :   Mapped variable AI5 */
-                    subindex TestMaster_Index2009[] = 
-                     {
-                       { RW, uint8, sizeof (UNS8), (void*)&AI5 }
-                     };
-
-/* index 0x200A :   Mapped variable AI6 */
-                    subindex TestMaster_Index200A[] = 
-                     {
-                       { RW, uint8, sizeof (UNS8), (void*)&AI6 }
-                     };
-
-/* index 0x200B :   Mapped variable AI7 */
-                    subindex TestMaster_Index200B[] = 
-                     {
-                       { RW, uint8, sizeof (UNS8), (void*)&AI7 }
-                     };
-
-/* index 0x200C :   Mapped variable AI8 */
-                    subindex TestMaster_Index200C[] = 
-                     {
-                       { RW, uint8, sizeof (UNS8), (void*)&AI8 }
-                     };
-
-/* index 0x200D :   Mapped variable AO4 */
-                    subindex TestMaster_Index200D[] = 
-                     {
-                       { RW, uint8, sizeof (UNS8), (void*)&AO4 }
+/* index 0x200F :   Mapped variable DI1 */
+                    subindex TestMaster_Index200F[] = 
+                     {
+                       { RW, boolean, sizeof (UNS8), (void*)&DI1 }
+                     };
+
+/* index 0x2010 :   Mapped variable DI2 */
+                    subindex TestMaster_Index2010[] = 
+                     {
+                       { RW, boolean, sizeof (UNS8), (void*)&DI2 }
+                     };
+
+/* index 0x2011 :   Mapped variable DI3 */
+                    subindex TestMaster_Index2011[] = 
+                     {
+                       { RW, boolean, sizeof (UNS8), (void*)&DI3 }
+                     };
+
+/* index 0x2012 :   Mapped variable DI4 */
+                    subindex TestMaster_Index2012[] = 
+                     {
+                       { RW, boolean, sizeof (UNS8), (void*)&DI4 }
+                     };
+
+/* index 0x2013 :   Mapped variable DI5 */
+                    subindex TestMaster_Index2013[] = 
+                     {
+                       { RW, boolean, sizeof (UNS8), (void*)&DI5 }
+                     };
+
+/* index 0x2014 :   Mapped variable DI6 */
+                    subindex TestMaster_Index2014[] = 
+                     {
+                       { RW, boolean, sizeof (UNS8), (void*)&DI6 }
+                     };
+
+/* index 0x2015 :   Mapped variable DI7 */
+                    subindex TestMaster_Index2015[] = 
+                     {
+                       { RW, boolean, sizeof (UNS8), (void*)&DI7 }
+                     };
+
+/* index 0x2016 :   Mapped variable DI8 */
+                    subindex TestMaster_Index2016[] = 
+                     {
+                       { RW, boolean, sizeof (UNS8), (void*)&DI8 }
                      };
 
 const indextable TestMaster_objdict[] = 
@@ -389,29 +263,18 @@
   { (subindex*)TestMaster_Index1018,sizeof(TestMaster_Index1018)/sizeof(TestMaster_Index1018[0]), 0x1018},
   { (subindex*)TestMaster_Index1280,sizeof(TestMaster_Index1280)/sizeof(TestMaster_Index1280[0]), 0x1280},
   { (subindex*)TestMaster_Index1400,sizeof(TestMaster_Index1400)/sizeof(TestMaster_Index1400[0]), 0x1400},
-  { (subindex*)TestMaster_Index1401,sizeof(TestMaster_Index1401)/sizeof(TestMaster_Index1401[0]), 0x1401},
-  { (subindex*)TestMaster_Index1402,sizeof(TestMaster_Index1402)/sizeof(TestMaster_Index1402[0]), 0x1402},
   { (subindex*)TestMaster_Index1600,sizeof(TestMaster_Index1600)/sizeof(TestMaster_Index1600[0]), 0x1600},
-  { (subindex*)TestMaster_Index1601,sizeof(TestMaster_Index1601)/sizeof(TestMaster_Index1601[0]), 0x1601},
-  { (subindex*)TestMaster_Index1602,sizeof(TestMaster_Index1602)/sizeof(TestMaster_Index1602[0]), 0x1602},
   { (subindex*)TestMaster_Index1800,sizeof(TestMaster_Index1800)/sizeof(TestMaster_Index1800[0]), 0x1800},
-  { (subindex*)TestMaster_Index1801,sizeof(TestMaster_Index1801)/sizeof(TestMaster_Index1801[0]), 0x1801},
   { (subindex*)TestMaster_Index1A00,sizeof(TestMaster_Index1A00)/sizeof(TestMaster_Index1A00[0]), 0x1A00},
-  { (subindex*)TestMaster_Index1A01,sizeof(TestMaster_Index1A01)/sizeof(TestMaster_Index1A01[0]), 0x1A01},
   { (subindex*)TestMaster_Index2000,sizeof(TestMaster_Index2000)/sizeof(TestMaster_Index2000[0]), 0x2000},
-  { (subindex*)TestMaster_Index2001,sizeof(TestMaster_Index2001)/sizeof(TestMaster_Index2001[0]), 0x2001},
-  { (subindex*)TestMaster_Index2002,sizeof(TestMaster_Index2002)/sizeof(TestMaster_Index2002[0]), 0x2002},
-  { (subindex*)TestMaster_Index2003,sizeof(TestMaster_Index2003)/sizeof(TestMaster_Index2003[0]), 0x2003},
-  { (subindex*)TestMaster_Index2004,sizeof(TestMaster_Index2004)/sizeof(TestMaster_Index2004[0]), 0x2004},
-  { (subindex*)TestMaster_Index2005,sizeof(TestMaster_Index2005)/sizeof(TestMaster_Index2005[0]), 0x2005},
-  { (subindex*)TestMaster_Index2006,sizeof(TestMaster_Index2006)/sizeof(TestMaster_Index2006[0]), 0x2006},
-  { (subindex*)TestMaster_Index2007,sizeof(TestMaster_Index2007)/sizeof(TestMaster_Index2007[0]), 0x2007},
-  { (subindex*)TestMaster_Index2008,sizeof(TestMaster_Index2008)/sizeof(TestMaster_Index2008[0]), 0x2008},
-  { (subindex*)TestMaster_Index2009,sizeof(TestMaster_Index2009)/sizeof(TestMaster_Index2009[0]), 0x2009},
-  { (subindex*)TestMaster_Index200A,sizeof(TestMaster_Index200A)/sizeof(TestMaster_Index200A[0]), 0x200A},
-  { (subindex*)TestMaster_Index200B,sizeof(TestMaster_Index200B)/sizeof(TestMaster_Index200B[0]), 0x200B},
-  { (subindex*)TestMaster_Index200C,sizeof(TestMaster_Index200C)/sizeof(TestMaster_Index200C[0]), 0x200C},
-  { (subindex*)TestMaster_Index200D,sizeof(TestMaster_Index200D)/sizeof(TestMaster_Index200D[0]), 0x200D},
+  { (subindex*)TestMaster_Index200F,sizeof(TestMaster_Index200F)/sizeof(TestMaster_Index200F[0]), 0x200F},
+  { (subindex*)TestMaster_Index2010,sizeof(TestMaster_Index2010)/sizeof(TestMaster_Index2010[0]), 0x2010},
+  { (subindex*)TestMaster_Index2011,sizeof(TestMaster_Index2011)/sizeof(TestMaster_Index2011[0]), 0x2011},
+  { (subindex*)TestMaster_Index2012,sizeof(TestMaster_Index2012)/sizeof(TestMaster_Index2012[0]), 0x2012},
+  { (subindex*)TestMaster_Index2013,sizeof(TestMaster_Index2013)/sizeof(TestMaster_Index2013[0]), 0x2013},
+  { (subindex*)TestMaster_Index2014,sizeof(TestMaster_Index2014)/sizeof(TestMaster_Index2014[0]), 0x2014},
+  { (subindex*)TestMaster_Index2015,sizeof(TestMaster_Index2015)/sizeof(TestMaster_Index2015[0]), 0x2015},
+  { (subindex*)TestMaster_Index2016,sizeof(TestMaster_Index2016)/sizeof(TestMaster_Index2016[0]), 0x2016},
 };
 
 const indextable * TestMaster_scanIndexOD (UNS16 wIndex, UNS32 * errorCode, ODCallback_t **callbacks)
@@ -427,29 +290,18 @@
 		case 0x1018: i = 5;break;
 		case 0x1280: i = 6;break;
 		case 0x1400: i = 7;break;
-		case 0x1401: i = 8;break;
-		case 0x1402: i = 9;break;
-		case 0x1600: i = 10;break;
-		case 0x1601: i = 11;break;
-		case 0x1602: i = 12;break;
-		case 0x1800: i = 13;break;
-		case 0x1801: i = 14;break;
-		case 0x1A00: i = 15;break;
-		case 0x1A01: i = 16;break;
-		case 0x2000: i = 17;break;
-		case 0x2001: i = 18;break;
-		case 0x2002: i = 19;break;
-		case 0x2003: i = 20;break;
-		case 0x2004: i = 21;break;
-		case 0x2005: i = 22;break;
-		case 0x2006: i = 23;break;
-		case 0x2007: i = 24;break;
-		case 0x2008: i = 25;break;
-		case 0x2009: i = 26;break;
-		case 0x200A: i = 27;break;
-		case 0x200B: i = 28;break;
-		case 0x200C: i = 29;break;
-		case 0x200D: i = 30;break;
+		case 0x1600: i = 8;break;
+		case 0x1800: i = 9;break;
+		case 0x1A00: i = 10;break;
+		case 0x2000: i = 11;break;
+		case 0x200F: i = 12;break;
+		case 0x2010: i = 13;break;
+		case 0x2011: i = 14;break;
+		case 0x2012: i = 15;break;
+		case 0x2013: i = 16;break;
+		case 0x2014: i = 17;break;
+		case 0x2015: i = 18;break;
+		case 0x2016: i = 19;break;
 		default:
 			*errorCode = OD_NO_SUCH_OBJECT;
 			return NULL;
@@ -462,24 +314,24 @@
  * Even if no pdoTransmit are defined, at least one entry is computed
  * for compilations issues.
  */
-UNS8 TestMaster_count_sync[2] = {0,};
+UNS8 TestMaster_count_sync[1] = {0,};
 
 quick_index TestMaster_firstIndex = {
   0, /* SDO_SVR */
   6, /* SDO_CLT */
   7, /* PDO_RCV */
-  10, /* PDO_RCV_MAP */
-  13, /* PDO_TRS */
-  15 /* PDO_TRS_MAP */
+  8, /* PDO_RCV_MAP */
+  9, /* PDO_TRS */
+  10 /* PDO_TRS_MAP */
 };
 
 quick_index TestMaster_lastIndex = {
   0, /* SDO_SVR */
   6, /* SDO_CLT */
-  9, /* PDO_RCV */
-  12, /* PDO_RCV_MAP */
-  14, /* PDO_TRS */
-  16 /* PDO_TRS_MAP */
+  7, /* PDO_RCV */
+  8, /* PDO_RCV_MAP */
+  9, /* PDO_TRS */
+  10 /* PDO_TRS_MAP */
 };
 
 UNS16 TestMaster_ObjdictSize = sizeof(TestMaster_objdict)/sizeof(TestMaster_objdict[0]);