Merge pull request #471 from qqice/master

Add support for JP 6.0DP
rbonghi · Dec 25, 2023 · f4e6c61 · f4e6c61
2 parents dc1cd8e + 58cf21d
commit f4e6c61
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/jtop/core/jetson_variables.py b/jtop/core/jetson_variables.py
@@ -41,6 +41,8 @@
 # Write version of jetpack installed
 # https://developer.nvidia.com/embedded/jetpack-archive
 NVIDIA_JETPACK = {
+    # -------- JP6 --------
+    "36.2.0": "6.0 DP",
     # -------- JP5 --------
     "35.4.1": "5.1.2",
     "35.3.1": "5.1.1",
@@ -104,6 +106,7 @@
 
 
 CUDA_TABLE = {
+    'tegra234': '8.7',
     'tegra23x': '8.7',  # JETSON ORIN - tegra234
     'tegra194': '7.2',  # JETSON XAVIER
     'tegra186': '6.2',  # JETSON TX2

diff --git a/jtop/core/memory.py b/jtop/core/memory.py
@@ -24,7 +24,7 @@
 import subprocess as sp
 from .processes import read_process_table
 from .engine import read_engine
-from .common import cat, GenericInterface
+from .common import cat, check_file, GenericInterface
 from .command import Command
 # Create logger
 logger = logging.getLogger(__name__)
@@ -425,7 +425,10 @@ def get_status(self, mem_total):
             memory['EMC']['online'] = True
             # Percentage utilization
             # https://forums.developer.nvidia.com/t/real-time-emc-bandwidth-with-sysfs/107479/3
-            utilization = int(cat(self._root_path + "/actmon_avg_activity/mc_all"))
+            if check_file(self._root_path + "/debug/cactmon/mc_all"):
+                utilization = int(cat(self._root_path + "/debug/cactmon/mc_all"))
+            else:
+                utilization = int(cat(self._root_path + "/actmon_avg_activity/mc_all"))
             memory['EMC']['val'] = utilization // memory['EMC']['cur']
         # Read IRAM if available
         if os.path.isdir(self._root_path + "/debug/nvmap/iram"):

diff --git a/jtop/core/temperature.py b/jtop/core/temperature.py
@@ -36,6 +36,8 @@ def read_temperature(data):
         except OSError:
             # If negative sensor offline
             values[name] = TEMPERATURE_OFFLINE
+        except ValueError:
+            values[name] = TEMPERATURE_OFFLINE
     return values