HG_REPOSITORIES/LPP/INSTRUMENTATION/SOLO_LFR/LPPMON_PLUGINS_PAUL Commit - r5:ead10fa095b7

Minor changes

leroy -

r5:ead10fa095b7 default

parent child

Context file:

r5:ead10fa095b7

Makefile +1 -1

             #############################################################################
             # Makefile for building: PAULs_LPPMON_PLUGINS
-            # Generated by qmake (2.01a) (Qt 4.8.3) on: Thu Nov 29 14:02:20 2012
+            # Generated by qmake (2.01a) (Qt 4.8.3) on: Mon Dec 10 07:51:52 2012
             # Project:  PAULs_LPPMON_PLUGINS.pro
             # Template: subdirs
             # Command: /usr/bin/qmake-qt4 -spec /usr/lib64/qt4/mkspecs/linux-g++ -o Makefile PAULs_LPPMON_PLUGINS.pro

PAULs_LPPMON_PLUGINS.pro 0 -1

             SUBDIRS = \
                 rmapplugin
             #include( $${LPPMONCFG}/lppmonplugin.prf)

PAULs_LPPMON_PLUGINS.pro.user +1 -1

             <?xml version="1.0" encoding="UTF-8"?>
             <!DOCTYPE QtCreatorProject>
-            <!-- Written by Qt Creator 2.4.1, 2012-12-07T14:08:53. -->
+            <!-- Written by Qt Creator 2.4.1, 2012-12-10T08:03:59. -->
             <qtcreator>
              <data>
               <variable>ProjectExplorer.Project.ActiveTarget</variable>

rmapplugin/Makefile +27 -6

             #############################################################################
             # Makefile for building: librmapplugin.so.1.0.0
-            # Generated by qmake (2.01a) (Qt 4.8.3) on: Mon Dec 3 13:45:43 2012
+            # Generated by qmake (2.01a) (Qt 4.8.3) on: Mon Dec 10 07:51:52 2012
             # Project:  rmapplugin.pro
             # Template: lib
             # Command: /usr/bin/qmake-qt4 -spec /usr/lib64/qt4/mkspecs/linux-g++ -o Makefile rmapplugin.pro
             		rmappluginpythonwrapper.cpp \
             		stardundee.cpp \
             		gresb.cpp \
+            		bridge.cpp \
             		/usr/include/lppmon/pluginsInterface/lppmonplugininterface.cpp moc/moc_rmappluginui.cpp \
             		moc/moc_rmapplugin.cpp \
             		moc/moc_spwpacketreceiver.cpp \
             		moc/moc_rmappluginpythonwrapper.cpp \
             		moc/moc_stardundee.cpp \
             		moc/moc_gresb.cpp \
+            		moc/moc_bridge.cpp \
             		moc/moc_genericPySysdriver.cpp \
             		moc/moc_lppmonplugin.cpp
             OBJECTS       = obj/rmapplugin.o \
             		obj/rmappluginpythonwrapper.o \
             		obj/stardundee.o \
             		obj/gresb.o \
+            		obj/bridge.o \
             		obj/lppmonplugininterface.o \
             		obj/moc_rmappluginui.o \
             		obj/moc_rmapplugin.o \
             		obj/moc_rmappluginpythonwrapper.o \
             		obj/moc_stardundee.o \
             		obj/moc_gresb.o \
+            		obj/moc_bridge.o \
             		obj/moc_genericPySysdriver.o \
             		obj/moc_lppmonplugin.o
             DIST          = /usr/lib64/qt4/mkspecs/common/unix.conf \
             dist:
             	@$(CHK_DIR_EXISTS) obj/rmapplugin1.0.0 || $(MKDIR) obj/rmapplugin1.0.0
