From 155c9eb093b4844750e2f63d0abc33de24ced50e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?King=20K=C3=A9vin?= Date: Mon, 15 Mar 2021 12:32:06 +0100 Subject: [PATCH] application: add 4 channels and rename channels --- application.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/application.c b/application.c index fe5be39..6a7ed28 100644 --- a/application.c +++ b/application.c @@ -65,10 +65,9 @@ const uint8_t adc_channels[] = {ADC_CHANNEL17, ADC_CHANNEL(TARGET_CHANNEL), ADC_ #define MUX_S2_PIN PB0 /**< pin to set S2 bit of analog multiplexer */ #define MUX_S3_PIN PB1 /**< pin to set S3 bit of analog multiplexer */ -#define CHANNEL_NUMBERS 12 /**< number of target signals */ -static const char* channel_names[] = {"B12", "B13", "B14", "B15", "A8 ", "A9 ", "A10", "A15", "B3 ", "B4 ", "B5 ", "B6 "}; /**< names of pin connected to target signals */ -static const uint32_t channel_ports[] = {GPIO_PORT(PB12), GPIO_PORT(PB13), GPIO_PORT(PB14), GPIO_PORT(PB15), GPIO_PORT(PA8), GPIO_PORT(PA9), GPIO_PORT(PA10), GPIO_PORT(PA15), GPIO_PORT(PB3), GPIO_PORT(PB4), GPIO_PORT(PB5), GPIO_PORT(PB6)}; /**< GPIO ports for signal pin */ -static const uint32_t channel_pins[] = {GPIO_PIN(PB12), GPIO_PIN(PB13), GPIO_PIN(PB14), GPIO_PIN(PB15), GPIO_PIN(PA8), GPIO_PIN(PA9), GPIO_PIN(PA10), GPIO_PIN(PA15), GPIO_PIN(PB3), GPIO_PIN(PB4), GPIO_PIN(PB5), GPIO_PIN(PB6)}; /**< GPIO pins for signal pin */ +#define CHANNEL_NUMBERS 16 /**< number of target signals */ +static const uint32_t channel_ports[] = {GPIO_PORT(PB12), GPIO_PORT(PB13), GPIO_PORT(PB14), GPIO_PORT(PB15), GPIO_PORT(PA8), GPIO_PORT(PA9), GPIO_PORT(PA10), GPIO_PORT(PA15), GPIO_PORT(PB3), GPIO_PORT(PB4), GPIO_PORT(PB5), GPIO_PORT(PB6), GPIO_PORT(PB7), GPIO_PORT(PB8), GPIO_PORT(PB9), GPIO_PORT(PB10)}; /**< GPIO ports for signal pin */ +static const uint32_t channel_pins[] = {GPIO_PIN(PB12), GPIO_PIN(PB13), GPIO_PIN(PB14), GPIO_PIN(PB15), GPIO_PIN(PA8), GPIO_PIN(PA9), GPIO_PIN(PA10), GPIO_PIN(PA15), GPIO_PIN(PB3), GPIO_PIN(PB4), GPIO_PIN(PB5), GPIO_PIN(PB6), GPIO_PIN(PB7), GPIO_PIN(PB8), GPIO_PIN(PB9), GPIO_PIN(PB10)}; /**< GPIO pins for signal pin */ static uint8_t channel_start = 0; /**< first signal of range to probe */ static uint8_t channel_stop = CHANNEL_NUMBERS - 1; /**< last signal of range to probe */ @@ -258,11 +257,9 @@ static void command_voltages(void* argument) print_target(); // print target voltage (also sets measurement conditions) puts("signal voltages:\n"); for (uint8_t i = channel_start; i <= channel_stop; i++) { - puts("- "); - puts(channel_names[i]); + printf("- CH%02u ", i); mux_select(i); // select the channel voltages = measure_voltages(); // measure raw voltages - puts(" "); print_fpu(voltages[2], 2); puts(" V\n"); } @@ -285,8 +282,8 @@ static void command_types(void* argument) gpio_set(GPIO_PORT(TARGET_EN), GPIO_PIN(TARGET_EN)); // ensure the level shifters pulling up the signals are not enabled for (uint8_t i = channel_start; i <= channel_stop; i++) { - puts(channel_names[i]); - puts(" "); + printf("CH%02u", i); + puts(" "); mux_select(i); // select the channel voltages = measure_voltages(); // measure raw voltages print_fpu(voltages[2], 2);