# HG changeset patch # User Paul LEROY # Date 2014-04-14 12:15:08 # Node ID a73c97699c81a53dfec54091497e993ad2e50842 # Parent d8815b251eb0adad17ee583c945e0b02bc9b2042 Sync diff --git a/projects/rmapplugin/Makefile b/projects/rmapplugin/Makefile --- a/projects/rmapplugin/Makefile +++ b/projects/rmapplugin/Makefile @@ -645,7 +645,7 @@ moc/moc_rmappluginui.cpp: /usr/include/q /usr/include/qt5/lppmon/common/qhexspinbox.h \ /usr/include/qt5/QtCore/QString \ /usr/include/qt5/QtGui/QValidator \ - /usr/include/qt5/lppmon/paulcommon/params.h \ + /usr/include/qt5/lppmon/paulcommon/paulcommonparams.h \ /usr/include/qt5/lppmon/paulcommon/gresbstatusenquiry.h \ /usr/include/qt5/QtWidgets/QTableWidget \ /usr/include/qt5/QtWidgets/qtablewidget.h \ @@ -1185,7 +1185,7 @@ moc/moc_rmapplugin.cpp: rmappluginui.h \ /usr/include/qt5/lppmon/common/qhexspinbox.h \ /usr/include/qt5/QtCore/QString \ /usr/include/qt5/QtGui/QValidator \ - /usr/include/qt5/lppmon/paulcommon/params.h \ + /usr/include/qt5/lppmon/paulcommon/paulcommonparams.h \ /usr/include/qt5/lppmon/paulcommon/gresbstatusenquiry.h \ /usr/include/qt5/QtWidgets/QTableWidget \ /usr/include/qt5/QtWidgets/qtablewidget.h \ @@ -1700,7 +1700,7 @@ moc/moc_rmappluginpythonwrapper.cpp: /us /usr/include/qt5/QtWidgets/QWidget \ /usr/include/qt5/QtCore/QString \ /usr/include/qt5/QtGui/QValidator \ - /usr/include/qt5/lppmon/paulcommon/params.h \ + /usr/include/qt5/lppmon/paulcommon/paulcommonparams.h \ ccsds.h \ /usr/include/qt5/lppmon/paulcommon/tcpackettosend.h \ /usr/include/qt5/lppmon/paulcommon/tmpackettoread.h \ @@ -1859,7 +1859,7 @@ moc/moc_stardundee.cpp: /usr/include/qt5 /usr/include/qt5/lppmon/common/qhexspinbox.h \ /usr/include/qt5/QtCore/QString \ /usr/include/qt5/QtGui/QValidator \ - /usr/include/qt5/lppmon/paulcommon/params.h \ + /usr/include/qt5/lppmon/paulcommon/paulcommonparams.h \ /home/spacewire/usb/spw_usb_driver_v2.68/inc/spw_usb_api.h \ /home/spacewire/usb/spw_usb_driver_v2.68/inc/spacewire_usb.h \ /home/spacewire/usb/spw_usb_driver_v2.68/inc/star_dundee_types.h \ @@ -2025,7 +2025,7 @@ moc/moc_gresb.cpp: /usr/include/qt5/QtWi /usr/include/qt5/lppmon/common/qhexspinbox.h \ /usr/include/qt5/QtCore/QString \ /usr/include/qt5/QtGui/QValidator \ - /usr/include/qt5/lppmon/paulcommon/params.h \ + /usr/include/qt5/lppmon/paulcommon/paulcommonparams.h \ /usr/include/qt5/lppmon/common/qipdialogbox.h \ ccsds.h \ /usr/include/qt5/lppmon/paulcommon/tmpackettoread.h \ @@ -2313,17 +2313,8 @@ moc/moc_entermode.cpp: /usr/include/qt5/ ../../../DEV_PLE/header/TC_types.h \ ../../../DEV_PLE/header/ccsds_types.h \ ../../../DEV_PLE/header/fsw_params_processing.h \ - /usr/include/qt5/lppmon/paulcommon/parameterdump.h \ - /usr/include/qt5/QtWidgets/QSpinBox \ - /usr/include/qt5/QtWidgets/qspinbox.h \ - /usr/include/qt5/QtWidgets/qabstractspinbox.h \ - /usr/include/qt5/QtGui/qvalidator.h \ - /usr/include/qt5/QtCore/qregularexpression.h \ - /usr/include/qt5/QtWidgets/QDoubleSpinBox \ - /usr/include/qt5/lppmon/paulcommon/tmpackettoread.h \ + /usr/include/qt5/lppmon/paulcommon/paulcommoncrc.h \ /usr/include/qt5/QtCore/QObject \ - /usr/include/qt5/lppmon/paulcommon/paulcommoncrc.h \ - /usr/include/qt5/lppmon/paulcommon/tcpackettosend.h \ entermode.h /usr/lib64/qt5/bin/moc $(DEFINES) $(INCPATH) -I/usr/lib/gcc/include/c++/4.8.2 -I/usr/lib/gcc/include/c++/4.8.2/x86_64-redhat-linux -I/usr/lib/gcc/include/c++/4.8.2/backward -I/usr/lib/gcc/x86_64-redhat-linux/4.8.2/include -I/usr/local/include -I/usr/include entermode.h -o moc/moc_entermode.cpp @@ -2861,7 +2852,7 @@ obj/rmapplugin.o: rmapplugin.cpp rmapplu /usr/include/qt5/lppmon/common/qhexspinbox.h \ /usr/include/qt5/QtCore/QString \ /usr/include/qt5/QtGui/QValidator \ - /usr/include/qt5/lppmon/paulcommon/params.h \ + /usr/include/qt5/lppmon/paulcommon/paulcommonparams.h \ /usr/include/qt5/lppmon/paulcommon/gresbstatusenquiry.h \ /usr/include/qt5/QtWidgets/QTableWidget \ /usr/include/qt5/QtWidgets/qtablewidget.h \ @@ -3430,7 +3421,7 @@ obj/rmappluginui.o: rmappluginui.cpp rma /usr/include/qt5/lppmon/common/qhexspinbox.h \ /usr/include/qt5/QtCore/QString \ /usr/include/qt5/QtGui/QValidator \ - /usr/include/qt5/lppmon/paulcommon/params.h \ + /usr/include/qt5/lppmon/paulcommon/paulcommonparams.h \ /usr/include/qt5/lppmon/paulcommon/gresbstatusenquiry.h \ /usr/include/qt5/QtWidgets/QTableWidget \ /usr/include/qt5/QtWidgets/qtablewidget.h \ @@ -3934,7 +3925,7 @@ obj/rmapoperations.o: rmapoperations.cpp /usr/include/qt5/QtWidgets/QWidget \ /usr/include/qt5/QtCore/QString \ /usr/include/qt5/QtGui/QValidator \ - /usr/include/qt5/lppmon/paulcommon/params.h + /usr/include/qt5/lppmon/paulcommon/paulcommonparams.h $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/rmapoperations.o rmapoperations.cpp obj/ccsds.o: ccsds.cpp ccsds.h @@ -4069,7 +4060,7 @@ obj/rmappluginpythonwrapper.o: rmapplugi /usr/include/qt5/QtWidgets/QWidget \ /usr/include/qt5/QtCore/QString \ /usr/include/qt5/QtGui/QValidator \ - /usr/include/qt5/lppmon/paulcommon/params.h \ + /usr/include/qt5/lppmon/paulcommon/paulcommonparams.h \ ccsds.h \ /usr/include/qt5/lppmon/paulcommon/tcpackettosend.h \ /usr/include/qt5/lppmon/paulcommon/tmpackettoread.h \ @@ -4235,7 +4226,7 @@ obj/stardundee.o: stardundee.cpp stardun /usr/include/qt5/lppmon/common/qhexspinbox.h \ /usr/include/qt5/QtCore/QString \ /usr/include/qt5/QtGui/QValidator \ - /usr/include/qt5/lppmon/paulcommon/params.h \ + /usr/include/qt5/lppmon/paulcommon/paulcommonparams.h \ /home/spacewire/usb/spw_usb_driver_v2.68/inc/spw_usb_api.h \ /home/spacewire/usb/spw_usb_driver_v2.68/inc/spacewire_usb.h \ /home/spacewire/usb/spw_usb_driver_v2.68/inc/star_dundee_types.h \ @@ -4739,7 +4730,7 @@ obj/gresb.o: gresb.cpp gresb.h \ /usr/include/qt5/lppmon/common/qhexspinbox.h \ /usr/include/qt5/QtCore/QString \ /usr/include/qt5/QtGui/QValidator \ - /usr/include/qt5/lppmon/paulcommon/params.h \ + /usr/include/qt5/lppmon/paulcommon/paulcommonparams.h \ /usr/include/qt5/lppmon/common/qipdialogbox.h \ ccsds.h \ /usr/include/qt5/lppmon/paulcommon/tmpackettoread.h \ @@ -5361,17 +5352,8 @@ obj/entermode.o: entermode.cpp entermode ../../../DEV_PLE/header/TC_types.h \ ../../../DEV_PLE/header/ccsds_types.h \ ../../../DEV_PLE/header/fsw_params_processing.h \ - /usr/include/qt5/lppmon/paulcommon/parameterdump.h \ - /usr/include/qt5/QtWidgets/QSpinBox \ - /usr/include/qt5/QtWidgets/qspinbox.h \ - /usr/include/qt5/QtWidgets/qabstractspinbox.h \ - /usr/include/qt5/QtGui/qvalidator.h \ - /usr/include/qt5/QtCore/qregularexpression.h \ - /usr/include/qt5/QtWidgets/QDoubleSpinBox \ - /usr/include/qt5/lppmon/paulcommon/tmpackettoread.h \ - /usr/include/qt5/QtCore/QObject \ /usr/include/qt5/lppmon/paulcommon/paulcommoncrc.h \ - /usr/include/qt5/lppmon/paulcommon/tcpackettosend.h + /usr/include/qt5/QtCore/QObject $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/entermode.o entermode.cpp obj/lfractions.o: lfractions.cpp lfractions.h \ diff --git a/projects/rmapplugin/rmapoperations.h b/projects/rmapplugin/rmapoperations.h --- a/projects/rmapplugin/rmapoperations.h +++ b/projects/rmapplugin/rmapoperations.h @@ -2,7 +2,7 @@ #define RMAPOPERATIONS_H #include -#include +#include #define READ_WRITE_MAX_COUNTS 4096 // in words #define RMAP_MAX_DATA_LENGTH 4*READ_WRITE_MAX_COUNTS // in bytes, shall be lower than the limit size of SPW packet of the GRESB bridge