From d71fb23ad9c13e93479a837f94e66ce04bd3f48b Mon Sep 17 00:00:00 2001 From: Edward Longman <el7g15@soton.ac.uk> Date: Thu, 11 Jul 2019 18:11:30 +0100 Subject: [PATCH] Change Synonyms to better represent their contents for the fr59xx --- source/lib/radio_drv/hal_spi_rf_exp430fr5994.h | 6 +++--- source/test/min2.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/source/lib/radio_drv/hal_spi_rf_exp430fr5994.h b/source/lib/radio_drv/hal_spi_rf_exp430fr5994.h index 993c4b8..ef8e222 100644 --- a/source/lib/radio_drv/hal_spi_rf_exp430fr5994.h +++ b/source/lib/radio_drv/hal_spi_rf_exp430fr5994.h @@ -67,7 +67,7 @@ extern "C" { */ /* Transceiver SPI signal */ -#define RF_PORT_SEL P5SEL0 +#define RF_PORT_SEL0 P5SEL0 #define RF_PORT_OUT P5OUT #define RF_PORT_DIR P5DIR #define RF_PORT_IN P5IN @@ -78,13 +78,13 @@ extern "C" { #define RF_SCLK_PIN BIT2 /* Transceiver chip select signal */ -#define RF_CS_N_PORT_SEL P4SEL0 +#define RF_CS_N_PORT_SEL0 P4SEL0 #define RF_CS_N_PORT_DIR P4DIR #define RF_CS_N_PORT_OUT P4OUT #define RF_CS_N_PIN BIT4 /* Transciever optional reset signal */ -#define RF_RESET_N_PORT_SEL P8SEL0 +#define RF_RESET_N_PORT_SEL0 P8SEL0 #define RF_RESET_N_PORT_DIR P8DIR #define RF_RESET_N_PORT_OUT P8OUT #define RF_RESET_N_PIN BIT3 diff --git a/source/test/min2.c b/source/test/min2.c index 2972c0a..b88c2d3 100644 --- a/source/test/min2.c +++ b/source/test/min2.c @@ -92,7 +92,7 @@ void main (void) UCB1BRW = 4; // select bit RF_MISO_PIN, RF_MOSI_PIN, RF_SCLK as peripheral - RF_PORT_SEL |= RF_MISO_PIN + RF_MOSI_PIN + RF_SCLK_PIN; + RF_PORT_SEL0 |= RF_MISO_PIN + RF_MOSI_PIN + RF_SCLK_PIN; // and set the correct direction on the port RF_PORT_DIR |= RF_MOSI_PIN + RF_SCLK_PIN; @@ -101,7 +101,7 @@ void main (void) RF_PORT_DIR &= ~(RF_MISO_PIN); // select chip select bit RF_CS_N_PORT_SEL as a port - RF_CS_N_PORT_SEL &= ~RF_CS_N_PIN; + RF_CS_N_PORT_SEL0 &= ~RF_CS_N_PIN; RF_CS_N_PORT_DIR |= RF_CS_N_PIN; RF_CS_N_PORT_OUT |= RF_CS_N_PIN; -- GitLab