From 9958bcb0de675a08ea75f2a50369177eadb14997 Mon Sep 17 00:00:00 2001 From: Tom Knot Date: Wed, 4 Jul 2018 15:03:14 +0200 Subject: [PATCH] Changed computation for current output --- modules/unipi/src/unipi_spi.c | 8 ++++---- version.txt | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/unipi/src/unipi_spi.c b/modules/unipi/src/unipi_spi.c index d143b02..7ee1a0f 100644 --- a/modules/unipi/src/unipi_spi.c +++ b/modules/unipi/src/unipi_spi.c @@ -641,13 +641,13 @@ void neuronspi_spi_iio_stm_ao_set_current(struct iio_dev *indio_dev, struct iio_ regmap_read(n_spi->reg_map, n_spi->regstart_table->vref_inp, &stm_v_inp_ref); regmap_read(n_spi->reg_map, n_spi->regstart_table->stm_ao_curr_err, &stm_i_err); regmap_read(n_spi->reg_map, n_spi->regstart_table->stm_ao_curr_off, &stm_i_off); - stm_true_ref = ((u64)stm_v_int_ref) * (330000 + stm_i_err); - stm_v_inp_ref = stm_v_inp_ref * 10000; - stm_true_val = (stm_true_val * 10000) - stm_i_off; + stm_true_ref = ((u64)stm_v_int_ref) * (330000 + stm_i_err) * 100; + stm_v_inp_ref = stm_v_inp_ref * 1000; + stm_true_val = ((stm_true_val * 10000) - stm_i_off) * 4095; do_div(stm_true_ref, stm_v_inp_ref); - do_div(stm_true_ref, 4095); stm_v_inp_ref = stm_true_ref; do_div(stm_true_val, stm_v_inp_ref); + do_div(stm_true_val, 10000); if (stm_true_val > 4095) stm_true_val = 4095; regmap_write(n_spi->reg_map, n_spi->regstart_table->stm_ao_val_reg, (unsigned int)stm_true_val); } diff --git a/version.txt b/version.txt index 62893fc..2f28b68 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -Repository:neuron-kernel ActiveBranch:[uart_timeout] PrecedingRelease:v.0.12 PrecedingRevision:80(7ebe7c2) LatestCommit:Wed Jul 4 14:56:23 CEST 2018 +Repository:neuron-kernel ActiveBranch:[uart_timeout] PrecedingRelease:v.0.12 PrecedingRevision:81(9d17667) LatestCommit:Wed Jul 4 15:03:14 CEST 2018 -- 2.34.1