diff --git a/CHANGELOG.md b/CHANGELOG.md index e74a9fb7..8862e7e3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,14 @@ # Change Log All notable changes to this project will be documented in this file. +## 2022-09-25 + +Disabling IIO-Oscilloscope for Python2_maint-3.7 branch. + +### Changed + +- Disabled IIO-Oscilloscope for Python2_maint-3.7 due to its failure to install + ## 2022-09-23 Adding support for bladeRF 2.0 micro and updating existing bladeRF content. diff --git a/Installer/installer b/Installer/installer index 1bd3200a..62e9093c 100755 --- a/Installer/installer +++ b/Installer/installer @@ -295,13 +295,13 @@ programs_ubuntu18_04.append(('PlutoSDR', #cmake ./ #make #sudo make install -cd ~/Installed_by_FISSURE -git clone https://github.com/analogdevicesinc/iio-oscilloscope.git # IIO oscilloscope is optional -cd iio-oscilloscope -git checkout origin/master -mkdir build && cd build -cmake ../ && make -sudo make install +#cd ~/Installed_by_FISSURE +#git clone https://github.com/analogdevicesinc/iio-oscilloscope.git # IIO oscilloscope is optional +#cd iio-oscilloscope +#git checkout origin/master +#mkdir build && cd build +#cmake ../ && make +#sudo make install #cd ~/Installed_by_FISSURE # Did not work #git clone https://github.com/analogdevicesinc/gr-iio.git #cd gr-iio @@ -1838,13 +1838,13 @@ programs_ubuntu18_04_5.append(('PlutoSDR', #cmake ./ #make #sudo make install -cd ~/Installed_by_FISSURE -git clone https://github.com/analogdevicesinc/iio-oscilloscope.git # IIO oscilloscope is optional -cd iio-oscilloscope -git checkout origin/master -mkdir build && cd build -cmake ../ && make -sudo make install +#cd ~/Installed_by_FISSURE +#git clone https://github.com/analogdevicesinc/iio-oscilloscope.git # IIO oscilloscope is optional +#cd iio-oscilloscope +#git checkout origin/master +#mkdir build && cd build +#cmake ../ && make +#sudo make install #cd ~/Installed_by_FISSURE # Did not work #git clone https://github.com/analogdevicesinc/gr-iio.git #cd gr-iio @@ -3384,13 +3384,13 @@ programs_ubuntu18_04_6.append(('PlutoSDR', #cmake ./ #make #sudo make install -cd ~/Installed_by_FISSURE -git clone https://github.com/analogdevicesinc/iio-oscilloscope.git # IIO oscilloscope is optional -cd iio-oscilloscope -git checkout origin/master -mkdir build && cd build -cmake ../ && make -sudo make install +#cd ~/Installed_by_FISSURE +#git clone https://github.com/analogdevicesinc/iio-oscilloscope.git # IIO oscilloscope is optional +#cd iio-oscilloscope +#git checkout origin/master +#mkdir build && cd build +#cmake ../ && make +#sudo make install #cd ~/Installed_by_FISSURE # Did not work #git clone https://github.com/analogdevicesinc/gr-iio.git #cd gr-iio diff --git a/Logs/event.log b/Logs/event.log index 6a98cb9c..a0a5c1c8 100644 --- a/Logs/event.log +++ b/Logs/event.log @@ -1,65 +1,65 @@ -09/23/2022 12:06:21 AM - dashboard: Port Initialized to tcp://127.0.0.1:5051 -09/23/2022 12:06:21 AM - dashboard: Initialized Schema: /home/user/FISSURE/YAML/dashboard.yaml -09/23/2022 12:06:21 AM - dashboard: Port Initialized to tcp://127.0.0.1:5057 -09/23/2022 12:06:21 AM - dashboard: Initialized Schema: /home/user/FISSURE/YAML/dashboard.yaml -09/23/2022 12:06:21 AM - dashboard: Port Connected to tcp://127.0.0.1:5055 -09/23/2022 12:06:21 AM - dashboard: Initialized Schema: /home/user/FISSURE/YAML/dashboard.yaml -09/23/2022 12:06:21 AM - dashboard: Port Connected to tcp://127.0.0.1:5059 -09/23/2022 12:06:21 AM - dashboard: Port Connected to tcp://127.0.0.1:5060 -09/23/2022 12:06:21 AM - dashboard: Port Connected to tcp://127.0.0.1:5065 -09/23/2022 12:06:21 AM - dashboard: Port Connected to tcp://127.0.0.1:5061 -09/23/2022 12:06:21 AM - dashboard: Port Connected to tcp://127.0.0.1:5063 -09/23/2022 12:06:22 AM - hiprfisr: End of HIPRFISR Initialization -09/23/2022 12:06:22 AM - hiprfisr: Port Connected to tcp://127.0.0.1:5051 -09/23/2022 12:06:22 AM - hiprfisr: Initialized Schema: /home/user/FISSURE/YAML/hiprfisr.yaml -09/23/2022 12:06:22 AM - hiprfisr: Port Initialized to tcp://127.0.0.1:5052 -09/23/2022 12:06:22 AM - hiprfisr: Initialized Schema: /home/user/FISSURE/YAML/tsi.yaml -09/23/2022 12:06:22 AM - hiprfisr: Port Initialized to tcp://127.0.0.1:5053 -09/23/2022 12:06:22 AM - hiprfisr: Initialized Schema: /home/user/FISSURE/YAML/fge.yaml -09/23/2022 12:06:22 AM - hiprfisr: Port Initialized to tcp://127.0.0.1:5054 -09/23/2022 12:06:22 AM - hiprfisr: Initialized Schema: /home/user/FISSURE/YAML/hiprfisr.yaml -09/23/2022 12:06:22 AM - hiprfisr: Port Initialized to tcp://127.0.0.1:5055 -09/23/2022 12:06:22 AM - hiprfisr: Initialized Schema: /home/user/FISSURE/YAML/hiprfisr.yaml -09/23/2022 12:06:22 AM - hiprfisr: Port Connected to tcp://127.0.0.1:5057 -09/23/2022 12:06:22 AM - hiprfisr: Initialized Schema: /home/user/FISSURE/YAML/hiprfisr.yaml -09/23/2022 12:06:22 AM - hiprfisr: Port Connected to tcp://127.0.0.1:5059 -09/23/2022 12:06:22 AM - hiprfisr: Port Connected to tcp://127.0.0.1:5060 -09/23/2022 12:06:22 AM - hiprfisr: Port Connected to tcp://127.0.0.1:5065 -09/23/2022 12:06:22 AM - hiprfisr: Port Connected to tcp://127.0.0.1:5061 -09/23/2022 12:06:22 AM - hiprfisr: Port Connected to tcp://127.0.0.1:5063 -09/23/2022 12:06:22 AM - hiprfisr: Start of Main Event Loop -09/23/2022 12:06:22 AM - tsi: Port Connected to tcp://localhost:5052 -09/23/2022 12:06:22 AM - tsi: Initialized Schema: /home/user/FISSURE/YAML/tsi.yaml -09/23/2022 12:06:22 AM - tsi: Port Initialized to tcp://*:5059 -09/23/2022 12:06:22 AM - tsi: Initialized Schema: /home/user/FISSURE/YAML/tsi.yaml -09/23/2022 12:06:22 AM - tsi: Port Connected to tcp://127.0.0.1:5055 -09/23/2022 12:06:22 AM - tsi: Initialized Schema: /home/user/FISSURE/YAML/tsi.yaml -09/23/2022 12:06:22 AM - tsi: Port Connected to tcp://127.0.0.1:5057 -09/23/2022 12:06:22 AM - fge: Port Connected to tcp://127.0.0.1:5053 -09/23/2022 12:06:22 AM - fge: Initialized Schema: /home/user/FISSURE/YAML/fge.yaml -09/23/2022 12:06:22 AM - fge: Port Initialized to tcp://127.0.0.1:5061 -09/23/2022 12:06:22 AM - fge: Initialized Schema: /home/user/FISSURE/YAML/fge.yaml -09/23/2022 12:06:22 AM - fge: Port Connected to tcp://127.0.0.1:5055 -09/23/2022 12:06:23 AM - fge: Initialized Schema: /home/user/FISSURE/YAML/fge.yaml -09/23/2022 12:06:23 AM - fge: Port Connected to tcp://127.0.0.1:5057 -09/23/2022 12:06:23 AM - pd: Port Connected to tcp://127.0.0.1:5054 -09/23/2022 12:06:23 AM - pd: Initialized Schema: /home/user/FISSURE/YAML/pd.yaml -09/23/2022 12:06:23 AM - pd: Port Initialized to tcp://127.0.0.1:5063 -09/23/2022 12:06:23 AM - pd: Initialized Schema: /home/user/FISSURE/YAML/pd.yaml -09/23/2022 12:06:23 AM - pd: Port Connected to tcp://127.0.0.1:5055 -09/23/2022 12:06:23 AM - pd: Initialized Schema: /home/user/FISSURE/YAML/pd.yaml -09/23/2022 12:06:23 AM - pd: Port Connected to tcp://127.0.0.1:5057 -09/23/2022 12:06:23 AM - hiprfisr: Sending message: HIPRFISR: Connected TSI -09/23/2022 12:06:23 AM - hiprfisr: Sending message: HIPRFISR: Connected FGE -09/23/2022 12:06:23 AM - hiprfisr: Sending message: HIPRFISR: Connected PD -09/23/2022 12:06:24 AM - dashboard: Sending message: Dashboard: Set Process SOIs [False, None, None, None] -09/23/2022 12:06:24 AM - dashboard: Sending message: Dashboard: SOI Selection Mode 0 -09/23/2022 12:06:24 AM - dashboard: Received message: HIPRFISR: Connected TSI -09/23/2022 12:06:24 AM - dashboard: Received message: HIPRFISR: Connected FGE -09/23/2022 12:06:24 AM - dashboard: Received message: HIPRFISR: Connected PD -09/23/2022 12:06:24 AM - hiprfisr: Received message: Dashboard: Set Process SOIs [False, None, None, None] -09/23/2022 12:06:24 AM - hiprfisr: Executing Callback: setProcessSOIs with parameters [False, None, None, None] -09/23/2022 12:06:24 AM - hiprfisr: Received message: Dashboard: SOI Selection Mode 0 -09/23/2022 12:06:24 AM - hiprfisr: Executing Callback: setSOI_SelectionMode with parameters 0 -09/23/2022 12:07:07 AM - dashboard: Sending message: Dashboard: Stop TSI Detector $Parameters -09/23/2022 12:07:07 AM - dashboard: Sending message: Dashboard: Stop PD $Parameters +09/25/2022 08:44:28 AM - dashboard: Port Initialized to tcp://127.0.0.1:5051 +09/25/2022 08:44:28 AM - dashboard: Initialized Schema: /home/user/FISSURE/YAML/dashboard.yaml +09/25/2022 08:44:28 AM - dashboard: Port Initialized to tcp://127.0.0.1:5057 +09/25/2022 08:44:28 AM - dashboard: Initialized Schema: /home/user/FISSURE/YAML/dashboard.yaml +09/25/2022 08:44:28 AM - dashboard: Port Connected to tcp://127.0.0.1:5055 +09/25/2022 08:44:28 AM - dashboard: Initialized Schema: /home/user/FISSURE/YAML/dashboard.yaml +09/25/2022 08:44:28 AM - dashboard: Port Connected to tcp://127.0.0.1:5059 +09/25/2022 08:44:28 AM - dashboard: Port Connected to tcp://127.0.0.1:5060 +09/25/2022 08:44:28 AM - dashboard: Port Connected to tcp://127.0.0.1:5065 +09/25/2022 08:44:28 AM - dashboard: Port Connected to tcp://127.0.0.1:5061 +09/25/2022 08:44:28 AM - dashboard: Port Connected to tcp://127.0.0.1:5063 +09/25/2022 08:44:29 AM - hiprfisr: End of HIPRFISR Initialization +09/25/2022 08:44:29 AM - hiprfisr: Port Connected to tcp://127.0.0.1:5051 +09/25/2022 08:44:29 AM - hiprfisr: Initialized Schema: /home/user/FISSURE/YAML/hiprfisr.yaml +09/25/2022 08:44:29 AM - hiprfisr: Port Initialized to tcp://127.0.0.1:5052 +09/25/2022 08:44:29 AM - hiprfisr: Initialized Schema: /home/user/FISSURE/YAML/tsi.yaml +09/25/2022 08:44:29 AM - hiprfisr: Port Initialized to tcp://127.0.0.1:5053 +09/25/2022 08:44:29 AM - hiprfisr: Initialized Schema: /home/user/FISSURE/YAML/fge.yaml +09/25/2022 08:44:29 AM - hiprfisr: Port Initialized to tcp://127.0.0.1:5054 +09/25/2022 08:44:29 AM - hiprfisr: Initialized Schema: /home/user/FISSURE/YAML/hiprfisr.yaml +09/25/2022 08:44:29 AM - hiprfisr: Port Initialized to tcp://127.0.0.1:5055 +09/25/2022 08:44:29 AM - hiprfisr: Initialized Schema: /home/user/FISSURE/YAML/hiprfisr.yaml +09/25/2022 08:44:29 AM - hiprfisr: Port Connected to tcp://127.0.0.1:5057 +09/25/2022 08:44:29 AM - hiprfisr: Initialized Schema: /home/user/FISSURE/YAML/hiprfisr.yaml +09/25/2022 08:44:29 AM - hiprfisr: Port Connected to tcp://127.0.0.1:5059 +09/25/2022 08:44:29 AM - hiprfisr: Port Connected to tcp://127.0.0.1:5060 +09/25/2022 08:44:29 AM - hiprfisr: Port Connected to tcp://127.0.0.1:5065 +09/25/2022 08:44:29 AM - hiprfisr: Port Connected to tcp://127.0.0.1:5061 +09/25/2022 08:44:29 AM - hiprfisr: Port Connected to tcp://127.0.0.1:5063 +09/25/2022 08:44:29 AM - hiprfisr: Start of Main Event Loop +09/25/2022 08:44:29 AM - tsi: Port Connected to tcp://localhost:5052 +09/25/2022 08:44:29 AM - tsi: Initialized Schema: /home/user/FISSURE/YAML/tsi.yaml +09/25/2022 08:44:29 AM - tsi: Port Initialized to tcp://*:5059 +09/25/2022 08:44:29 AM - fge: Port Connected to tcp://127.0.0.1:5053 +09/25/2022 08:44:29 AM - tsi: Initialized Schema: /home/user/FISSURE/YAML/tsi.yaml +09/25/2022 08:44:29 AM - tsi: Port Connected to tcp://127.0.0.1:5055 +09/25/2022 08:44:29 AM - fge: Initialized Schema: /home/user/FISSURE/YAML/fge.yaml +09/25/2022 08:44:29 AM - fge: Port Initialized to tcp://127.0.0.1:5061 +09/25/2022 08:44:29 AM - tsi: Initialized Schema: /home/user/FISSURE/YAML/tsi.yaml +09/25/2022 08:44:29 AM - tsi: Port Connected to tcp://127.0.0.1:5057 +09/25/2022 08:44:29 AM - fge: Initialized Schema: /home/user/FISSURE/YAML/fge.yaml +09/25/2022 08:44:29 AM - fge: Port Connected to tcp://127.0.0.1:5055 +09/25/2022 08:44:29 AM - fge: Initialized Schema: /home/user/FISSURE/YAML/fge.yaml +09/25/2022 08:44:29 AM - fge: Port Connected to tcp://127.0.0.1:5057 +09/25/2022 08:44:30 AM - pd: Port Connected to tcp://127.0.0.1:5054 +09/25/2022 08:44:30 AM - pd: Initialized Schema: /home/user/FISSURE/YAML/pd.yaml +09/25/2022 08:44:30 AM - pd: Port Initialized to tcp://127.0.0.1:5063 +09/25/2022 08:44:30 AM - pd: Initialized Schema: /home/user/FISSURE/YAML/pd.yaml +09/25/2022 08:44:30 AM - pd: Port Connected to tcp://127.0.0.1:5055 +09/25/2022 08:44:30 AM - pd: Initialized Schema: /home/user/FISSURE/YAML/pd.yaml +09/25/2022 08:44:30 AM - pd: Port Connected to tcp://127.0.0.1:5057 +09/25/2022 08:44:30 AM - dashboard: Sending message: Dashboard: Set Process SOIs [False, None, None, None] +09/25/2022 08:44:30 AM - dashboard: Sending message: Dashboard: SOI Selection Mode 0 +09/25/2022 08:44:30 AM - hiprfisr: Received message: Dashboard: Set Process SOIs [False, None, None, None] +09/25/2022 08:44:30 AM - hiprfisr: Executing Callback: setProcessSOIs with parameters [False, None, None, None] +09/25/2022 08:44:30 AM - hiprfisr: Received message: Dashboard: SOI Selection Mode 0 +09/25/2022 08:44:30 AM - hiprfisr: Executing Callback: setSOI_SelectionMode with parameters 0 +09/25/2022 08:44:30 AM - hiprfisr: Sending message: HIPRFISR: Connected TSI +09/25/2022 08:44:30 AM - hiprfisr: Sending message: HIPRFISR: Connected FGE +09/25/2022 08:44:30 AM - hiprfisr: Sending message: HIPRFISR: Connected PD +09/25/2022 08:44:31 AM - dashboard: Received message: HIPRFISR: Connected TSI +09/25/2022 08:44:31 AM - dashboard: Received message: HIPRFISR: Connected FGE +09/25/2022 08:44:31 AM - dashboard: Received message: HIPRFISR: Connected PD +09/25/2022 08:44:47 AM - dashboard: Sending message: Dashboard: Stop TSI Detector $Parameters +09/25/2022 08:44:47 AM - dashboard: Sending message: Dashboard: Stop PD $Parameters diff --git a/UI/dashboard.ui b/UI/dashboard.ui index 10816bf6..c58a6090 100644 --- a/UI/dashboard.ui +++ b/UI/dashboard.ui @@ -28976,6 +28976,9 @@ p, li { white-space: pre-wrap; } + + false + IIO Oscilloscope diff --git a/YAML/fissure_config.yaml b/YAML/fissure_config.yaml index 7139f587..1f1fd23f 100644 --- a/YAML/fissure_config.yaml +++ b/YAML/fissure_config.yaml @@ -18,13 +18,13 @@ fft_sample_rate: 1e6 fft_size: 4096 fge_hiprfisr_dealer_port: 5053 fge_pub_port: 5061 -hardware_archive: bladeRF 2.0 -hardware_attack: bladeRF 2.0 -hardware_daughterboard_archive: CBX-120 -hardware_daughterboard_attack: CBX-120 -hardware_daughterboard_iq: CBX-120 -hardware_daughterboard_pd: CBX-120 -hardware_daughterboard_tsi: CBX-120 +hardware_archive: '' +hardware_attack: '' +hardware_daughterboard_archive: '' +hardware_daughterboard_attack: '' +hardware_daughterboard_iq: '' +hardware_daughterboard_pd: '' +hardware_daughterboard_tsi: '' hardware_interface_archive: '' hardware_interface_attack: '' hardware_interface_iq: '' @@ -35,14 +35,14 @@ hardware_ip_attack: '' hardware_ip_iq: '' hardware_ip_pd: '' hardware_ip_tsi: '' -hardware_iq: bladeRF 2.0 -hardware_pd: bladeRF 2.0 +hardware_iq: '' +hardware_pd: '' hardware_serial_archive: '' hardware_serial_attack: '' hardware_serial_iq: '' hardware_serial_pd: '' hardware_serial_tsi: '' -hardware_tsi: bladeRF 2.0 +hardware_tsi: '' heartbeat_interval: 5 hiprfisr_pub_port: 5055 morse_code_amplitude_threshold: 0.5