aboutsummaryrefslogtreecommitdiffstats
path: root/src/gadc
diff options
context:
space:
mode:
authorinmarket <andrewh@inmarket.com.au>2015-01-21 17:26:24 +1000
committerinmarket <andrewh@inmarket.com.au>2015-01-21 17:26:24 +1000
commitfa8167b94d13e94a6cb953e7f549a89f155f77c6 (patch)
tree8c33f78c45ca72ac2653327607f1d7caed668c5e /src/gadc
parent34939386d7390b0876973a1969f336b814313a22 (diff)
downloaduGFX-fa8167b94d13e94a6cb953e7f549a89f155f77c6.tar.gz
uGFX-fa8167b94d13e94a6cb953e7f549a89f155f77c6.tar.bz2
uGFX-fa8167b94d13e94a6cb953e7f549a89f155f77c6.zip
Big file rename to reduce problems with brain-dead IDE's that don't handle project file hierarchies well.
Naming is more consistent with the new scheme. May affect some third party drivers (header file renames).
Diffstat (limited to 'src/gadc')
-rw-r--r--src/gadc/gadc.c (renamed from src/gadc/gadc_gadc.c)11
-rw-r--r--src/gadc/gadc.h (renamed from src/gadc/sys_defs.h)2
-rw-r--r--src/gadc/gadc.mk1
-rw-r--r--src/gadc/gadc_driver.h (renamed from src/gadc/driver.h)2
-rw-r--r--src/gadc/gadc_options.h (renamed from src/gadc/sys_options.h)2
-rw-r--r--src/gadc/gadc_rules.h (renamed from src/gadc/sys_rules.h)2
-rw-r--r--src/gadc/sys_make.mk1
7 files changed, 6 insertions, 15 deletions
diff --git a/src/gadc/gadc_gadc.c b/src/gadc/gadc.c
index 5ac8e53c..ec0bc880 100644
--- a/src/gadc/gadc_gadc.c
+++ b/src/gadc/gadc.c
@@ -5,19 +5,12 @@
* http://ugfx.org/license.html
*/
-/**
- * @file src/gadc/gadc_gadc.c
- * @brief GADC sub-system code.
- *
- * @addtogroup GADC
- * @{
- */
#include "gfx.h"
#if GFX_USE_GADC
/* Include the driver defines */
-#include "driver.h"
+#include "gadc_driver.h"
#if GADC_MAX_HIGH_SPEED_SAMPLERATE > GADC_MAX_SAMPLE_FREQUENCY/2
#error "GADC: GADC_MAX_HIGH_SPEED_SAMPLERATE has been set too high. It must be less than half the maximum CPU rate"
@@ -358,5 +351,3 @@ bool_t gadcLowSpeedStart(uint32_t physdev, adcsample_t *buffer, GADCCallbackFunc
}
#endif /* GFX_USE_GADC */
-/** @} */
-
diff --git a/src/gadc/sys_defs.h b/src/gadc/gadc.h
index 1f40f6df..461e490e 100644
--- a/src/gadc/sys_defs.h
+++ b/src/gadc/gadc.h
@@ -6,7 +6,7 @@
*/
/**
- * @file src/gadc/sys_defs.h
+ * @file src/gadc/gadc.h
*
* @addtogroup GADC
*
diff --git a/src/gadc/gadc.mk b/src/gadc/gadc.mk
new file mode 100644
index 00000000..05b1e9cc
--- /dev/null
+++ b/src/gadc/gadc.mk
@@ -0,0 +1 @@
+GFXSRC += $(GFXLIB)/src/gadc/gadc.c
diff --git a/src/gadc/driver.h b/src/gadc/gadc_driver.h
index 77604b9f..7c72dfd4 100644
--- a/src/gadc/driver.h
+++ b/src/gadc/gadc_driver.h
@@ -6,7 +6,7 @@
*/
/**
- * @file src/gadc/driver.h
+ * @file src/gadc/gadc_driver.h
* @brief GADC - Periodic ADC driver header file.
*
* @defgroup Driver Driver
diff --git a/src/gadc/sys_options.h b/src/gadc/gadc_options.h
index d9519c39..18c5038c 100644
--- a/src/gadc/sys_options.h
+++ b/src/gadc/gadc_options.h
@@ -6,7 +6,7 @@
*/
/**
- * @file src/gadc/sys_options.h
+ * @file src/gadc/gadc_options.h
* @brief GADC - Periodic ADC subsystem options header file.
*
* @addtogroup GADC
diff --git a/src/gadc/sys_rules.h b/src/gadc/gadc_rules.h
index 363b2434..d6c6e5ee 100644
--- a/src/gadc/sys_rules.h
+++ b/src/gadc/gadc_rules.h
@@ -6,7 +6,7 @@
*/
/**
- * @file src/gadc/sys_rules.h
+ * @file src/gadc/gadc_rules.h
* @brief GADC safety rules header file.
*
* @addtogroup GADC
diff --git a/src/gadc/sys_make.mk b/src/gadc/sys_make.mk
deleted file mode 100644
index 21a07dbe..00000000
--- a/src/gadc/sys_make.mk
+++ /dev/null
@@ -1 +0,0 @@
-GFXSRC += $(GFXLIB)/src/gadc/gadc_gadc.c