From 7a16fadbf843ca5d49fb20b5f5785ffccfd9019f Mon Sep 17 00:00:00 2001 From: ian-v Date: Mon, 6 Jan 2014 09:52:29 -0800 Subject: Co-exist with C++ (issue #85) --- stm/led.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'stm/led.c') diff --git a/stm/led.c b/stm/led.c index 9809c2177..e89adbb78 100644 --- a/stm/led.c +++ b/stm/led.c @@ -176,15 +176,16 @@ mp_obj_t led_obj_off(mp_obj_t self_in) { static MP_DEFINE_CONST_FUN_OBJ_1(led_obj_on_obj, led_obj_on); static MP_DEFINE_CONST_FUN_OBJ_1(led_obj_off_obj, led_obj_off); +static const mp_method_t led_obj_type_methods[] = { + { "on", &led_obj_on_obj }, + { "off", &led_obj_off_obj }, + { NULL, NULL }, +}; static const mp_obj_type_t led_obj_type = { { &mp_const_type }, "Led", .print = led_obj_print, - .methods = { - { "on", &led_obj_on_obj }, - { "off", &led_obj_off_obj }, - { NULL, NULL }, - } + .methods = led_obj_type_methods, }; mp_obj_t pyb_Led(mp_obj_t led_id) { -- cgit v1.2.3 From 5fd8fd2c16076f683b629b513e8865e461d4c9a8 Mon Sep 17 00:00:00 2001 From: ian-v Date: Mon, 6 Jan 2014 13:51:53 -0800 Subject: Revert MP_BOOL, etc. and use instead --- stm/led.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'stm/led.c') diff --git a/stm/led.c b/stm/led.c index e89adbb78..9809c2177 100644 --- a/stm/led.c +++ b/stm/led.c @@ -176,16 +176,15 @@ mp_obj_t led_obj_off(mp_obj_t self_in) { static MP_DEFINE_CONST_FUN_OBJ_1(led_obj_on_obj, led_obj_on); static MP_DEFINE_CONST_FUN_OBJ_1(led_obj_off_obj, led_obj_off); -static const mp_method_t led_obj_type_methods[] = { - { "on", &led_obj_on_obj }, - { "off", &led_obj_off_obj }, - { NULL, NULL }, -}; static const mp_obj_type_t led_obj_type = { { &mp_const_type }, "Led", .print = led_obj_print, - .methods = led_obj_type_methods, + .methods = { + { "on", &led_obj_on_obj }, + { "off", &led_obj_off_obj }, + { NULL, NULL }, + } }; mp_obj_t pyb_Led(mp_obj_t led_id) { -- cgit v1.2.3