@@ -21,7 +21,7 @@ l = getSupportedSDR()
2121- l : Array of symbols of supported SDRs
2222"""
2323function getSupportedSDRs ()
24- return [:uhd ;:sdr_over_network ; : radiosim ;:pluto ;:rtlsdr ;:bladerf ];
24+ return [:uhd ;:radiosim ;:pluto ;:rtlsdr ;:bladerf ];
2525end
2626export getSupportedSDRs
2727
@@ -84,7 +84,6 @@ Receive nbSamples from the SDR and fill them in the output buffer. The buffer fo
8484# --- Output parameters
8585- buffer : Output buffer from the radio filled with nbSamples samples
8686"""
87- recv (obj:: SDROverNetwork ,tul... ) = SDROverNetworks. recv (obj,tul... );
8887recv (obj:: UHDBinding ,tul... ) = UHDBindings. recv (obj,tul... );
8988recv (obj:: RadioSim ,tul... ) = RadioSims. recv (obj,tul... );
9089recv (obj:: RTLSDRBinding ,tul... ) = RTLSDRBindings. recv (obj,tul... );
@@ -103,7 +102,6 @@ Receive from the SDR and fill them in the input buffer.
103102# --- Output parameters
104103- nbSamples : Number of samples filled
105104"""
106- recv! (sig,obj:: SDROverNetwork ,tul... ) = SDROverNetworks. recv! (sig,obj,tul... );
107105recv! (sig,obj:: UHDBinding ,tul... ) = UHDBindings. recv! (sig,obj,tul... );
108106recv! (sig,obj:: RadioSim ,tul... ) = RadioSims. recv! (sig,obj,tul... );
109107recv! (sig,obj:: RTLSDRBinding ,tul... ) = RTLSDRBindings. recv! (sig,obj,tul... );
@@ -124,7 +122,6 @@ send(radio,buffer,cyclic=false)
124122- nbEch : Number of samples effectively send [Csize_t]. It corresponds to the number of complex samples sent.
125123"""
126124
127- send (obj:: SDROverNetwork ,sig,tul... ;kwarg... ) = SDROverNetworks. send (obj,sig,tul... ;kwarg... );
128125send (obj:: UHDBinding ,sig,tul... ;kwarg... ) = UHDBindings. send (obj,sig,tul... )
129126send (obj:: RadioSim ,sig,tul... ;kwarg... ) = RadioSims. send (obj,sig,tul... )
130127send (obj:: RTLSDRBinding ,sig,tul... ;kwarg... ) = RTLSDRBindings. send (obj,sig,tul... )
@@ -150,27 +147,6 @@ function openSDR(name::Symbol,tul...;key...)
150147 if name == :uhd
151148 suppKwargs = [:args ;:channels ;:antennas ;:cpu_format ;:otw_format ;:subdev ;:nbAntennaRx ;:nbAntennaTx ;:bypassStreamer ];
152149 radio = openUHD (tul... ;parseKeyword (key,suppKwargs)... );
153- elseif (name == :sdr_over_network || name == :e310 )
154- suppKwargs = [:addr ];
155- keyOut = parseKeyword (key,suppKwargs);
156- if haskey (key,:args )
157- # For UHDBindings IP address is set as args="addr=192.168.10.14". We want to support this
158- # We look at args and find addr inside and extract the IP address. Then create a dict entry
159- str = key[:args ];
160- ind = findfirst (" addr" ,str)[1 ];
161- # If addr flag is here, convert it into IP
162- if ~ isnothing (ind)
163- # --- Getting end of parameter
164- indV = findfirst (" ," ,str[ind: end ]);
165- # --- If last parameters, get the compelte string
166- (isnothing (indV)) ? indF = length (str) : indF = indV[1 ];;
167- # --- Extract ip address
168- ip = str[ind+ 5 : indF];
169- # --- Create a new input in dictionnary
170- keyOut[:addr ] = ip;
171- end
172- end
173- radio = openUhdOverNetwork (tul... ;keyOut... );
174150 elseif (name == :radiosim )
175151 suppKwargs = [:packetSize ;:scaleSleep ;:buffer ];
176152 radio = openRadioSim (tul... ;parseKeyword (key,suppKwargs)... );
0 commit comments