Merge with Edouard's Modifications
authorlaurent
Wed, 15 Feb 2012 00:44:24 +0100
changeset 684 d376a8b0b602
parent 681 383864958dac (diff)
parent 683 57aa9da845d5 (current diff)
child 685 2db8b87016a0
Merge with Edouard's Modifications
LPCBeremiz.py
plugins/canfestival/canfestival.py
--- a/LPCBeremiz.py	Wed Feb 15 00:32:01 2012 +0100
+++ b/LPCBeremiz.py	Wed Feb 15 00:44:24 2012 +0100
@@ -1146,6 +1146,8 @@
         leftwindowsizer = wx.BoxSizer(wx.HORIZONTAL)
         leftwindowvsizer.AddSizer(leftwindowsizer, 0, border=0, flag=0)
         
+        self.GenerateEnableButton(leftwindow, leftwindowsizer, plugin)
+        
         st = wx.StaticText(leftwindow, -1)
         st.SetFont(wx.Font(faces["size"], wx.DEFAULT, wx.NORMAL, wx.BOLD, faceName = faces["helv"]))
         st.SetLabel(plugin.GetFullIEC_Channel())
--- a/targets/Win32/plc_Win32_main.c	Wed Feb 15 00:32:01 2012 +0100
+++ b/targets/Win32/plc_Win32_main.c	Wed Feb 15 00:44:24 2012 +0100
@@ -244,10 +244,12 @@
 
 void Retain(unsigned int offset, unsigned int count, void * p)
 {
+    /*
     unsigned int position;
     for(position=0; position<count; position++ ){
         printf("%d : 0x%2.2x\n", offset+position, ((char*)p)[position]);
     }
+    */
 }
 
 void Remind(unsigned int offset, unsigned int count, void *p)