diff options
| author | John R. Lenton <jlenton@gmail.com> | 2014-01-07 18:01:08 +0000 |
|---|---|---|
| committer | John R. Lenton <jlenton@gmail.com> | 2014-01-07 18:01:08 +0000 |
| commit | 270112f7312f724e46ae34649dfce3ec43b697e0 (patch) | |
| tree | d7438ae877350aede062d8ac7e62e52ab35cb018 /stm/servo.c | |
| parent | c06763a0207dde7f2060f7b1670a0b99298a01f8 (diff) | |
| parent | fd04bb3bacf5dbc4d79c04a49520e3e81abb7352 (diff) | |
| download | micropython-270112f7312f724e46ae34649dfce3ec43b697e0.tar.gz micropython-270112f7312f724e46ae34649dfce3ec43b697e0.zip | |
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
Diffstat (limited to 'stm/servo.c')
| -rw-r--r-- | stm/servo.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/stm/servo.c b/stm/servo.c index 31190ce795..cc9633a996 100644 --- a/stm/servo.c +++ b/stm/servo.c @@ -137,14 +137,16 @@ static mp_obj_t servo_obj_angle(mp_obj_t self_in, mp_obj_t angle) { static MP_DEFINE_CONST_FUN_OBJ_2(servo_obj_angle_obj, servo_obj_angle); +static const mp_method_t servo_methods[] = { + { "angle", &servo_obj_angle_obj }, + { NULL, NULL }, +}; + static const mp_obj_type_t servo_obj_type = { { &mp_const_type }, "Servo", .print = servo_obj_print, - .methods = { - { "angle", &servo_obj_angle_obj }, - { NULL, NULL }, - } + .methods = servo_methods, }; mp_obj_t pyb_Servo(mp_obj_t servo_id) { |