aboutsummaryrefslogtreecommitdiff
path: root/teensy
diff options
context:
space:
mode:
authorDamien George2016-10-18 11:06:20 +1100
committerDamien George2016-10-21 16:26:01 +1100
commit4ebdb1f2b217410cdc1cee0e0c0da8fceb7627f2 (patch)
treed6188cf8f6579ffa66b8370032b8184a901a5312 /teensy
parent5d0735b93a52ff7f2f41dd27f3a22ca847f6b49b (diff)
py: Be more specific with MP_DECLARE_CONST_FUN_OBJ macros.
In order to have more fine-grained control over how builtin functions are constructed, the MP_DECLARE_CONST_FUN_OBJ macros are made more specific, with suffix of _0, _1, _2, _3, _VAR, _VAR_BETEEN or _KW. These names now match the MP_DEFINE_CONST_FUN_OBJ macros.
Diffstat (limited to 'teensy')
-rw-r--r--teensy/modpyb.c6
-rw-r--r--teensy/servo.h4
2 files changed, 5 insertions, 5 deletions
diff --git a/teensy/modpyb.c b/teensy/modpyb.c
index 0eb2a7b51..9f601e327 100644
--- a/teensy/modpyb.c
+++ b/teensy/modpyb.c
@@ -272,9 +272,9 @@ STATIC mp_obj_t pyb_hid_send_report(mp_obj_t arg) {
}
STATIC MP_DEFINE_CONST_FUN_OBJ_1(pyb_hid_send_report_obj, pyb_hid_send_report);
-MP_DECLARE_CONST_FUN_OBJ(pyb_source_dir_obj); // defined in main.c
-MP_DECLARE_CONST_FUN_OBJ(pyb_main_obj); // defined in main.c
-MP_DECLARE_CONST_FUN_OBJ(pyb_usb_mode_obj); // defined in main.c
+MP_DECLARE_CONST_FUN_OBJ_1(pyb_source_dir_obj); // defined in main.c
+MP_DECLARE_CONST_FUN_OBJ_1(pyb_main_obj); // defined in main.c
+MP_DECLARE_CONST_FUN_OBJ_1(pyb_usb_mode_obj); // defined in main.c
STATIC const mp_map_elem_t pyb_module_globals_table[] = {
{ MP_OBJ_NEW_QSTR(MP_QSTR___name__), MP_OBJ_NEW_QSTR(MP_QSTR_pyb) },
diff --git a/teensy/servo.h b/teensy/servo.h
index 5dad04113..5f1c87b69 100644
--- a/teensy/servo.h
+++ b/teensy/servo.h
@@ -2,6 +2,6 @@ void servo_init(void);
extern const mp_obj_type_t pyb_servo_type;
-MP_DECLARE_CONST_FUN_OBJ(pyb_servo_set_obj);
-MP_DECLARE_CONST_FUN_OBJ(pyb_pwm_set_obj);
+MP_DECLARE_CONST_FUN_OBJ_2(pyb_servo_set_obj);
+MP_DECLARE_CONST_FUN_OBJ_2(pyb_pwm_set_obj);