@@ -88,7 +88,6 bool stardundeeSPW_USB::disconnectBridge | |||||
88 | return false; |
|
88 | return false; | |
89 | } |
|
89 | } | |
90 |
|
90 | |||
91 |
|
||||
92 | int stardundeeSPW_USB::pushRMAPPacket(char *packet, int size) |
|
91 | int stardundeeSPW_USB::pushRMAPPacket(char *packet, int size) | |
93 | { |
|
92 | { | |
94 | return this->manager->sendPacket(packet,size); |
|
93 | return this->manager->sendPacket(packet,size); | |
@@ -366,11 +365,12 void stardundeeSPW_USB::makeGUI(socexplo | |||||
366 | connect(this,SIGNAL(SetBrickAsARouter(bool)), ((StarDundeeGUI*)this->p_GUI),SLOT(setBrickAsARouter(bool))); |
|
365 | connect(this,SIGNAL(SetBrickAsARouter(bool)), ((StarDundeeGUI*)this->p_GUI),SLOT(setBrickAsARouter(bool))); | |
367 | connect(this,SIGNAL(BytesReceivedFromSpw(uint)), ((StarDundeeGUI*)this->p_GUI),SLOT(updateNbReceivedBytesFromSpw(uint))); |
|
366 | connect(this,SIGNAL(BytesReceivedFromSpw(uint)), ((StarDundeeGUI*)this->p_GUI),SLOT(updateNbReceivedBytesFromSpw(uint))); | |
368 | connect(this,SIGNAL(BytesTransmittedToSpw(uint)), ((StarDundeeGUI*)this->p_GUI),SLOT(updateNbTransmittedBytesToSpw(uint))); |
|
367 | connect(this,SIGNAL(BytesTransmittedToSpw(uint)), ((StarDundeeGUI*)this->p_GUI),SLOT(updateNbTransmittedBytesToSpw(uint))); | |
369 |
connect(this, |
|
368 | connect(this,SIGNAL(CCSDSPacketTransmittedToSpw()), ((StarDundeeGUI*)this->p_GUI),SLOT(updateCCSDSPacketTransmittedToSpw())); | |
370 | connect(this,SIGNAL(SetTimecodeFrequency(double)), ((StarDundeeGUI*)this->p_GUI),SLOT(setTimecodeFrequency(QString))); |
|
369 | connect(this,SIGNAL(SetTimecodeFrequency(double)), ((StarDundeeGUI*)this->p_GUI),SLOT(setTimecodeFrequency(QString))); | |
371 | connect(this,SIGNAL(StartSendingTimecodes(bool)), ((StarDundeeGUI*)this->p_GUI),SLOT(setStartSendingTimecodes(bool))); |
|
370 | connect(this,SIGNAL(StartSendingTimecodes(bool)), ((StarDundeeGUI*)this->p_GUI),SLOT(setStartSendingTimecodes(bool))); | |
372 |
|
371 | |||
373 | connect(this,SIGNAL(GetLinkNumber()), this->manager, SLOT(getLinkNumber())); |
|
372 | connect(this,SIGNAL(SendOneTimecode(unsigned char)),this->manager, SLOT(sendOneTimecode(unsigned char))); | |
|
373 | connect(this,SIGNAL(GetLinkNumber()), this->manager, SLOT(getLinkNumber())); | |||
374 | } |
|
374 | } | |
375 |
|
375 | |||
376 | void stardundeeSPW_USB::sendPacketComingFromTCPServer(char *packet, int size) |
|
376 | void stardundeeSPW_USB::sendPacketComingFromTCPServer(char *packet, int size) | |
@@ -1069,6 +1069,20 void stardundeeSPW_USB_Manager::setTimec | |||||
1069 | SocExplorerEngine::message(this->plugin,"tick frequency set to " + QString::number(currentFrequency) +" Hz"); |
|
1069 | SocExplorerEngine::message(this->plugin,"tick frequency set to " + QString::number(currentFrequency) +" Hz"); | |
1070 | } |
|
1070 | } | |
1071 |
|
1071 | |||
|
1072 | void stardundeeSPW_USB_Manager::sendOneTimecode( unsigned char nTimein ) | |||
|
1073 | { | |||
|
1074 | // enable external timecode selection | |||
|
1075 | if(!USBSpaceWire_TC_EnableExternalTimecodeSelection(hDevice,1)) | |||
|
1076 | SocExplorerEngine::message(this->plugin,"sendOneTimecode *** ERR *** enable external timecode selection"); | |||
|
1077 | ||||
|
1078 | if (!USBSpaceWire_TC_PerformTickIn( hDevice, nTimein) ) | |||
|
1079 | SocExplorerEngine::message( this->plugin,"sendOneTimecode *** ERR *** Could not send the requested timecode: " + QString::number(nTimein) ); | |||
|
1080 | else | |||
|
1081 | SocExplorerEngine::message( this->plugin,"sendOneTimecode *** OK *** timecode sent " + QString::number(nTimein) ); | |||
|
1082 | ||||
|
1083 | // disable external timecode selection | |||
|
1084 | if(!USBSpaceWire_TC_EnableExternalTimecodeSelection(hDevice,0)) | |||
|
1085 | SocExplorerEngine::message(this->plugin,"sendOneTimecode *** ERR *** disable external timecode selection"); | |||
|
1086 | } | |||
1072 |
|
1087 | |||
1073 |
|
1088 | |||
1074 |
|
@@ -69,6 +69,7 signals: | |||||
69 |
|
69 | |||
70 | public slots: |
|
70 | public slots: | |
71 | void sendTimecodePeriodically( bool onOff ); |
|
71 | void sendTimecodePeriodically( bool onOff ); | |
|
72 | void sendOneTimecode(unsigned char nTimein); | |||
72 | int getLinkNumber( void ); |
|
73 | int getLinkNumber( void ); | |
73 |
|
74 | |||
74 | private: |
|
75 | private: | |
@@ -131,6 +132,7 signals: | |||||
131 | void BytesTransmittedToSpw( unsigned int ); |
|
132 | void BytesTransmittedToSpw( unsigned int ); | |
132 | void CCSDSPacketTransmittedToSpw( void ); |
|
133 | void CCSDSPacketTransmittedToSpw( void ); | |
133 | void StartSendingTimecodes( bool ); |
|
134 | void StartSendingTimecodes( bool ); | |
|
135 | void SendOneTimecode( unsigned char ); | |||
134 | int GetLinkNumber(); |
|
136 | int GetLinkNumber(); | |
135 |
|
137 | |||
136 | public slots: |
|
138 | public slots: |
@@ -119,6 +119,8 void spwplugin::bridgeSelectionChanged(c | |||||
119 | ((stardundeeSPW_USB*)bridge),SIGNAL(StartSendingTimecodes(bool))); |
|
119 | ((stardundeeSPW_USB*)bridge),SIGNAL(StartSendingTimecodes(bool))); | |
120 | connect(((spwPyWrapper*)this->pyObject),SIGNAL(StarDundeeSetTimecodeFrequency(double)), |
|
120 | connect(((spwPyWrapper*)this->pyObject),SIGNAL(StarDundeeSetTimecodeFrequency(double)), | |
121 | ((stardundeeSPW_USB*)bridge),SIGNAL(SetTimecodeFrequency(double))); |
|
121 | ((stardundeeSPW_USB*)bridge),SIGNAL(SetTimecodeFrequency(double))); | |
|
122 | connect(((spwPyWrapper*)this->pyObject),SIGNAL(StarDundeeSendOneTimecode(unsigned char)), | |||
|
123 | ((stardundeeSPW_USB*)bridge),SIGNAL(SendOneTimecode(unsigned char))); | |||
122 | connect(this->bridge,SIGNAL(pushPacketOverTCP(char*,int)),this->tcpServer,SLOT(pushPacket(char*,int))); |
|
124 | connect(this->bridge,SIGNAL(pushPacketOverTCP(char*,int)),this->tcpServer,SLOT(pushPacket(char*,int))); | |
123 | connect(this->tcpServer, SIGNAL(sendSPWPacket(char*,int)), ((stardundeeSPW_USB*)bridge), SLOT(sendPacketComingFromTCPServer(char*,int))); |
|
125 | connect(this->tcpServer, SIGNAL(sendSPWPacket(char*,int)), ((stardundeeSPW_USB*)bridge), SLOT(sendPacketComingFromTCPServer(char*,int))); | |
124 | } |
|
126 | } |
@@ -26,6 +26,7 signals: | |||||
26 | void StarDundeeSetBrickAsARouter( bool ); |
|
26 | void StarDundeeSetBrickAsARouter( bool ); | |
27 | void StarDundeeSetTimecodeFrequency( double ); |
|
27 | void StarDundeeSetTimecodeFrequency( double ); | |
28 | void StarDundeeStartTimecodes( bool ); |
|
28 | void StarDundeeStartTimecodes( bool ); | |
|
29 | void StarDundeeSendOneTimecode( unsigned char timecode ); | |||
29 |
|
30 | |||
30 | void TCPServerConnect(); |
|
31 | void TCPServerConnect(); | |
31 | void TCPServerDisconnect(); |
|
32 | void TCPServerDisconnect(); |
General Comments 0
You need to be logged in to leave comments.
Login now