-            	$(COPY_FILE) --parents $(SOURCES) $(DIST) obj/rmapplugin1.0.0/ && $(COPY_FILE) --parents rmappluginui.h rmapplugin.h rmapoperations.h ccsds.h spwpacketreceiver.h ../common_PLE/qipdialogbox.h ../common_PLE/gresbstatusenquiry.h spectralmatricesdmasimulator.h rmappluginpythonwrapper.h stardundee.h ../spw_usb_driver_v2.61/inc/spw_usb_api.h ../spw_usb_driver_v2.61/inc/spw_config_library.h gresb.h /usr/include/genericPySysdriver.h /usr/include/lppmonplugin.h obj/rmapplugin1.0.0/ && $(COPY_FILE) --parents rmapplugin.cpp rmappluginui.cpp rmapoperations.cpp ccsds.cpp spwpacketreceiver.cpp ../common_PLE/qipdialogbox.cpp ../common_PLE/gresbstatusenquiry.cpp spectralmatricesdmasimulator.cpp rmappluginpythonwrapper.cpp stardundee.cpp gresb.cpp /usr/include/lppmon/pluginsInterface/lppmonplugininterface.cpp obj/rmapplugin1.0.0/ && (cd `dirname obj/rmapplugin1.0.0` && $(TAR) rmapplugin1.0.0.tar rmapplugin1.0.0 && $(COMPRESS) rmapplugin1.0.0.tar) && $(MOVE) `dirname obj/rmapplugin1.0.0`/rmapplugin1.0.0.tar.gz . && $(DEL_FILE) -r obj/rmapplugin1.0.0
+            	$(COPY_FILE) --parents $(SOURCES) $(DIST) obj/rmapplugin1.0.0/ && $(COPY_FILE) --parents rmappluginui.h rmapplugin.h rmapoperations.h ccsds.h spwpacketreceiver.h ../common_PLE/qipdialogbox.h ../common_PLE/gresbstatusenquiry.h spectralmatricesdmasimulator.h rmappluginpythonwrapper.h stardundee.h ../spw_usb_driver_v2.61/inc/spw_usb_api.h ../spw_usb_driver_v2.61/inc/spw_config_library.h gresb.h bridge.h /usr/include/genericPySysdriver.h /usr/include/lppmonplugin.h obj/rmapplugin1.0.0/ && $(COPY_FILE) --parents rmapplugin.cpp rmappluginui.cpp rmapoperations.cpp ccsds.cpp spwpacketreceiver.cpp ../common_PLE/qipdialogbox.cpp ../common_PLE/gresbstatusenquiry.cpp spectralmatricesdmasimulator.cpp rmappluginpythonwrapper.cpp stardundee.cpp gresb.cpp bridge.cpp /usr/include/lppmon/pluginsInterface/lppmonplugininterface.cpp obj/rmapplugin1.0.0/ && (cd `dirname obj/rmapplugin1.0.0` && $(TAR) rmapplugin1.0.0.tar rmapplugin1.0.0 && $(COMPRESS) rmapplugin1.0.0.tar) && $(MOVE) `dirname obj/rmapplugin1.0.0`/rmapplugin1.0.0.tar.gz . && $(DEL_FILE) -r obj/rmapplugin1.0.0
             clean:compiler_clean
             mocables: compiler_moc_header_make_all compiler_moc_source_make_all
-            compiler_moc_header_make_all: moc/moc_rmappluginui.cpp moc/moc_rmapplugin.cpp moc/moc_spwpacketreceiver.cpp moc/moc_qipdialogbox.cpp moc/moc_gresbstatusenquiry.cpp moc/moc_spectralmatricesdmasimulator.cpp moc/moc_rmappluginpythonwrapper.cpp moc/moc_stardundee.cpp moc/moc_gresb.cpp moc/moc_genericPySysdriver.cpp moc/moc_lppmonplugin.cpp
+            compiler_moc_header_make_all: moc/moc_rmappluginui.cpp moc/moc_rmapplugin.cpp moc/moc_spwpacketreceiver.cpp moc/moc_qipdialogbox.cpp moc/moc_gresbstatusenquiry.cpp moc/moc_spectralmatricesdmasimulator.cpp moc/moc_rmappluginpythonwrapper.cpp moc/moc_stardundee.cpp moc/moc_gresb.cpp moc/moc_bridge.cpp moc/moc_genericPySysdriver.cpp moc/moc_lppmonplugin.cpp
             compiler_moc_header_clean:
