Revision 147:39a1839cac63, committed 2014-04-03

Comitter:

mbed_official

Date:

Thu Apr 03 00:00:07 2014 +0100

Parent:

146:f64d43ff0c18

Child:

148:213f3ebbe634

Commit message:

Synchronized with git revision 8281a04c8436de32409c62d6e516739fc3454292

Full URL: https://github.com/mbedmicro/mbed/commit/8281a04c8436de32409c62d6e516739fc3454292/

Added PWM pins and mbed overrides for NMI_b

Changed in this revision

--- a/targets/hal/TARGET_Freescale/TARGET_KSDK_MCUS/TARGET_K64F/PeripheralNames.h	Wed Apr 02 21:00:08 2014 +0100
+++ b/targets/hal/TARGET_Freescale/TARGET_KSDK_MCUS/TARGET_K64F/PeripheralNames.h	Thu Apr 03 00:00:07 2014 +0100
@@ -70,6 +70,16 @@
     PWM_22 = (2 << TPM_SHIFT) | (5),  // FTM2 CH5
     PWM_23 = (2 << TPM_SHIFT) | (6),  // FTM2 CH6
     PWM_24 = (2 << TPM_SHIFT) | (7),  // FTM2 CH7
+    // could be 4 or could be 3... not sure what register
+    //  this is for... too much abstraction
+    PWM_25 = (3 << TPM_SHIFT) | (0),  // FTM3 CH0
+    PWM_26 = (3 << TPM_SHIFT) | (1),  // FTM3 CH1
+    PWM_27 = (3 << TPM_SHIFT) | (2),  // FTM3 CH2
+    PWM_28 = (3 << TPM_SHIFT) | (3),  // FTM3 CH3
+    PWM_29 = (3 << TPM_SHIFT) | (4),  // FTM3 CH4
+    PWM_30 = (3 << TPM_SHIFT) | (5),  // FTM3 CH5
+    PWM_31 = (3 << TPM_SHIFT) | (6),  // FTM3 CH6
+    PWM_32 = (3 << TPM_SHIFT) | (7),  // FTM3 CH7
 } PWMName;
 
 #define ADC_INSTANCE_SHIFT           8

