Renamed analog attribute modes

diff --git a/modules/unipi/src/unipi_sysfs.c b/modules/unipi/src/unipi_sysfs.c
index 4c9bd584fe4a6cfe18a8707621eeb651bdcece45..83866cdf36ced62d055b41c4bcb1eb8ebf05aad6 100644 (file)
--- a/modules/unipi/src/unipi_sysfs.c
+++ b/modules/unipi/src/unipi_sysfs.c
@@ -1160,10 +1160,10 @@ static DEVICE_ATTR(sys_gpio_di_base, 0440, neuronspi_spi_gpio_show_di_base, NULL
 static DEVICE_ATTR(sys_gpio_ro_count, 0440, neuronspi_spi_gpio_show_ro_count, NULL);
 static DEVICE_ATTR(sys_gpio_ro_prefix, 0440, neuronspi_spi_gpio_show_ro_prefix, NULL);
 static DEVICE_ATTR(sys_gpio_ro_base, 0440, neuronspi_spi_gpio_show_ro_base, NULL);
-static DEVICE_ATTR(mode_ai_type_a, 0660, neuronspi_iio_show_stm_ai_mode, neuronspi_iio_store_stm_ai_mode);
-static DEVICE_ATTR(mode_ao_type_a, 0660, neuronspi_iio_show_stm_ao_mode, neuronspi_iio_store_stm_ao_mode);
-static DEVICE_ATTR(mode_ai_type_b, 0660, neuronspi_iio_show_external_ai_mode, neuronspi_iio_store_external_ai_mode);
-static DEVICE_ATTR(mode_ao_type_b, 0660, neuronspi_iio_show_external_ao_mode, neuronspi_iio_store_external_ao_mode);
+static DEVICE_ATTR(mode_ai_voltage_current, 0660, neuronspi_iio_show_stm_ai_mode, neuronspi_iio_store_stm_ai_mode);
+static DEVICE_ATTR(mode_ao_voltage_current_resistance, 0660, neuronspi_iio_show_stm_ao_mode, neuronspi_iio_store_stm_ao_mode);
+static DEVICE_ATTR(mode_ai_voltage_current_resistance, 0660, neuronspi_iio_show_external_ai_mode, neuronspi_iio_store_external_ai_mode);
+static DEVICE_ATTR(mode_ao_voltage, 0660, neuronspi_iio_show_external_ao_mode, neuronspi_iio_store_external_ao_mode);
 
 static struct attribute *neuron_plc_attrs[] = {
                &dev_attr_model_name.attr,
@@ -1226,22 +1226,22 @@ static struct attribute *neuron_gpio_ro_attrs[] = {
 };
 
 static struct attribute *neuron_stm_ai_attrs[] = {
-               &dev_attr_mode_ai_type_a.attr,
+               &dev_attr_mode_ai_voltage_current.attr,
                NULL,
 };
 
 static struct attribute *neuron_stm_ao_attrs[] = {
-               &dev_attr_mode_ao_type_a.attr,
+               &dev_attr_mode_ao_voltage_current_resistance.attr,
                NULL,
 };
 
 static struct attribute *neuron_sec_ai_attrs[] = {
-               &dev_attr_mode_ai_type_b.attr,
+               &dev_attr_mode_ai_voltage_current_resistance.attr,
                NULL,
 };
 
 static struct attribute *neuron_sec_ao_attrs[] = {
-               &dev_attr_mode_ao_type_b.attr,
+               &dev_attr_mode_ao_voltage.attr,
                NULL,
 };
 

diff --git a/version.txt b/version.txt
index 3f2cd99dce65b7b3961f5a132876314a26cf02bb..496ccd001c2552386fd6538df7aa3e3c35dfae19 100644 (file)
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-Repository:neuron-kernel ActiveBranch:[uart_timeout] PrecedingRelease:v.0.12 PrecedingRevision:75(28c08dd) LatestCommit:Tue Jul 3 21:17:48 CEST 2018
+Repository:neuron-kernel ActiveBranch:[uart_timeout] PrecedingRelease:v.0.12 PrecedingRevision:76(ef0de24) LatestCommit:Wed Jul 4 12:49:07 CEST 2018