Merge with daa1e1c3fba43ee73a2e827961155b1372ca433e
authoredouard
Tue, 27 Oct 2009 14:35:57 +0100
changeset 610 485e9b8a3e76
parent 609 c59dce78bbad (current diff)
parent 608 daa1e1c3fba4 (diff)
child 611 3e0c776da33b
Merge with daa1e1c3fba43ee73a2e827961155b1372ca433e
--- a/drivers/timers_unix/timers_unix.c	Wed Oct 14 16:37:37 2009 +0200
+++ b/drivers/timers_unix/timers_unix.c	Tue Oct 27 14:35:57 2009 +0100
@@ -48,6 +48,11 @@
 	// Take first absolute time ref.
 	gettimeofday(&last_sig,NULL);
 
+#if defined(__UCLIBC__)
+	int ret;
+	ret = timer_create(CLOCK_PROCESS_CPUTIME_ID, NULL, &timer);
+	signal(SIGALRM, timer_notify);
+#else
 	memset (&sigev, 0, sizeof (struct sigevent));
 	sigev.sigev_value.sival_int = 0;
 	sigev.sigev_notify = SIGEV_THREAD;
@@ -55,6 +60,7 @@
 	sigev.sigev_notify_function = timer_notify;
 
 	timer_create (CLOCK_REALTIME, &sigev, &timer);
+#endif
 }
 
 void StopTimerLoop(TimerCallback_t exitfunction)
--- a/objdictgen/networkedit.py	Wed Oct 14 16:37:37 2009 +0200
+++ b/objdictgen/networkedit.py	Tue Oct 27 14:35:57 2009 +0100
@@ -398,40 +398,33 @@
 
     def OnQuitMenu(self, event):
         self.Close()
-        event.Skip()
-
+        
     def OnAddSDOServerMenu(self, event):
         self.Manager.AddSDOServerToCurrent()
         self.RefreshBufferState()
         self.RefreshCurrentIndexList()
-        event.Skip()
-    
+        
     def OnAddSDOClientMenu(self, event):
         self.Manager.AddSDOClientToCurrent()
         self.RefreshBufferState()
         self.RefreshCurrentIndexList()
-        event.Skip()
-
+        
     def OnAddPDOTransmitMenu(self, event):
         self.Manager.AddPDOTransmitToCurrent()
         self.RefreshBufferState()
         self.RefreshCurrentIndexList()
-        event.Skip()
-
+        
     def OnAddPDOReceiveMenu(self, event):
         self.Manager.AddPDOReceiveToCurrent()
         self.RefreshBufferState()
         self.RefreshCurrentIndexList()
-        event.Skip()
-
+        
     def OnAddMapVariableMenu(self, event):
         self.AddMapVariable()
-        event.Skip()
-
+        
     def OnAddUserTypeMenu(self, event):
         self.AddUserType()
-        event.Skip()
-
+        
     def OnNodeSelectedChanged(self, event):
         if not self.Closing:
             selected = event.GetSelection()
@@ -473,8 +466,7 @@
                     message = wx.MessageDialog(self, result, _("ERROR"), wx.OK|wx.ICON_ERROR)
                     message.ShowModal()
                     message.Destroy()
-        event.Skip()
-
+        
     def OnOpenProjectMenu(self, event):
         if self.NodeList:
             defaultpath = os.path.dirname(self.NodeList.GetRoot())
@@ -502,8 +494,7 @@
                     message.ShowModal()
                     message.Destroy()
         dialog.Destroy()
-        event.Skip()
-
+        
     def OnSaveProjectMenu(self, event):
         if not self.ModeSolo and getattr(self, "_onsave", None) != None:
             self._onsave()
@@ -513,8 +504,7 @@
                 message = wx.MessageDialog(self, result, _("Error"), wx.OK|wx.ICON_ERROR)
                 message.ShowModal()
                 message.Destroy()
-        event.Skip()
-
+        
     def OnCloseProjectMenu(self, event):
         if self.NodeList:
             if self.NodeList.HasChanged():
@@ -535,8 +525,7 @@
                 self.RefreshNetworkNodes()
                 self.RefreshTitle()
                 self.RefreshMainMenu()
-        event.Skip()
-
+        
 #-------------------------------------------------------------------------------
 #                             Slave Nodes Management
 #-------------------------------------------------------------------------------
