bmarechal / gnuradio

Download as
Browse Code ยป

Commit 21598fce166205c3028c7fe9c368f3826b97db7c

Authored by bmarechal
1 parent bd35fd2566
Exists in master

add nco HW config

Showing 6 changed files with 29 additions and 16 deletions Side-by-side Diff

redpitaya/client/dds_gnuradio.grc
Diff comments   View file @ 21598fc
... ... @@ -168,7 +168,7 @@
168 168 </param>
169 169 <param>
170 170 <key>value</key>
171   - <value>"192.168.0.202"</value>
  171 + <value>"192.168.0.203"</value>
172 172 </param>
173 173 </block>
174 174 <block>
175 175  
... ... @@ -215,11 +215,11 @@
215 215 </param>
216 216 <param>
217 217 <key>start</key>
218   - <value>-60000000</value>
  218 + <value>0</value>
219 219 </param>
220 220 <param>
221 221 <key>step</key>
222   - <value>1</value>
  222 + <value>1000</value>
223 223 </param>
224 224 <param>
225 225 <key>stop</key>
... ... @@ -459,6 +459,14 @@
459 459 <param>
460 460 <key>offset</key>
461 461 <value>0</value>
  462 + </param>
  463 + <param>
  464 + <key>pinc_sw</key>
  465 + <value>1</value>
  466 + </param>
  467 + <param>
  468 + <key>poff_sw</key>
  469 + <value>1</value>
462 470 </param>
463 471 <param>
464 472 <key>port</key>
redpitaya/client/dds_gnuradio.py
Diff comments   View file @ 21598fc
... ... @@ -3,7 +3,7 @@
3 3 ##################################################
4 4 # GNU Radio Python Flow Graph
5 5 # Title: Dds Gnuradio
6   -# Generated: Wed Apr 5 11:34:01 2017
  6 +# Generated: Sat Apr 8 10:39:47 2017
7 7 ##################################################
8 8  
9 9 if __name__ == '__main__':
... ... @@ -58,7 +58,7 @@
58 58 self.port = port = 1001
59 59 self.offset_out1 = offset_out1 = 0
60 60 self.f_dds = f_dds = 0
61   - self.addr = addr = "192.168.0.202"
  61 + self.addr = addr = "192.168.0.203"
62 62 self.a_dds = a_dds = 0
63 63  
64 64 ##################################################
... ... @@ -67,7 +67,7 @@
67 67 self._offset_out1_range = Range(-2**13, 2**13-1, 1, 0, 200)
68 68 self._offset_out1_win = RangeWidget(self._offset_out1_range, self.set_offset_out1, 'Offset DDS', "counter_slider", int)
69 69 self.top_grid_layout.addWidget(self._offset_out1_win, 2, 0)
70   - self._f_dds_range = Range(-60000000, 60000000, 1, 0, 200)
  70 + self._f_dds_range = Range(0, 60000000, 1000, 0, 200)
71 71 self._f_dds_win = RangeWidget(self._f_dds_range, self.set_f_dds, 'DDS frequency', "counter_slider", float)
72 72 self.top_grid_layout.addWidget(self._f_dds_win, 0, 0)
73 73 self._a_dds_range = Range(0, 2**13-1, 1, 0, 200)
... ... @@ -81,6 +81,8 @@
81 81 freq_dds=f_dds,
82 82 acc_size=32,
83 83 offset=0,
  84 + pinc_sw=1,
  85 + poff_sw=1,