-            	-$(DEL_FILE) moc/moc_rmappluginui.cpp moc/moc_rmapplugin.cpp moc/moc_spwpacketreceiver.cpp moc/moc_qipdialogbox.cpp moc/moc_gresbstatusenquiry.cpp moc/moc_spectralmatricesdmasimulator.cpp moc/moc_rmappluginpythonwrapper.cpp moc/moc_stardundee.cpp moc/moc_gresb.cpp moc/moc_genericPySysdriver.cpp moc/moc_lppmonplugin.cpp
+            	-$(DEL_FILE) moc/moc_rmappluginui.cpp moc/moc_rmapplugin.cpp moc/moc_spwpacketreceiver.cpp moc/moc_qipdialogbox.cpp moc/moc_gresbstatusenquiry.cpp moc/moc_spectralmatricesdmasimulator.cpp moc/moc_rmappluginpythonwrapper.cpp moc/moc_stardundee.cpp moc/moc_gresb.cpp moc/moc_bridge.cpp moc/moc_genericPySysdriver.cpp moc/moc_lppmonplugin.cpp
             moc/moc_rmappluginui.cpp: rmapoperations.h \
             		spectralmatricesdmasimulator.h \
             		stardundee.h \
+            		gresb.h \
             		rmappluginui.h
             	/usr/lib64/qt4/bin/moc $(DEFINES) $(INCPATH) rmappluginui.h -o moc/moc_rmappluginui.cpp
             		rmapoperations.h \
             		spectralmatricesdmasimulator.h \
             		stardundee.h \
+            		gresb.h \
             		ccsds.h \
             		spwpacketreceiver.h \
             		rmapplugin.h
             moc/moc_rmappluginpythonwrapper.cpp: rmappluginpythonwrapper.h
             	/usr/lib64/qt4/bin/moc $(DEFINES) $(INCPATH) rmappluginpythonwrapper.h -o moc/moc_rmappluginpythonwrapper.cpp
-            moc/moc_stardundee.cpp: stardundee.h
+            moc/moc_stardundee.cpp: rmapoperations.h \
+            		stardundee.h
             	/usr/lib64/qt4/bin/moc $(DEFINES) $(INCPATH) stardundee.h -o moc/moc_stardundee.cpp
             moc/moc_gresb.cpp: gresb.h
             	/usr/lib64/qt4/bin/moc $(DEFINES) $(INCPATH) gresb.h -o moc/moc_gresb.cpp
+            moc/moc_bridge.cpp: rmapoperations.h \
+            		bridge.h
+            	/usr/lib64/qt4/bin/moc $(DEFINES) $(INCPATH) bridge.h -o moc/moc_bridge.cpp
             moc/moc_genericPySysdriver.cpp: /usr/include/genericPySysdriver.h
             	/usr/lib64/qt4/bin/moc $(DEFINES) $(INCPATH) /usr/include/genericPySysdriver.h -o moc/moc_genericPySysdriver.cpp
             		rmapoperations.h \
             		spectralmatricesdmasimulator.h \
             		stardundee.h \
+            		gresb.h \
             		ccsds.h \
             		spwpacketreceiver.h \
             		rmappluginpythonwrapper.h
             		rmapoperations.h \
             		spectralmatricesdmasimulator.h \
             		stardundee.h \
+            		gresb.h \
             		ccsds.h \
             		spwpacketreceiver.h
             	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/rmappluginui.o rmappluginui.cpp
             obj/ccsds.o: ccsds.cpp ccsds.h
             	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/ccsds.o ccsds.cpp
-            obj/spwpacketreceiver.o: spwpacketreceiver.cpp spwpacketreceiver.h
+            obj/spwpacketreceiver.o: spwpacketreceiver.cpp spwpacketreceiver.h \
+            		rmapoperations.h
             	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/spwpacketreceiver.o spwpacketreceiver.cpp
             obj/qipdialogbox.o: ../common_PLE/qipdialogbox.cpp ../common_PLE/qipdialogbox.h
             obj/gresb.o: gresb.cpp gresb.h
             	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/gresb.o gresb.cpp
+            obj/bridge.o: bridge.cpp bridge.h \
+            		rmapoperations.h
+            	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/bridge.o bridge.cpp
             obj/lppmonplugininterface.o: /usr/include/lppmon/pluginsInterface/lppmonplugininterface.cpp /usr/include/lppmon/pluginsInterface/lppmonplugininterface.h \
             		/usr/include/lppmon/pluginsInterface/lppmonplugininterface_global.h
             	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/lppmonplugininterface.o /usr/include/lppmon/pluginsInterface/lppmonplugininterface.cpp
             obj/moc_gresb.o: moc/moc_gresb.cpp
             	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/moc_gresb.o moc/moc_gresb.cpp
