mpm: CMake cleanup, Python code enhancements

- Send user defined data in ping
- Improve rpc_shell, add mpm_debug.py, fix tracebacks in multiprocessing

5 files changed, 90 insertions, 1 deletions

diff --git a/mpm/python/usrp_mpm/dboard_manager/CMakeLists.txt b/mpm/python/usrp_mpm/dboard_manager/CMakeLists.txt
new file mode 100644
index 000000000..b642d506e
--- /dev/null
+++ b/mpm/python/usrp_mpm/dboard_manager/CMakeLists.txt
@@ -0,0 +1,30 @@
+#
+# Copyright 2017 Ettus Research (National Instruments)
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+########################################################################
+# This file included, use CMake directory variables
+########################################################################
+SET(USRP_MPM_FILES ${USRP_MPM_FILES})
+SET(USRP_MPM_DBMGR_FILES
+    ${CMAKE_CURRENT_SOURCE_DIR}/__init__.py
+    ${CMAKE_CURRENT_SOURCE_DIR}/base.py
+    ${CMAKE_CURRENT_SOURCE_DIR}/magnesium.py
+    ${CMAKE_CURRENT_SOURCE_DIR}/eiscat.py
+    ${CMAKE_CURRENT_SOURCE_DIR}/unknown.py
+    )
+LIST(APPEND USRP_MPM_FILES ${USRP_MPM_DBMGR_FILES})
+SET(USRP_MPM_FILES ${USRP_MPM_FILES} PARENT_SCOPE)
diff --git a/mpm/python/usrp_mpm/dboard_manager/__init__.py b/mpm/python/usrp_mpm/dboard_manager/__init__.py
index 774f348d4..02746e78f 100644
--- a/mpm/python/usrp_mpm/dboard_manager/__init__.py
+++ b/mpm/python/usrp_mpm/dboard_manager/__init__.py
@@ -20,6 +20,7 @@ dboards module __init__.py
 from .. import libpyusrp_periphs as lib
 from magnesium import magnesium
 from eiscat import eiscat
+from test import test
 from unknown import unknown
 
 hw_pids = {
diff --git a/mpm/python/usrp_mpm/dboard_manager/base.py b/mpm/python/usrp_mpm/dboard_manager/base.py
index bf0a115cc..257a2424d 100644
--- a/mpm/python/usrp_mpm/dboard_manager/base.py
+++ b/mpm/python/usrp_mpm/dboard_manager/base.py
@@ -30,6 +30,7 @@ class dboard_manager(object):
     Sanitizes arguments before calling C++ functions.
     Ties various constants to specific daughterboard class
     """
+    _eeprom = {}
     def __init__(self, eeprom={}):
         self._eeprom = eeprom
 
diff --git a/mpm/python/usrp_mpm/dboard_manager/magnesium.py b/mpm/python/usrp_mpm/dboard_manager/magnesium.py
index 2201064ad..d48768208 100644
--- a/mpm/python/usrp_mpm/dboard_manager/magnesium.py
+++ b/mpm/python/usrp_mpm/dboard_manager/magnesium.py
@@ -20,6 +20,7 @@ magnesium dboard implementation module
 from base import dboard_manager
 from base import lib
 from base import log
+import struct
 
 class magnesium(dboard_manager):
     hw_pid = 2
@@ -47,4 +48,3 @@ class magnesium(dboard_manager):
         # magnesium eeprom contains
         # nothing
         return struct.unpack_from("x", data)
-
diff --git a/mpm/python/usrp_mpm/dboard_manager/test.py b/mpm/python/usrp_mpm/dboard_manager/test.py
new file mode 100644
index 000000000..b2e422bb4
--- /dev/null
+++ b/mpm/python/usrp_mpm/dboard_manager/test.py
@@ -0,0 +1,57 @@
+#
+# Copyright 2017 Ettus Research (National Instruments)
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+"""
+magnesium dboard implementation module
+"""
+from base import dboard_manager
+from base import log
+
+
+class fake_spi(object):
+    def __init__(self, addr):
+        self.addr = addr
+
+
+class test_device(object):
+    def __init__(self, dev1, dev2, dev3):
+        self.dev1 = fake_spi(dev1)
+        self.dev2 = fake_spi(dev2)
+        self.dev3 = fake_spi(dev3)
+
+    def test_method1(self, argument):
+        return argument
+
+
+class test(dboard_manager):
+    hw_pid = 234
+    special_eeprom_addrs = {"special0": "something"}
+    spi_chipselect = {"0": "dev1", "1": "dev2", "2": "dev3"}
+    spidevs = {}
+
+    def __init__(self, *args, **kwargs):
+        # eeprom_data is a tuple (head_dict, raw_data)
+        super(test, self).__init__(*args, **kwargs)
+        # I'm the test device, I can fake out my EEPROM
+        self.dev1 = "0"
+        self.dev2 = "1"
+        self.dev3 = "2"
+
+    def init_device(self):
+        self._device = test_device(self.dev1, self.dev2, self.dev3)
+
+
+