fengqi/lv_micropython
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge pull request #719 from dhylands/pin_fix

Browse Source 
Use mp_const_none to initialize mapper and map_dict (fix #701)
This commit is contained in:
Paul Sokolovsky 2014-06-26 22:49:44 +03:00
commit 91b576d147
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
stmhal/pin.c
View File

@ -100,8 +100,8 @@ STATIC mp_obj_t pin_class_map_dict;
STATIC bool pin_class_debug; STATIC bool pin_class_debug;
void pin_init(void) { void pin_init(void) {
pin_class_mapper = MP_OBJ_NULL; pin_class_mapper = mp_const_none;
pin_class_map_dict = MP_OBJ_NULL; pin_class_map_dict = mp_const_none;
pin_class_debug = false; pin_class_debug = false;
} }
@ -120,7 +120,7 @@ const pin_obj_t *pin_find(mp_obj_t user_obj) {
return pin_obj; return pin_obj;
} }
if (pin_class_mapper != MP_OBJ_NULL) { if (pin_class_mapper != mp_const_none) {
pin_obj = mp_call_function_1(pin_class_mapper, user_obj); pin_obj = mp_call_function_1(pin_class_mapper, user_obj);
if (pin_obj != mp_const_none) { if (pin_obj != mp_const_none) {
if (!MP_OBJ_IS_TYPE(pin_obj, &pin_type)) { if (!MP_OBJ_IS_TYPE(pin_obj, &pin_type)) {
@ -139,7 +139,7 @@ const pin_obj_t *pin_find(mp_obj_t user_obj) {
// other lookup methods. // other lookup methods.
} }
if (pin_class_map_dict != MP_OBJ_NULL) { if (pin_class_map_dict != mp_const_none) {
mp_map_t *pin_map_map = mp_obj_dict_get_map(pin_class_map_dict); mp_map_t *pin_map_map = mp_obj_dict_get_map(pin_class_map_dict);
mp_map_elem_t *elem = mp_map_lookup(pin_map_map, user_obj, MP_MAP_LOOKUP); mp_map_elem_t *elem = mp_map_lookup(pin_map_map, user_obj, MP_MAP_LOOKUP);
if (elem != NULL && elem->value != NULL) { if (elem != NULL && elem->value != NULL) {