+            obj/moc_bridge.o: moc/moc_bridge.cpp
+            	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/moc_bridge.o moc/moc_bridge.cpp
             obj/moc_genericPySysdriver.o: moc/moc_genericPySysdriver.cpp
             	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/moc_genericPySysdriver.o moc/moc_genericPySysdriver.cpp

rmapplugin/bridge.cpp +150 0

@@ -3,4 +3,154
3	bridge::bridge(QWidget *parent) :	3	bridge::bridge(QWidget *parent) :
4	QWidget(parent)	4	QWidget(parent)
5	{	5	{
		6	// Packet receiver
		7	rmapPacketSEMAPHORE = new QSemaphore;
		8	ccsdsPacketSEMAPHORE = new QSemaphore;
		9	rmapPacket = (char*) malloc(RMAP_MAX_PACKET_LENGTH);
		10	ccsdsPacket = (unsigned char*) malloc(CCSDS_MAX_PACKET_LENGTH);
		11	spwPacket = (char*) malloc( qMax(RMAP_MAX_PACKET_LENGTH, CCSDS_MAX_PACKET_LENGTH) );
		12
		13	bridge_LAYOUT = new QGridLayout;
6	}	14	}
		15
		16	bridge::~bridge()
		17	{
		18	free(rmapPacket);
		19	free(ccsdsPacket);
		20	free(spwPacket);
		21	}
		22
		23	unsigned int bridge::Write(unsigned int *Value, unsigned int count, unsigned int address)
		24	{
		25	unsigned int remainingCount = count;
		26	unsigned int iOffset = 0;
		27	QString console_message;
		28	char* data;
		29
		30	if(rmapPacketSEMAPHORE->available()!=0)
		31	{
		32	emit appendToLog("WARNING === in function WRITE of rmapplugin *** RMAP request already running, WRITE access stopped");
		33	return 1;
		34	}
		35
		36	emit this->RMAP_write_reply_setText("reply to the write command required\nlast reply status: unavailable");
		37
		38	data = (char) malloc(READ_WRITE_MAX_COUNTS4);
		39
		40	emit appendToLog(QString("* START * WRITE ")+ QString::number(count) + QString(" word(s) @0x")+ QString::number(address,16));
		41
		42	while (remainingCount > READ_WRITE_MAX_COUNTS)
		43	{
		44	for (int i = 0; i<READ_WRITE_MAX_COUNTS; i++)
		45	{
		46	data[i*4+3] = (char) ((unsigned int) Value[i+iOffset]);
		47	data[i*4+2] = (char) ((unsigned int) Value[i+iOffset]>>8);
		48	data[i*4+1] = (char) ((unsigned int) Value[i+iOffset]>>16);
		49	data[i*4+0] = (char) ((unsigned int) Value[i+iOffset]>>24);
		50	}
		51
		52	console_message.sprintf("remainingCount: %d => ", remainingCount);
		53	emit appendToLog(console_message + QString("Write ")+ QString::number(READ_WRITE_MAX_COUNTS*4) + QString(" byte(s) @0x")+ QString::number(address,16));
		54
		55	if(WriteBLOCK(data, READ_WRITE_MAX_COUNTS*4, address)==0)
		56	{
		57	emit appendToLog("WARNING === in function WRITE of rmapplugin *** RMAP write command failed");
		58	return 1;
		59	}
		60
		61	remainingCount = remainingCount - READ_WRITE_MAX_COUNTS;
		62	address = address + READ_WRITE_MAX_COUNTS * 4;
		63	iOffset = iOffset + READ_WRITE_MAX_COUNTS;
		64	}
		65
		66	if (remainingCount > 0)
		67	{
		68	for (unsigned int i = 0; i<remainingCount; i++)
		69	{
		70	data[i*4+3] = (char) ((unsigned int) Value[i+iOffset]);
		71	data[i*4+2] = (char) ((unsigned int) Value[i+iOffset]>>8);
		72	data[i*4+1] = (char) ((unsigned int) Value[i+iOffset]>>16);
		73	data[i*4+0] = (char) ((unsigned int) Value[i+iOffset]>>24);
		74	}
		75
		76	console_message.sprintf("remainingCount: %d => ", remainingCount);
		77	emit appendToLog(console_message + QString("Write ")+ QString::number(remainingCount*4) + QString(" byte(s) @0x")+ QString::number(address,16));
		78
		79	if (WriteBLOCK(data, remainingCount*4, address)==0)
		80	{
		81	emit appendToLog("WARNING === in function WRITE of rmapplugin *** RMAP write command failed");
		82	return 1;
		83	}
		84	}
		85
		86	emit appendToLog(QString("* STOP * WRITE"));
		87	free(data);
		88	return count;
		89	}
		90
		91	unsigned int bridge::Read(unsigned int *Value, unsigned int count, unsigned int address)
		92	{
		93	unsigned int remainingCount = count;
		94	unsigned int iOffset = 0;
		95	QString console_message;
		96
		97	if(rmapPacketSEMAPHORE->available()!=0)
		98	{
		99	emit appendToLog("WARNING === in function READ of rmapplugin *** RMAP request already running, READ access stopped");
		100	return 1;
		101	}
		102	emit appendToLog(QString("* START * READ ")+ QString::number(count) + QString(" word(s) @0x")+ QString::number(address,16));
		103
		104	while (remainingCount > READ_WRITE_MAX_COUNTS)
		105	{
		106	console_message.sprintf("remainingCount: %d => ", remainingCount);
		107	emit appendToLog(console_message + QString("Read ")+ QString::number(4*READ_WRITE_MAX_COUNTS) + QString(" byte(s) @0x")+ QString::number(address,16));
		108
		109	if (this->ReadBLOCK(READ_WRITE_MAX_COUNTS*4, address)==0)
		110	{
		111	emit appendToLog("WARNING === in function READ of rmapplugin *** RMAP packet not received");
		112	return 1;
		113	}
		114
		115	for(int i=0;i<READ_WRITE_MAX_COUNTS;i++)
		116	{
		117	Value[i+iOffset] = (unsigned char) rmapPacket[i*4+RMAP_READ_REPLY_HEADER_LENGTH];
		118	for(int j=1;j<4;j++)
		119	{
		120	Value[i+iOffset]= ((unsigned char) (rmapPacket[i*4+j+RMAP_READ_REPLY_HEADER_LENGTH]))
		121	+ Value[i+iOffset]*256;
		122	}
		123	}
		124
		125	remainingCount = remainingCount - READ_WRITE_MAX_COUNTS;
		126	address = address + READ_WRITE_MAX_COUNTS * 4;
		127	iOffset = iOffset + READ_WRITE_MAX_COUNTS;
		128	rmapPacketSEMAPHORE->acquire();
		129	}
		130
		131	if (remainingCount > 0)
		132	{
		133	console_message.sprintf("remainingCount: %d => ", remainingCount);
		134	emit appendToLog(console_message + QString("Read ")+ QString::number(4*remainingCount) + QString(" byte(s) @0x")+ QString::number(address,16));
		135
		136	if (this->ReadBLOCK(4*remainingCount, address)==0)
		137	{
		138	emit appendToLog("WARNING === in function READ of rmapplugin *** RMAP packet not received");
		139	return 1;
		140	}
		141
		142	for(unsigned int i=0;i<remainingCount;i++)
		143	{
		144	Value[i+iOffset] = (unsigned char) rmapPacket[i*4+RMAP_READ_REPLY_HEADER_LENGTH];
		145	for(int j=1;j<4;j++)
		146	{
		147	Value[i+iOffset]= ((unsigned char)(rmapPacket[i4+j+RMAP_READ_REPLY_HEADER_LENGTH])) + Value[i+iOffset]256;
		148	}
		149	}
		150	rmapPacketSEMAPHORE->acquire();
		151	}
		152
		153	emit appendToLog(QString("* STOP * READ "));
		154	return count;
		155	}
		156

