lpcmanager

Fixed CanFestival plugin and added -Wno-unused-function to remove warnings when compiling PLC application.

2015-11-20, Edouard Tisserant
51687d9f2518
Parents 4782e9507f71
Children 22dc415b96c6
Fixed CanFestival plugin and added -Wno-unused-function to remove warnings when compiling PLC application.
2 files changed, 9 insertions(+), 12 deletions(-)
  • +8 -11
    LPCManager.py
  • +1 -1
    MC9target/XSD
    • --- a/LPCManager.py Mon Nov 16 10:29:25 2015 +0100
    +++ b/LPCManager.py Fri Nov 20 16:04:42 2015 +0100
    @@ -104,14 +104,14 @@
    from controls import TextCtrlAutoComplete
    havecanfestival = False
    -try:
    - from canfestival import RootClass as CanOpenRootClass
    - from canfestival.canfestival import _SlaveCTN, _NodeListCTN, NodeManager
    - from canfestival.NetworkEditor import NetworkEditor
    - from canfestival.SlaveEditor import SlaveEditor
    - havecanfestival = True
    -except:
    - havecanfestival = False
    +#try:
    +from canfestival import RootClass as CanOpenRootClass
    +from canfestival.canfestival import _SlaveCTN, _NodeListCTN, NodeManager
    +from canfestival.NetworkEditor import NetworkEditor
    +from canfestival.SlaveEditor import SlaveEditor
    +havecanfestival = True
    +#except:
    +# havecanfestival = False
    SCROLLBAR_UNIT = 10
    WINDOW_COLOUR = wx.Colour(240,240,240)
    @@ -1130,9 +1130,6 @@
    self.AddToMenuToolBar([(wx.ID_SAVE, "save", _(u'Save'), None),
    (wx.ID_PRINT, "print", _(u'Print'), None)])
    - def _init_coll_AddMenu_Items(self, parent):
    - IDEFrame._init_coll_AddMenu_Items(self, parent, False)
    -
    def _init_ctrls(self, prnt):
    Beremiz._init_ctrls(self, prnt)
    --- a/MC9target/XSD Mon Nov 16 10:29:25 2015 +0100
    +++ b/MC9target/XSD Fri Nov 20 16:04:42 2015 +0100
    @@ -1,7 +1,7 @@
    <xsd:element name="MC9">
    <xsd:complexType>
    <xsd:attribute name="Compiler" type="xsd:string" use="optional" default="arm-none-linux-gnueabi-gcc"/>
    - <xsd:attribute name="CFLAGS" type="xsd:string" use="optional" default="--sysroot=../arm-none-linux-gnueabi-apf28 -I../arm-none-linux-gnueabi-apf28/usr/include/xenomai -D_GNU_SOURCE -D_REENTRANT -Wall -pipe -D__XENO__ -Wno-unused-but-set-variable"/>
    + <xsd:attribute name="CFLAGS" type="xsd:string" use="optional" default="--sysroot=../arm-none-linux-gnueabi-apf28 -I../arm-none-linux-gnueabi-apf28/usr/include/xenomai -D_GNU_SOURCE -D_REENTRANT -Wall -pipe -D__XENO__ -Wno-unused-but-set-variable -Wno-unused-function"/>
    <xsd:attribute name="Linker" type="xsd:string" use="optional" default="arm-none-linux-gnueabi-gcc"/>
    <xsd:attribute name="LDFLAGS" type="xsd:string" use="optional" default="--sysroot=../arm-none-linux-gnueabi-apf28 -lnative -lxenomai -lpthread -lrtdm"/>
    <xsd:attribute name="XenoConfig" type="xsd:string" use="optional"/>