From 69507a0354e88d68d57671b3bab8aca278f2cefb Mon Sep 17 00:00:00 2001 From: Gareth Farrington Date: Sat, 15 Jun 2024 19:10:08 -0700 Subject: sensor_hx71x: Update Sensors to report to load_cell_probe Signed-off-by: Gareth Farrington --- src/sensor_ads1220.c | 16 ++++++++++++++++ src/sensor_hx71x.c | 16 ++++++++++++++++ 2 files changed, 32 insertions(+) (limited to 'src') diff --git a/src/sensor_ads1220.c b/src/sensor_ads1220.c index ea33379a..f51dc355 100644 --- a/src/sensor_ads1220.c +++ b/src/sensor_ads1220.c @@ -11,6 +11,7 @@ #include "command.h" // DECL_COMMAND #include "sched.h" // sched_add_timer #include "sensor_bulk.h" // sensor_bulk_report +#include "load_cell_probe.h" // load_cell_probe_report_sample #include "spicmds.h" // spidev_transfer #include @@ -21,6 +22,7 @@ struct ads1220_adc { struct spidev_s *spi; uint8_t pending_flag, data_count; struct sensor_bulk sb; + struct load_cell_probe *lce; }; // Flag types @@ -94,6 +96,11 @@ ads1220_read_adc(struct ads1220_adc *ads1220, uint8_t oid) if (counts & 0x800000) counts |= 0xFF000000; + // endstop is optional, report if enabled and no errors + if (ads1220->lce) { + load_cell_probe_report_sample(ads1220->lce, counts); + } + add_sample(ads1220, oid, counts); } @@ -111,6 +118,15 @@ command_config_ads1220(uint32_t *args) DECL_COMMAND(command_config_ads1220, "config_ads1220 oid=%c" " spi_oid=%c data_ready_pin=%u"); +void +ads1220_attach_load_cell_probe(uint32_t *args) { + uint8_t oid = args[0]; + struct ads1220_adc *ads1220 = oid_lookup(oid, command_config_ads1220); + ads1220->lce = load_cell_probe_oid_lookup(args[1]); +} +DECL_COMMAND(ads1220_attach_load_cell_probe, + "ads1220_attach_load_cell_probe oid=%c load_cell_probe_oid=%c"); + // start/stop capturing ADC data void command_query_ads1220(uint32_t *args) diff --git a/src/sensor_hx71x.c b/src/sensor_hx71x.c index f20d8807..74575eec 100644 --- a/src/sensor_hx71x.c +++ b/src/sensor_hx71x.c @@ -12,6 +12,7 @@ #include "command.h" // DECL_COMMAND #include "sched.h" // sched_add_timer #include "sensor_bulk.h" // sensor_bulk_report +#include "load_cell_probe.h" // load_cell_probe_report_sample #include #include @@ -24,6 +25,7 @@ struct hx71x_adc { struct gpio_in dout; // pin used to receive data from the hx71x struct gpio_out sclk; // pin used to generate clock for the hx71x struct sensor_bulk sb; + struct load_cell_probe *lce; }; enum { @@ -175,6 +177,11 @@ hx71x_read_adc(struct hx71x_adc *hx71x, uint8_t oid) counts = hx71x->last_error; } + // probe is optional, report if enabled + if (hx71x->last_error == 0 && hx71x->lce) { + load_cell_probe_report_sample(hx71x->lce, counts); + } + // Add measurement to buffer add_sample(hx71x, oid, counts, false); } @@ -198,6 +205,15 @@ command_config_hx71x(uint32_t *args) DECL_COMMAND(command_config_hx71x, "config_hx71x oid=%c gain_channel=%c" " dout_pin=%u sclk_pin=%u"); +void +hx71x_attach_load_cell_probe(uint32_t *args) { + uint8_t oid = args[0]; + struct hx71x_adc *hx71x = oid_lookup(oid, command_config_hx71x); + hx71x->lce = load_cell_probe_oid_lookup(args[1]); +} +DECL_COMMAND(hx71x_attach_load_cell_probe, "hx71x_attach_load_cell_probe oid=%c" + " load_cell_probe_oid=%c"); + // start/stop capturing ADC data void command_query_hx71x(uint32_t *args) -- cgit v1.2.3-70-g09d2