Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

target K20D5M #135

Merged
merged 17 commits into from
Dec 26, 2013
Merged

target K20D5M #135

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
5bd25ac
Added K20D5M support
mconners Sep 24, 2013
8ca8014
Merge branch 'master' into K20D50
0xc0170 Nov 18, 2013
4e09b52
K20 uVision files, ld NVIC offset
0xc0170 Nov 19, 2013
3dc97b2
startup ARM - stack pointer, serial functional
0xc0170 Nov 22, 2013
0e99a7c
Analog API - pins, analog pins (arduino) correction, irq
0xc0170 Nov 26, 2013
c5a2e6e
pwm, spi - pin definition, dac removed
0xc0170 Nov 27, 2013
d8d526f
Merge branch 'master' into K20D50
0xc0170 Nov 28, 2013
5e9e53f
PWM - changes to start the channel
0xc0170 Dec 10, 2013
988894e
Merge branch 'master' into K20D50
0xc0170 Dec 17, 2013
3662215
SPI, RTC, Serial changes
0xc0170 Dec 23, 2013
c9a029c
Merge branch 'master' into K20D50
0xc0170 Dec 23, 2013
b73b57d
I2C, pullup
0xc0170 Dec 23, 2013
78140c4
LPTMR timer - OSCEN set, GCC startup vectors add
0xc0170 Dec 25, 2013
6aa237f
K20D5M exporters for uVision and ARM GCC
0xc0170 Dec 25, 2013
6352603
K20D5M flash algo for template
0xc0170 Dec 26, 2013
15e246f
Merge branch 'master' into K20D50
0xc0170 Dec 26, 2013
ee7c33d
K20D5M default irq handler
0xc0170 Dec 26, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
pwm, spi - pin definition, dac removed
  • Loading branch information
