3391e19068
A bit of stylistic cleanup (chose the wrong side during conflict resolution).
2014-01-07 18:06:34 +00:00
270112f731
Merge remote-tracking branch 'upstream/master' into listsort. Lots of conflict fun.
...
Conflicts:
py/obj.h
py/objbool.c
py/objboundmeth.c
py/objcell.c
py/objclass.c
py/objclosure.c
py/objcomplex.c
py/objdict.c
py/objexcept.c
py/objfun.c
py/objgenerator.c
py/objinstance.c
py/objmodule.c
py/objrange.c
py/objset.c
py/objslice.c
2014-01-07 18:01:08 +00:00
c06763a020
This implements a better (more python-conformant) list.sort.
...
It's not really about that, though; it's about me figuring out a sane
way forward for keyword-argument functions (and function
metadata). But it's useful as is, and shouldn't break any existing
code, so here you have it; I'm going to park it in my mind for a bit
while sorting out the rest of the dict branch.
2014-01-07 17:29:16 +00:00
fd04bb3bac
Add some example scripts for pyboard (some can run on PC).
2014-01-07 17:14:05 +00:00
7b21c2d8f0
py: Fix allocation of unique code blocks.
2014-01-07 16:54:58 +00:00
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
d49420e74c
Merge branch 'master' of github.com:dpgeorge/micropython
2014-01-07 15:21:03 +00:00
d3ebe4829d
Factor and simplify Makefile's and mpconfig, part 2.
2014-01-07 15:20:33 +00:00
136f67523b
Factor and simplify Makefile's and mpconfig.
2014-01-07 14:54:15 +00:00
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
880ce2d7fa
Merge pull request #97 from dhylands/teensy-3.1
...
Initial support for Teensy 3.1
2014-01-06 14:32:56 -08:00
ff07bb3adb
stm: Re-fix LED defines.
2014-01-06 22:17:37 +00:00
439ff90959
Merge branch 'master' of https://github.com/iabdalkader/micropython
2014-01-06 22:16:04 +00:00
a5a01df81d
Make list and str method tables static
2014-01-06 14:14:11 -08:00
8b1b59c28e
Merge branch 'master' of github.com:dpgeorge/micropython
2014-01-06 22:13:45 +00:00
e2e3d11e87
py: Fix up number operations and coercion.
2014-01-06 22:13:00 +00:00
5fd8fd2c16
Revert MP_BOOL, etc. and use <stdbool.h> instead
2014-01-06 13:51:53 -08:00
7a16fadbf8
Co-exist with C++ (issue #85 )
2014-01-06 09:52:29 -08:00
fe039b4f4f
Typo fix in comment.
2014-01-06 17:54:34 +02:00
e5ee1693ad
Use constructor to create small int (avoid exposing mp_obj_t internals to VM).
2014-01-06 17:54:16 +02:00
297446e7af
Initial support for Teensy 3.1
2014-01-06 00:20:11 -08:00
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
e03c0533fe
Merge pull request #94 from chipaca/list_reverse
...
Implements list.reverse; fixes issue #66 .
2014-01-05 16:08:58 -08:00
a10dba7509
Merge remote-tracking branch 'upstream/master' into list_reverse
2014-01-06 00:08:21 +00:00
8137b004b0
Merge branch 'list_remove' of git://github.com/chipaca/micropython into chipaca-list_remove
2014-01-05 23:58:49 +00:00
aa35fc60d7
Merge pull request #92 from chipaca/list_insert
...
List insert. Fixes issue #61 .
2014-01-05 15:59:00 -08:00
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
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
6b0b4a0cad
stm: pull-up usr switch on pyboard (fixes regression).
2014-01-05 23:49:34 +00:00
568a6c9d79
Merge pull request #86 from iabdalkader/master
...
Add Initial Support for STM32F4DISCOVERY Board
2014-01-05 15:45:40 -08:00
8a7604da3b
Merge pull request #88 from dhylands/mp-qstr-init
...
Make qstr_init reinitialize last_pool.
2014-01-05 15:38:15 -08:00
ba3f87c947
Merge remote-tracking branch 'upstream/master' into list_reverse
2014-01-05 22:29:03 +00:00
d52a0318ce
Merge remote-tracking branch 'upstream/master' into list_remove
2014-01-05 22:27:11 +00:00
8428b8f3c9
Merge remote-tracking branch 'upstream/master' into list_insert
2014-01-05 22:11:01 +00:00
c553162ebc
Fix off-by-one in non-default values of index's 2nd and 3rd arguments.
2014-01-05 21:57:27 +00:00
860ffb0a43
Convert many object types structs to use C99 tagged initializer syntax.
2014-01-05 22:34:09 +02:00
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
b3683abaeb
Add gitignore file
2014-01-05 21:32:30 +02:00
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
12e2656472
stm: allow more flash for the binary.
2014-01-05 14:34:17 +00:00
823877bce0
stm: rename sw_xx to switch_xx; change Python bindings to new version.
2014-01-05 14:04:55 +00:00
cd3c1ee3fc
Merge pull request #82 from iabdalkader/master
...
Move user switch code into a separate module
2014-01-05 06:05:13 -08:00
1703597c0b
Merge pull request #80 from xyb/striter
...
Implements str iterator
2014-01-05 05:53:31 -08:00
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
a3ab68e949
Merge pull request #78 from chipaca/list_index
...
Implements list.index. Fixes issue #57 .
2014-01-05 05:42:37 -08:00
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
1dd657fa87
Add fatfs readme/license.
2014-01-05 11:57:17 +00:00
11f1e4b8f1
Add test for basic builtin types.
2014-01-05 11:39:59 +00:00
8cfc9f07b9
Implements str iterator
2014-01-05 18:47:51 +08:00
7e73a8fd09
Merge remote-tracking branch 'upstream/master' into list_index
2014-01-05 01:57:54 +00:00
John R. Lenton
Damien George
Mark Schafer
ian-v
Paul Sokolovsky
Dave Hylands
mux
xyb