jackcartersmith/blackmagic
1
0
Fork 0
Code Issues Pull Requests Releases Activity

other/dogm128: Coding-style fixes.

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

181
examples/stm32/f1/other/dogm128/dogm128.c
View File

@ -25,100 +25,105 @@ u8 dogm128_cursor_y;
void dogm128_send_command(u8 command) void dogm128_send_command(u8 command)
{ {
u32 counter; u32 i;
gpio_clear(DOGM128_A0_PORT, DOGM128_A0_PIN); /* A0 low for commands */ gpio_clear(DOGM128_A0_PORT, DOGM128_A0_PIN); /* A0 low for commands */
spi_send(DOGM128_SPI, command); spi_send(DOGM128_SPI, command);
for (counter = 0; counter<=500; counter++) /* wait */ for (i = 0; i <= 500; i++) /* Wait a bit. */
{} ;
} }
void dogm128_send_data(u8 data) void dogm128_send_data(u8 data)
{ {
u32 counter; u32 i;
gpio_set(DOGM128_A0_PORT, DOGM128_A0_PIN); /* A0 high for data */ gpio_set(DOGM128_A0_PORT, DOGM128_A0_PIN); /* A0 high for data */
spi_send(DOGM128_SPI, data); spi_send(DOGM128_SPI, data);
for (counter = 0; counter<=500; counter++) /* wait */ for (i = 0; i <= 500; i++) /* Wait a bit. */
{} ;
} }
void dogm128_init() void dogm128_init(void)
{ {
u32 counter; u32 i;
/* reset the display */ /* Reset the display (reset low for dogm128). */
gpio_clear(DOGM128_RESET_PORT, DOGM128_RESET_PIN); /* reset low for dogm128 */ gpio_clear(DOGM128_RESET_PORT, DOGM128_RESET_PIN);
for (counter = 0; counter<=60000; counter++) /* wait */ for (i = 0; i <= 60000; i++) /* Wait a bit. */
{} ;
gpio_set(DOGM128_RESET_PORT, DOGM128_RESET_PIN); /* reset high for dogm128 */
for (counter = 0; counter<=60000; counter++) /* wait */ /* Get the display out of reset (reset high for dogm128). */
{} gpio_set(DOGM128_RESET_PORT, DOGM128_RESET_PIN);
for (i = 0; i <= 60000; i++) /* Wait a bit. */
;
gpio_clear(DOGM128_A0_PORT, DOGM128_A0_PIN); /* A0 low for init */ gpio_clear(DOGM128_A0_PORT, DOGM128_A0_PIN); /* A0 low for init */
/* tell the display that we want to start */ /* Tell the display that we want to start. */
spi_set_nss_low(DOGM128_SPI); spi_set_nss_low(DOGM128_SPI);
/* init sequence */ /* Init sequence. */
dogm128_send_command(DOGM128_DISPLAY_START_ADDRESS_BASE + 0); dogm128_send_command(DOGM128_DISPLAY_START_ADDRESS_BASE + 0);
dogm128_send_command(DOGM128_ADC_REVERSE); dogm128_send_command(DOGM128_ADC_REVERSE);
dogm128_send_command(DOGM128_COM_OUTPUT_SCAN_NORMAL); dogm128_send_command(DOGM128_COM_OUTPUT_SCAN_NORMAL);
dogm128_send_command(DOGM128_DISPLAY_NORMAL); dogm128_send_command(DOGM128_DISPLAY_NORMAL);
dogm128_send_command(DOGM128_BIAS_19); dogm128_send_command(DOGM128_BIAS_19);
dogm128_send_command(DOGM128_POWER_CONTROL_BASE + 0x07); dogm128_send_command(DOGM128_POWER_CONTROL_BASE + 0x07);
dogm128_send_command(DOGM128_BOOSTER_RATIO_SET); dogm128_send_command(DOGM128_BOOSTER_RATIO_SET);
dogm128_send_command(0x00); /* Booster x4 */ dogm128_send_command(0x00); /* Booster x4 */
dogm128_send_command(DOGM128_V0_OUTPUT_RESISTOR_BASE + 0x07); dogm128_send_command(DOGM128_V0_OUTPUT_RESISTOR_BASE + 0x07);
dogm128_send_command(DOGM128_ELECTRONIC_VOLUME_MODE_SET); dogm128_send_command(DOGM128_ELECTRONIC_VOLUME_MODE_SET);
dogm128_send_command(0x16); /* Contrast */ dogm128_send_command(0x16); /* Contrast */
dogm128_send_command(DOGM128_STATIC_INDICATOR_OFF); dogm128_send_command(DOGM128_STATIC_INDICATOR_OFF);
dogm128_send_command(0x00); /* Flashing OFF */ dogm128_send_command(0x00); /* Flashing OFF */
dogm128_send_command(DOGM128_DISPLAY_ON); dogm128_send_command(DOGM128_DISPLAY_ON);
/* end transfer */ /* End transfer. */
spi_set_nss_high(DOGM128_SPI); spi_set_nss_high(DOGM128_SPI);
} }
void dogm128_print_char(u8 data) void dogm128_print_char(u8 data)
{ {
u8 i; u8 i, page, shift, xcoord, ycoord;
u8 page;
u8 shift;
u8 xcoord;
u8 ycoord;
xcoord = dogm128_cursor_x; xcoord = dogm128_cursor_x;
ycoord = dogm128_cursor_y; ycoord = dogm128_cursor_y;
page = (63 - ycoord) / 8; /* the display consists of 8 lines a 8 dots each. */ /* The display consists of 8 lines a 8 dots each. */
page = (63 - ycoord) / 8;
shift = (7 -((63 - ycoord) % 8)); /* vertical shift */ shift = (7 -((63 - ycoord) % 8)); /* vertical shift */
/* font is 8x5 so iterate each column of the character */ /* Font is 8x5 so iterate each column of the character. */
for (i = 0; i <= 5; i++) { for (i = 0; i <= 5; i++) {
/* right border reached? */ /* Right border reached? */
if ((xcoord + i) > 127) if ((xcoord + i) > 127)
return; return;
dogm128_cursor_x++; dogm128_cursor_x++;
/* 0xAA = end of character - no dots in this line */ /* 0xAA = end of character - no dots in this line. */
if (dogm128_font[data - 0x20][i] == 0xAA) { if (dogm128_font[data - 0x20][i] == 0xAA) {
dogm128_ram[(page * 128) + xcoord + i] &= ~(0xFF >> shift); /* clear area */ dogm128_ram[(page * 128) + xcoord + i] &=
if ((shift > 0) && (page > 0)) ~(0xFF >> shift); /* Clear area. */
dogm128_ram[((page - 1) * 128) + xcoord + i] &= ~(0xFF << (8 - shift)); /* clear area */ if ((shift > 0) && (page > 0))
dogm128_ram[((page - 1) * 128) + xcoord + i]
&= ~(0xFF << (8 - shift)); /* Clear area. */
return; return;
} }
/* lower part */ /* Lower part. */
dogm128_ram[(page * 128) + xcoord + i] &= ~(0xFF >> shift); /* clear area */ dogm128_ram[(page * 128) + xcoord + i] &=
dogm128_ram[(page * 128) + xcoord + i] = (dogm128_font[data - 0x20][i] >> shift); ~(0xFF >> shift); /* Clear area. */
/* higher part if needed */ dogm128_ram[(page * 128) + xcoord + i] =
(dogm128_font[data - 0x20][i] >> shift);
/* Higher part if needed. */
if ((shift > 0) && (page > 0)) { if ((shift > 0) && (page > 0)) {
dogm128_ram[((page - 1) * 128) + xcoord + i] &= ~(0xFF << (8 - shift)); /* clear area */ dogm128_ram[((page - 1) * 128) + xcoord + i] &=
dogm128_ram[((page - 1) * 128) + xcoord + i] = (dogm128_font[data - 0x20][i] << (8 - shift)); ~(0xFF << (8 - shift)); /* Clear area. */
dogm128_ram[((page - 1) * 128) + xcoord + i] =
(dogm128_font[data - 0x20][i] << (8 - shift));
} }
} }
} }
@ -129,7 +134,7 @@ void dogm128_set_cursor(u8 xcoord, u8 ycoord)
dogm128_cursor_y = ycoord; dogm128_cursor_y = ycoord;
} }
void dogm128_print_string(char * s) void dogm128_print_string(char *s)
{ {
while (*s != 0) { while (*s != 0) {
dogm128_print_char(*s); dogm128_print_char(*s);
@ -139,50 +144,57 @@ void dogm128_print_string(char * s)
void dogm128_set_dot(u8 xcoord, u8 ycoord) void dogm128_set_dot(u8 xcoord, u8 ycoord)
{ {
dogm128_ram[(((63 - ycoord) / 8) * 128) + xcoord] |= (1 << ((63 - ycoord) % 8)); dogm128_ram[(((63 - ycoord) / 8) * 128) + xcoord] |=
(1 << ((63 - ycoord) % 8));
} }
void dogm128_clear_dot(u8 xcoord, u8 ycoord) void dogm128_clear_dot(u8 xcoord, u8 ycoord)
{ {
dogm128_ram[(((63 - ycoord) / 8) * 128) + xcoord] &= ~(1 << ((63 - ycoord) % 8)); dogm128_ram[(((63 - ycoord) / 8) * 128) + xcoord] &=
~(1 << ((63 - ycoord) % 8));
} }
void dogm128_update_display() void dogm128_update_display(void)
{ {
u8 page; u8 page, column;
u8 column;
/* tell the display that we want to start */ /* Tell the display that we want to start. */
spi_set_nss_low(DOGM128_SPI); spi_set_nss_low(DOGM128_SPI);
for (page = 0; page <= 7; page++) { for (page = 0; page <= 7; page++) {
dogm128_send_command(0xB0 + page); /* set page */ dogm128_send_command(0xB0 + page); /* Set page. */
dogm128_send_command(0x10); /* set column upper address to 0 */ dogm128_send_command(0x10); /* Set column upper address to 0. */
dogm128_send_command(0x00); /* set column lower address to 0 */ dogm128_send_command(0x00); /* Set column lower address to 0. */
for (column = 0; column <= 127; column++) { for (column = 0; column <= 127; column++)
dogm128_send_data(dogm128_ram[(page * 128) + column]); dogm128_send_data(dogm128_ram[(page * 128) + column]);
}
} }
spi_set_nss_high(DOGM128_SPI); spi_set_nss_high(DOGM128_SPI);
} }
void dogm128_clear() void dogm128_clear(void)
{ {
u16 i; int i;
for (i = 0; i<=1023; i++) { for (i = 0; i <= 1023; i++)
dogm128_ram[i] = 0; dogm128_ram[i] = 0;
}
dogm128_update_display(); dogm128_update_display();
} }
/* This is a non-monospace font definition (upside down for better handling). /*
* 0xAA is the end of the character so its not space efficient in your memory, but on your display. * This is a non-monospace font definition (upside down for better handling).
* We are starting with " " as the first printable character at 0x20, so we have to substract 0x20 later. * 0xAA is the end of the character so it's not space efficient in your memory,
* Its the only defined to 127/0x7F so if you have german umlauts or other special characters from above * but on your display.
* you have to expand this definition a little bit. */ *
* We are starting with " " as the first printable character at 0x20, so we
* have to substract 0x20 later.
*
* Its the only defined to 127/0x7F so if you have German umlauts or other
* special characters from above you have to expand this definition a
* little bit.
*/
const u8 dogm128_font[96][6] = { const u8 dogm128_font[96][6] = {
@ -192,18 +204,18 @@ const u8 dogm128_font[96][6] = {
/* 23 # */ {0x28, 0x7C, 0x28, 0x7C, 0x28, 0xAA}, /* 23 # */ {0x28, 0x7C, 0x28, 0x7C, 0x28, 0xAA},
/* 24 $ */ {0x24, 0x2A, 0x7F, 0x2A, 0x10, 0xAA}, /* 24 $ */ {0x24, 0x2A, 0x7F, 0x2A, 0x10, 0xAA},
/* 25 % */ {0x62, 0x18, 0x46, 0xAA, 0xAA, 0xAA}, /* 25 % */ {0x62, 0x18, 0x46, 0xAA, 0xAA, 0xAA},
/* 26 & */ {0x30, 0x4C, 0x5A, 0x24, 0x50, 0xAA}, /* 26 & */ {0x30, 0x4C, 0x5A, 0x24, 0x50, 0xAA},
/* 27 ' */ {0x06, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA}, /* 27 ' */ {0x06, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA},
/* 28 ( */ {0x3E, 0x41, 0xAA, 0xAA, 0xAA, 0xAA}, /* 28 ( */ {0x3E, 0x41, 0xAA, 0xAA, 0xAA, 0xAA},
/* 29 ) */ {0x41, 0x3E, 0xAA, 0xAA, 0xAA, 0xAA}, /* 29 ) */ {0x41, 0x3E, 0xAA, 0xAA, 0xAA, 0xAA},
/* 2A * */ {0x28, 0x10, 0x7C, 0x10, 0x28, 0xAA}, /* 2A * */ {0x28, 0x10, 0x7C, 0x10, 0x28, 0xAA},
/* 2B + */ {0x10, 0x38, 0x10, 0xAA, 0xAA, 0xAA}, /* 2B + */ {0x10, 0x38, 0x10, 0xAA, 0xAA, 0xAA},
/* 2C , */ {0xC0, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA}, /* 2C , */ {0xC0, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA},
/* 2D - */ {0x10, 0x10, 0x10, 0xAA, 0xAA, 0xAA}, /* 2D - */ {0x10, 0x10, 0x10, 0xAA, 0xAA, 0xAA},
/* 2E . */ {0x40, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA}, /* 2E . */ {0x40, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA},
/* 2F / */ {0x60, 0x18, 0x06, 0xAA, 0xAA, 0xAA}, /* 2F / */ {0x60, 0x18, 0x06, 0xAA, 0xAA, 0xAA},
/* 30 0 */ {0x3C, 0x42, 0x42, 0x3C, 0xAA, 0xAA}, /* 30 0 */ {0x3C, 0x42, 0x42, 0x3C, 0xAA, 0xAA},
/* 31 1 */ {0x44, 0x7E, 0x40, 0xAA, 0xAA, 0xAA}, /* 31 1 */ {0x44, 0x7E, 0x40, 0xAA, 0xAA, 0xAA},
/* 32 2 */ {0x44, 0x62, 0x52, 0x4C, 0xAA, 0xAA}, /* 32 2 */ {0x44, 0x62, 0x52, 0x4C, 0xAA, 0xAA},
/* 33 3 */ {0x4A, 0x4A, 0x34, 0xAA, 0xAA, 0xAA}, /* 33 3 */ {0x4A, 0x4A, 0x34, 0xAA, 0xAA, 0xAA},
@ -286,6 +298,5 @@ const u8 dogm128_font[96][6] = {
/* 7C | */ {0x7E, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA}, /* 7C | */ {0x7E, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA},
/* 7D } */ {0x41, 0x36, 0x08, 0xAA, 0xAA, 0xAA}, /* 7D } */ {0x41, 0x36, 0x08, 0xAA, 0xAA, 0xAA},
/* 7E ~ */ {0x20, 0x10, 0x20, 0x10, 0xAA, 0xAA}, /* 7E ~ */ {0x20, 0x10, 0x20, 0x10, 0xAA, 0xAA},
/* 7F DEL */ {0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA} /* 7F DEL */ {0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA},
}; };

18
examples/stm32/f1/other/dogm128/dogm128.h
View File

@ -24,11 +24,13 @@
#include <libopencm3/stm32/f1/gpio.h> #include <libopencm3/stm32/f1/gpio.h>
#include <libopencm3/stm32/spi.h> #include <libopencm3/stm32/spi.h>
/* PB10 GPIO - ~RESET /*
* PB10 GPIO - ~RESET
* PB12 SPI2_NSS - ~CS1 * PB12 SPI2_NSS - ~CS1
* PB13 SPI2_SCK - SCL * PB13 SPI2_SCK - SCL
* PB14 SPI2_MISO - A0 * PB14 SPI2_MISO - A0
* PB15 SPI2_MOSI - SI */ * PB15 SPI2_MOSI - SI
*/
#define DOGM128_SPI SPI2 #define DOGM128_SPI SPI2
#define DOGM128_RESET_PIN GPIO10 #define DOGM128_RESET_PIN GPIO10
@ -75,12 +77,12 @@ extern u8 dogm128_cursor_y;
void dogm128_send_command(u8 command); void dogm128_send_command(u8 command);
void dogm128_set_cursor(u8 xcoord, u8 ycoord); void dogm128_set_cursor(u8 xcoord, u8 ycoord);
void dogm128_print_char(u8 data); void dogm128_print_char(u8 data);
void dogm128_print_string(char * s); void dogm128_print_string(char *s);
void dogm128_set_dot(u8 xcoord, u8 ycoord); void dogm128_set_dot(u8 xcoord, u8 ycoord);
void dogm128_clear_dot(u8 xcoord, u8 ycoord); void dogm128_clear_dot(u8 xcoord, u8 ycoord);
void dogm128_send_data(u8 data); void dogm128_send_data(u8 data);
void dogm128_init(); void dogm128_init(void);
void dogm128_update_display(); void dogm128_update_display(void);
void dogm128_clear(); void dogm128_clear(void);
#endif #endif

45
examples/stm32/f1/other/dogm128/main.c
View File

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