From be986aa8d9b4e86583e74355d8cb1069f28aca4f Mon Sep 17 00:00:00 2001 From: Thomas Otto Date: Thu, 25 Mar 2010 10:13:15 +0100 Subject: Corrected Makefile for ADC example --- examples/other/adc_temperature_sensor/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/other/adc_temperature_sensor/Makefile b/examples/other/adc_temperature_sensor/Makefile index b968dbc..a708bcb 100644 --- a/examples/other/adc_temperature_sensor/Makefile +++ b/examples/other/adc_temperature_sensor/Makefile @@ -26,8 +26,8 @@ LD = $(PREFIX)-ld OBJCOPY = $(PREFIX)-objcopy OBJDUMP = $(PREFIX)-objdump # Uncomment this line if you want to use the installed (not local) library. -TOOLCHAIN_DIR = `dirname \`which $(CC)\``/.. -#TOOLCHAIN_DIR = ../../.. +#TOOLCHAIN_DIR = `dirname \`which $(CC)\``/.. +TOOLCHAIN_DIR = ../../.. CFLAGS = -O0 -g -Wall -Wextra -I$(TOOLCHAIN_DIR)/include -fno-common \ -mcpu=cortex-m3 -mthumb LDSCRIPT = $(BINARY).ld -- cgit v1.2.3 From feb3f187fe9140c1419ad82f90bac1ee9681a8ee Mon Sep 17 00:00:00 2001 From: Thomas Otto Date: Thu, 25 Mar 2010 13:11:59 +0100 Subject: Added systick.h definitions. --- include/libopenstm32/systick.h | 70 ++++++++++++++++++++++++++++++++++++++++++ lib/systick.c | 22 +++++++++++++ 2 files changed, 92 insertions(+) create mode 100644 include/libopenstm32/systick.h create mode 100644 lib/systick.c diff --git a/include/libopenstm32/systick.h b/include/libopenstm32/systick.h new file mode 100644 index 0000000..a4e426c --- /dev/null +++ b/include/libopenstm32/systick.h @@ -0,0 +1,70 @@ +/* + * This file is part of the libopenstm32 project. + * + * Copyright (C) 2010 Thomas Otto + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef LIBOPENSTM32_SYSTICK_H +#define LIBOPENSTM32_SYSTICK_H + +#include +#include + +/* --- SYSTICK registers --------------------------------------------------- */ + +/* Control and status register (STK_CTRL) */ +#define STK_CTRL MMIO32(SYSTICK_BASE + 0x00) + +/* reload value register (STK_LOAD) */ +#define STK_LOAD MMIO32(SYSTICK_BASE + 0x04) + +/* current value register (STK_VAL) */ +#define STK_VAL MMIO32(SYSTICK_BASE + 0x08) + +/* calibration value register (STK_CALIB) */ +#define STK_CALIB MMIO32(SYSTICK_BASE + 0x0C) + +/* --- STK_CTRL values ----------------------------------------------------- */ +/* Bits [31:17] Reserved, must be kept cleared. */ +/* COUNTFLAG: */ +#define STK_CTRL_COUNTFLAG (1 << 16) +/* Bits [15:3] Reserved, must be kept cleared. */ +/* CLKSOURCE: Clock source selection */ +#define STK_CTRL_CLKSOURCE (1 << 2) +/* TICKINT: SysTick exception request enable */ +#define STK_CTRL_TICKINT (1 << 1) +/* ENABLE: Counter enable */ +#define STK_CTRL_ENABLE (1 << 0) + +/* --- STK_LOAD values ----------------------------------------------------- */ +/* Bits [31:24] Reserved, must be kept cleared. */ +/* RELOAD[23:0]: RELOAD value */ + +/* --- STK_VAL values ------------------------------------------------------ */ +/* Bits [31:24] Reserved, must be kept cleared. */ +/* CURRENT[23:0]: Current counter value */ + +/* --- STK_CALIB values ---------------------------------------------------- */ +/* NOREF: NOREF flag */ +#define STK_CALIB_NOREF (1 << 31) +/* SKEW: SKEW flag */ +#define STK_CALIB_SKEW (1 << 30) +/* Bits [29:24] Reserved, must be kept cleared. */ +/* TENMS[23:0]: Calibration value */ + +/* --- Function Prototypes ------------------------------------------------- */ + +#endif diff --git a/lib/systick.c b/lib/systick.c new file mode 100644 index 0000000..3298ee6 --- /dev/null +++ b/lib/systick.c @@ -0,0 +1,22 @@ +/* + * This file is part of the libopenstm32 project. + * + * Copyright (C) 2010 Thomas Otto + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include + + -- cgit v1.2.3 From 3518301870be7e2ef1083bea6c170f28fa574d78 Mon Sep 17 00:00:00 2001 From: Thomas Otto Date: Thu, 25 Mar 2010 13:13:01 +0100 Subject: Integrated systick into build system. --- include/libopenstm32.h | 1 + lib/Makefile | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/include/libopenstm32.h b/include/libopenstm32.h index 5991b24..03d488a 100644 --- a/include/libopenstm32.h +++ b/include/libopenstm32.h @@ -37,5 +37,6 @@ #include #include #include +#include #endif diff --git a/lib/Makefile b/lib/Makefile index b23762a..d85afee 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -28,7 +28,7 @@ CFLAGS = -Os -g -Wall -Wextra -I../include -fno-common \ # ARFLAGS = rcsv ARFLAGS = rcs OBJS = vector.o rcc.o gpio.o usart.o adc.o spi.o flash.o nvic.o \ - rtc.o i2c.o dma.o + rtc.o i2c.o dma.o systick.o # Be silent per default, but 'make V=1' will show all compiler calls. ifneq ($(V),1) -- cgit v1.2.3