8000 Merge branch 'master' into iabdalkader-cc3k-update · sparkfun/circuitpython@6f70542 · GitHub
[go: up one dir, main page]
Skip to content

Commit 6f70542

Browse files
dpgeorgedpgeorge
committed
Merge branch 'master' into iabdalkader-cc3k-update
Conflicts: stmhal/mpconfigport.h stmhal/pybwlan.c
2 parents e1eea16 + bad2df3 commit 6f70542

File tree

165 files changed

+12528
-1199
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

165 files changed

+12528
-1199
lines changed

‎.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ script:
2020
- make -C windows CROSS_COMPILE=i586-mingw32msvc-
2121

2222
- (cd tests && MICROPY_CPYTHON3=python3.3 ./run-tests)
23+
- (cd tests && MICROPY_CPYTHON3=python3.3 ./run-tests --emit native)
2324

2425
after_failure:
2526
- (cd tests && for exp in *.exp; do testbase=$(basename $exp .exp); echo -e "\nFAILURE $testbase"; diff -u $testbase.exp $testbase.out; done)

‎bare-arm/mpconfigport.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@
3535

3636
#define BYTES_PER_WORD (4)
3737

38+
#define MICROPY_MAKE_POINTER_CALLABLE(p) ((void*)((mp_uint_t)(p) | 1))
39+
3840
#define UINT_FMT "%lu"
3941
#define INT_FMT "%ld"
4042

@@ -44,7 +46,7 @@ typedef void *machine_ptr_t; // must be of pointer size
4446
typedef const void *machine_const_ptr_t; // must be of pointer size
4547

4648
// extra built in names to add to the global namespace
47-
extern const struct _mp_obj_fun_native_t mp_builtin_open_obj;
49+
extern const struct _mp_obj_fun_builtin_t mp_builtin_open_obj;
4850
#define MICROPY_PORT_BUILTINS \
4951
{ MP_OBJ_NEW_QSTR(MP_QSTR_open), (mp_obj_t)&mp_builtin_open_obj },
5052

‎drivers/README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
This directory contains drivers for specific hardware. The drivers are
2+
intended to work across multiple ports.

‎drivers/wiznet5k/README.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
This is the driver for the WIZnet5x00 series of Ethernet controllers.
2+
3+
Adapted for Micro Python.
4+
5+
Original source: https://github.com/Wiznet/W5500_EVB/tree/master/ioLibrary
6+
Taken on: 30 August 2014

0 commit comments

Comments
 (0)
0