--- a/targets/hal/TARGET_Freescale/TARGET_KSDK_MCUS/TARGET_K64F/PinNames.h	Wed Apr 02 21:00:08 2014 +0100
+++ b/targets/hal/TARGET_Freescale/TARGET_KSDK_MCUS/TARGET_K64F/PinNames.h	Thu Apr 03 00:00:07 2014 +0100
@@ -30,16 +30,16 @@
 #define GPIO_PORT_SHIFT 12
 
 typedef enum {
-    PTA0 = (0 << GPIO_PORT_SHIFT | 0),
-    PTA1 = (0 << GPIO_PORT_SHIFT | 1),
-    PTA2 = (0 << GPIO_PORT_SHIFT | 2),
-    PTA3 = (0 << GPIO_PORT_SHIFT | 3),
-    PTA4 = (0 << GPIO_PORT_SHIFT | 4),
-    PTA5 = (0 << GPIO_PORT_SHIFT | 5),
-    PTA6 = (0 << GPIO_PORT_SHIFT | 6),
-    PTA7 = (0 << GPIO_PORT_SHIFT | 7),
-    PTA8 = (0 << GPIO_PORT_SHIFT | 8),
-    PTA9 = (0 << GPIO_PORT_SHIFT | 9),
+    PTA0  = (0 << GPIO_PORT_SHIFT | 0 ),
+    PTA1  = (0 << GPIO_PORT_SHIFT | 1 ),
+    PTA2  = (0 << GPIO_PORT_SHIFT | 2 ),
+    PTA3  = (0 << GPIO_PORT_SHIFT | 3 ),
+    PTA4  = (0 << GPIO_PORT_SHIFT | 4 ),
+    PTA5  = (0 << GPIO_PORT_SHIFT | 5 ),
+    PTA6  = (0 << GPIO_PORT_SHIFT | 6 ),
+    PTA7  = (0 << GPIO_PORT_SHIFT | 7 ),
+    PTA8  = (0 << GPIO_PORT_SHIFT | 8 ),
+    PTA9  = (0 << GPIO_PORT_SHIFT | 9 ),
     PTA10 = (0 << GPIO_PORT_SHIFT | 10),
     PTA11 = (0 << GPIO_PORT_SHIFT | 11),
     PTA12 = (0 << GPIO_PORT_SHIFT | 12),
@@ -62,16 +62,16 @@
     PTA29 = (0 << GPIO_PORT_SHIFT | 29),
     PTA30 = (0 << GPIO_PORT_SHIFT | 30),
     PTA31 = (0 << GPIO_PORT_SHIFT | 31),
-    PTB0 = (1 << GPIO_PORT_SHIFT | 0),
-    PTB1 = (1 << GPIO_PORT_SHIFT | 1),
-    PTB2 = (1 << GPIO_PORT_SHIFT | 2),
-    PTB3 = (1 << GPIO_PORT_SHIFT | 3),
-    PTB4 = (1 << GPIO_PORT_SHIFT | 4),
-    PTB5 = (1 << GPIO_PORT_SHIFT | 5),
-    PTB6 = (1 << GPIO_PORT_SHIFT | 6),
-    PTB7 = (1 << GPIO_PORT_SHIFT | 7),
-    PTB8 = (1 << GPIO_PORT_SHIFT | 8),
-    PTB9 = (1 << GPIO_PORT_SHIFT | 9),
+    PTB0  = (1 << GPIO_PORT_SHIFT | 0 ),
+    PTB1  = (1 << GPIO_PORT_SHIFT | 1 ),
+    PTB2  = (1 << GPIO_PORT_SHIFT | 2 ),
+    PTB3  = (1 << GPIO_PORT_SHIFT | 3 ),
+    PTB4  = (1 << GPIO_PORT_SHIFT | 4 ),
+    PTB5  = (1 << GPIO_PORT_SHIFT | 5 ),
+    PTB6  = (1 << GPIO_PORT_SHIFT | 6 ),
+    PTB7  = (1 << GPIO_PORT_SHIFT | 7 ),
+    PTB8  = (1 << GPIO_PORT_SHIFT | 8 ),
+    PTB9  = (1 << GPIO_PORT_SHIFT | 9 ),
     PTB10 = (1 << GPIO_PORT_SHIFT | 10),
     PTB11 = (1 << GPIO_PORT_SHIFT | 11),
     PTB12 = (1 << GPIO_PORT_SHIFT | 12),
@@ -94,16 +94,16 @@
     PTB29 = (1 << GPIO_PORT_SHIFT | 29),
     PTB30 = (1 << GPIO_PORT_SHIFT | 30),
     PTB31 = (1 << GPIO_PORT_SHIFT | 31),
-    PTC0 = (2 << GPIO_PORT_SHIFT | 0),
-    PTC1 = (2 << GPIO_PORT_SHIFT | 1),
-    PTC2 = (2 << GPIO_PORT_SHIFT | 2),
-    PTC3 = (2 << GPIO_PORT_SHIFT | 3),
-    PTC4 = (2 << GPIO_PORT_SHIFT | 4),
-    PTC5 = (2 << GPIO_PORT_SHIFT | 5),
-    PTC6 = (2 << GPIO_PORT_SHIFT | 6),
-    PTC7 = (2 << GPIO_PORT_SHIFT | 7),
-    PTC8 = (2 << GPIO_PORT_SHIFT | 8),
-    PTC9 = (2 << GPIO_PORT_SHIFT | 9),
+    PTC0  = (2 << GPIO_PORT_SHIFT | 0 ),
+    PTC1  = (2 << GPIO_PORT_SHIFT | 1 ),
+    PTC2  = (2 << GPIO_PORT_SHIFT | 2 ),
+    PTC3  = (2 << GPIO_PORT_SHIFT | 3 ),
+    PTC4  = (2 << GPIO_PORT_SHIFT | 4 ),
+    PTC5  = (2 << GPIO_PORT_SHIFT | 5 ),
+    PTC6  = (2 << GPIO_PORT_SHIFT | 6 ),
+    PTC7  = (2 << GPIO_PORT_SHIFT | 7 ),
+    PTC8  = (2 << GPIO_PORT_SHIFT | 8 ),
+    PTC9  = (2 << GPIO_PORT_SHIFT | 9 ),
     PTC10 = (2 << GPIO_PORT_SHIFT | 10),
     PTC11 = (2 << GPIO_PORT_SHIFT | 11),
     PTC12 = (2 << GPIO_PORT_SHIFT | 12),
@@ -126,16 +126,16 @@
     PTC29 = (2 << GPIO_PORT_SHIFT | 29),
     PTC30 = (2 << GPIO_PORT_SHIFT | 30),
     PTC31 = (2 << GPIO_PORT_SHIFT | 31),
-    PTD0 = (3 << GPIO_PORT_SHIFT | 0),
-    PTD1 = (3 << GPIO_PORT_SHIFT | 1),
-    PTD2 = (3 << GPIO_PORT_SHIFT | 2),
-    PTD3 = (3 << GPIO_PORT_SHIFT | 3),
-    PTD4 = (3 << GPIO_PORT_SHIFT | 4),
-    PTD5 = (3 << GPIO_PORT_SHIFT | 5),
-    PTD6 = (3 << GPIO_PORT_SHIFT | 6),
-    PTD7 = (3 << GPIO_PORT_SHIFT | 7),
-    PTD8 = (3 << GPIO_PORT_SHIFT | 8),
-    PTD9 = (3 << GPIO_PORT_SHIFT | 9),
+    PTD0  = (3 << GPIO_PORT_SHIFT | 0 ),
+    PTD1  = (3 << GPIO_PORT_SHIFT | 1 ),
+    PTD2  = (3 << GPIO_PORT_SHIFT | 2 ),
+    PTD3  = (3 << GPIO_PORT_SHIFT | 3 ),
+    PTD4  = (3 << GPIO_PORT_SHIFT | 4 ),
+    PTD5  = (3 << GPIO_PORT_SHIFT | 5 ),
+    PTD6  = (3 << GPIO_PORT_SHIFT | 6 ),
+    PTD7  = (3 << GPIO_PORT_SHIFT | 7 ),
+    PTD8  = (3 << GPIO_PORT_SHIFT | 8 ),
+    PTD9  = (3 << GPIO_PORT_SHIFT | 9 ),
     PTD10 = (3 << GPIO_PORT_SHIFT | 10),
     PTD11 = (3 << GPIO_PORT_SHIFT | 11),
     PTD12 = (3 << GPIO_PORT_SHIFT | 12),
@@ -158,16 +158,16 @@
     PTD29 = (3 << GPIO_PORT_SHIFT | 29),
     PTD30 = (3 << GPIO_PORT_SHIFT | 30),
     PTD31 = (3 << GPIO_PORT_SHIFT | 31),
-    PTE0 = (4 << GPIO_PORT_SHIFT | 0),
-    PTE1 = (4 << GPIO_PORT_SHIFT | 1),
-    PTE2 = (4 << GPIO_PORT_SHIFT | 2),
-    PTE3 = (4 << GPIO_PORT_SHIFT | 3),
-    PTE4 = (4 << GPIO_PORT_SHIFT | 4),
-    PTE5 = (4 << GPIO_PORT_SHIFT | 5),
-    PTE6 = (4 << GPIO_PORT_SHIFT | 6),
-    PTE7 = (4 << GPIO_PORT_SHIFT | 7),
-    PTE8 = (4 << GPIO_PORT_SHIFT | 8),
-    PTE9 = (4 << GPIO_PORT_SHIFT | 9),
+    PTE0  = (4 << GPIO_PORT_SHIFT | 0 ),
+    PTE1  = (4 << GPIO_PORT_SHIFT | 1 ),
+    PTE2  = (4 << GPIO_PORT_SHIFT | 2 ),
+    PTE3  = (4 << GPIO_PORT_SHIFT | 3 ),
+    PTE4  = (4 << GPIO_PORT_SHIFT | 4 ),
+    PTE5  = (4 << GPIO_PORT_SHIFT | 5 ),
+    PTE6  = (4 << GPIO_PORT_SHIFT | 6 ),
+    PTE7  = (4 << GPIO_PORT_SHIFT | 7 ),
+    PTE8  = (4 << GPIO_PORT_SHIFT | 8 ),
+    PTE9  = (4 << GPIO_PORT_SHIFT | 9 ),
     PTE10 = (4 << GPIO_PORT_SHIFT | 10),
     PTE11 = (4 << GPIO_PORT_SHIFT | 11),
     PTE12 = (4 << GPIO_PORT_SHIFT | 12),

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/targets/hal/TARGET_Freescale/TARGET_KSDK_MCUS/TARGET_K64F/mbed_overrides.c	Thu Apr 03 00:00:07 2014 +0100
@@ -0,0 +1,32 @@
+/* mbed Microcontroller Library
+ * Copyright (c) 2006-2013 ARM Limited
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include "gpio_api.h"
+
+// called before main - implement here if board needs it ortherwise, let
+//  the application override this if necessary
+//void mbed_sdk_init()
+//{
+//
+//}
+
+// Change the NMI pin to an input. This allows NMI pin to 
+//  be used as a low power mode wakeup.  The application will
+//  need to change the pin back to NMI_b or wakeup only occurs once!
+void NMI_Handler(void)
+{
+    gpio_t gpio;
+    gpio_init_in(&gpio, PTA4);
+}

--- a/targets/hal/TARGET_Freescale/TARGET_KSDK_MCUS/TARGET_K64F/pwmout_api.c	Wed Apr 02 21:00:08 2014 +0100
+++ b/targets/hal/TARGET_Freescale/TARGET_KSDK_MCUS/TARGET_K64F/pwmout_api.c	Thu Apr 03 00:00:07 2014 +0100
@@ -23,7 +23,49 @@
 #include "fsl_clock_manager.h"
 
 static const PinMap PinMap_PWM[] = {
+    {PTA0 , PWM_6 , 3},
+    {PTA1 , PWM_7 , 3},
+    {PTA2 , PWM_8 , 3},
+    {PTA3 , PWM_1 , 3},
+    {PTA4 , PWM_2 , 3},
+    {PTA5 , PWM_3 , 3},
+    {PTA6 , PWM_4 , 3},
+    {PTA7 , PWM_5 , 3},
+    {PTA8 , PWM_9 , 3},
+    {PTA9 , PWM_10, 3},
+    {PTA10, PWM_17, 3},
+    {PTA11, PWM_18, 3},
+    {PTA12, PWM_9 , 3},
+    {PTA13, PWM_10, 3},
+    
+    {PTB0 , PWM_9 , 3},
+    {PTB1 , PWM_10, 3},
     {PTB18, PWM_17, 3},
+    {PTB19, PWM_18, 3},
+    
+    {PTC1 , PWM_1 , 4},
+    {PTC2 , PWM_2 , 4},
+    {PTC3 , PWM_3 , 4},
+    {PTC4 , PWM_4 , 4},
+    {PTC5 , PWM_3 , 7},
+    {PTC8 , PWM_29, 3},
+    {PTC9 , PWM_30, 3},
+    {PTC10, PWM_31, 3},
+    {PTC11, PWM_32, 3},
+    
+    {PTD0 , PWM_25, 4},
+    {PTD1 , PWM_26, 4},
+    {PTD2 , PWM_27, 4},
+    {PTD3 , PWM_28, 4},
+    {PTD4 , PWM_5 , 4},
+    {PTD5 , PWM_6 , 4},
+    {PTD6 , PWM_7 , 4},
+    {PTD4 , PWM_5 , 4},
+    {PTD7 , PWM_8 , 4},
+    
+    {PTE5 , PWM_25, 6},
+    {PTE6 , PWM_26, 6},
+        
     {NC   , NC    , 0}
 };