motan: Support recording lis2dw and mpu9250 sensors from data_logger.py

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>

1 files changed, 7 insertions, 8 deletions

diff --git a/scripts/motan/data_logger.py b/scripts/motan/data_logger.py
index 7d704c83..81370713 100755
--- a/scripts/motan/data_logger.py
+++ b/scripts/motan/data_logger.py
@@ -151,16 +151,15 @@ class DataLogger:
             self.send_subscribe("stepq:" + stepper,
                                 "motion_report/dump_stepper", {"name": stepper})
         # Subscribe to additional sensor data
+        stypes = ["adxl345", "lis2dw", "mpu9250", "angle"]
         config = status["configfile"]["settings"]
         for cfgname in config.keys():
-            if cfgname == "adxl345" or cfgname.startswith("adxl345 "):
-                aname = cfgname.split()[-1]
-                self.send_subscribe("adxl345:" + aname, "adxl345/dump_adxl345",
-                                    {"sensor": aname})
-            if cfgname.startswith("angle "):
-                aname = cfgname.split()[1]
-                self.send_subscribe("angle:" + aname, "angle/dump_angle",
-                                    {"sensor": aname})
+            for st in stypes:
+                if cfgname == st or cfgname.startswith(st + " "):
+                    aname = cfgname.split()[-1]
+                    lname = "%s:%s" % (st, aname)
+                    qcmd = "%s/dump_%s" % (st, st)
+                    self.send_subscribe(lname, qcmd, {"sensor": aname})
     def handle_dump(self, msg, raw_msg):
         msg_id = msg["id"]
         if "result" not in msg: