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

PWM Patch Pull Request #22

Merged
merged 5 commits into from
Aug 7, 2013
Merged

PWM Patch Pull Request #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d29ebef
Begin to add can_api.c to LPC11C24 codebase. Not complete yet, which …
matthewelse Aug 6, 2013
548d18e
Pull in changes to the main mbed code base.
matthewelse Aug 6, 2013
0c0b51f
Fixed pwm_api bug
toyowata Aug 7, 2013
b437a3c
Removed can_api.c from TARGET_LPC11CXX, as it's not ready for pull re…
matthewelse Aug 7, 2013
e1eb357
Added changes to PWM API from LPC1114 to LPC11C24
matthewelse Aug 7, 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
2 changes: 1 addition & 1 deletion libraries/mbed/targets/cmsis/TARGET_NXP/TARGET_LPC11XX/LPC11xx.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,7 @@ typedef struct
__IO uint32_t PC; /*!< Offset: 0x010 Prescale Counter Register (R/W) */
__IO uint32_t MCR; /*!< Offset: 0x014 Match Control Register (R/W) */
union {
__IO uint32_t MR[4]; /*!< (@ 0x40014018) Match Register */
__IO uint32_t MR[4]; /*!< Offset: Match Register base */
struct{
__IO uint32_t MR0; /*!< Offset: 0x018 Match Register 0 (R/W) */
__IO uint32_t MR1; /*!< Offset: 0x01C Match Register 1 (R/W) */
Expand Down
4 changes: 4 additions & 0 deletions libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11CXX/objects.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,10 @@ struct spi_s {
LPC_SSP_TypeDef *spi;
};

struct can_s {
int index;
};

#include "gpio_object.h"

#ifdef __cplusplus
Expand Down
20 changes: 15 additions & 5 deletions libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11CXX/pwmout_api.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,21 @@ typedef struct {
uint8_t mr;
} timer_mr;

static timer_mr pwm_timer_map[4] = {
{0, 0},
{1, 0},
{2, 0},
{3, 0},
static timer_mr pwm_timer_map[11] = {
{0, 0}, /* CT16B0, MR0 */
{0, 1}, /* CT16B0, MR1 */
{0, 2}, /* CT16B0, MR2 */

{1, 0}, /* CT16B1, MR0 */
{1, 1}, /* CT16B1, MR1 */

{2, 0}, /* CT32B0, MR0 */
{2, 1}, /* CT32B0, MR1 */
{2, 2}, /* CT32B0, MR2 */

{3, 0}, /* CT32B1, MR0 */
{3, 1}, /* CT32B1, MR1 */
{3, 2} /* CT32B1, MR2 */
};

static LPC_TMR_TypeDef *Timers[4] = {
Expand Down
20 changes: 15 additions & 5 deletions libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11XX/pwmout_api.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,21 @@ typedef struct {
uint8_t mr;
} timer_mr;

static timer_mr pwm_timer_map[4] = {
{0, 0},
{1, 0},
{2, 0},
{3, 0},
static timer_mr pwm_timer_map[11] = {
{0, 0}, /* CT16B0, MR0 */
{0, 1}, /* CT16B0, MR1 */
{0, 2}, /* CT16B0, MR2 */

{1, 0}, /* CT16B1, MR0 */
{1, 1}, /* CT16B1, MR1 */

{2, 0}, /* CT32B0, MR0 */
{2, 1}, /* CT32B0, MR1 */
{2, 2}, /* CT32B0, MR2 */

{3, 0}, /* CT32B1, MR0 */
{3, 1}, /* CT32B1, MR1 */
{3, 2} /* CT32B1, MR2 */
};

static LPC_TMR_TypeDef *Timers[4] = {
Expand Down