rmapplugin/bridge.h +38 -2

@@ -2,17 +2,53
2	#define BRIDGE_H	2	#define BRIDGE_H
3		3
4	#include <QWidget>	4	#include <QWidget>
		5	#include <QSemaphore>
		6	#include <QGridLayout>
		7	#include "rmapoperations.h"
5		8
6	class bridge : public QWidget	9	class bridge : public QWidget
7	{	10	{
8	Q_OBJECT	11	Q_OBJECT
9	public:	12	public:
10	explicit bridge(QWidget *parent = 0);	13	explicit bridge(QWidget *parent = 0);
11		14	~bridge();
		15	unsigned int Write(unsigned int *Value,unsigned int count,unsigned int address=0);
		16	unsigned int Read(unsigned int *Value,unsigned int count,unsigned int address=0);
		17	virtual unsigned int WriteSPW(char *Value, unsigned int count, char targetLogicalAddress, char userApplication);
		18	virtual unsigned int WriteBLOCK(char *data,unsigned int nbBytes,unsigned int address=0) = 0;
		19	virtual unsigned int ReadBLOCK(unsigned int nbBytes,unsigned int address=0) = 0;
		20	virtual unsigned int getLinkStatus(unsigned char link) = 0;
		21
		22	unsigned char rmapTargetLogicalAddress ;
		23	unsigned char rmapSourceLogicalAddress ;
		24
		25	RMAP_command_codes commandCode;
		26
		27	QGridLayout *bridge_LAYOUT;
		28
		29	QSemaphore *rmapPacketSEMAPHORE;
		30	QSemaphore *ccsdsPacketSEMAPHORE;
		31
		32	char *spwPacket;
		33	char* rmapPacket;
		34	unsigned char *ccsdsPacket;
		35
12	signals:	36	signals:
		37	void sendMessage(QString message);
		38	void isOpen(bool);
		39	void RMAP_write_reply_setText(QString);
		40	void appendToLog(QString);
		41	void ccsdsPacketAvailable(unsigned char*, unsigned int);
13		42
14	public slots:	43	public slots:
15		44	unsigned int Open();
		45	unsigned int Close();
		46	virtual int receiveSPWPacket(unsigned char requestID) = 0;
		47	void commandCodeHasChanged(RMAP_command_codes code) {this->commandCode = code;}
		48	void targetHasChanged(int target) {rmapTargetLogicalAddress = (unsigned char) target;}
		49	void sourceHasChanged(int target) {rmapSourceLogicalAddress = (unsigned char) target;}
		50
		51	private:
16	};	52	};
17		53
18	#endif // BRIDGE_H	54	#endif // BRIDGE_H

