aboutsummaryrefslogtreecommitdiffstats
path: root/klippy/extras
diff options
context:
space:
mode:
authorDmitry Butyugin <dmbutyugin@google.com>2021-01-29 19:35:33 +0100
committerKevinOConnor <kevin@koconnor.net>2021-02-02 14:13:24 -0500
commit0fb2449be035efe729d587a3257ac9a9fe8178bc (patch)
tree576b5908f6341be3f811c7ca5808c10ee27542df /klippy/extras
parent891852ed9c2c4439b5f928faa7a3c01386bec868 (diff)
downloadkutter-0fb2449be035efe729d587a3257ac9a9fe8178bc.tar.gz
kutter-0fb2449be035efe729d587a3257ac9a9fe8178bc.tar.xz
kutter-0fb2449be035efe729d587a3257ac9a9fe8178bc.zip
adxl345: Add accelerometer chip name to the raw data file name
Signed-off-by: Dmitry Butyugin <dmbutyugin@google.com>
Diffstat (limited to 'klippy/extras')
-rw-r--r--klippy/extras/adxl345.py15
1 files changed, 9 insertions, 6 deletions
diff --git a/klippy/extras/adxl345.py b/klippy/extras/adxl345.py
index c29d5451..7bf1ab59 100644
--- a/klippy/extras/adxl345.py
+++ b/klippy/extras/adxl345.py
@@ -125,17 +125,17 @@ class ADXL345:
mcu.register_response(self._handle_adxl345_start, "adxl345_start", oid)
mcu.register_response(self._handle_adxl345_data, "adxl345_data", oid)
# Register commands
- name = "default"
+ self.name = "default"
if len(config.get_name().split()) > 1:
- name = config.get_name().split()[1]
+ self.name = config.get_name().split()[1]
gcode = self.printer.lookup_object('gcode')
- gcode.register_mux_command("ACCELEROMETER_MEASURE", "CHIP", name,
+ gcode.register_mux_command("ACCELEROMETER_MEASURE", "CHIP", self.name,
self.cmd_ACCELEROMETER_MEASURE,
desc=self.cmd_ACCELEROMETER_MEASURE_help)
- gcode.register_mux_command("ACCELEROMETER_QUERY", "CHIP", name,
+ gcode.register_mux_command("ACCELEROMETER_QUERY", "CHIP", self.name,
self.cmd_ACCELEROMETER_QUERY,
desc=self.cmd_ACCELEROMETER_QUERY_help)
- if name == "default":
+ if self.name == "default":
gcode.register_mux_command("ACCELEROMETER_MEASURE", "CHIP", None,
self.cmd_ACCELEROMETER_MEASURE)
gcode.register_mux_command("ACCELEROMETER_QUERY", "CHIP", None,
@@ -229,7 +229,10 @@ class ADXL345:
return
res = self.finish_measurements()
# Write data to file
- filename = "/tmp/adxl345-%s.csv" % (name,)
+ if self.name == "default":
+ filename = "/tmp/adxl345-%s.csv" % (name,)
+ else:
+ filename = "/tmp/adxl345-%s-%s.csv" % (self.name, name,)
res.write_to_file(filename)
cmd_ACCELEROMETER_MEASURE_help = "Start/stop accelerometer"
def cmd_ACCELEROMETER_MEASURE(self, gcmd):