From d29e4d2b7c2f0bf0ba9c543eb94846b64f396ae3 Mon Sep 17 00:00:00 2001 From: Piotr Esden-Tempski Date: Thu, 22 Jan 2015 18:38:16 -0800 Subject: [PATCH] [stm32f429i-discovery] Moved Chucks remaining examples to the correct directory. Additionally added Chucks readme to the stm32f429i-discovery board readme. --- examples/stm32/f4/stm32f4-disco/README | 40 ------------------- .../stm32/f4/stm32f4-disco/stm32f4-disco.ld | 32 --------------- .../stm32/f4/stm32f429i-discovery/README.md | 36 +++++++++++++++++ .../lcd-serial/Makefile | 2 +- .../lcd-serial/README | 0 .../lcd-serial/clock.c | 0 .../lcd-serial/clock.h | 0 .../lcd-serial/console.c | 0 .../lcd-serial/console.h | 0 .../lcd-serial/font-7x12.c | 0 .../lcd-serial/gfx.c | 0 .../lcd-serial/gfx.h | 0 .../lcd-serial/lcd-serial.c | 0 .../lcd-serial/lcd-spi.c | 0 .../lcd-serial/lcd-spi.h | 0 .../lcd-serial/sdram.c | 0 .../lcd-serial/sdram.h | 0 .../sdram/Makefile | 2 +- .../sdram/clock.c | 0 .../sdram/clock.h | 0 .../sdram/console.c | 0 .../sdram/console.h | 0 .../sdram/sdram.c | 0 .../spi/Makefile | 2 +- .../spi/README | 0 .../spi/clock.c | 0 .../spi/clock.h | 0 .../spi/console.c | 0 .../spi/console.h | 0 .../spi/spi-mems.c | 0 30 files changed, 39 insertions(+), 75 deletions(-) delete mode 100644 examples/stm32/f4/stm32f4-disco/README delete mode 100644 examples/stm32/f4/stm32f4-disco/stm32f4-disco.ld rename examples/stm32/f4/{stm32f4-disco => stm32f429i-discovery}/lcd-serial/Makefile (80%) rename examples/stm32/f4/{stm32f4-disco => stm32f429i-discovery}/lcd-serial/README (100%) rename examples/stm32/f4/{stm32f4-disco => stm32f429i-discovery}/lcd-serial/clock.c (100%) rename examples/stm32/f4/{stm32f4-disco => stm32f429i-discovery}/lcd-serial/clock.h (100%) rename examples/stm32/f4/{stm32f4-disco => stm32f429i-discovery}/lcd-serial/console.c (100%) rename examples/stm32/f4/{stm32f4-disco => stm32f429i-discovery}/lcd-serial/console.h (100%) rename examples/stm32/f4/{stm32f4-disco => stm32f429i-discovery}/lcd-serial/font-7x12.c (100%) rename examples/stm32/f4/{stm32f4-disco => stm32f429i-discovery}/lcd-serial/gfx.c (100%) rename examples/stm32/f4/{stm32f4-disco => stm32f429i-discovery}/lcd-serial/gfx.h (100%) rename examples/stm32/f4/{stm32f4-disco => stm32f429i-discovery}/lcd-serial/lcd-serial.c (100%) rename examples/stm32/f4/{stm32f4-disco => stm32f429i-discovery}/lcd-serial/lcd-spi.c (100%) rename examples/stm32/f4/{stm32f4-disco => stm32f429i-discovery}/lcd-serial/lcd-spi.h (100%) rename examples/stm32/f4/{stm32f4-disco => stm32f429i-discovery}/lcd-serial/sdram.c (100%) rename examples/stm32/f4/{stm32f4-disco => stm32f429i-discovery}/lcd-serial/sdram.h (100%) rename examples/stm32/f4/{stm32f4-disco => stm32f429i-discovery}/sdram/Makefile (95%) rename examples/stm32/f4/{stm32f4-disco => stm32f429i-discovery}/sdram/clock.c (100%) rename examples/stm32/f4/{stm32f4-disco => stm32f429i-discovery}/sdram/clock.h (100%) rename examples/stm32/f4/{stm32f4-disco => stm32f429i-discovery}/sdram/console.c (100%) rename examples/stm32/f4/{stm32f4-disco => stm32f429i-discovery}/sdram/console.h (100%) rename examples/stm32/f4/{stm32f4-disco => stm32f429i-discovery}/sdram/sdram.c (100%) rename examples/stm32/f4/{stm32f4-disco => stm32f429i-discovery}/spi/Makefile (70%) rename examples/stm32/f4/{stm32f4-disco => stm32f429i-discovery}/spi/README (100%) rename examples/stm32/f4/{stm32f4-disco => stm32f429i-discovery}/spi/clock.c (100%) rename examples/stm32/f4/{stm32f4-disco => stm32f429i-discovery}/spi/clock.h (100%) rename examples/stm32/f4/{stm32f4-disco => stm32f429i-discovery}/spi/console.c (100%) rename examples/stm32/f4/{stm32f4-disco => stm32f429i-discovery}/spi/console.h (100%) rename examples/stm32/f4/{stm32f4-disco => stm32f429i-discovery}/spi/spi-mems.c (100%) diff --git a/examples/stm32/f4/stm32f4-disco/README b/examples/stm32/f4/stm32f4-disco/README deleted file mode 100644 index 6ae9cb5..0000000 --- a/examples/stm32/f4/stm32f4-disco/README +++ /dev/null @@ -1,40 +0,0 @@ -README ------- - -These examples are designed to demonstrate the use of libopencm3 -with the STM32F4Discovery-DISCO board. This board has a 2.2" -TFT LCD touchscreen on it, a MEMS gyroscope, and 8MB of SDRAM. - -If you move through the examples in this order, the code from -the previous example will be used in the next example: - -0) blink - verify that you can build a program, link it, and - download it to the board. Blinks the GREEN LED at about - 2Hz - -1) systick_blink - Clock setup, Systick setup, LED GPIO setup - and blinking. - -2) usart - Program a USART on the board as a console (requires - a digital to serial adapter) - -3) usart-irq - Program a USART on the board as a console with - an interrupt driven receive routine. This allows you to - interrupt execution with ^C as you can on a Linux process. - -4) sdram - SDRAM setup, using the usb port as a console, which - sets up the SDRAM - -5) spi - Serial Peripheral Interface example which talks to - the MEMS gyroscope on the DISCO board. - -6) lcd-serial - Activates the TFT using the SPI port (serial) and - holds a frame buffer in the SDRAM area. - -7) lcd - Now uses the new LCD "driver" peripheral to refresh - the contents with what is in memory, very fast, write in - memory and it appears on screen. - -8) dma2d - The 2D graphics accelerator device which displays - various animations on the LCD using code from all of the - previous examples. diff --git a/examples/stm32/f4/stm32f4-disco/stm32f4-disco.ld b/examples/stm32/f4/stm32f4-disco/stm32f4-disco.ld deleted file mode 100644 index fb4862b..0000000 --- a/examples/stm32/f4/stm32f4-disco/stm32f4-disco.ld +++ /dev/null @@ -1,32 +0,0 @@ -/* - * This file is part of the libopencm3 project. - * - * Copyright (C) 2009 Uwe Hermann - * Copyright (C) 2011 Stephen Caudle - * - * This library is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this library. If not, see . - */ - -/* Linker script for ST STM32F4DISCOVERY "DISCO" (STM32F429, 2024K flash, 192K RAM). */ - -/* Define memory regions. */ -MEMORY -{ - rom (rx) : ORIGIN = 0x08000000, LENGTH = 2048K - ram (rwx) : ORIGIN = 0x20000000, LENGTH = 128K -} - -/* Include the common ld script. */ -INCLUDE libopencm3_stm32f4.ld - diff --git a/examples/stm32/f4/stm32f429i-discovery/README.md b/examples/stm32/f4/stm32f429i-discovery/README.md index 5f6809d..9a8967a 100644 --- a/examples/stm32/f4/stm32f429i-discovery/README.md +++ b/examples/stm32/f4/stm32f429i-discovery/README.md @@ -6,3 +6,39 @@ port, 2.4" QVGA TFT LCD display, 64Mbits external SDRAM and ST MEMS gyroscope. http://www.st.com/web/catalog/tools/FM116/SC959/SS1532/PF259090 +# Chuck McManis README + +These examples are designed to demonstrate the use of libopencm3 +with the STM32F4Discovery-DISCO board. This board has a 2.2" +TFT LCD touchscreen on it, a MEMS gyroscope, and 8MB of SDRAM. + +If you move through the examples in this order, the code from +the previous example will be used in the next example: + +0. miniblink - verify that you can build a program, link it, and download it to + the board. Blinks the GREEN LED at about 2Hz + +1. tick\_blink - Clock setup, Systick setup, LED GPIO setup and blinking. + +2. usart\_console - Program a USART on the board as a console (requires + clonsing jumpers on your discovery board connecting USART1 to the + programmer) + +3. usart\_irq\_console - Program a USART on the board as a console with an + interrupt driven receive routine. This allows you to interrupt execution + with ^C as you can on a Linux process. + +4. sdram - SDRAM setup, using the usb port as a console, which sets up the + SDRAM + +5. spi - Serial Peripheral Interface example which talks to the MEMS gyroscope + on the DISCO board. + +6. lcd-serial - Activates the TFT using the SPI port (serial) and holds a frame + buffer in the SDRAM area. + +7. lcd - Now uses the new LCD "driver" peripheral to refresh the contents with + what is in memory, very fast, write in memory and it appears on screen. + +8. dma2d - The 2D graphics accelerator device which displays various animations + on the LCD using code from all of the previous examples. diff --git a/examples/stm32/f4/stm32f4-disco/lcd-serial/Makefile b/examples/stm32/f4/stm32f429i-discovery/lcd-serial/Makefile similarity index 80% rename from examples/stm32/f4/stm32f4-disco/lcd-serial/Makefile rename to examples/stm32/f4/stm32f429i-discovery/lcd-serial/Makefile index f9e11c7..74c3dd5 100644 --- a/examples/stm32/f4/stm32f4-disco/lcd-serial/Makefile +++ b/examples/stm32/f4/stm32f429i-discovery/lcd-serial/Makefile @@ -5,6 +5,6 @@ BINARY = lcd-serial # we use sin/cos from the library LDLIBS += -lm -LDSCRIPT = ../stm32f4-disco.ld +LDSCRIPT = ../stm32f429i-discovery.ld include ../../Makefile.include diff --git a/examples/stm32/f4/stm32f4-disco/lcd-serial/README b/examples/stm32/f4/stm32f429i-discovery/lcd-serial/README similarity index 100% rename from examples/stm32/f4/stm32f4-disco/lcd-serial/README rename to examples/stm32/f4/stm32f429i-discovery/lcd-serial/README diff --git a/examples/stm32/f4/stm32f4-disco/lcd-serial/clock.c b/examples/stm32/f4/stm32f429i-discovery/lcd-serial/clock.c similarity index 100% rename from examples/stm32/f4/stm32f4-disco/lcd-serial/clock.c rename to examples/stm32/f4/stm32f429i-discovery/lcd-serial/clock.c diff --git a/examples/stm32/f4/stm32f4-disco/lcd-serial/clock.h b/examples/stm32/f4/stm32f429i-discovery/lcd-serial/clock.h similarity index 100% rename from examples/stm32/f4/stm32f4-disco/lcd-serial/clock.h rename to examples/stm32/f4/stm32f429i-discovery/lcd-serial/clock.h diff --git a/examples/stm32/f4/stm32f4-disco/lcd-serial/console.c b/examples/stm32/f4/stm32f429i-discovery/lcd-serial/console.c similarity index 100% rename from examples/stm32/f4/stm32f4-disco/lcd-serial/console.c rename to examples/stm32/f4/stm32f429i-discovery/lcd-serial/console.c diff --git a/examples/stm32/f4/stm32f4-disco/lcd-serial/console.h b/examples/stm32/f4/stm32f429i-discovery/lcd-serial/console.h similarity index 100% rename from examples/stm32/f4/stm32f4-disco/lcd-serial/console.h rename to examples/stm32/f4/stm32f429i-discovery/lcd-serial/console.h diff --git a/examples/stm32/f4/stm32f4-disco/lcd-serial/font-7x12.c b/examples/stm32/f4/stm32f429i-discovery/lcd-serial/font-7x12.c similarity index 100% rename from examples/stm32/f4/stm32f4-disco/lcd-serial/font-7x12.c rename to examples/stm32/f4/stm32f429i-discovery/lcd-serial/font-7x12.c diff --git a/examples/stm32/f4/stm32f4-disco/lcd-serial/gfx.c b/examples/stm32/f4/stm32f429i-discovery/lcd-serial/gfx.c similarity index 100% rename from examples/stm32/f4/stm32f4-disco/lcd-serial/gfx.c rename to examples/stm32/f4/stm32f429i-discovery/lcd-serial/gfx.c diff --git a/examples/stm32/f4/stm32f4-disco/lcd-serial/gfx.h b/examples/stm32/f4/stm32f429i-discovery/lcd-serial/gfx.h similarity index 100% rename from examples/stm32/f4/stm32f4-disco/lcd-serial/gfx.h rename to examples/stm32/f4/stm32f429i-discovery/lcd-serial/gfx.h diff --git a/examples/stm32/f4/stm32f4-disco/lcd-serial/lcd-serial.c b/examples/stm32/f4/stm32f429i-discovery/lcd-serial/lcd-serial.c similarity index 100% rename from examples/stm32/f4/stm32f4-disco/lcd-serial/lcd-serial.c rename to examples/stm32/f4/stm32f429i-discovery/lcd-serial/lcd-serial.c diff --git a/examples/stm32/f4/stm32f4-disco/lcd-serial/lcd-spi.c b/examples/stm32/f4/stm32f429i-discovery/lcd-serial/lcd-spi.c similarity index 100% rename from examples/stm32/f4/stm32f4-disco/lcd-serial/lcd-spi.c rename to examples/stm32/f4/stm32f429i-discovery/lcd-serial/lcd-spi.c diff --git a/examples/stm32/f4/stm32f4-disco/lcd-serial/lcd-spi.h b/examples/stm32/f4/stm32f429i-discovery/lcd-serial/lcd-spi.h similarity index 100% rename from examples/stm32/f4/stm32f4-disco/lcd-serial/lcd-spi.h rename to examples/stm32/f4/stm32f429i-discovery/lcd-serial/lcd-spi.h diff --git a/examples/stm32/f4/stm32f4-disco/lcd-serial/sdram.c b/examples/stm32/f4/stm32f429i-discovery/lcd-serial/sdram.c similarity index 100% rename from examples/stm32/f4/stm32f4-disco/lcd-serial/sdram.c rename to examples/stm32/f4/stm32f429i-discovery/lcd-serial/sdram.c diff --git a/examples/stm32/f4/stm32f4-disco/lcd-serial/sdram.h b/examples/stm32/f4/stm32f429i-discovery/lcd-serial/sdram.h similarity index 100% rename from examples/stm32/f4/stm32f4-disco/lcd-serial/sdram.h rename to examples/stm32/f4/stm32f429i-discovery/lcd-serial/sdram.h diff --git a/examples/stm32/f4/stm32f4-disco/sdram/Makefile b/examples/stm32/f4/stm32f429i-discovery/sdram/Makefile similarity index 95% rename from examples/stm32/f4/stm32f4-disco/sdram/Makefile rename to examples/stm32/f4/stm32f429i-discovery/sdram/Makefile index e9391f6..709cd4b 100644 --- a/examples/stm32/f4/stm32f4-disco/sdram/Makefile +++ b/examples/stm32/f4/stm32f429i-discovery/sdram/Makefile @@ -19,7 +19,7 @@ OBJS = console.o clock.o BINARY = sdram -LDSCRIPT = ../stm32f4-disco.ld +LDSCRIPT = ../stm32f429i-discovery.ld include ../../Makefile.include diff --git a/examples/stm32/f4/stm32f4-disco/sdram/clock.c b/examples/stm32/f4/stm32f429i-discovery/sdram/clock.c similarity index 100% rename from examples/stm32/f4/stm32f4-disco/sdram/clock.c rename to examples/stm32/f4/stm32f429i-discovery/sdram/clock.c diff --git a/examples/stm32/f4/stm32f4-disco/sdram/clock.h b/examples/stm32/f4/stm32f429i-discovery/sdram/clock.h similarity index 100% rename from examples/stm32/f4/stm32f4-disco/sdram/clock.h rename to examples/stm32/f4/stm32f429i-discovery/sdram/clock.h diff --git a/examples/stm32/f4/stm32f4-disco/sdram/console.c b/examples/stm32/f4/stm32f429i-discovery/sdram/console.c similarity index 100% rename from examples/stm32/f4/stm32f4-disco/sdram/console.c rename to examples/stm32/f4/stm32f429i-discovery/sdram/console.c diff --git a/examples/stm32/f4/stm32f4-disco/sdram/console.h b/examples/stm32/f4/stm32f429i-discovery/sdram/console.h similarity index 100% rename from examples/stm32/f4/stm32f4-disco/sdram/console.h rename to examples/stm32/f4/stm32f429i-discovery/sdram/console.h diff --git a/examples/stm32/f4/stm32f4-disco/sdram/sdram.c b/examples/stm32/f4/stm32f429i-discovery/sdram/sdram.c similarity index 100% rename from examples/stm32/f4/stm32f4-disco/sdram/sdram.c rename to examples/stm32/f4/stm32f429i-discovery/sdram/sdram.c diff --git a/examples/stm32/f4/stm32f4-disco/spi/Makefile b/examples/stm32/f4/stm32f429i-discovery/spi/Makefile similarity index 70% rename from examples/stm32/f4/stm32f4-disco/spi/Makefile rename to examples/stm32/f4/stm32f429i-discovery/spi/Makefile index 11d3013..21b8da5 100644 --- a/examples/stm32/f4/stm32f4-disco/spi/Makefile +++ b/examples/stm32/f4/stm32f429i-discovery/spi/Makefile @@ -3,6 +3,6 @@ OBJS = clock.o console.o BINARY = spi-mems -LDSCRIPT = ../stm32f4-disco.ld +LDSCRIPT = ../stm32f429i-discovery.ld include ../../Makefile.include diff --git a/examples/stm32/f4/stm32f4-disco/spi/README b/examples/stm32/f4/stm32f429i-discovery/spi/README similarity index 100% rename from examples/stm32/f4/stm32f4-disco/spi/README rename to examples/stm32/f4/stm32f429i-discovery/spi/README diff --git a/examples/stm32/f4/stm32f4-disco/spi/clock.c b/examples/stm32/f4/stm32f429i-discovery/spi/clock.c similarity index 100% rename from examples/stm32/f4/stm32f4-disco/spi/clock.c rename to examples/stm32/f4/stm32f429i-discovery/spi/clock.c diff --git a/examples/stm32/f4/stm32f4-disco/spi/clock.h b/examples/stm32/f4/stm32f429i-discovery/spi/clock.h similarity index 100% rename from examples/stm32/f4/stm32f4-disco/spi/clock.h rename to examples/stm32/f4/stm32f429i-discovery/spi/clock.h diff --git a/examples/stm32/f4/stm32f4-disco/spi/console.c b/examples/stm32/f4/stm32f429i-discovery/spi/console.c similarity index 100% rename from examples/stm32/f4/stm32f4-disco/spi/console.c rename to examples/stm32/f4/stm32f429i-discovery/spi/console.c diff --git a/examples/stm32/f4/stm32f4-disco/spi/console.h b/examples/stm32/f4/stm32f429i-discovery/spi/console.h similarity index 100% rename from examples/stm32/f4/stm32f4-disco/spi/console.h rename to examples/stm32/f4/stm32f429i-discovery/spi/console.h diff --git a/examples/stm32/f4/stm32f4-disco/spi/spi-mems.c b/examples/stm32/f4/stm32f429i-discovery/spi/spi-mems.c similarity index 100% rename from examples/stm32/f4/stm32f4-disco/spi/spi-mems.c rename to examples/stm32/f4/stm32f429i-discovery/spi/spi-mems.c