rmapplugin/gresb.h +5 0

             public slots:
             private:
+                //*******************
+                // specific functions
+                //*****************
+                // specific members
                 QLabel *gresbBridgeIPLabel;
                 QLabel *gresbVirtualLinkLabel;
                 QLabel *spwLinkLabel;

rmapplugin/rmapplugin.pro 0 -3

             DEFINES += driver_VID=0
             DEFINES += driver_PID=0
             QT += network
             LIBS += ../spw_usb_driver_v2.61/lib/x86_64/libSpaceWireUSBAPI.so \
                 ../spw_usb_driver_v2.61/lib/x86_64/libConfigLibraryUSB.so

rmapplugin/stardundee.cpp +10 -11

                 commandCode = invalid0; // initialization of the cmmand code for the RMAP transfers
                 rmapSourceLogicalAddress = 0x20;
-                connection_LAYOUT = new QGridLayout;
+                bridge_LAYOUT = new QGridLayout;
                 usbDeviceNumber_LABEL = new QLabel(tr("USB device number: "));
                 linkNumber_LABEL = new QLabel(tr("SpaceWire link number: "));
                 sourceLogicalAddress_SPINBOX->setRange(0,254);
                 sourceLogicalAddress_SPINBOX->setValue(32);
-                connection_LAYOUT->addWidget(usbDeviceNumber_LABEL, 0, 0, 1, 1);
+                bridge_LAYOUT->addWidget(usbDeviceNumber_LABEL, 0, 0, 1, 1);
-                connection_LAYOUT->addWidget(usbDeviceNumber_SPINBOX, 0, 1, 1, 1);
+                bridge_LAYOUT->addWidget(usbDeviceNumber_SPINBOX, 0, 1, 1, 1);
-                connection_LAYOUT->addWidget(linkNumber_LABEL, 1, 0, 1, 1);
+                bridge_LAYOUT->addWidget(linkNumber_LABEL, 1, 0, 1, 1);
-                connection_LAYOUT->addWidget(linkNumber_SPINBOX, 1, 1, 1, 1);
+                bridge_LAYOUT->addWidget(linkNumber_SPINBOX, 1, 1, 1, 1);
-                connection_LAYOUT->addWidget(sourceLogicalAddress_LABEL, 2, 0, 1, 1);
+                bridge_LAYOUT->addWidget(sourceLogicalAddress_LABEL, 2, 0, 1, 1);
-                connection_LAYOUT->addWidget(sourceLogicalAddress_SPINBOX, 2, 1, 1, 1);
+                bridge_LAYOUT->addWidget(sourceLogicalAddress_SPINBOX, 2, 1, 1, 1);
+                bridge_LAYOUT->setRowStretch(3, 1);
+                bridge_LAYOUT->setColumnStretch(2, 1);
-                connection_LAYOUT->setRowStretch(3, 1);
+                this->setLayout(bridge_LAYOUT);
-                connection_LAYOUT->setColumnStretch(2, 1);
-                this->setLayout(connection_LAYOUT);
                 connect(this->sourceLogicalAddress_SPINBOX, SIGNAL(valueChanged(int)), this, SLOT(sourceHasChanged(int)));
             }

