Index: trunk/MagicSoft/Cosy/Changelog
===================================================================
--- trunk/MagicSoft/Cosy/Changelog	(revision 8864)
+++ trunk/MagicSoft/Cosy/Changelog	(revision 8865)
@@ -1,3 +1,33 @@
                                                                   -*-*- END -*-*-
+
+ 2008/02/20 Thomas Bretz (La Palma)
+
+   * candrv/ethernet.[h,cc]:
+     - return kFALSE even if RecvRaw return a value <0
+
+   * devdrv/macs.[h,cc]:
+     - added setting and reseeting of an armed state disallowing
+       all movements
+     - set fPosActive if positiong has been started to prevent lags
+       in the program flow
+     - added fArmed to PDO1
+     - added some debug output
+
+   * gui/MGCosy.[h,cc]:
+     - added "Arm" button to the display in expert mode
+     - added armed state to the Update member function
+
+   * main/MCosy.[h,cc]:
+     - commented out all accesses to the third MACS
+     - added code to allow the armed state to be set from the gui
+     - pipe the armed state to the gui
+
+   * tcpip/MTcpIpIO.[h,cc]:
+     - added a timeout to MTcpIpI when waiting for new data
+       which is set to 5s by default
+     - return kFALSE even if RecvRaw return a value <0
+     - wait for new connection in case of timeout
+
+
 
  2008/02/17 Thomas Bretz (La Palma)
