From 073052ce9421618372de48ca0f8c4454e6b3e3d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?King=20K=C3=A9vin?= Date: Thu, 11 Mar 2021 14:20:12 +0100 Subject: [PATCH] application: minor: rename signal to channel --- application.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/application.c b/application.c index ec77516..0ceda52 100644 --- a/application.c +++ b/application.c @@ -65,11 +65,11 @@ const uint8_t channels[] = {ADC_CHANNEL17, ADC_CHANNEL(TARGET_CHANNEL), ADC_CHAN #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 SIGNAL_NUMBERS 12 /**< number of target signals */ -static const char* signal_names[] = {"B12", "B13", "B14", "B15", "A8 ", "A9 ", "A10", "A15", "B3 ", "B4 ", "B5 ", "B6 "}; /**< names of pin connected to target signals */ -static const uint32_t signal_rccs[] = {GPIO_RCC(PB12), GPIO_RCC(PB13), GPIO_RCC(PB14), GPIO_RCC(PB15), GPIO_RCC(PA8), GPIO_RCC(PA9), GPIO_RCC(PA10), GPIO_RCC(PA15), GPIO_RCC(PB3), GPIO_RCC(PB4), GPIO_RCC(PB5), GPIO_RCC(PB6)}; /**< RCC for signal pin ports */ -static const uint32_t signal_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 signal_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 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_rccs[] = {GPIO_RCC(PB12), GPIO_RCC(PB13), GPIO_RCC(PB14), GPIO_RCC(PB15), GPIO_RCC(PA8), GPIO_RCC(PA9), GPIO_RCC(PA10), GPIO_RCC(PA15), GPIO_RCC(PB3), GPIO_RCC(PB4), GPIO_RCC(PB5), GPIO_RCC(PB6)}; /**< RCC for signal pin ports */ +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 */ size_t putc(char c) { @@ -220,9 +220,9 @@ static void command_voltages(void* argument) float* voltages; print_target(); // print target voltage (also sets measurement conditions) puts("signal voltages:\n"); - for (uint8_t i = 0; i < SIGNAL_NUMBERS; i++) { + for (uint8_t i = 0; i < CHANNEL_NUMBERS; i++) { puts("- "); - puts(signal_names[i]); + puts(channel_names[i]); mux_select(i); // select the channel voltages = measure_voltages(); // measure raw voltages puts(" "); @@ -247,8 +247,8 @@ static void command_types(void* argument) gpio_set(GPIO_PORT(SIGNAL_PU_PIN), GPIO_PIN(SIGNAL_PU_PIN)); // ensure pull-up is not active 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 = 0; i < SIGNAL_NUMBERS; i++) { - puts(signal_names[i]); + for (uint8_t i = 0; i < CHANNEL_NUMBERS; i++) { + puts(channel_names[i]); puts(" "); mux_select(i); // select the channel voltages = measure_voltages(); // measure raw voltages @@ -758,9 +758,9 @@ void main(void) puts("OK\n"); puts("setup signal pins: "); - for (uint8_t i = 0; i < SIGNAL_NUMBERS; i++) { - rcc_periph_clock_enable(signal_rccs[i]); // enable clock for port domain - gpio_mode_setup(signal_ports[i], GPIO_MODE_INPUT, GPIO_PUPD_NONE, signal_pins[i]); // ensure pin is floating input + for (uint8_t i = 0; i < CHANNEL_NUMBERS; i++) { + rcc_periph_clock_enable(channel_rccs[i]); // enable clock for port domain + gpio_mode_setup(channel_ports[i], GPIO_MODE_INPUT, GPIO_PUPD_NONE, channel_pins[i]); // ensure pin is floating input } puts("OK\n");