rmapplugin/stardundee.h +19 -17

                 ~StarDundee();
                 unsigned int Write(unsigned int *Value,unsigned int count,unsigned int address=0);
                 unsigned int Read(unsigned int *Value,unsigned int count,unsigned int address=0);
-                unsigned int WriteStarDundee(unsigned int *Value, unsigned int count, unsigned int address);
                 unsigned int WriteSPW(char *Value, unsigned int count, char targetLogicalAddress, char userApplication);
                 unsigned int getLinkStatus(unsigned char link);
                 void sourceHasChanged(int target) {rmapSourceLogicalAddress = (unsigned char) target;}
             private:
-                unsigned int GetRoutingTableEntry();
+                //******************
+                // general functions
                 unsigned int WriteBLOCK(char *data,unsigned int nbBytes,unsigned int address=0);
                 unsigned int ReadBLOCK(unsigned int nbBytes,unsigned int address=0);
                 void acquireRMAPSemaphore() {rmapPacketSEMAPHORE->acquire();}
                 void acquireCCSDSSemaphore() {ccsdsPacketSEMAPHORE->acquire();}
+                //****************
+                // general members
                 unsigned char rmapTargetLogicalAddress ;
                 unsigned char rmapSourceLogicalAddress ;
+                RMAP_command_codes commandCode;
+                QGridLayout *bridge_LAYOUT;
+                QSemaphore *rmapPacketSEMAPHORE;
+                QSemaphore *ccsdsPacketSEMAPHORE;
+                char* rmapPacket;
+                unsigned char *ccsdsPacket;
+                char *spwPacket;
+                unsigned int rmapPacketSize;
+                unsigned int ccsdsPacketSize;
-                RMAP_command_codes commandCode;
+                //**************************
+                // specific member functions
+                unsigned int GetRoutingTableEntry();
+                //**************************
+                // specific member variables
                 QLabel *usbDeviceNumber_LABEL;
                 QLabel *linkNumber_LABEL;
                 QLabel *sourceLogicalAddress_LABEL;
                 QSpinBox *linkNumber_SPINBOX;
                 QSpinBox *sourceLogicalAddress_SPINBOX;
-                QGridLayout *connection_LAYOUT;
+                USB_SPACEWIRE_ID pIdentifier;   // unique identifier for the send/receive operations
-                unsigned char pBuffer[10];      // Pointer to the start of the user buffer from which to transmit data
-                USB_SPACEWIRE_ID pIdentifier;   // A pointer to a variable which will be set to contain a unique identifier for the send
                 star_device_handle hDevice;     // Handle to the SpaceWire device
                 USB_SPACEWIRE_STATUS result;    // The result of the send operation
-                // Packet receiver
-                QSemaphore *rmapPacketSEMAPHORE;
-                QSemaphore *ccsdsPacketSEMAPHORE;
-                char* rmapPacket;      // The buffer to receive RMAP READ packets
-                unsigned char *ccsdsPacket;
-                char *spwPacket;
-                unsigned int rmapPacketSize;
-                unsigned int ccsdsPacketSize;
             };
             #endif // STARDUNDEE_H

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages