From: Michal Sojka <sojkam1@fel.cvut.cz>
Date: Wed, 2 Sep 2015 16:38:29 +0000 (+0200)
Subject: adc: Support different number of channels depending on the target
X-Git-Tag: eaton-0.6~2
X-Git-Url: http://rtime.felk.cvut.cz/gitweb/rpp-test-sw.git/commitdiff_plain/d4534f51e2ee78bd16ed7c729272af373fbb2e6a

adc: Support different number of channels depending on the target
---

diff --git a/rpp-test-sw/commands/cmd_adc.c b/rpp-test-sw/commands/cmd_adc.c
index 5c88ff6..9cdd168 100644
--- a/rpp-test-sw/commands/cmd_adc.c
+++ b/rpp-test-sw/commands/cmd_adc.c
@@ -48,13 +48,13 @@ int cmd_do_read_adc1_values(cmd_io_t *cmd_io, const struct cmd_des *des, char *p
 	if (param[1] == param[0] + 7) { /* Single pin variant */
 		if (sscanf(param[1], "%d", &min) != 1)
 			return -CMDERR_BADPAR;
-		if (min > 15)
+		if (min >= PORT_ADC_CHANNELS)
 			return -CMDERR_NODEV;
 		max = min;
 	}
 	else {              /* All pins */
 		min = 0;
-		max = port_desc[PORT_ID_ADC].numchn - 1;
+		max = PORT_ADC_CHANNELS - 1;
 	}
 	for (i = min; i <= max; i++) {
 		unsigned d = rpp_adc_get(i+1);
@@ -68,10 +68,13 @@ int cmd_do_adc_watch(cmd_io_t *cmd_io, const struct cmd_des *des, char *param[])
 {
 	int i;
 
-	rpp_sci_printf("ADC Inputs Test [0-15]:\r\n");
-	rpp_sci_printf("===============================================================================================\r\n");
+	rpp_sci_printf("ADC Inputs Test [0-%d]:\r\n", PORT_ADC_CHANNELS - 1);
 
-	for (i = 0; i < 16; i++)
+	for (i = 0; i < PORT_ADC_CHANNELS; i++)
+		rpp_sci_printf("======");
+	rpp_sci_printf("\n");
+
+	for (i = 0; i < PORT_ADC_CHANNELS; i++)
 		rpp_sci_printf("%5d ", i);
 	rpp_sci_printf("\n");
 
@@ -83,10 +86,10 @@ int cmd_do_adc_watch(cmd_io_t *cmd_io, const struct cmd_des *des, char *param[])
         // Update inputs
         rpp_adc_update();
 
-		for (i = 0; i < 16; i++)
+		for (i = 0; i < PORT_ADC_CHANNELS; i++)
 			rpp_sci_printf("%5d ", rpp_adc_get(i+1));
 		rpp_sci_printf("lsb\n");
-		for (i = 0; i < 16; i++)
+		for (i = 0; i < PORT_ADC_CHANNELS; i++)
 			rpp_sci_printf("%5.2f ", lsb2volts(rpp_adc_get(i+1)));
 		rpp_sci_printf("V\r\033[A"); /* Cursor up */