@0xc0170
0xc0170 committed Nov 27, 2013
commit c5a2e6ed0e9095cc8f1d4036ee75836edadd02c6
21 changes: 10 additions & 11 deletions libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/PeripheralNames.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,18 +37,17 @@ typedef enum {

#define TPM_SHIFT 8
typedef enum {
PWM_1 = (0 << TPM_SHIFT) | (0), // TPM0 CH0
PWM_2 = (0 << TPM_SHIFT) | (1), // TPM0 CH1
PWM_3 = (0 << TPM_SHIFT) | (2), // TPM0 CH2
PWM_4 = (0 << TPM_SHIFT) | (3), // TPM0 CH3
PWM_5 = (0 << TPM_SHIFT) | (4), // TPM0 CH4
PWM_6 = (0 << TPM_SHIFT) | (5), // TPM0 CH5
PWM_1 = (0 << TPM_SHIFT) | (0), // FTM0 CH0
PWM_2 = (0 << TPM_SHIFT) | (1), // FTM0 CH1
PWM_3 = (0 << TPM_SHIFT) | (2), // FTM0 CH2
PWM_4 = (0 << TPM_SHIFT) | (3), // FTM0 CH3
PWM_5 = (0 << TPM_SHIFT) | (4), // FTM0 CH4
PWM_6 = (0 << TPM_SHIFT) | (5), // FTM0 CH5
PWM_7 = (0 << TPM_SHIFT) | (6), // FTM0 CH6
PWM_8 = (0 << TPM_SHIFT) | (7), // FTM0 CH7

PWM_7 = (1 << TPM_SHIFT) | (0), // TPM1 CH0
PWM_8 = (1 << TPM_SHIFT) | (1), // TPM1 CH1

PWM_9 = (2 << TPM_SHIFT) | (0), // TPM2 CH0
PWM_10 = (2 << TPM_SHIFT) | (1) // TPM2 CH1
PWM_9 = (1 << TPM_SHIFT) | (0), // FTM1 CH0
PWM_10 = (1 << TPM_SHIFT) | (1), // FTM1 CH1
} PWMName;

typedef enum {
Expand Down
2 changes: 1 addition & 1 deletion libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/device.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#define DEVICE_INTERRUPTIN 1

#define DEVICE_ANALOGIN 1
#define DEVICE_ANALOGOUT 1
#define DEVICE_ANALOGOUT 0

#define DEVICE_SERIAL 1

Expand Down
4 changes: 0 additions & 4 deletions libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/objects.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,6 @@ struct analogin_s {
ADCName adc;
};

struct dac_s {
DACName dac;
};

struct i2c_s {
I2C_Type *i2c;
};
Expand Down
8 changes: 6 additions & 2 deletions libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/port_api.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,12 @@ void port_mode(port_t *obj, PinMode mode) {

void port_dir(port_t *obj, PinDirection dir) {
switch (dir) {
case PIN_INPUT : *obj->reg_dir &= ~obj->mask; break;
case PIN_OUTPUT: *obj->reg_dir |= obj->mask; break;
case PIN_INPUT :
*obj->reg_dir &= ~obj->mask;
break;
case PIN_OUTPUT:
*obj->reg_dir |= obj->mask;
break;
}
}

Expand Down
46 changes: 8 additions & 38 deletions libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/pwmout_api.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,45 +21,16 @@

static const PinMap PinMap_PWM[] = {
// LEDs
{LED_RED , PWM_9 , 3}, // PTB18, FTM2 CH0
{LED_GREEN, PWM_10, 3}, // PTB19, FTM2 CH1
{LED_BLUE , PWM_2 , 4}, // PTD1 , FTM0 CH1
{LED_RED , PWM_3 , 3}, // PTC3, FTM0 CH2
{LED_GREEN, PWM_5, 3}, // PTD4, FTM0 CH4
{LED_BLUE , PWM_9 , 3}, // PTA2 , FTM0 CH7

// Arduino digital pinout
{D0, PWM_9 , 3}, // PTA1 , FTM2 CH0
{D1, PWM_10, 3}, // PTA2 , FTM2 CH1
{D2, PWM_5 , 4}, // PTD4 , FTM0 CH4
{D3, PWM_7 , 3}, // PTA12, FTM1 CH0
{D4, PWM_2 , 3}, // PTA4 , FTM0 CH1
{D5, PWM_3 , 3}, // PTA5 , FTM0 CH2
{D6, PWM_5 , 3}, // PTC8 , FTM0 CH4
{D7, PWM_6 , 3}, // PTC9 , FTM0 CH5
{D8, PWM_8 , 3}, // PTA13, FTM1 CH1
{D9, PWM_6 , 4}, // PTD5 , FTM0 CH5
{D10, PWM_1 , 4}, // PTD0 , FTM0 CH0
{D11, PWM_3 , 4}, // PTD2 , FTM0 CH2
{D12, PWM_4 , 4}, // PTD3 , FTM0 CH3
{D13, PWM_2 , 4}, // PTD1 , FTM0 CH1,

{PTA0, PWM_6, 3},
{PTA3, PWM_1, 3},
{PTB0, PWM_7, 3},
{PTB1, PWM_8, 3},
{PTB2, PWM_9, 3},
{PTB3, PWM_10, 3},
{PTC1, PWM_1, 4},
{PTC2, PWM_2, 4},
{PTC3, PWM_3, 4},
{PTC4, PWM_4, 4},
{PTE20, PWM_7, 3},
{PTE21, PWM_8, 3},
{PTE22, PWM_9, 3},
{PTE23, PWM_10, 3},
{PTE24, PWM_1, 3},
{PTE25, PWM_2, 3},
{PTE29, PWM_3, 3},
{PTE30, PWM_4, 3},
{PTE31, PWM_5, 3},
{D3, PWM_5 , 3}, // PTA12, FTM0 CH4
{D5, PWM_7 , 3}, // PTA1 , FTM0 CH6
{D6, PWM_3 , 3}, // PTC3 , FTM0 CH2
{D9, PWM_8 , 4}, // PTD2 , FTM0 CH7
{D10, PWM_2 , 4}, // PTC2 , FTM0 CH1

{NC , NC , 0}
};
Expand All @@ -78,7 +49,6 @@ void pwmout_init(pwmout_t* obj, PinName pin) {

SIM->SCGC5 |= 1 << (SIM_SCGC5_PORTA_SHIFT + port);
SIM->SCGC6 |= 1 << (SIM_SCGC6_FTM0_SHIFT + ftm_n);
SIM->SOPT2 |= SIM_SOPT2_CLKOUTSEL(1); // Clock source: MCGFLLCLK or MCGPLLCLK

FTM_Type *ftm = (FTM_Type *)(FTM0_BASE + 0x1000 * ftm_n);
ftm->SC = FTM_SC_CLKS(1) | FTM_SC_PS(6); // (48)MHz / 64 = (0.75)MHz
Expand Down
103 changes: 37 additions & 66 deletions libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20D5M/spi_api.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,54 +22,26 @@
#include "error.h"

static const PinMap PinMap_SPI_SCLK[] = {
{PTA15, SPI_0, 2},
{PTB11, SPI_0, 2},
{PTC5, SPI_0, 2},
{PTD1, SPI_0, 2},
{PTD5, SPI_0, 2},
{PTE2, SPI_0, 2},
{PTC5, SPI_0, 2},
{PTD1, SPI_0, 2},
{NC , NC , 0}
};

static const PinMap PinMap_SPI_MOSI[] = {
{PTA16, SPI_0, 2},
{PTA17, SPI_0, 5},
{PTB16, SPI_0, 2},
{PTB17, SPI_0, 5},
{PTC6, SPI_0, 2},
{PTC7, SPI_0, 5},
{PTD2, SPI_0, 2},
{PTD3, SPI_0, 5},
{PTD6, SPI_0, 2},
{PTD7, SPI_0, 5},
{PTE1, SPI_0, 2},
{PTE3, SPI_0, 5},
{PTD2, SPI_0, 2},
{PTC6, SPI_0, 2},
{NC , NC , 0}
};

static const PinMap PinMap_SPI_MISO[] = {
{PTA16, SPI_0, 5},
{PTA17, SPI_0, 2},
{PTB16, SPI_0, 5},
{PTB17, SPI_0, 2},
{PTC6, SPI_0, 5},
{PTC7, SPI_0, 2},
{PTD2, SPI_0, 5},
{PTD3, SPI_0, 2},
{PTD6, SPI_0, 5},
{PTD7, SPI_0, 2},
{PTE1, SPI_0, 5},
{PTE3, SPI_0, 2},
{PTD3, SPI_0, 2},
{PTC7, SPI_0, 2},
{NC , NC , 0}
};

static const PinMap PinMap_SPI_SSEL[] = {
{PTA14, SPI_0, 2},
{PTB10, SPI_0, 2},
{PTC4, SPI_0, 2},
{PTD0, SPI_0, 2},
{PTD4, SPI_0, 2},
{PTE4, SPI_0, 2},
{PTD0, SPI_0, 2},
{PTC4, SPI_0, 2},
{NC , NC , 0}
};

Expand All @@ -90,7 +62,6 @@ void spi_init(spi_t *obj, PinName mosi, PinName miso, PinName sclk, PinName ssel
// enable power and clocking
switch ((int)obj->spi) {
case SPI_0: SIM->SCGC5 |= 1 << 11; SIM->SCGC4 |= 1 << 22; break;
//case SPI_1: SIM->SCGC5 |= 1 << 13; SIM->SCGC4 |= 1 << 23; break;
}

// set default format and frequency
Expand Down Expand Up @@ -137,35 +108,35 @@ void spi_format(spi_t *obj, int bits, int mode, int slave) {
}

void spi_frequency(spi_t *obj, int hz) {
// uint32_t error = 0;
// uint32_t p_error = 0xffffffff;
// uint32_t ref = 0;
// uint8_t spr = 0;
// uint8_t ref_spr = 0;
// uint8_t ref_prescaler = 0;

// // bus clk
// uint32_t PCLK = 48000000u;
// uint8_t prescaler = 1;
// uint8_t divisor = 2;

// for (prescaler = 1; prescaler <= 8; prescaler++) {
// divisor = 2;
// for (spr = 0; spr <= 8; spr++, divisor *= 2) {
// ref = PCLK / (prescaler*divisor);
// if (ref > (uint32_t)hz)
// continue;
// error = hz - ref;
// if (error < p_error) {
// ref_spr = spr;
// ref_prescaler = prescaler - 1;
// p_error = error;
// }
// }
// }

// // set SPPR and SPR
// obj->spi->CTAR = ((ref_prescaler & 0x7) << 4) | (ref_spr & 0xf);
uint32_t error = 0;
uint32_t p_error = 0xffffffff;
uint32_t ref = 0;
uint8_t spr = 0;
uint8_t ref_spr = 0;
uint8_t ref_prescaler = 0;

// bus clk
uint32_t PCLK = 48000000u;
uint8_t prescaler = 1;
uint8_t divisor = 2;

for (prescaler = 1; prescaler <= 8; prescaler++) {
divisor = 2;
for (spr = 0; spr <= 8; spr++, divisor *= 2) {
ref = PCLK / (prescaler*divisor);
if (ref > (uint32_t)hz)
continue;
error = hz - ref;
if (error < p_error) {
ref_spr = spr;
ref_prescaler = prescaler - 1;
p_error = error;
}
}
}

// set SPPR and SPR
obj->spi->CTAR[0] = ((ref_prescaler & 0x7) << 4) | (ref_spr & 0xf);
}

static inline int spi_writeable(spi_t * obj) {
Expand Down