Merge branch 'KL46_DEV' of git://github.com/sg-/mbed into sg--KL46_DEV

Conflicts: README.md
2013-12-17 12:06:12 +02:00 · 2013-12-17 12:06:12 +02:00 · c560db3233
parent 572b22395f 6e4388c303
commit c560db3233
2 changed files with 4 additions and 3 deletions
--- a/README.md
+++ b/README.md
@ -37,7 +37,7 @@ NXP:
 Freescale:
 * KL05Z (Cortex-M0+)
 * [KL25Z](http://mbed.org/platforms/KL25Z/) (Cortex-M0+)
-* KL46Z (Cortex-M0+)
+* [KL46Z](https://mbed.org/platforms/FRDM-KL46Z/) (Cortex-M0+)

 STMicroelectronics:
 * STM32F407 (Cortex-M4)
--- a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KL46Z/PinNames.h
+++ b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KL46Z/PinNames.h
@ -231,10 +231,11 @@ typedef enum {
    NC = (int)0xFFFFFFFF
 } PinName;

-/* PullDown not available for KL46 */
+/* Pull modes for input pins */
 typedef enum {
    PullNone = 0,
-    PullUp = 2,
+    PullDown = 2,
+    PullUp = 3
 } PinMode;

 #ifdef __cplusplus