From 2f2ebd0ae021d12be544e2777ccabe839917b03f Mon Sep 17 00:00:00 2001 From: LEdoianX Date: Thu, 14 Apr 2016 21:22:23 +0200 Subject: [PATCH] Fixed Makefile.final and main.c Makefile.final: removed trailing whitespace betweeen comments main.c: swapped inline and void (to avoid useless compiler messages) --- Makefile.final | 8 ++++---- main.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile.final b/Makefile.final index cf6ddb9..34b4569 100644 --- a/Makefile.final +++ b/Makefile.final @@ -1,8 +1,8 @@ -#OPENCM3_DIR = /home/ledoian/Development/STM32/libopencm3/libopencm3 # Zirconium -OPENCM3_DIR = /home/ledoian/libopencm3-examples/libopencm3-examples/libopencm3 # Xenon +#OPENCM3_DIR = /home/ledoian/Development/STM32/libopencm3/libopencm3 +OPENCM3_DIR = /home/ledoian/libopencm3-examples/libopencm3-examples/libopencm3 -#EXAMPLE_DIR = /home/ledoian/Development/STM32/libopencm3-examples/libopencm3-examples/stm32/f1/stm32vl-discovery # Zirconium -EXAMPLE_DIR = /home/ledoian/libopencm3-examples/libopencm3-examples/examples/stm32/f1/stm32vl-discovery # Xenon +#EXAMPLE_DIR = /home/ledoian/Development/STM32/libopencm3-examples/libopencm3-examples/stm32/f1/stm32vl-discovery +EXAMPLE_DIR = /home/ledoian/libopencm3-examples/libopencm3-examples/examples/stm32/f1/stm32vl-discovery %.o: %.c arm-none-eabi-gcc -Os -g -Wextra -Wshadow -Wimplicit-function-declaration -Wredundant-decls -Wmissing-prototypes -fno-common -ffunction-sections -fdata-sections -MD -Wall -Wundef -I$(OPENCM3_DIR)/include -DSTM32F1 -mthumb -mcpu=cortex-m3 -msoft-float -mfix-cortex-m3-ldrd -c $*.c -o $*.o diff --git a/main.c b/main.c index 7400237..b3ee665 100644 --- a/main.c +++ b/main.c @@ -24,7 +24,7 @@ void setup (void) { // All the blackbox code gpio_set_mode(GPIOA, GPIO_MODE_INPUT, GPIO_CNF_INPUT_FLOAT, GPIO0); } -void inline wait (int ticks) { // This works in libopenocm3 examples +inline void wait (int ticks) { // This works in libopenocm3 examples int i; for (i=0;i