Skip to content

CAN-Related Pull Request #20

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

Merged
merged 23 commits into from
Aug 6, 2013
Merged

CAN-Related Pull Request #20

Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
200b263
Added basic stuff necessary to compile for LPC11C24 target.
matthewelse Jul 27, 2013
429d2e6
Enabled CAN for LPC11CXX in device.h
matthewelse Jul 29, 2013
07cddbf
Merge remote-tracking branch 'upstream/master'
matthewelse Jul 30, 2013
51bfe26
Add can_t->index to struct and set it during can_init
omdathetkan Jul 30, 2013
8ef8aac
Merge remote-tracking branch 'upstream/master'
omdathetkan Jul 31, 2013
454935a
Update README.md to include LPC11C24 under supported chips.
matthewelse Jul 31, 2013
63b2b27
Refactor CAN interrupt handling to LPC176X HAL implementation
omdathetkan Jul 31, 2013
a16dc72
Add @param documentation for new event parameter
omdathetkan Jul 31, 2013
d899612
Merge branch 'forpullrequest'
matthewelse Aug 1, 2013
f685efa
Merge remote-tracking branch 'upstream/master'
omdathetkan Aug 2, 2013
48fc1aa
Add test case MBED_30 and MBED_31 to test CAN api
omdathetkan Aug 2, 2013
b470ea0
Fixed things that shouldn't have been changed
matthewelse Aug 5, 2013
7c8c722
Pushed LPC1114 I2C updates to the LPC11C24
matthewelse Aug 5, 2013
2c45596
Merge https://github.com/jorisa/mbed
matthewelse Aug 5, 2013
ef28879
Merged remote tracking branch 'upstream/master'
matthewelse Aug 5, 2013
e38b3df
Added LPC11C24 to README.md
matthewelse Aug 5, 2013
c747e25
Rename some argument and enum names to match existing naming
omdathetkan Aug 6, 2013
f7a2be4
Merge remote-tracking branch 'upstream/master'
matthewelse Aug 6, 2013
bf02700
Merge https://github.com/jorisa/mbed
matthewelse Aug 6, 2013
714daff
Fix CAN Test (MBED_30)
matthewelse Aug 6, 2013
6cf35db
Fix CAN Interrupt Test (MBED_31)
matthewelse Aug 6, 2013
4401516
Removed unnecessary core_cm* files, as they are now shared in cmsis
matthewelse Aug 6, 2013
45470ab
Updated READMEs
matthewelse Aug 6, 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
Merge remote-tracking branch 'upstream/master'
  • Loading branch information
@matthewelse
matthewelse committed Aug 6, 2013
commit f7a2be4beda3ec4b9e6b896d62dc6d4af34aaebc

This merge commit was added into this branch cleanly.

There are no new changes to show, but you can still view the diff.