Commit Graph

4347 Commits

Author SHA1 Message Date
Damien George 97209d38e1 Merge branch 'cplusplus' of https://github.com/ian-v/micropython into ian-v-cplusplus
Conflicts:
	py/objcomplex.c
2014-01-07 15:58:30 +00:00
Damien George d49420e74c Merge branch 'master' of github.com:dpgeorge/micropython 2014-01-07 15:21:03 +00:00
Damien George d3ebe4829d Factor and simplify Makefile's and mpconfig, part 2. 2014-01-07 15:20:33 +00:00
Damien George 136f67523b Factor and simplify Makefile's and mpconfig. 2014-01-07 14:54:15 +00:00
Mark Schafer 501399330e vector logo master with layers
inkscape master file has dxf and coloured svg layers.
Choose a layer for suitable work.
2014-01-07 15:01:10 +13:00
Damien George 880ce2d7fa Merge pull request #97 from dhylands/teensy-3.1
Initial support for Teensy 3.1
2014-01-06 14:32:56 -08:00
Damien George ff07bb3adb stm: Re-fix LED defines. 2014-01-06 22:17:37 +00:00
Damien George 439ff90959 Merge branch 'master' of https://github.com/iabdalkader/micropython 2014-01-06 22:16:04 +00:00
ian-v a5a01df81d Make list and str method tables static 2014-01-06 14:14:11 -08:00
Damien George 8b1b59c28e Merge branch 'master' of github.com:dpgeorge/micropython 2014-01-06 22:13:45 +00:00
Damien George e2e3d11e87 py: Fix up number operations and coercion. 2014-01-06 22:13:00 +00:00
ian-v 5fd8fd2c16 Revert MP_BOOL, etc. and use <stdbool.h> instead 2014-01-06 13:51:53 -08:00
ian-v 7a16fadbf8 Co-exist with C++ (issue #85) 2014-01-06 09:52:29 -08:00
Paul Sokolovsky fe039b4f4f Typo fix in comment. 2014-01-06 17:54:34 +02:00
Paul Sokolovsky e5ee1693ad Use constructor to create small int (avoid exposing mp_obj_t internals to VM). 2014-01-06 17:54:16 +02:00
Dave Hylands 297446e7af Initial support for Teensy 3.1 2014-01-06 00:20:11 -08:00
mux 7c0c28dd71 Fix LED pin enum
* Fix LED pin enum, first one should start at 1
* Fix LED initialization typo
2014-01-06 06:41:56 +02:00
Damien George e03c0533fe Merge pull request #94 from chipaca/list_reverse
Implements list.reverse; fixes issue #66.
2014-01-05 16:08:58 -08:00
John R. Lenton a10dba7509 Merge remote-tracking branch 'upstream/master' into list_reverse 2014-01-06 00:08:21 +00:00
Damien George 8137b004b0 Merge branch 'list_remove' of git://github.com/chipaca/micropython into chipaca-list_remove 2014-01-05 23:58:49 +00:00
Damien George aa35fc60d7 Merge pull request #92 from chipaca/list_insert
List insert. Fixes issue #61.
2014-01-05 15:59:00 -08:00
Damien George 17f4497d6d Merge pull request #91 from chipaca/list_index
Fix off-by-one in non-default values of index's 2nd and 3rd arguments.
2014-01-05 15:55:55 -08:00
Damien George 73595feb75 Merge pull request #89 from pfalcon/c99-tagged-structs
Convert many object types structs to use C99 tagged initializer syntax.
2014-01-05 15:54:51 -08:00
Damien George 6b0b4a0cad stm: pull-up usr switch on pyboard (fixes regression). 2014-01-05 23:49:34 +00:00
Damien George 568a6c9d79 Merge pull request #86 from iabdalkader/master
Add Initial Support for STM32F4DISCOVERY Board
2014-01-05 15:45:40 -08:00
Damien George 8a7604da3b Merge pull request #88 from dhylands/mp-qstr-init
Make qstr_init reinitialize last_pool.
2014-01-05 15:38:15 -08:00
John R. Lenton ba3f87c947 Merge remote-tracking branch 'upstream/master' into list_reverse 2014-01-05 22:29:03 +00:00
John R. Lenton d52a0318ce Merge remote-tracking branch 'upstream/master' into list_remove 2014-01-05 22:27:11 +00:00
John R. Lenton 8428b8f3c9 Merge remote-tracking branch 'upstream/master' into list_insert 2014-01-05 22:11:01 +00:00
John R. Lenton c553162ebc Fix off-by-one in non-default values of index's 2nd and 3rd arguments. 2014-01-05 21:57:27 +00:00
Paul Sokolovsky 860ffb0a43 Convert many object types structs to use C99 tagged initializer syntax. 2014-01-05 22:34:09 +02:00
Dave Hylands d986b582c0 Make qstr_init reinitialize last_pool.
This causes the pool to get reinitialized properly on a soft-reset.
2014-01-05 12:08:55 -08:00
mux b3683abaeb Add gitignore file 2014-01-05 21:32:30 +02:00
mux 50d5420deb Add Initial Support for STM32F4DISCOVERY Board
* Add a TARGET definition to Makefile (default PYBOARD).
* Add support for discovery LEDs in led module.
* Add support for discovery user switch in usersw
* Add EXTI interrupt handler for discovery user switch on (PA0).
* Parameterize led and usrsw modules pins and port.
* Issue #83
2014-01-05 19:38:41 +02:00
Damien George 12e2656472 stm: allow more flash for the binary. 2014-01-05 14:34:17 +00:00
Damien George 823877bce0 stm: rename sw_xx to switch_xx; change Python bindings to new version. 2014-01-05 14:04:55 +00:00
Damien George cd3c1ee3fc Merge pull request #82 from iabdalkader/master
Move user switch code into a separate module
2014-01-05 06:05:13 -08:00
Damien George 1703597c0b Merge pull request #80 from xyb/striter
Implements str iterator
2014-01-05 05:53:31 -08:00
Damien George f0691f4ed5 Fix qstr in objlist.c; add more tests for list.index.
list.index fails on an edge case.
2014-01-05 13:44:06 +00:00
Damien George a3ab68e949 Merge pull request #78 from chipaca/list_index
Implements list.index. Fixes issue #57.
2014-01-05 05:42:37 -08:00
mux de7fcc0c06 Move user switch code into a separate module
* Move user switch code from main.c into a separate module (usrsw)
* Add usrsw.c to Makefile
2014-01-05 14:56:46 +02:00
Damien George 1dd657fa87 Add fatfs readme/license. 2014-01-05 11:57:17 +00:00
Damien George 11f1e4b8f1 Add test for basic builtin types. 2014-01-05 11:39:59 +00:00
xyb 8cfc9f07b9 Implements str iterator 2014-01-05 18:47:51 +08:00
John R. Lenton 7e73a8fd09 Merge remote-tracking branch 'upstream/master' into list_index 2014-01-05 01:57:54 +00:00
Damien George 45b43c21c4 Oops: add objint.c 2014-01-05 01:50:45 +00:00
Damien George 8b2688f893 Add FONT-LICENSE for Exo font used in Micro Python name-logo. 2014-01-04 23:47:11 +00:00
Damien George 91e6873c17 Merge pull request #71 from redteam316/dxf
Added DXF R2000 vector text.
2014-01-04 15:45:08 -08:00
Damien George 1c3880a78e Merge pull request #72 from redteam316/svg
Added SVG vector text.
2014-01-04 15:44:56 -08:00
Damien George a494b29c73 Merge pull request #73 from mikaeleiman/apple-clang-fixes
Apple clang fixes
2014-01-04 12:29:34 -08:00