Installer updates, gr-tpms_poore update

CHANGELOG.md

@@ -1,6 +1,26 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
+## 2022-08-27
+
+DragonOS and Ubuntu 22.04 are still in beta status. They are under development and several features are known to be missing. Several items in the installer might conflict with existing programs or fail to install until the status is removed.
+
+### Added
+
+- maint-3.10 out-of-tree modules in Custom Blocks folder and the installer; still missing: gr-ainfosec, gr-fuzzer, gr-bluetooth, gr-limesdr(?)
+- Ask to proceed before installing PyQt4/5 and other programs with the first installer program
+- DragonOS Focal install option, software items are still being tested, check back later for a full verified list
+
+### Changed
+
+- SoftwareAndConflicts 22.04 OOT status
+- README to expand on beta status for operating systems
+
+### Fixed
+
+- Updated Python2 branch to the latest gr-tpms_poore for better error handling
+- Fixed 20.04 variable for Enscribe in 22.04 section of the installer
+
 ## 2022-08-25
 
 ### Added

Custom_Blocks/maint-3.7/gr-tpms_poore-maint-3.7/README.md

@@ -2,12 +2,14 @@
 
 This GNU Radio out-of-tree module transmits and receives Tire Pressure Monitoring System (TPMS) signals for the sensor on my car. More sensors and SDRs might be supported/tested in the future. This all works fine for me when I transmit from the driver's seat and when I receive next to the target tire with either a USRP B210 or B205mini using the standard HackRF antenna.
 