84 86 )
85 87  
86 88 self.add_const_set_offset_0_0 = redpitaya_gnuradio.add_const_set_offset(
... ... @@ -121,7 +123,7 @@
121 123  
122 124 def set_f_dds(self, f_dds):
123 125 self.f_dds = f_dds
124   - self.nco_counter_send_conf_0.set_nco(device='/dev/dds_freq', freq_ref=125000000, freq_dds=self.f_dds, acc_size=32, offset=0)
  126 + self.nco_counter_send_conf_0.set_nco(device='/dev/dds_freq', freq_ref=125000000, freq_dds=self.f_dds, acc_size=32, offset=0, pinc_sw=1, poff_sw=1)
125 127  
126 128 def get_addr(self):
127 129 return self.addr
redpitaya/client/vco_only.grc
Diff comments   View file @ 21598fc
... ... @@ -168,7 +168,7 @@
168 168 </param>
169 169 <param>
170 170 <key>value</key>
171   - <value>"192.168.0.202"</value>
  171 + <value>"192.168.0.203"</value>
172 172 </param>
173 173 </block>
174 174 <block>
... ... @@ -530,7 +530,7 @@
530 530 </param>
531 531 <param>
532 532 <key>start</key>
533   - <value>0</value>
  533 + <value>-2**13</value>
534 534 </param>
535 535 <param>
536 536 <key>step</key>
redpitaya/client/vco_only.py
Diff comments   View file @ 21598fc
... ... @@ -3,7 +3,7 @@
3 3 ##################################################
4 4 # GNU Radio Python Flow Graph
5 5 # Title: Vco Only
6   -# Generated: Thu Apr 6 18:24:10 2017
  6 +# Generated: Tue Apr 11 09:58:12 2017
7 7 ##################################################
8 8  
9 9 if __name__ == '__main__':
... ... @@ -64,7 +64,7 @@
64 64 self.dds_f0 = dds_f0 = 0
65 65 self.dds_ampl = dds_ampl = 0
66 66 self.dac1_offset = dac1_offset = 0
67   - self.addr = addr = "192.168.0.202"
  67 + self.addr = addr = "192.168.0.203"
68 68 self.adc1_offset = adc1_offset = 0
69 69  
70 70 ##################################################
... ... @@ -84,7 +84,7 @@
84 84 self._inc_sw_callback(self.inc_sw)
85 85 _inc_sw_check_box.stateChanged.connect(lambda i: self.set_inc_sw(self._inc_sw_choices[bool(i)]))
86 86 self.top_grid_layout.addWidget(_inc_sw_check_box, 2, 1)
87   - self._dds_range_range = Range(0, 2**13-1, 1, 0, 200)
  87 + self._dds_range_range = Range(-2**13, 2**13-1, 1, 0, 200)
88 88 self._dds_range_win = RangeWidget(self._dds_range_range, self.set_dds_range, 'dds_range', "counter_slider", int)
89 89 self.top_grid_layout.addWidget(self._dds_range_win, 5, 3)
90 90 self._dds_offset_range = Range(-2**13, 2**13-1, 1, 0, 200)
redpitaya/server/server.py
Diff comments   View file @ 21598fc
... ... @@ -4,6 +4,8 @@
4 4 from thread import start_new_thread
5 5 import liboscimp_fpga
6 6  
  7 +###########################################################
  8 +
7 9 def clientThread(conn, addr):
8 10 print('Open connection from ' + addr[0] + ':' + str(addr[1]) + '\n')
9 11 while True:
10 12  
... ... @@ -18,10 +20,11 @@
18 20 pass
19 21 if recv[0] == "nco_counter_send_conf":
20 22 try:
21   - liboscimp_fpga.nco_counter_send_conf(recv[1], int(recv[2]), int(recv[3]), int(recv[4]), int(recv[5]))
  23 + liboscimp_fpga.nco_counter_send_conf(recv[1], int(recv[2]), int(recv[3]), int(recv[4]), int(recv[5]), int(recv[6]), int(recv[7]))
22 24 except:
23   - pass
24   - conn.close()
  25 + pass
  26 +
  27 +###########################################################
25 28  
26 29 ctrl_sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
27 30 ctrl_sock.bind(('', 1001))
sdr/fm_radio/fm_radio.py
Diff comments   View file @ 21598fc
... ... @@ -3,7 +3,7 @@
3 3 ##################################################
4 4 # GNU Radio Python Flow Graph
5 5 # Title: Fm Radio
6   -# Generated: Tue Mar 21 14:48:06 2017
  6 +# Generated: Sat Apr 8 11:09:28 2017
7 7 ##################################################
8 8  
9 9 if __name__ == '__main__':