Commit Graph

18764 Commits (4c94d78f1b07b96c0015968583196be65eb73159)

Author SHA1 Message Date
Emilio Monti 262bd869a4 Merge pull request #21 from 0xc0170/kl25z_adc_channels
KL25Z adc channels A
2013-08-07 02:14:35 -07:00
Matthew Else e1eb357c53 Added changes to PWM API from LPC1114 to LPC11C24 2013-08-07 09:45:47 +01:00
Matthew Else b437a3ca22 Removed can_api.c from TARGET_LPC11CXX, as it's not ready for pull request yet. 2013-08-07 09:43:28 +01:00
Toyomasa Watarai 0c0b51f663 Fixed pwm_api bug
Corrected pwm_timer_map table for LPC1114
2013-08-07 16:24:58 +09:00
0xc0170 6127ed3bb7 KL25Z adc channels A
- only channels B were available
2013-08-06 21:21:03 +02:00
Matthew Else 548d18ebd7 Pull in changes to the main mbed code base. 2013-08-06 20:04:32 +01:00
Matthew Else d29ebefbd9 Begin to add can_api.c to LPC11C24 codebase. Not complete yet, which is why it's #if 0ed out. Lots of build errors come up if #if0 isn't there, which is why it is for now. 2013-08-06 17:41:31 +01:00
Emilio Monti e42786649f The LPC1347 board does not have an interface chip 2013-08-06 16:36:03 +01:00
Emilio Monti 790a71b041 Merge pull request #20 from matthewelse/master
CAN-Related Pull Request
2013-08-06 07:15:15 -07:00
Matthew Else 45470aba31 Updated READMEs 2013-08-06 15:09:41 +01:00
Matthew Else 4401516f14 Removed unnecessary core_cm* files, as they are now shared in cmsis 2013-08-06 15:06:28 +01:00
Emilio Monti 2c882199b4 Add lwIP copyright information 2013-08-06 14:55:22 +01:00
Matthew Else 6cf35dbcb8 Fix CAN Interrupt Test (MBED_31) 2013-08-06 14:52:04 +01:00
Matthew Else 714daff020 Fix CAN Test (MBED_30) 2013-08-06 14:51:00 +01:00
Emilio Monti 3c6e2ab67a Add license to workspace_tools files 2013-08-06 14:38:00 +01:00
Emilio Monti d027bb4839 Add Apache v2 LICENSE file 2013-08-06 12:05:04 +01:00
Matthew Else bf02700a32 Merge https://github.com/jorisa/mbed 2013-08-06 09:43:52 +01:00
Matthew Else f7a2be4bed Merge remote-tracking branch 'upstream/master' 2013-08-06 09:42:09 +01:00
Joris Aerts c747e2533f Rename some argument and enum names to match existing naming
Add CAN->mode(Mode mode) function (not implemented in hal)
2013-08-05 17:28:27 -07:00
emilmont 4f03cd09b8 Remove undefined peripherals 2013-08-05 22:09:32 +01:00
Emilio Monti 44b55c9c7b Merge pull request #18 from 0xc0170/kl25z_arm_gcc
Kl25z arm gcc
2013-08-05 11:21:28 -07:00
0xc0170 e1af24c1f2 Spaces correction 2013-08-05 19:06:22 +02:00
Matthew Else e38b3df861 Added LPC11C24 to README.md 2013-08-05 17:25:12 +01:00
Matthew Else ef28879863 Merged remote tracking branch 'upstream/master' 2013-08-05 17:22:01 +01:00
Matthew Else 2c45596673 Merge https://github.com/jorisa/mbed 2013-08-05 17:11:58 +01:00
Matthew Else 7c8c7228c8 Pushed LPC1114 I2C updates to the LPC11C24 2013-08-05 17:09:22 +01:00
Matthew Else b470ea0e73 Fixed things that shouldn't have been changed 2013-08-05 14:36:57 +01:00
0xc0170 3c0775f5c3 More pin mux options for KL25Z
- as reported in mbed bug section, add all available mux options
2013-08-04 21:33:06 +02:00
0xc0170 e993e94886 Update kl25z_gcc_arm branch to latest master 2013-08-04 19:21:04 +02:00
0xc0170 08beebcd83 RAM region shifted by 0xC0 for vectors 2013-08-02 22:32:41 +02:00
0xc0170 0d6bec9d8c LD - space reserved for vectors in RAM 2013-08-02 21:08:29 +02:00
Emilio Monti 8562b3660b Add LPC1347 export templates. Cleanup GCC toolchain check. 2013-08-02 17:56:11 +01:00
0xc0170 48ee225d1f vectors and flash protection area are separated 2013-08-02 18:01:49 +02:00
Emilio Monti 54893092c3 Merge pull request #17 from matthewelse/forpullrequest
LPC1114 Port Pull Request
2013-08-02 08:56:44 -07:00
matthewelse 7827d62504 Added alternative DIP package names for pins in the LPC1114
Added this so it is consistent with the notebook page.
2013-08-02 10:38:05 +01:00
Matthew Else 65765b6c68 Merge branch 'forpullrequest' of https://github.com/matthewelse/mbed into forpullrequest 2013-08-02 09:44:57 +01:00
Matthew Else fa19362d61 Removed non-functional LPC1347 uVision export support, and added LPC1114 support, which does work. 2013-08-02 09:44:36 +01:00
0xc0170 afab75fd01 only one flash memory (FLASH) 2013-08-02 07:14:36 +02:00
Joris Aerts 48fc1aa49d Add test case MBED_30 and MBED_31 to test CAN api 2013-08-01 17:54:13 -07:00
Joris Aerts f685efa9b2 Merge remote-tracking branch 'upstream/master' 2013-08-01 17:24:20 -07:00
matthewelse 34e9983d8a Addition of a newline to the end of gitignore
To stop github pointing it out to me that I've missed a new line :O the horror!
2013-08-01 23:17:43 +01:00
matthewelse c01e03c09e Tidied up one line of targets.py
Removed an extra indent.
2013-08-01 23:12:04 +01:00
matthewelse 7c2658bb60 Reverted unnecessary change to settings.py
Also keeps the GCC_ARM_PATH in keeping with the rest of the code, rather than looking out of place.
2013-08-01 23:08:53 +01:00
Matthew Else 7f736b9d19 Removed unnecessary LPC1114-specific test. 2013-08-01 23:04:13 +01:00
Matthew Else 789f81b1ea Removed extra core_* files that are no longer needed. Makes Emilio more happy. 2013-08-01 22:54:52 +01:00
matthewelse 37087326f2 Reverted the change to ARM.py from dc68b76
Fixes one of Emilio's problems :D
2013-08-01 22:41:23 +01:00
Matthew Else d899612525 Merge branch 'forpullrequest' 2013-08-01 16:25:28 +01:00
Matthew Else 0f7ece02a8 Fixed I2C API 2013-08-01 16:23:13 +01:00
Matthew Else df5c36a9ae Uncommented i2c_wait_SI(obj), as it should not have been commented out. 2013-08-01 16:04:18 +01:00
Matthew Else dc68b76d0f Added timeout for i2c_stop in LPC1114 target. 2013-08-01 15:46:05 +01:00