other/dogm128: Coding-style fixes.

This commit is contained in:
Uwe Hermann
2011-11-12 17:45:55 +01:00
parent cd259c6eb3
commit f3f1123d07
3 changed files with 130 additions and 114 deletions

View File

@@ -40,7 +40,7 @@ void gpio_setup(void)
/* A0 of DOGM128 */
gpio_set_mode(GPIOB, GPIO_MODE_OUTPUT_50_MHZ,
GPIO_CNF_OUTPUT_PUSHPULL, GPIO14);
/*reset of DOGM128 */
/* Reset of DOGM128 */
gpio_set_mode(GPIOB, GPIO_MODE_OUTPUT_50_MHZ,
GPIO_CNF_OUTPUT_PUSHPULL, GPIO10);
@@ -53,24 +53,28 @@ void gpio_setup(void)
GPIO_CNF_OUTPUT_ALTFN_PUSHPULL, GPIO15);
}
void spi_setup()
void spi_setup(void)
{
/* the DOGM128 display is connected to SPI2, so initialise it correctly */
/* The DOGM128 display is connected to SPI2, so initialise it. */
rcc_peripheral_enable_clock(&RCC_APB1ENR, RCC_APB1ENR_SPI2EN);
spi_set_unidirectional_mode(DOGM128_SPI); /* we want to send only */
spi_disable_crc(DOGM128_SPI); /* no CRC for this slave */
spi_set_dff_8bit(DOGM128_SPI); /* 8-bit dataword-length */
spi_set_full_duplex_mode(DOGM128_SPI); /* not receive-only */
spi_enable_software_slave_management(DOGM128_SPI); /* we want to handle the CS signal in software */
spi_set_nss_high(DOGM128_SPI);
spi_set_baudrate_prescaler(DOGM128_SPI, SPI_CR1_BR_FPCLK_DIV_256); /* PCLOCK/256 as clock */
spi_set_master_mode(DOGM128_SPI); /* we want to control everything and generate the clock -> master */
spi_set_clock_polarity_1(DOGM128_SPI); /* sck idle state high */
spi_set_clock_phase_1(DOGM128_SPI); /* bit is taken on the second (rising edge) of sck */
spi_enable_ss_output(DOGM128_SPI);
spi_enable(DOGM128_SPI);
spi_set_unidirectional_mode(DOGM128_SPI); /* We want to send only. */
spi_disable_crc(DOGM128_SPI); /* No CRC for this slave. */
spi_set_dff_8bit(DOGM128_SPI); /* 8-bit dataword-length */
spi_set_full_duplex_mode(DOGM128_SPI); /* Not receive-only */
/* We want to handle the CS signal in software. */
spi_enable_software_slave_management(DOGM128_SPI);
spi_set_nss_high(DOGM128_SPI);
/* PCLOCK/256 as clock. */
spi_set_baudrate_prescaler(DOGM128_SPI, SPI_CR1_BR_FPCLK_DIV_256);
/* We want to control everything and generate the clock -> master. */
spi_set_master_mode(DOGM128_SPI);
spi_set_clock_polarity_1(DOGM128_SPI); /* SCK idle state high. */
/* Bit is taken on the second (rising edge) of SCK. */
spi_set_clock_phase_1(DOGM128_SPI);
spi_enable_ss_output(DOGM128_SPI);
spi_enable(DOGM128_SPI);
}
int main(void)
@@ -81,7 +85,7 @@ int main(void)
gpio_clear(GPIOB, GPIO7); /* LED1 on */
gpio_set(GPIOB, GPIO6); /* LED2 off */
dogm128_init();
dogm128_clear();
@@ -93,18 +97,17 @@ int main(void)
dogm128_print_string(" !#$%&'()*+,-./0123456789");
dogm128_set_cursor(0, 32);
dogm128_print_string(":;<=>?@[\\]^_`{|}~");
dogm128_set_dot(10, 10);
dogm128_set_dot(20, 10);
dogm128_set_dot(30, 10);
dogm128_set_dot(40, 10);
dogm128_set_dot(50, 10);
dogm128_update_display();
gpio_set(GPIOB, GPIO7); /* LED1 off */
while(1); /* Halt. */
gpio_set(GPIOB, GPIO7); /* LED1 off */
while (1); /* Halt. */
return 0;
}