From b5afa06443594c8fdb5e951a61f42fab9712f676 Mon Sep 17 00:00:00 2001 From: Michael Dryden Date: Fri, 31 Oct 2014 16:56:37 -0400 Subject: [PATCH] Style changes. --- DSTAT-temp/src/ads1255.c | 42 ++++++++++++++++++++++++++-------------- 1 file changed, 27 insertions(+), 15 deletions(-) diff --git a/DSTAT-temp/src/ads1255.c b/DSTAT-temp/src/ads1255.c index ef7244f..d0ba56f 100644 --- a/DSTAT-temp/src/ads1255.c +++ b/DSTAT-temp/src/ads1255.c @@ -94,7 +94,8 @@ void ads1255_setup(uint8_t buff, uint8_t rate, uint8_t pga){ usart_spi_transmit(&USARTE1, ADS_SYNC); usart_spi_transmit(&USARTE1, ADS_SELFCAL); // while (ioport_pin_is_high(IOPORT_CREATE_PIN(PORTD, 5))); - while (arch_ioport_get_pin_level(IOPORT_CREATE_PIN(PORTD, 5))); + while (arch_ioport_get_pin_level(IOPORT_CREATE_PIN(PORTD, 5))) + ; usart_spi_deselect_device(&USARTE1, &spi_device_conf); return; @@ -121,7 +122,8 @@ void ads1255_rdatac(void){ usart_spi_transmit(&USARTE1, ADS_RDATAC); // while (ioport_pin_is_high(IOPORT_CREATE_PIN(PORTD, 5))); - while (arch_ioport_get_pin_level(IOPORT_CREATE_PIN(PORTD, 5))); + while (arch_ioport_get_pin_level(IOPORT_CREATE_PIN(PORTD, 5))) + ; usart_spi_deselect_device(&USARTE1, &spi_device_conf); return; @@ -136,12 +138,16 @@ int16_t ads1255_read_fast(void){ usart_spi_select_device(&USARTE1, &spi_device_conf); for (int i = 1; i >= 0; --i){ - while (usart_data_register_is_empty(&USARTE1) == false); + while (usart_data_register_is_empty(&USARTE1) == false) + ; usart_put(&USARTE1, CONFIG_USART_SPI_DUMMY); - while (usart_rx_is_complete(&USARTE1) == false); + while (usart_rx_is_complete(&USARTE1) == false) + ; input_buffer.uint[i] = usart_get(&USARTE1); } - while (!usart_tx_is_complete(&USARTE1)); + + while (!usart_tx_is_complete(&USARTE1)) + ; usart_clear_tx_complete(&USARTE1); usart_spi_deselect_device(&USARTE1, &spi_device_conf); @@ -150,8 +156,6 @@ int16_t ads1255_read_fast(void){ } int16_t ads1255_read_fast_single(void){ - - union{ uint8_t uint[2]; int16_t int16; @@ -161,12 +165,16 @@ int16_t ads1255_read_fast_single(void){ usart_spi_transmit(&USARTE1, ADS_RDATA); delay_us(6.5); for (int i = 1; i >= 0; --i){ - while (usart_data_register_is_empty(&USARTE1) == false); + while (usart_data_register_is_empty(&USARTE1) == false) + ; usart_put(&USARTE1, CONFIG_USART_SPI_DUMMY); - while (usart_rx_is_complete(&USARTE1) == false); + while (usart_rx_is_complete(&USARTE1) == false) + ; input_buffer.uint[i] = usart_get(&USARTE1); } - while (!usart_tx_is_complete(&USARTE1)); + + while (!usart_tx_is_complete(&USARTE1)) + ; usart_clear_tx_complete(&USARTE1); usart_spi_deselect_device(&USARTE1, &spi_device_conf); @@ -193,19 +201,23 @@ int32_t ads1255_read_fast24(void){ usart_spi_select_device(&USARTE1, &spi_device_conf); for (int i = 2; i >= 0; --i){ - while (usart_data_register_is_empty(&USARTE1) == false); + while (usart_data_register_is_empty(&USARTE1) == false) + ; usart_put(&USARTE1, CONFIG_USART_SPI_DUMMY); - while (usart_rx_is_complete(&USARTE1) == false); + while (usart_rx_is_complete(&USARTE1) == false) + ; input_buffer.uint[i] = usart_get(&USARTE1); } - while (!usart_tx_is_complete(&USARTE1)); + + while (!usart_tx_is_complete(&USARTE1)) + ; usart_clear_tx_complete(&USARTE1); usart_spi_deselect_device(&USARTE1, &spi_device_conf); if (input_buffer.uint[2] > 0x7F) - input_buffer.uint[3] = 0xFF; + input_buffer.uint[3] = 0xFF; else - input_buffer.uint[3] = 0x0; + input_buffer.uint[3] = 0x0; // printf("%x %x %x\n\r", input_buffer.uint[2],input_buffer.uint[1], input_buffer.uint[0]); cpu_irq_restore(flags); -- GitLab