Skip to content

Commit 05a55be

Browse files
author
Chris Poore
committed
Disabling IIO-Oscilloscope for Python2 branch
1 parent 54ebee9 commit 05a55be

File tree

5 files changed

+107
-96
lines changed

5 files changed

+107
-96
lines changed

‎CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,14 @@
11
# Change Log
22
All notable changes to this project will be documented in this file.
33

4+
## 2022-09-25
5+
6+
Disabling IIO-Oscilloscope for Python2_maint-3.7 branch.
7+
8+
### Changed
9+
10+
- Disabled IIO-Oscilloscope for Python2_maint-3.7 due to its failure to install
11+
412
## 2022-09-23
513

614
Adding support for bladeRF 2.0 micro and updating existing bladeRF content.

‎Installer/installer

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -295,13 +295,13 @@ programs_ubuntu18_04.append(('PlutoSDR',
295295
#cmake ./
296296
#make
297297
#sudo make install
298-
cd ~/Installed_by_FISSURE
299-
git clone https://github.com/analogdevicesinc/iio-oscilloscope.git # IIO oscilloscope is optional
300-
cd iio-oscilloscope
301-
git checkout origin/master
302-
mkdir build && cd build
303-
cmake ../ && make
304-
sudo make install
298+
#cd ~/Installed_by_FISSURE
299+
#git clone https://github.com/analogdevicesinc/iio-oscilloscope.git # IIO oscilloscope is optional
300+
#cd iio-oscilloscope
301+
#git checkout origin/master
302+
#mkdir build && cd build
303+
#cmake ../ && make
304+
#sudo make install
305305
#cd ~/Installed_by_FISSURE # Did not work
306306
#git clone https://github.com/analogdevicesinc/gr-iio.git
307307
#cd gr-iio
@@ -1838,13 +1838,13 @@ programs_ubuntu18_04_5.append(('PlutoSDR',
18381838
#cmake ./
18391839
#make
18401840
#sudo make install
1841-
cd ~/Installed_by_FISSURE
1842-
git clone https://github.com/analogdevicesinc/iio-oscilloscope.git # IIO oscilloscope is optional
1843-
cd iio-oscilloscope
1844-
git checkout origin/master
1845-
mkdir build && cd build
1846-
cmake ../ && make
1847-
sudo make install
1841+
#cd ~/Installed_by_FISSURE
1842+
#git clone https://github.com/analogdevicesinc/iio-oscilloscope.git # IIO oscilloscope is optional
1843+
#cd iio-oscilloscope
1844+
#git checkout origin/master
1845+
#mkdir build && cd build
1846+
#cmake ../ && make
1847+
#sudo make install
18481848
#cd ~/Installed_by_FISSURE # Did not work
18491849
#git clone https://github.com/analogdevicesinc/gr-iio.git
18501850
#cd gr-iio
@@ -3384,13 +3384,13 @@ programs_ubuntu18_04_6.append(('PlutoSDR',
33843384
#cmake ./
33853385
#make
33863386
#sudo make install
3387-
cd ~/Installed_by_FISSURE
3388-
git clone https://github.com/analogdevicesinc/iio-oscilloscope.git # IIO oscilloscope is optional
3389-
cd iio-oscilloscope
3390-
git checkout origin/master
3391-
mkdir build && cd build
3392-
cmake ../ && make
3393-
sudo make install
3387+
#cd ~/Installed_by_FISSURE
3388+
#git clone https://github.com/analogdevicesinc/iio-oscilloscope.git # IIO oscilloscope is optional
3389+
#cd iio-oscilloscope
3390+
#git checkout origin/master
3391+
#mkdir build && cd build
3392+
#cmake ../ && make
3393+
#sudo make install
33943394
#cd ~/Installed_by_FISSURE # Did not work
33953395
#git clone https://github.com/analogdevicesinc/gr-iio.git
33963396
#cd gr-iio

‎Logs/event.log

Lines changed: 65 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -1,65 +1,65 @@
1-
09/23/2022 12:06:21 AM - dashboard: Port Initialized to tcp://127.0.0.1:5051
2-
09/23/2022 12:06:21 AM - dashboard: Initialized Schema: /home/user/FISSURE/YAML/dashboard.yaml
3-
09/23/2022 12:06:21 AM - dashboard: Port Initialized to tcp://127.0.0.1:5057
4-
09/23/2022 12:06:21 AM - dashboard: Initialized Schema: /home/user/FISSURE/YAML/dashboard.yaml
5-
09/23/2022 12:06:21 AM - dashboard: Port Connected to tcp://127.0.0.1:5055
6-
09/23/2022 12:06:21 AM - dashboard: Initialized Schema: /home/user/FISSURE/YAML/dashboard.yaml
7-
09/23/2022 12:06:21 AM - dashboard: Port Connected to tcp://127.0.0.1:5059
8-
09/23/2022 12:06:21 AM - dashboard: Port Connected to tcp://127.0.0.1:5060
9-
09/23/2022 12:06:21 AM - dashboard: Port Connected to tcp://127.0.0.1:5065
10-
09/23/2022 12:06:21 AM - dashboard: Port Connected to tcp://127.0.0.1:5061
11-
09/23/2022 12:06:21 AM - dashboard: Port Connected to tcp://127.0.0.1:5063
12-
09/23/2022 12:06:22 AM - hiprfisr: End of HIPRFISR Initialization
13-
09/23/2022 12:06:22 AM - hiprfisr: Port Connected to tcp://127.0.0.1:5051
14-
09/23/2022 12:06:22 AM - hiprfisr: Initialized Schema: /home/user/FISSURE/YAML/hiprfisr.yaml
15-
09/23/2022 12:06:22 AM - hiprfisr: Port Initialized to tcp://127.0.0.1:5052
16-
09/23/2022 12:06:22 AM - hiprfisr: Initialized Schema: /home/user/FISSURE/YAML/tsi.yaml
17-
09/23/2022 12:06:22 AM - hiprfisr: Port Initialized to tcp://127.0.0.1:5053
18-
09/23/2022 12:06:22 AM - hiprfisr: Initialized Schema: /home/user/FISSURE/YAML/fge.yaml
19-
09/23/2022 12:06:22 AM - hiprfisr: Port Initialized to tcp://127.0.0.1:5054
20-
09/23/2022 12:06:22 AM - hiprfisr: Initialized Schema: /home/user/FISSURE/YAML/hiprfisr.yaml
21-
09/23/2022 12:06:22 AM - hiprfisr: Port Initialized to tcp://127.0.0.1:5055
22-
09/23/2022 12:06:22 AM - hiprfisr: Initialized Schema: /home/user/FISSURE/YAML/hiprfisr.yaml
23-
09/23/2022 12:06:22 AM - hiprfisr: Port Connected to tcp://127.0.0.1:5057
24-
09/23/2022 12:06:22 AM - hiprfisr: Initialized Schema: /home/user/FISSURE/YAML/hiprfisr.yaml
25-
09/23/2022 12:06:22 AM - hiprfisr: Port Connected to tcp://127.0.0.1:5059
26-
09/23/2022 12:06:22 AM - hiprfisr: Port Connected to tcp://127.0.0.1:5060
27-
09/23/2022 12:06:22 AM - hiprfisr: Port Connected to tcp://127.0.0.1:5065
28-
09/23/2022 12:06:22 AM - hiprfisr: Port Connected to tcp://127.0.0.1:5061
29-
09/23/2022 12:06:22 AM - hiprfisr: Port Connected to tcp://127.0.0.1:5063
30-
09/23/2022 12:06:22 AM - hiprfisr: Start of Main Event Loop
31-
09/23/2022 12:06:22 AM - tsi: Port Connected to tcp://localhost:5052
32-
09/23/2022 12:06:22 AM - tsi: Initialized Schema: /home/user/FISSURE/YAML/tsi.yaml
33-
09/23/2022 12:06:22 AM - tsi: Port Initialized to tcp://*:5059
34-
09/23/2022 12:06:22 AM - tsi: Initialized Schema: /home/user/FISSURE/YAML/tsi.yaml
35-
09/23/2022 12:06:22 AM - tsi: Port Connected to tcp://127.0.0.1:5055
36-
09/23/2022 12:06:22 AM - tsi: Initialized Schema: /home/user/FISSURE/YAML/tsi.yaml
37-
09/23/2022 12:06:22 AM - tsi: Port Connected to tcp://127.0.0.1:5057
38-
09/23/2022 12:06:22 AM - fge: Port Connected to tcp://127.0.0.1:5053
39-
09/23/2022 12:06:22 AM - fge: Initialized Schema: /home/user/FISSURE/YAML/fge.yaml
40-
09/23/2022 12:06:22 AM - fge: Port Initialized to tcp://127.0.0.1:5061
41-
09/23/2022 12:06:22 AM - fge: Initialized Schema: /home/user/FISSURE/YAML/fge.yaml
42-
09/23/2022 12:06:22 AM - fge: Port Connected to tcp://127.0.0.1:5055
43-
09/23/2022 12:06:23 AM - fge: Initialized Schema: /home/user/FISSURE/YAML/fge.yaml
44-
09/23/2022 12:06:23 AM - fge: Port Connected to tcp://127.0.0.1:5057
45-
09/23/2022 12:06:23 AM - pd: Port Connected to tcp://127.0.0.1:5054
46-
09/23/2022 12:06:23 AM - pd: Initialized Schema: /home/user/FISSURE/YAML/pd.yaml
47-
09/23/2022 12:06:23 AM - pd: Port Initialized to tcp://127.0.0.1:5063
48-
09/23/2022 12:06:23 AM - pd: Initialized Schema: /home/user/FISSURE/YAML/pd.yaml
49-
09/23/2022 12:06:23 AM - pd: Port Connected to tcp://127.0.0.1:5055
50-
09/23/2022 12:06:23 AM - pd: Initialized Schema: /home/user/FISSURE/YAML/pd.yaml
51-
09/23/2022 12:06:23 AM - pd: Port Connected to tcp://127.0.0.1:5057
52-
09/23/2022 12:06:23 AM - hiprfisr: Sending message: HIPRFISR: Connected TSI
53-
09/23/2022 12:06:23 AM - hiprfisr: Sending message: HIPRFISR: Connected FGE
54-
09/23/2022 12:06:23 AM - hiprfisr: Sending message: HIPRFISR: Connected PD
55-
09/23/2022 12:06:24 AM - dashboard: Sending message: Dashboard: Set Process SOIs [False, None, None, None]
56-
09/23/2022 12:06:24 AM - dashboard: Sending message: Dashboard: SOI Selection Mode 0
57-
09/23/2022 12:06:24 AM - dashboard: Received message: HIPRFISR: Connected TSI
58-
09/23/2022 12:06:24 AM - dashboard: Received message: HIPRFISR: Connected FGE
59-
09/23/2022 12:06:24 AM - dashboard: Received message: HIPRFISR: Connected PD
60-
09/23/2022 12:06:24 AM - hiprfisr: Received message: Dashboard: Set Process SOIs [False, None, None, None]
61-
09/23/2022 12:06:24 AM - hiprfisr: Executing Callback: setProcessSOIs with parameters [False, None, None, None]
62-
09/23/2022 12:06:24 AM - hiprfisr: Received message: Dashboard: SOI Selection Mode 0
63-
09/23/2022 12:06:24 AM - hiprfisr: Executing Callback: setSOI_SelectionMode with parameters 0
64-
09/23/2022 12:07:07 AM - dashboard: Sending message: Dashboard: Stop TSI Detector $Parameters
65-
09/23/2022 12:07:07 AM - dashboard: Sending message: Dashboard: Stop PD $Parameters
1+
09/25/2022 08:44:28 AM - dashboard: Port Initialized to tcp://127.0.0.1:5051
2+
09/25/2022 08:44:28 AM - dashboard: Initialized Schema: /home/user/FISSURE/YAML/dashboard.yaml
3+
09/25/2022 08:44:28 AM - dashboard: Port Initialized to tcp://127.0.0.1:5057
4+
09/25/2022 08:44:28 AM - dashboard: Initialized Schema: /home/user/FISSURE/YAML/dashboard.yaml
5+
09/25/2022 08:44:28 AM - dashboard: Port Connected to tcp://127.0.0.1:5055
6+
09/25/2022 08:44:28 AM - dashboard: Initialized Schema: /home/user/FISSURE/YAML/dashboard.yaml
7+
09/25/2022 08:44:28 AM - dashboard: Port Connected to tcp://127.0.0.1:5059
8+
09/25/2022 08:44:28 AM - dashboard: Port Connected to tcp://127.0.0.1:5060
9+
09/25/2022 08:44:28 AM - dashboard: Port Connected to tcp://127.0.0.1:5065
10+
09/25/2022 08:44:28 AM - dashboard: Port Connected to tcp://127.0.0.1:5061
11+
09/25/2022 08:44:28 AM - dashboard: Port Connected to tcp://127.0.0.1:5063
12+
09/25/2022 08:44:29 AM - hiprfisr: End of HIPRFISR Initialization
13+
09/25/2022 08:44:29 AM - hiprfisr: Port Connected to tcp://127.0.0.1:5051
14+
09/25/2022 08:44:29 AM - hiprfisr: Initialized Schema: /home/user/FISSURE/YAML/hiprfisr.yaml
15+
09/25/2022 08:44:29 AM - hiprfisr: Port Initialized to tcp://127.0.0.1:5052
16+
09/25/2022 08:44:29 AM - hiprfisr: Initialized Schema: /home/user/FISSURE/YAML/tsi.yaml
17+
09/25/2022 08:44:29 AM - hiprfisr: Port Initialized to tcp://127.0.0.1:5053
18+
09/25/2022 08:44:29 AM - hiprfisr: Initialized Schema: /home/user/FISSURE/YAML/fge.yaml
19+
09/25/2022 08:44:29 AM - hiprfisr: Port Initialized to tcp://127.0.0.1:5054
20+
09/25/2022 08:44:29 AM - hiprfisr: Initialized Schema: /home/user/FISSURE/YAML/hiprfisr.yaml
21+
09/25/2022 08:44:29 AM - hiprfisr: Port Initialized to tcp://127.0.0.1:5055
22+
09/25/2022 08:44:29 AM - hiprfisr: Initialized Schema: /home/user/FISSURE/YAML/hiprfisr.yaml
23+
09/25/2022 08:44:29 AM - hiprfisr: Port Connected to tcp://127.0.0.1:5057
24+
09/25/2022 08:44:29 AM - hiprfisr: Initialized Schema: /home/user/FISSURE/YAML/hiprfisr.yaml
25+
09/25/2022 08:44:29 AM - hiprfisr: Port Connected to tcp://127.0.0.1:5059
26+
09/25/2022 08:44:29 AM - hiprfisr: Port Connected to tcp://127.0.0.1:5060
27+
09/25/2022 08:44:29 AM - hiprfisr: Port Connected to tcp://127.0.0.1:5065
28+
09/25/2022 08:44:29 AM - hiprfisr: Port Connected to tcp://127.0.0.1:5061
29+
09/25/2022 08:44:29 AM - hiprfisr: Port Connected to tcp://127.0.0.1:5063
30+
09/25/2022 08:44:29 AM - hiprfisr: Start of Main Event Loop
31+
09/25/2022 08:44:29 AM - tsi: Port Connected to tcp://localhost:5052
32+
09/25/2022 08:44:29 AM - tsi: Initialized Schema: /home/user/FISSURE/YAML/tsi.yaml
33+
09/25/2022 08:44:29 AM - tsi: Port Initialized to tcp://*:5059
34+
09/25/2022 08:44:29 AM - fge: Port Connected to tcp://127.0.0.1:5053
35+
09/25/2022 08:44:29 AM - tsi: Initialized Schema: /home/user/FISSURE/YAML/tsi.yaml
36+
09/25/2022 08:44:29 AM - tsi: Port Connected to tcp://127.0.0.1:5055
37+
09/25/2022 08:44:29 AM - fge: Initialized Schema: /home/user/FISSURE/YAML/fge.yaml
38+
09/25/2022 08:44:29 AM - fge: Port Initialized to tcp://127.0.0.1:5061
39+
09/25/2022 08:44:29 AM - tsi: Initialized Schema: /home/user/FISSURE/YAML/tsi.yaml
40+
09/25/2022 08:44:29 AM - tsi: Port Connected to tcp://127.0.0.1:5057
41+
09/25/2022 08:44:29 AM - fge: Initialized Schema: /home/user/FISSURE/YAML/fge.yaml
42+
09/25/2022 08:44:29 AM - fge: Port Connected to tcp://127.0.0.1:5055
43+
09/25/2022 08:44:29 AM - fge: Initialized Schema: /home/user/FISSURE/YAML/fge.yaml
44+
09/25/2022 08:44:29 AM - fge: Port Connected to tcp://127.0.0.1:5057
45+
09/25/2022 08:44:30 AM - pd: Port Connected to tcp://127.0.0.1:5054
46+
09/25/2022 08:44:30 AM - pd: Initialized Schema: /home/user/FISSURE/YAML/pd.yaml
47+
09/25/2022 08:44:30 AM - pd: Port Initialized to tcp://127.0.0.1:5063
48+
09/25/2022 08:44:30 AM - pd: Initialized Schema: /home/user/FISSURE/YAML/pd.yaml
49+
09/25/2022 08:44:30 AM - pd: Port Connected to tcp://127.0.0.1:5055
50+
09/25/2022 08:44:30 AM - pd: Initialized Schema: /home/user/FISSURE/YAML/pd.yaml
51+
09/25/2022 08:44:30 AM - pd: Port Connected to tcp://127.0.0.1:5057
52+
09/25/2022 08:44:30 AM - dashboard: Sending message: Dashboard: Set Process SOIs [False, None, None, None]
53+
09/25/2022 08:44:30 AM - dashboard: Sending message: Dashboard: SOI Selection Mode 0
54+
09/25/2022 08:44:30 AM - hiprfisr: Received message: Dashboard: Set Process SOIs [False, None, None, None]
55+
09/25/2022 08:44:30 AM - hiprfisr: Executing Callback: setProcessSOIs with parameters [False, None, None, None]
56+
09/25/2022 08:44:30 AM - hiprfisr: Received message: Dashboard: SOI Selection Mode 0
57+
09/25/2022 08:44:30 AM - hiprfisr: Executing Callback: setSOI_SelectionMode with parameters 0
58+
09/25/2022 08:44:30 AM - hiprfisr: Sending message: HIPRFISR: Connected TSI
59+
09/25/2022 08:44:30 AM - hiprfisr: Sending message: HIPRFISR: Connected FGE
60+
09/25/2022 08:44:30 AM - hiprfisr: Sending message: HIPRFISR: Connected PD
61+
09/25/2022 08:44:31 AM - dashboard: Received message: HIPRFISR: Connected TSI
62+
09/25/2022 08:44:31 AM - dashboard: Received message: HIPRFISR: Connected FGE
63+
09/25/2022 08:44:31 AM - dashboard: Received message: HIPRFISR: Connected PD
64+
09/25/2022 08:44:47 AM - dashboard: Sending message: Dashboard: Stop TSI Detector $Parameters
65+
09/25/2022 08:44:47 AM - dashboard: Sending message: Dashboard: Stop PD $Parameters

‎UI/dashboard.ui

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28976,6 +28976,9 @@ p, li { white-space: pre-wrap; }
2897628976
</property>
2897728977
</action>
2897828978
<action name="actionIIO_Oscilloscope">
28979+
<property name="enabled">
28980+
<bool>false</bool>
28981+
</property>
2897928982
<property name="text">
2898028983
<string>IIO Oscilloscope</string>
2898128984
</property>

‎YAML/fissure_config.yaml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@ fft_sample_rate: 1e6
1818
fft_size: 4096
1919
fge_hiprfisr_dealer_port: 5053
2020
fge_pub_port: 5061
21-
hardware_archive: bladeRF 2.0
22-
hardware_attack: bladeRF 2.0
23-
hardware_daughterboard_archive: CBX-120
24-
hardware_daughterboard_attack: CBX-120
25-
hardware_daughterboard_iq: CBX-120
26-
hardware_daughterboard_pd: CBX-120
27-
hardware_daughterboard_tsi: CBX-120
21+
hardware_archive: ''
22+
hardware_attack: ''
23+
hardware_daughterboard_archive: ''
24+
hardware_daughterboard_attack: ''
25+
hardware_daughterboard_iq: ''
26+
hardware_daughterboard_pd: ''
27+
hardware_daughterboard_tsi: ''
2828
hardware_interface_archive: ''
2929
hardware_interface_attack: ''
3030
hardware_interface_iq: ''
@@ -35,14 +35,14 @@ hardware_ip_attack: ''
3535
hardware_ip_iq: ''
3636
hardware_ip_pd: ''
3737
hardware_ip_tsi: ''
38-
hardware_iq: bladeRF 2.0
39-
hardware_pd: bladeRF 2.0
38+
hardware_iq: ''
39+
hardware_pd: ''
4040
hardware_serial_archive: ''
4141
hardware_serial_attack: ''
4242
hardware_serial_iq: ''
4343
hardware_serial_pd: ''
4444
hardware_serial_tsi: ''
45-
hardware_tsi: bladeRF 2.0
45+
hardware_tsi: ''
4646
heartbeat_interval: 5
4747
hiprfisr_pub_port: 5055
4848
morse_code_amplitude_threshold: 0.5

0 commit comments

Comments
 (0)