+This software has been integrated into [FISSURE: The RF Framework](https://github.com/ainfosec/FISSURE).
+
 # Installation
 
-The maint-3.7 branch is for GNU Radio versions prior to 3.8 while the maint-3.8 is for versions 3.8+.
+The maint-3.7 branch is for GNU Radio versions prior to 3.8 while the maint-3.8 is for version 3.8 and the maint-3.10 is for version >= 3.10.
 
 ```
-sudo python -m pip install crcmod
+sudo python2 -m pip install crcmod
 cd gr-tpms_poore/
 mkdir build
 cd build

Custom_Blocks/maint-3.7/gr-tpms_poore-maint-3.7/python/decoder.py

@@ -101,8 +101,8 @@ def work(self, input_items, output_items):
                 get_message = self.decodeBitstream(get_bits)
 
                 # Print to Output Port
-                self.message_port_pub(pmt.intern("out"), pmt.to_pmt(get_message))
-
+                if get_message != "-1":
+                    self.message_port_pub(pmt.intern("out"), pmt.to_pmt(get_message))
 
             # Reset
             self.start_tag = 0

Help/Markdown/SoftwareAndConflicts.md

@@ -26,14 +26,14 @@ The following is a table of the major software tools that have been proven to wo
 | GQRX | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
 | gr-acars | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
 | gr-adsb | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :question: | :question: | :question: |
-| gr-ainfosec | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
+| gr-ainfosec | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :question: |
 | gr-air-modes | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
 | gr-ais | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
-| gr-bluetooth | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
+| gr-bluetooth | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :question: |
 | gr-clapper_plus | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
 | gr-dect2 | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
 | gr-foo | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
-| gr-fuzzer | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
+| gr-fuzzer | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :question: |
 | gr-garage_door | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
 | gr-gsm | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
 | gr-ieee802-11 | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |

Help/SoftwareAndConflicts.html

@@ -325,7 +325,7 @@ <h1><a id="user-content-third-party-software" class="anchor" aria-hidden="true"
 <td align="center"><g-emoji class="g-emoji" alias="heavy_check_mark" fallback-src="https://github.githubassets.com/images/icons/emoji/unicode/2714.png">✔️</g-emoji></td>
 <td align="center"><g-emoji class="g-emoji" alias="heavy_check_mark" fallback-src="https://github.githubassets.com/images/icons/emoji/unicode/2714.png">✔️</g-emoji></td>
 <td align="center"><g-emoji class="g-emoji" alias="heavy_check_mark" fallback-src="https://github.githubassets.com/images/icons/emoji/unicode/2714.png">✔️</g-emoji></td>
-<td align="center"><g-emoji class="g-emoji" alias="heavy_check_mark" fallback-src="https://github.githubassets.com/images/icons/emoji/unicode/2714.png">✔️</g-emoji></td>
+<td align="center"><g-emoji class="g-emoji" alias="question" fallback-src="https://github.githubassets.com/images/icons/emoji/unicode/2753.png">❓</g-emoji></td>
 </tr>
 <tr>
 <td>gr-air-modes</td>
@@ -352,7 +352,7 @@ <h1><a id="user-content-third-party-software" class="anchor" aria-hidden="true"
 <td align="center"><g-emoji class="g-emoji" alias="heavy_check_mark" fallback-src="https://github.githubassets.com/images/icons/emoji/unicode/2714.png">✔️</g-emoji></td>
 <td align="center"><g-emoji class="g-emoji" alias="heavy_check_mark" fallback-src="https://github.githubassets.com/images/icons/emoji/unicode/2714.png">✔️</g-emoji></td>
 <td align="center"><g-emoji class="g-emoji" alias="heavy_check_mark" fallback-src="https://github.githubassets.com/images/icons/emoji/unicode/2714.png">✔️</g-emoji></td>
-<td align="center"><g-emoji class="g-emoji" alias="heavy_check_mark" fallback-src="https://github.githubassets.com/images/icons/emoji/unicode/2714.png">✔️</g-emoji></td>
+<td align="center"><g-emoji class="g-emoji" alias="question" fallback-src="https://github.githubassets.com/images/icons/emoji/unicode/2753.png">❓</g-emoji></td>
 </tr>
 <tr>
 <td>gr-clapper_plus</td>
@@ -388,7 +388,7 @@ <h1><a id="user-content-third-party-software" class="anchor" aria-hidden="true"
 <td align="center"><g-emoji class="g-emoji" alias="heavy_check_mark" fallback-src="https://github.githubassets.com/images/icons/emoji/unicode/2714.png">✔️</g-emoji></td>
 <td align="center"><g-emoji class="g-emoji" alias="heavy_check_mark" fallback-src="https://github.githubassets.com/images/icons/emoji/unicode/2714.png">✔️</g-emoji></td>
 <td align="center"><g-emoji class="g-emoji" alias="heavy_check_mark" fallback-src="https://github.githubassets.com/images/icons/emoji/unicode/2714.png">✔️</g-emoji></td>
-<td align="center"><g-emoji class="g-emoji" alias="heavy_check_mark" fallback-src="https://github.githubassets.com/images/icons/emoji/unicode/2714.png">✔️</g-emoji></td>
+<td align="center"><g-emoji class="g-emoji" alias="question" fallback-src="https://github.githubassets.com/images/icons/emoji/unicode/2753.png">❓</g-emoji></td>
 </tr>
 <tr>
 <td>gr-garage_door</td>

README.md

@@ -22,8 +22,12 @@ Operating System            |  FISSURE Branch
 | Ubuntu 20.04.4 (x64) | Python3_maint-3.8 |
 
 **In-Progress (beta)**
+
+These operating systems are still in beta status. They are under development and several features are known to be missing. Several items in the installer might conflict with existing programs or fail to install until the status is removed.
+
 Operating System            |  FISSURE Branch
 :-------------------------:|:-------------------------:
+| DragonOS Focal (x86_64) | Python3_maint-3.8 |
 | Ubuntu 22.04 (x64) | Python3_maint-3.8 |
 
 Note: Certain software tools do not work for every OS. Refer to [Software And Conflicts](/Help/Markdown/SoftwareAndConflicts.md)
@@ -36,7 +40,7 @@ git checkout <Python2_maint-3.7> or <Python3_maint-3.8>
 ./install
 ```
 
-This will automatically install PyQt software dependencies required to launch the installation GUIs if they are not found. 
+This will install PyQt software dependencies required to launch the installation GUIs if they are not found. 
 
 Next, select the option that best matches your operating system (should be detected automatically if your OS matches an option).
 

install

@@ -19,33 +19,66 @@ then
     exit
 fi
 
+dragonOS_focal=$(lsb_release -d 2>&1 | grep "DragonOS Focal")
+if [[ -n "$dragonOS_focal" ]]
+then
+    # DragonOS Focal
+    echo "DragonOS Focal detected"
+    echo "This branch is for Ubuntu 18.04, 18.04.5 and 18.04.6 only. Switch to a different FISSURE branch before installing!"
+    exit
+fi
+
 python_version=$(python -V 2>&1 | grep -Po '(?<=Python )(.+)')
 if [[ -z "$python_version" ]]
 then
     # Ubuntu 18.04
     echo "No Python!" 
-    sudo apt-get -y update
-    sudo apt-get install -y python-setuptools python-dev build-essential        
+    read -p "Python2 is required to open the installer. Do you want to proceed? [y]/n: " yn1
+    case $yn1 in
+        # No
+        [Nn]* ) exit;;
+
+        # Yes/Everything Else
+        * )
+            sudo apt-get -y update
+            sudo apt-get install -y python-setuptools python-dev build-essential     
+        ;;
+    esac
 fi
 
 qt4_version=$(ls /usr/lib/python2.7/dist-packages/ | grep PyQt4)
 if [[ -z "$qt4_version" ]]
 then
     # Ubuntu 18.04
     echo "No Qt4!"
-    sudo apt-get -y install python-qt4
+    read -p "Qt4 is required to open the installer. Do you want to proceed? [y]/n: " yn2
+    case $yn2 in
+        # No
+        [Nn]* ) exit;;
+
+        # Yes/Everything Else
+        * )
+            sudo apt-get -y install python-qt4 
+        ;;
+    esac    
 fi
 
 get_libcanberra=$(locate libcanberra-gtk-module.so 2>&1 | grep "libcanberra-gtk-module.so")
-if [[ -z "$get_libcanberra" ]]
+if [[ -z "$get_libcanberra111" ]]
 then
     # Ubuntu 18.04
     echo "No libcanberra-gtk-module!"
-    sudo apt-get install -y libcanberra-gtk-module
+    read -p "libcanberra is required to open the installer. Do you want to proceed? [y]/n: " yn3
+    case $yn3 in
+        # No
+        [Nn]* ) exit;;
+
+        # Yes/Everything Else
+        * )
+            sudo apt-get install -y libcanberra-gtk-module
+        ;;
+    esac        
 fi
 
-
 DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd)
 $DIR/Installer/installer
-#gnome-terminal -- $DIR/Installer/install  # does a new terminal fix python2 import checks in the next GUI?
-