From 6a0b0bf7d1b7244575cc896bfb62e9d021f5f2c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?King=20K=C3=A9vin?= Date: Mon, 17 Feb 2020 14:52:16 +0100 Subject: [PATCH] sensor_pzem: fix USART GPIO definitions --- lib/sensor_pzem.c | 16 ++++++++-------- lib/sensor_pzem.h | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/lib/sensor_pzem.c b/lib/sensor_pzem.c index 998cc15..15291d9 100644 --- a/lib/sensor_pzem.c +++ b/lib/sensor_pzem.c @@ -12,10 +12,10 @@ * along with this program. If not, see . * */ -/** library to query measurements from peacefair PZEM-004 and PZEM-004T electricity meter (code) - * @file sensor_pzem.c +/** library to query measurements from peacefair PZEM-004 and PZEM-004T electricity meter + * @file * @author King Kévin - * @date 2016 + * @date 2016-2020 * @note peripherals used: USART @ref sensor_pzem_usart, timer @ref sensor_pzem_timer */ @@ -59,11 +59,11 @@ void sensor_pzem_setup(void) { /* enable USART I/O peripheral */ rcc_periph_clock_enable(RCC_AFIO); // enable pin alternate function (USART) - rcc_periph_clock_enable(USART_PORT_RCC(SENSOR_PZEM_USART)); // enable clock for USART port peripheral - rcc_periph_clock_enable(USART_RCC(SENSOR_PZEM_USART)); // enable clock for USART peripheral - gpio_set_mode(USART_PORT(SENSOR_PZEM_USART), GPIO_MODE_OUTPUT_2_MHZ, GPIO_CNF_OUTPUT_ALTFN_PUSHPULL, USART_PIN_TX(SENSOR_PZEM_USART)); // setup GPIO pin USART transmit - gpio_set_mode(USART_PORT(SENSOR_PZEM_USART), GPIO_MODE_INPUT, GPIO_CNF_INPUT_PULL_UPDOWN, USART_PIN_RX(SENSOR_PZEM_USART)); // setup GPIO pin USART receive - gpio_set(USART_PORT(SENSOR_PZEM_USART), USART_PIN_RX(SENSOR_PZEM_USART)); // pull up to avoid noise when not connected + rcc_periph_clock_enable(RCC_USART(SENSOR_PZEM_USART)); // enable clock for USART peripheral + rcc_periph_clock_enable(RCC_USART_PORT(SENSOR_PZEM_USART)); // enable clock for USART port peripheral + gpio_set_mode(USART_TX_PORT(SENSOR_PZEM_USART), GPIO_MODE_OUTPUT_2_MHZ, GPIO_CNF_OUTPUT_ALTFN_PUSHPULL, USART_TX_PIN(SENSOR_PZEM_USART)); // setup GPIO pin USART transmit + gpio_set_mode(USART_RX_PORT(SENSOR_PZEM_USART), GPIO_MODE_INPUT, GPIO_CNF_INPUT_PULL_UPDOWN, USART_RX_PIN(SENSOR_PZEM_USART)); // setup GPIO pin USART receive + gpio_set(USART_RX_PORT(SENSOR_PZEM_USART), USART_RX_PIN(SENSOR_PZEM_USART)); // pull up to avoid noise when not connected /* setup USART parameters for electricity meter: 9600 8N1 */ usart_set_baudrate(USART(SENSOR_PZEM_USART), 9600); // the electricity meter uses a fixed baud rate of 9600 bps diff --git a/lib/sensor_pzem.h b/lib/sensor_pzem.h index 19dec12..8488ac7 100644 --- a/lib/sensor_pzem.h +++ b/lib/sensor_pzem.h @@ -12,10 +12,10 @@ * along with this program. If not, see . * */ -/** library to query measurements from peacefair PZEM-004 and PZEM-004T electricity meter (API) - * @file sensor_pzem.h +/** library to query measurements from peacefair PZEM-004 and PZEM-004T electricity meter + * @file * @author King Kévin - * @date 2016 + * @date 2016-2020 * @note peripherals used: USART @ref sensor_pzem_usart, timer @ref sensor_pzem_timer */ #pragma once