diff options
| author | lynxeyed-atsu <lynxeyed@xj9.so-net.ne.jp> | 2012-09-01 12:46:41 +0900 |
|---|---|---|
| committer | lynxeyed-atsu <lynxeyed@xj9.so-net.ne.jp> | 2012-09-01 12:46:41 +0900 |
| commit | 8299e5476fba3bf9da31802ae9315a8bc2ed1ca7 (patch) | |
| tree | cdf5102dbd446645e97d2b7838620cd13d582e03 /src | |
| parent | 12e5040eacf8cb6db3a3f8fb11fd85733113704a (diff) | |
fixed preprocessors
Diffstat (limited to 'src')
| -rwxr-xr-x | src/core/system_LPC11xx.cpp | 14 | ||||
| -rwxr-xr-x | src/user_application.cpp | 2 |
2 files changed, 13 insertions, 3 deletions
diff --git a/src/core/system_LPC11xx.cpp b/src/core/system_LPC11xx.cpp index 5a291c5..1e5d157 100755 --- a/src/core/system_LPC11xx.cpp +++ b/src/core/system_LPC11xx.cpp @@ -125,14 +125,24 @@ #define SYSOSCCTRL_Val 0x00000000
#define WDTOSC_SETUP 0
#define WDTOSCCTRL_Val 0x000000A0
+
+#if defined ( NO_EXTCLK )
+ #define SYSPLLCLKSEL_Val 0x00000000 // for NON EXTCLK
+#else
#define SYSPLLCLKSEL_Val 0x00000001
-//#define SYSPLLCLKSEL_Val 0x00000000 // for NON EXTCLK
+#endif
+
#define SYSPLL_SETUP 1
#define SYSPLLCTRL_Val 0x00000023
#define MAINCLKSEL_Val 0x00000003
#define SYSAHBCLKDIV_Val 0x00000001
+
+#if defined ( NO_EXTCLK )
+ #define AHBCLKCTRL_Val 0x0001FFFF // for NON EXTCLK
+#else
#define AHBCLKCTRL_Val 0x0001005F
-//#define AHBCLKCTRL_Val 0x0001FFFF // for NON EXTCLK
+#endif
+
#define SSP0CLKDIV_Val 0x00000001
#define UARTCLKDIV_Val 0x00000001
#define SSP1CLKDIV_Val 0x00000001
diff --git a/src/user_application.cpp b/src/user_application.cpp index 63d5043..7024398 100755 --- a/src/user_application.cpp +++ b/src/user_application.cpp @@ -4,7 +4,7 @@ void setup() {
Serial.begin(9600); // XBeeのセットアップ
Serial.println("\r\nStart...");
-
+
}
void loop()
|