@@ -560,8 +549,7 @@
                 message.ShowModal()
                 message.Destroy()
         dialog.Destroy()
-        event.Skip()
-
+        
     def OnRemoveSlaveMenu(self, event):
         slavenames = self.NodeList.GetSlaveNames()
         slaveids = self.NodeList.GetSlaveIDs()
@@ -583,8 +571,7 @@
                 message = wx.MessageDialog(self, result, _("Error"), wx.OK|wx.ICON_ERROR)
                 message.ShowModal()
                 message.Destroy()
-        event.Skip()
-
+        
 #-------------------------------------------------------------------------------
 #                             Refresh Functions
 #-------------------------------------------------------------------------------
@@ -597,8 +584,7 @@
 
     def OnRefreshMenu(self, event):
         self.RefreshCurrentIndexList()
-        event.Skip()
-
+        
     def RefreshCurrentIndexList(self):
         selected = self.NetworkNodes.GetSelection()
         if selected == 0:
@@ -711,7 +697,6 @@
             self.Manager.AddSpecificEntryToCurrent(text)
             self.RefreshBufferState()
             self.RefreshCurrentIndexList()
-            event.Skip()
         return ProfileCallBack
 
 #-------------------------------------------------------------------------------
@@ -734,13 +719,11 @@
         self.Manager.LoadCurrentPrevious()
         self.RefreshCurrentIndexList()
         self.RefreshBufferState()
-        event.Skip()
 
     def OnRedoMenu(self, event):
         self.Manager.LoadCurrentNext()
         self.RefreshCurrentIndexList()
         self.RefreshBufferState()
-        event.Skip()
 
 #-------------------------------------------------------------------------------
 #                                Help Method
@@ -766,7 +749,6 @@
                 message = wx.MessageDialog(self, result, _("ERROR"), wx.OK|wx.ICON_ERROR)
                 message.ShowModal()
                 message.Destroy()
-        event.Skip()
         
     def OnHelpCANFestivalMenu(self, event):
         #self.OpenHtmlFrame("CAN Festival Reference", os.path.join(ScriptDirectory, "doc/canfestival.html"), wx.Size(1000, 600))
@@ -777,11 +759,9 @@
                 os.spawnl(os.P_DETACH, readerexepath, "AcroRd32.exe", '"%s"'%os.path.join(ScriptDirectory, "doc","manual_en.pdf"))
         else:
             os.system("xpdf -remote CANFESTIVAL %s %d &"%(os.path.join(ScriptDirectory, "doc/manual_en.pdf"),16))
-        event.Skip()
 
     def OnAboutMenu(self, event):
         self.OpenHtmlFrame(_("About CAN Festival"), os.path.join(ScriptDirectory, "doc/about.html"), wx.Size(500, 450))
-        event.Skip()
 
     def OpenHtmlFrame(self, title, file, size):
         if title not in self.HtmlFrameOpened:
@@ -799,18 +779,15 @@
     def OnCommunicationMenu(self, event):
         dictionary,current = self.Manager.GetCurrentCommunicationLists()
         self.EditProfile(_("Edit DS-301 Profile"), dictionary, current)
-        event.Skip()
     
     def OnOtherCommunicationMenu(self, event):
         dictionary,current = self.Manager.GetCurrentDS302Lists()
         self.EditProfile(_("Edit DS-302 Profile"), dictionary, current)
-        event.Skip()
     
     def OnEditProfileMenu(self, event):
         title = _("Edit %s Profile")%self.Manager.GetCurrentProfileName()
         dictionary,current = self.Manager.GetCurrentProfileLists()
         self.EditProfile(title, dictionary, current)
-        event.Skip()
     
     def EditProfile(self, title, dictionary, current):
         dialog = CommunicationDialog(self)
@@ -853,7 +830,6 @@
             if selected >= 0:
                 window = self.NetworkNodes.GetPage(selected)
                 window.RefreshTable()
-        event.Skip()
 
 
 #-------------------------------------------------------------------------------
--- a/objdictgen/objdictedit.py	Wed Oct 14 16:37:37 2009 +0200
+++ b/objdictgen/objdictedit.py	Tue Oct 27 14:35:57 2009 +0100
@@ -381,34 +381,28 @@
         self.Manager.AddSDOServerToCurrent()
         self.RefreshBufferState()
         self.RefreshCurrentIndexList()
