Changeset 8683
- Timestamp:
- 02/15/09 18:33:05 (4 years ago)
- Location:
- ossiedev/branches/hvolos/packetwfrm/metadataversions/components
- Files:
-
- 4 modified
-
DigitalModem-metadata/src/DigitalDemodulator_metadata.cpp (modified) (2 diffs)
-
SymbolSyncPoly-metadata/src/FrameSynchronizer_metadata.cpp (modified) (6 diffs)
-
rc2007_gui/WorkModules.py (modified) (1 diff)
-
rc2007_gui/wx_inits.py (modified) (7 diffs)
Legend:
- Unmodified
- Added
- Removed
-
ossiedev/branches/hvolos/packetwfrm/metadataversions/components/DigitalModem-metadata/src/DigitalDemodulator_metadata.cpp
r8031 r8683 216 216 while( true ) { 217 217 // Get data from port 218 dataIn_0->getData(I_in, Q_in, packet_data); 218 219 //HVdataIn_0->getData(I_in, Q_in, packet_data); 220 221 dataIn_0->getData(I_in, Q_in); 219 222 220 223 if ( ossieDebugLevel > 5 ) { 221 224 std::cout << "DigitalDemodulator-metadata got data" << std::endl; 222 standardInterfaces::PrintMetaData( *packet_data );225 //HV standardInterfaces::PrintMetaData( *packet_data ); 223 226 } 224 227 225 228 // Set the modulation scheme based on the meta data tag 226 SetModulationSchemeOnMetaData(); 229 230 //HVSetModulationSchemeOnMetaData(); 231 232 SetModulationScheme(SigProc::QAM16); 233 227 234 228 235 // Read input data length … … 253 260 254 261 dataIn_0->bufferEmptied(); 255 dataOut_0->pushPacket(bits_out, *packet_data); 262 //HV dataOut_0->pushPacket(bits_out, *packet_data); 263 dataOut_0->pushPacket(bits_out); 256 264 257 265 delete [] b; -
ossiedev/branches/hvolos/packetwfrm/metadataversions/components/SymbolSyncPoly-metadata/src/FrameSynchronizer_metadata.cpp
r8023 r8683 248 248 249 249 // Get data from port 250 dataIn_0->getData(I_in_0, Q_in_0, metadata); 250 //HV dataIn_0->getData(I_in_0, Q_in_0, metadata); 251 dataIn_0->getData(I_in_0, Q_in_0); 251 252 252 253 DEBUG(7, FrameSynchronizer_metadata, "Got " << I_in_0->length() << " samples") … … 254 255 DEBUG(7, FrameSync, "rx signal strength: "<< (float) (metadata->signal_strength) << "dB"); 255 256 257 /**HV 256 258 if (metadata->signal_strength < rssi_threshold_dB) { 257 259 rssi_counter++; … … 263 265 rssi_counter = 0; 264 266 } 267 **/ 265 268 266 269 // Adjust sampling frequency in metadata 267 metadata->sampling_frequency /= float(k);270 //HV metadata->sampling_frequency /= float(k); 268 271 269 272 // Read input data length … … 382 385 DEBUG(5, FrameSynchronizer_metadata, "trying to decode frame header..."); 383 386 DecodeFrameHeader(); 384 SetMetaDataModulationScheme();387 //HV SetMetaDataModulationScheme(); 385 388 386 389 case EXTRACT_FRAME: … … 395 398 case EXTRACT_EOM_CODE: 396 399 // set to BPSK 397 SetMetaDataModulationScheme();400 //HV SetMetaDataModulationScheme(); 398 401 DEBUG(5, FrameSynchronizer_metadata, "trying to extract EOM code..."); 399 402 extracted = ExtractFrameEOM( … … 427 430 428 431 DEBUG(5, FrameSynchronizer_metadata, "pushing " << I_out_0.length() << " samples") 429 dataOut_0->pushPacket(I_out_0, Q_out_0, *metadata); 432 //HV dataOut_0->pushPacket(I_out_0, Q_out_0, *metadata); 433 dataOut_0->pushPacket(I_out_0, Q_out_0); 430 434 } 431 435 -
ossiedev/branches/hvolos/packetwfrm/metadataversions/components/rc2007_gui/WorkModules.py
r8657 r8683 71 71 72 72 # global sound card variables 73 audio_sampling_frequency = 16000 73 audio_sampling_frequency = 16000 #16000 74 74 audio_channels = 1 75 audio_buffer_length = 1024 75 audio_buffer_length = 1024 #1024 76 76 77 77 def CreateMetadataObject(): -
ossiedev/branches/hvolos/packetwfrm/metadataversions/components/rc2007_gui/wx_inits.py
r7328 r8683 19 19 class MainFrame(wx.Frame): 20 20 def __init__(self, orb, parent=None, id=-1, pos=wx.DefaultPosition, 21 title=" Team MPRG"):21 title="OSSIE Talk"): 22 22 23 23 self.orb_ref = orb … … 35 35 36 36 menu = wx.Menu() 37 menu.Append(210,'&Clear Text History','Erase the dirty talk...')37 #menu.Append(210,'&Clear Text History','Erase the dirty talk...') 38 38 menu.Append(205, 'E&xit', 'Enough of this already!') 39 39 self.Bind(wx.EVT_MENU, self.OnFileExit, id=205) 40 self.Bind(wx.EVT_MENU,self.OnClearTextHistory,id=210)40 #self.Bind(wx.EVT_MENU,self.OnClearTextHistory,id=210) 41 41 self.mainmenu.Append(menu, '&File') 42 42 … … 56 56 57 57 def _init_ctrls(self, prnt): 58 frame_size = wx.Size( 412, 310)58 frame_size = wx.Size(180, 80) 59 59 talk_btn_size = wx.Size(175,50) 60 rx_text_box_size = (400, 130)61 text_edit_size = wx.Size(400,30)62 text_btn_size = wx.Size(145,50)60 #rx_text_box_size = (400, 130) 61 #text_edit_size = wx.Size(400,30) 62 #text_btn_size = wx.Size(145,50) 63 63 64 64 … … 66 66 pos=wx.Point(1, 570), size=frame_size, 67 67 style=wx.DEFAULT_FRAME_STYLE, 68 title=' Team MPRG 2007')68 title='OSSIE Talk') 69 69 70 70 # most of the wx widgets will reside on the panel: … … 82 82 83 83 # send text message button 84 self.TextBtn = wx.Button(id=-1, label='Send Text',85 name='TextBtn',86 parent=panel,87 size=text_btn_size)88 self.TextBtn.SetFont(wx.Font(16, wx.SWISS, wx.NORMAL,89 wx.BOLD, False))90 self.TextBtn.Bind(wx.EVT_LEFT_UP, self.OnSendText, id=-1)84 #self.TextBtn = wx.Button(id=-1, label='Send Text', 85 # name='TextBtn', 86 # parent=panel, 87 # size=text_btn_size) 88 #self.TextBtn.SetFont(wx.Font(16, wx.SWISS, wx.NORMAL, 89 # wx.BOLD, False)) 90 #self.TextBtn.Bind(wx.EVT_LEFT_UP, self.OnSendText, id=-1) 91 91 92 92 # Text editors: 93 self.rxTextEditor = wx.TextCtrl(id=-1,94 name=u'rxTextEditor',95 parent=panel,96 size = rx_text_box_size,97 style= wx.TE_MULTILINE,98 value=u'')99 100 self.textEditor = wx.TextCtrl(id=-1,101 name=u'textEditor',102 parent=panel,103 size=text_edit_size,104 style=wx.TE_PROCESS_ENTER,105 value=u'')106 self.textEditor.Bind(wx.EVT_TEXT_ENTER, self.OnSendText, id=-1)93 #self.rxTextEditor = wx.TextCtrl(id=-1, 94 # name=u'rxTextEditor', 95 # parent=panel, 96 # size = rx_text_box_size, 97 # style= wx.TE_MULTILINE, 98 # value=u'') 99 # 100 #self.textEditor = wx.TextCtrl(id=-1, 101 # name=u'textEditor', 102 # parent=panel, 103 # size=text_edit_size, 104 # style=wx.TE_PROCESS_ENTER, 105 # value=u'') 106 #self.textEditor.Bind(wx.EVT_TEXT_ENTER, self.OnSendText, id=-1) 107 107 108 108 # sizer grid: 109 109 sizer = wx.FlexGridSizer(cols=1, hgap=6, vgap = 6) 110 sizer.AddMany([self.TalkBtn, 111 self.rxTextEditor, 112 self.textEditor, 113 self.TextBtn]) 110 #sizer.AddMany([self.TalkBtn, 111 # self.rxTextEditor, 112 # self.textEditor, 113 # self.TextBtn]) 114 sizer.AddMany([self.TalkBtn]) 114 115 panel.SetSizer(sizer) 115 116 … … 125 126 event.Skip() 126 127 127 def OnSendText(self, event):128 text=''129 text =copy.copy(str(self.textEditor.GetLineText(0)))130 self.textEditor.Clear()131 if len(text)>0:132 self.orb_ref.rc2007_gui_Obj.tx_work_mod.SendTextData(text)133 updatedtext=str(self.rxTextEditor.GetValue())134 updatedtext+='Snd('+strftime("%H:%M:%S",localtime()) + '):'+text+'\n'135 self.rxTextEditor.Clear()136 self.rxTextEditor.write(updatedtext)137 event.Skip()128 #def OnSendText(self, event): 129 # text='' 130 # text =copy.copy(str(self.textEditor.GetLineText(0))) 131 # self.textEditor.Clear() 132 # if len(text)>0: 133 # self.orb_ref.rc2007_gui_Obj.tx_work_mod.SendTextData(text) 134 # updatedtext=str(self.rxTextEditor.GetValue()) 135 # updatedtext+='Snd('+strftime("%H:%M:%S",localtime()) + '):'+text+'\n' 136 # self.rxTextEditor.Clear() 137 # self.rxTextEditor.write(updatedtext) 138 # event.Skip() 138 139 139 def DisplayText(self, text):140 locker = wx.MutexGuiLocker()141 updatedtext=str(self.rxTextEditor.GetValue())142 updatedtext+='Rcv('+strftime("%H:%M:%S",localtime()) + '):'+copy.copy(text)+'\n'143 self.rxTextEditor.Clear()144 try:145 self.rxTextEditor.write(updatedtext)146 except:147 print "WARNING! rc2007_gui got incompatible ASCII symbols!"140 #def DisplayText(self, text): 141 # locker = wx.MutexGuiLocker() 142 # updatedtext=str(self.rxTextEditor.GetValue()) 143 # updatedtext+='Rcv('+strftime("%H:%M:%S",localtime()) + '):'+copy.copy(text)+'\n' 144 # self.rxTextEditor.Clear() 145 # try: 146 # self.rxTextEditor.write(updatedtext) 147 # except: 148 # print "WARNING! rc2007_gui got incompatible ASCII symbols!" 148 149 149 def OnClearTextHistory(self,event):150 self.rxTextEditor.Clear()151 event.Skip()150 #def OnClearTextHistory(self,event): 151 # self.rxTextEditor.Clear() 152 # event.Skip() 152 153 153 154 def OnFileExit(self, event): … … 160 161 the menu bar''' 161 162 from wx.lib.dialogs import ScrolledMessageDialog 162 about = ScrolledMessageDialog(self, " SDRF2007 \nTeam MPRG\nOSSIE \nA product of Wireless@VT.",163 about = ScrolledMessageDialog(self, "OSSIE Talk \nOSSIE \nA product of Wireless@VT.", 163 164 "About...") 164 165 about.ShowModal()
