aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorKen Sarkies2012-12-05 16:05:40 +1030
committerKen Sarkies2013-01-08 19:50:22 +1030
commit1029597e7034bc088179227efe84bc0c00391082 (patch)
tree150ed25904324f45bb3acb6924428693d5c227d4 /lib
parent7ec382c7d5dfdc868ab52501bebf02eb23a416a0 (diff)
Move DAC to common area
(Note there are now dummy source files dac.c (and others) that are not compiled but are needed for documentation).
Diffstat (limited to 'lib')
-rw-r--r--lib/stm32/common/dac_common_all.c (renamed from lib/stm32/dac.c)6
-rw-r--r--lib/stm32/f1/Makefile4
-rw-r--r--lib/stm32/f1/dac.c28
-rw-r--r--lib/stm32/f2/Makefile2
-rw-r--r--lib/stm32/f2/dac.c28
-rw-r--r--lib/stm32/f4/Makefile2
-rw-r--r--lib/stm32/f4/dac.c28
-rw-r--r--lib/stm32/l1/Makefile7
-rw-r--r--lib/stm32/l1/dac.c28
9 files changed, 120 insertions, 13 deletions
diff --git a/lib/stm32/dac.c b/lib/stm32/common/dac_common_all.c
index 55440bf..a6be233 100644
--- a/lib/stm32/dac.c
+++ b/lib/stm32/common/dac_common_all.c
@@ -1,8 +1,4 @@
-/** @defgroup STM32F_dac_file DAC
-
-@ingroup STM32F_files
-
-@brief <b>libopencm3 STM32Fxx Digital to Analog Converter</b>
+/** @addtogroup dac_file
@version 1.0.0
diff --git a/lib/stm32/f1/Makefile b/lib/stm32/f1/Makefile
index 845ae0c..7da3449 100644
--- a/lib/stm32/f1/Makefile
+++ b/lib/stm32/f1/Makefile
@@ -31,9 +31,9 @@ ARFLAGS = rcs
OBJS = rcc.o gpio.o usart.o adc.o flash.o \
rtc.o i2c.o dma.o exti.o ethernet.o \
usb_f103.o usb.o usb_control.o usb_standard.o can.o \
- timer.o usb_f107.o desig.o crc.o dac.o iwdg.o pwr.o \
+ timer.o usb_f107.o desig.o crc.o iwdg.o pwr.o \
usb_fx07_common.o \
- gpio_common_all.o spi_common_all.o
+ gpio_common_all.o spi_common_all.o dac_common_all.o
VPATH += ../../usb:../:../../cm3:../common
diff --git a/lib/stm32/f1/dac.c b/lib/stm32/f1/dac.c
new file mode 100644
index 0000000..90dc029
--- /dev/null
+++ b/lib/stm32/f1/dac.c
@@ -0,0 +1,28 @@
+/** @defgroup dac_file DAC
+
+@ingroup STM32F1xx
+
+@brief <b>libopencm3 STM32F1xx DAC</b>
+
+*/
+
+/*
+ * This file is part of the libopencm3 project.
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+#include <libopencm3/stm32/dac.h>
+#include <libopencm3/stm32/common/dac_common_all.h>
+
diff --git a/lib/stm32/f2/Makefile b/lib/stm32/f2/Makefile
index 174dbce..190812c 100644
--- a/lib/stm32/f2/Makefile
+++ b/lib/stm32/f2/Makefile
@@ -30,7 +30,7 @@ CFLAGS = -Os -g -Wall -Wextra -I../../../include -fno-common \
ARFLAGS = rcs
OBJS = rcc.o gpio.o usart.o flash.o \
i2c.o exti2.o timer.o \
- gpio_common_all.o gpio_common_f24.o spi_common_all.o
+ gpio_common_all.o gpio_common_f24.o spi_common_all.o dac_common_all.o
VPATH += ../../usb:../:../../cm3:../common
diff --git a/lib/stm32/f2/dac.c b/lib/stm32/f2/dac.c
new file mode 100644
index 0000000..5d20703
--- /dev/null
+++ b/lib/stm32/f2/dac.c
@@ -0,0 +1,28 @@
+/** @defgroup dac_file DAC
+
+@ingroup STM32F2xx
+
+@brief <b>libopencm3 STM32F2xx DAC</b>
+
+*/
+
+/*
+ * This file is part of the libopencm3 project.
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+#include <libopencm3/stm32/dac.h>
+#include <libopencm3/stm32/common/dac_common_all.h>
+
diff --git a/lib/stm32/f4/Makefile b/lib/stm32/f4/Makefile
index 0bd9a10..282ed48 100644
--- a/lib/stm32/f4/Makefile
+++ b/lib/stm32/f4/Makefile
@@ -33,7 +33,7 @@ OBJS = rcc.o gpio.o usart.o flash.o \
i2c.o exti2.o pwr.o timer.o \
usb.o usb_standard.o usb_control.o usb_fx07_common.o usb_f107.o \
usb_f207.o adc.o dma.o \
- gpio_common_all.o gpio_common_f24.o spi_common_all.o
+ gpio_common_all.o gpio_common_f24.o spi_common_all.o dac_common_all.o
VPATH += ../../usb:../:../../cm3:../common
diff --git a/lib/stm32/f4/dac.c b/lib/stm32/f4/dac.c
new file mode 100644
index 0000000..4776c41
--- /dev/null
+++ b/lib/stm32/f4/dac.c
@@ -0,0 +1,28 @@
+/** @defgroup dac_file DAC
+
+@ingroup STM32F4xx
+
+@brief <b>libopencm3 STM32F4xx DAC</b>
+
+*/
+
+/*
+ * This file is part of the libopencm3 project.
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+#include <libopencm3/stm32/dac.h>
+#include <libopencm3/stm32/common/dac_common_all.h>
+
diff --git a/lib/stm32/l1/Makefile b/lib/stm32/l1/Makefile
index b533acf..ee50b6c 100644
--- a/lib/stm32/l1/Makefile
+++ b/lib/stm32/l1/Makefile
@@ -28,10 +28,9 @@ CFLAGS = -Os -g -Wall -Wextra -I../../../include -fno-common \
-ffunction-sections -fdata-sections -MD -DSTM32L1
# ARFLAGS = rcsv
ARFLAGS = rcs
-OBJS = rcc.o desig.o crc.o usart.o exti2.o
-OBJS += flash.o gpio_common_all.o gpio_common_f24.o spi_common_all.o
-OBJS += pwr_chipset.o # TODO, get pwr.o to fix f2/f4 first... pwr.o
-OBJS += timer.o
+OBJS = rcc.o desig.o crc.o usart.o exti2.o flash.o timer.o
+OBJS += gpio_common_all.o gpio_common_f24.o spi_common_all.o dac_common_all.o
+OBJS += pwr_chipset.o # TODO, get pwr.o to fix f2/f4 first... pwr.o
VPATH += ../../usb:../:../../cm3:../common
diff --git a/lib/stm32/l1/dac.c b/lib/stm32/l1/dac.c
new file mode 100644
index 0000000..534f9f1
--- /dev/null
+++ b/lib/stm32/l1/dac.c
@@ -0,0 +1,28 @@
+/** @defgroup dac_file DAC
+
+@ingroup STM32L1xx
+
+@brief <b>libopencm3 STM32L1xx DAC</b>
+
+*/
+
+/*
+ * This file is part of the libopencm3 project.
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+#include <libopencm3/stm32/dac.h>
+#include <libopencm3/stm32/common/dac_common_all.h>
+