-        event.Skip()
-    
+        
     def OnAddSDOClientMenu(self, event):
         self.Manager.AddSDOClientToCurrent()
         self.RefreshBufferState()
         self.RefreshCurrentIndexList()
-        event.Skip()
-
+        
     def OnAddPDOTransmitMenu(self, event):
         self.Manager.AddPDOTransmitToCurrent()
         self.RefreshBufferState()
         self.RefreshCurrentIndexList()
-        event.Skip()
-
+        
     def OnAddPDOReceiveMenu(self, event):
         self.Manager.AddPDOReceiveToCurrent()
         self.RefreshBufferState()
         self.RefreshCurrentIndexList()
-        event.Skip()
-
+        
     def OnAddMapVariableMenu(self, event):
         self.AddMapVariable()
-        event.Skip()
-
+        
     def OnAddUserTypeMenu(self, event):
         self.AddUserType()
-        event.Skip()
-
+        
     def OnFileSelectedChanged(self, event):
         if not self.Closing:
             selected = event.GetSelection()
@@ -442,7 +436,6 @@
                 message = wx.MessageDialog(self, result, _("ERROR"), wx.OK|wx.ICON_ERROR)
                 message.ShowModal()
                 message.Destroy()
-        event.Skip()
         
     def OnHelpCANFestivalMenu(self, event):
         #self.OpenHtmlFrame("CAN Festival Reference", os.path.join(ScriptDirectory, "doc/canfestival.html"), wx.Size(1000, 600))
@@ -462,12 +455,10 @@
                 message = wx.MessageDialog(self, _("Check if xpdf is correctly installed on your computer"), _("ERROR"), wx.OK|wx.ICON_ERROR)
                 message.ShowModal()
                 message.Destroy()
-        event.Skip()
-
+        
     def OnAboutMenu(self, event):
         self.OpenHtmlFrame(_("About CAN Festival"), os.path.join(ScriptDirectory, "doc/about.html"), wx.Size(500, 450))
-        event.Skip()
-
+        
     def OpenHtmlFrame(self, title, file, size):
         if title not in self.HtmlFrameOpened:
             self.HtmlFrameOpened.append(title)
@@ -479,8 +470,7 @@
 
     def OnQuitMenu(self, event):
         self.Close()
-        event.Skip()
-    
+        
     def OnCloseFrame(self, event):
         self.Closing = True
         if not self.ModeSolo:
@@ -518,8 +508,7 @@
 
     def OnRefreshMenu(self, event):
         self.RefreshCurrentIndexList()
-        event.Skip()
-
+        
     def RefreshCurrentIndexList(self):
         selected = self.FileOpened.GetSelection()
         window = self.FileOpened.GetPage(selected)
@@ -628,14 +617,12 @@
         self.Manager.LoadCurrentPrevious()
         self.RefreshCurrentIndexList()
         self.RefreshBufferState()
-        event.Skip()
-
+        
     def OnRedoMenu(self, event):
         self.Manager.LoadCurrentNext()
         self.RefreshCurrentIndexList()
         self.RefreshBufferState()
-        event.Skip()
-
+        
 
 #-------------------------------------------------------------------------------
 #                         Load and Save Funtions
@@ -666,8 +653,7 @@
                 message.ShowModal()
                 message.Destroy()
         dialog.Destroy()
-        event.Skip()
-
+        
     def OnOpenMenu(self, event):
         filepath = self.Manager.GetCurrentFilePath()
         if filepath != "":
@@ -697,19 +683,16 @@
                     message.ShowModal()
                     message.Destroy()
         dialog.Destroy()
-        event.Skip()
-
+        
     def OnSaveMenu(self, event):
         if not self.ModeSolo and getattr(self, "_onsave", None) != None:
             self._onsave()
             self.RefreshBufferState()
         else:
             self.Save()
-        event.Skip()
-    
+        
     def OnSaveAsMenu(self, event):
         self.SaveAs()
-        event.Skip()
         
     def Save(self):
         result = self.Manager.SaveCurrentInFile()
@@ -765,7 +748,6 @@
                 self.FileOpened.SetSelection(min(current, self.FileOpened.GetPageCount() - 1))
             self.RefreshBufferState()
             self.RefreshMainMenu()
-        event.Skip()
         
 
 #-------------------------------------------------------------------------------
@@ -799,7 +781,6 @@
                 message.ShowModal()
                 message.Destroy()
         dialog.Destroy()
