Remove NRZ-I to prevent mixing with NRZ + Invert, clarify names. (#776)

* Change NRZ-I decoding from invert to differential encoding (see e.g. https://en.wikipedia.org/wiki/Non-return-to-zero). Fix #775 * skip bugged cython version * Remove "Non Return To Zero Inverted (NRZ-I)" due to contradictory definitions in literature. Co-authored-by: jopohl <[email protected]>
jopohl · May 19, 2020 · 1d3981c · 1d3981c
1 parent 749cf3d
commit 1d3981c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 7 deletions.
diff --git a/data/requirements.txt b/data/requirements.txt
@@ -3,4 +3,4 @@ numpy>=1.9,!=1.16.0; sys_platform == 'win32'
 pyqt5; sys_platform != 'win32'
 pyqt5!=5.14.2; sys_platform == 'win32'
 psutil
-cython
+cython!=0.29.18
diff --git a/src/urh/signalprocessing/Encoding.py b/src/urh/signalprocessing/Encoding.py
@@ -74,10 +74,6 @@ def name(self):
     def is_nrz(self) -> bool:
         return len(self.chain) <= 1
 
-    @property
-    def is_nrzi(self) -> bool:
-        return len(self.chain) == 2 and self.chain[1] == self.code_differential
-
     @property
     def contains_cut(self) -> bool:
         return self.code_cut in self.chain

diff --git a/src/urh/util/ProjectManager.py b/src/urh/util/ProjectManager.py
@@ -122,8 +122,8 @@ def load_decodings(self):
 
         fallback = [Encoding(["Non Return To Zero (NRZ)"]),
 
-                    Encoding(["Non Return To Zero Inverted (NRZ-I)",
-                              settings.DECODING_DIFFERENTIAL]),
+                    Encoding(["Non Return To Zero + Invert",
+                              settings.DECODING_INVERT]),
 
                     Encoding(["Manchester I",
                               settings.DECODING_EDGE]),