Detect RT95/VOX

chirp/bitwise.py

@@ -64,8 +64,6 @@
 import re
 import warnings
 
-from builtins import bytes
-
 from chirp import bitwise_grammar
 
 LOG = logging.getLogger(__name__)

chirp/chirp_common.py

@@ -13,8 +13,6 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from builtins import bytes
-
 import base64
 import json
 import inspect
@@ -1389,9 +1387,11 @@ def load(self, filename):
         pass
 
 
-class DetectableInterface:
-    DETECTED_MODELS = None
+def class_detected_models_attribute(cls):
+    return 'DETECTED_MODELS_%s' % cls.__name__
 
+
+class DetectableInterface:
     @classmethod
     def detect_from_serial(cls, pipe):
         """Communicate with the radio via serial to determine proper class
@@ -1400,14 +1400,28 @@ def detect_from_serial(cls, pipe):
         RadioError if not. If NotImplemented is raised, we assume that no
         detection is possible or necessary.
         """
-        assert cls.DETECTED_MODELS is None, (
+        detected = getattr(cls, class_detected_models_attribute(cls), None)
+        assert detected is None, (
             'Class has detected models but no detect_from_serial() '
             'implementation')
         raise NotImplementedError()
 
     @classmethod
-    def detected_models(cls):
-        return list(cls.DETECTED_MODELS or [])
+    def detected_models(cls, include_self=True):
+        detected = getattr(cls, class_detected_models_attribute(cls), [])
+        # Only include this class if it is registered
+        if include_self and hasattr(cls, '_DETECTED_BY'):
+            extra = [cls]
+        else:
+            extra = []
+        return extra + list(detected)
+
+    @classmethod
+    def detect_model(cls, detected_cls):
+        detected_attr = class_detected_models_attribute(cls)
+        if getattr(cls, detected_attr, None) is None:
+            setattr(cls, detected_attr, [])
+        getattr(cls, detected_attr).append(detected_cls)
 
 
 class CloneModeRadio(FileBackedRadio, ExternalMemoryProperties,

chirp/directory.py

@@ -63,8 +63,8 @@ def register(cls):
     DRV_TO_RADIO[ident] = cls
     RADIO_TO_DRV[cls] = ident
 
-    if not hasattr(cls, '_DETECTED_MODEL'):
-        cls._DETECTED_MODEL = False
+    if not hasattr(cls, '_DETECTED_BY'):
+        cls._DETECTED_BY = None
 
     return cls
 
@@ -81,10 +81,8 @@ def detected_by(manager_class):
     def wrapper(cls):
         assert issubclass(cls, chirp_common.CloneModeRadio)
 
-        cls._DETECTED_MODEL = True
-        if manager_class.DETECTED_MODELS is None:
-            manager_class.DETECTED_MODELS = []
-        manager_class.DETECTED_MODELS.append(cls)
+        cls._DETECTED_BY = manager_class
+        manager_class.detect_model(cls)
         return cls
 
     return wrapper