Skip to content
Snippets Groups Projects
Commit 46fcbafa authored by Michael DM Dryden's avatar Michael DM Dryden
Browse files

Style changes.

parent b1e132ea
No related merge requests found
......@@ -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,12 +201,16 @@ 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);
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment