Index: trunk/MagicSoft/Cosy/Changelog
===================================================================
--- trunk/MagicSoft/Cosy/Changelog	(revision 1675)
+++ trunk/MagicSoft/Cosy/Changelog	(revision 1699)
@@ -1,3 +1,52 @@
                                                                   -*-*- END -*-*-
+
+ 2003/01/08 - Thomas Bretz:
+ 
+   * bending.txt:
+     - added (preliminary)
+
+   * .cosyrc:
+     - added
+	> Az_GearRatio[U_mot/U_tel]: 5891.7
+	> Zd_GearRatio[U_mot/U_tel]: 2475.6
+	> Az_ResRE[re/U_mot]: 500
+	> Zd_ResRE[re/U_mot]: 500
+	> Az_Id-MAC1: 1
+	> Az_Id-MAC2: 3
+	> Zd_Id-MAC:  2
+	> Zd_Id-MAC1: 4
+	> Zd_Id-MAC2: 5
+	> Az_Id-MAC:  6
+
+   * Makefile:
+     - removed cosy.so
+
+   * Makefile.conf.linux-gnu:
+     - removed optimization (causes problems) --> TO BE FIXED
+
+   * candrv/canopen.h:
+     - added return value to WaitForSDO
+
+   * devdrv/macs.cc:
+     - fixed a typo
+
+   * gui/MGCosy.cc:
+     - added 'Reset Bending'
+
+   * main/MBending.[h,cc]
+     - added Reset
+     - fixed a problem with the units in the correction
+     - added CorrectBack functions
+
+   * main/MCosy.[h,cc]:
+     - changed the bahaviour in case no MAC3 is found
+     - fixed that the MAC3 didn't synchronize anymore
+     - added the bending correction to the displayed position
+     - added a workaround for the wrong (0) Gear Ratios --> TO BE FIXED
+     - added Reset Bending
+     - changed the MAC and SE Id to be a resource value (from .cosyrc)
+
+
+
  2002/11/12 - Thomas Bretz (LaPalma):