-        event.Skip()
 
     def OnExportEDSMenu(self, event):
         dialog = wx.FileDialog(self, _("Choose a file"), os.getcwd(), self.Manager.GetCurrentNodeInfos()[0], _("EDS files (*.eds)|*.eds|All files|*.*"), wx.SAVE|wx.OVERWRITE_PROMPT|wx.CHANGE_DIR)
@@ -823,7 +804,6 @@
                 message.ShowModal()
                 message.Destroy()
         dialog.Destroy()
-        event.Skip()
 
     def OnExportCMenu(self, event):
         dialog = wx.FileDialog(self, _("Choose a file"), os.getcwd(), self.Manager.GetCurrentNodeInfos()[0],  _("CANFestival C files (*.c)|*.c|All files|*.*"), wx.SAVE|wx.OVERWRITE_PROMPT|wx.CHANGE_DIR)
@@ -847,7 +827,6 @@
                 message.ShowModal()
                 message.Destroy()
         dialog.Destroy()
-        event.Skip()
 
 #-------------------------------------------------------------------------------
 #                          Editing Profiles functions
@@ -856,18 +835,15 @@
     def OnCommunicationMenu(self, event):
         dictionary,current = self.Manager.GetCurrentCommunicationLists()
         self.EditProfile(_("Edit DS-301 Profile"), dictionary, current)
-        event.Skip()
     
     def OnOtherCommunicationMenu(self, event):
         dictionary,current = self.Manager.GetCurrentDS302Lists()
         self.EditProfile(_("Edit DS-302 Profile"), dictionary, current)
-        event.Skip()
     
     def OnEditProfileMenu(self, event):
         title = _("Edit %s Profile")%self.Manager.GetCurrentProfileName()
         dictionary,current = self.Manager.GetCurrentProfileLists()
         self.EditProfile(title, dictionary, current)
-        event.Skip()
     
     def EditProfile(self, title, dictionary, current):
         dialog = CommunicationDialog(self)
@@ -896,7 +872,6 @@
             self.Manager.AddSpecificEntryToCurrent(text)
             self.RefreshBufferState()
             self.RefreshCurrentIndexList()
-            event.Skip()
         return ProfileCallBack
 
 #-------------------------------------------------------------------------------
@@ -918,7 +893,6 @@
             if selected >= 0:
                 window = self.FileOpened.GetPage(selected)
                 window.RefreshTable()
-        event.Skip()
 
 
 #-------------------------------------------------------------------------------
--- a/objdictgen/subindextable.py	Wed Oct 14 16:37:37 2009 +0200
+++ b/objdictgen/subindextable.py	Tue Oct 27 14:35:57 2009 +0100
@@ -817,8 +817,7 @@
                         self.ParentWindow.RefreshBufferState()
                         self.RefreshIndexList()
                     dialog.Destroy()
-        event.Skip()
-
+        
     def OnModifyIndexMenu(self, event):
         if self.Editable:
             selected = self.IndexList.GetSelection()
@@ -837,7 +836,6 @@
                         self.Manager.SetCurrentUserType(index, type, min, max, length)
                         self.ParentWindow.RefreshBufferState()
                         self.RefreshIndexList()
-        event.Skip()
         
     def OnDeleteIndexMenu(self, event):
         if self.Editable:
@@ -848,8 +846,7 @@
                     self.Manager.ManageEntriesOfCurrent([],[index])
                     self.ParentWindow.RefreshBufferState()
                     self.RefreshIndexList()
-        event.Skip()
-
+        
     def OnAddSubindexMenu(self, event):
         if self.Editable:
             selected = self.IndexList.GetSelection()
@@ -869,8 +866,7 @@
                             message.ShowModal()
                             message.Destroy()
                     dialog.Destroy()
-        event.Skip()
-
+        
     def OnDeleteSubindexMenu(self, event):
         if self.Editable:
             selected = self.IndexList.GetSelection()
@@ -890,8 +886,7 @@
                             message.ShowModal()
                             message.Destroy()
                     dialog.Destroy()
-        event.Skip()
-
+        
     def OnDefaultValueSubindexMenu(self, event):
         if self.Editable:
             selected = self.IndexList.GetSelection()
@@ -902,4 +897,4 @@
                     self.Manager.SetCurrentEntryToDefault(index, row)
                     self.ParentWindow.RefreshBufferState()
                     self.RefreshIndexList()
-        event.Skip()
+        
\ No newline at end of file