File tree Expand file tree Collapse file tree 2 files changed +9
-3
lines changed
atmel-samd/common-hal/nativeio Expand file tree Collapse file tree 2 files changed +9
-3
lines changed Original file line number Diff line number Diff line change @@ -175,7 +175,7 @@ enum digitalinout_pull_t common_hal_nativeio_digitalinout_get_pull(
175
175
"Cannot get pull while in output mode." ));
176
176
return PULL_NONE ;
177
177
} else {
178
- if (port_base -> PINCFG [pin % 32 ].bit .PULLEN ! = 0 ) {
178
+ if (port_base -> PINCFG [pin % 32 ].bit .PULLEN = = 0 ) {
179
179
return PULL_NONE ;
180
180
} if ((port_base -> OUT .reg & pin_mask ) > 0 ) {
181
181
return PULL_UP ;
Original file line number Diff line number Diff line change @@ -302,14 +302,20 @@ STATIC mp_obj_t nativeio_digitalinout_obj_get_pull(mp_obj_t self_in) {
302
302
}
303
303
MP_DEFINE_CONST_FUN_OBJ_1 (nativeio_digitalinout_get_pull_obj , nativeio_digitalinout_obj_get_pull );
304
304
305
- STATIC mp_obj_t nativeio_digitalinout_obj_set_pull (mp_obj_t self_in , mp_obj_t pull ) {
305
+ STATIC mp_obj_t nativeio_digitalinout_obj_set_pull (mp_obj_t self_in , mp_obj_t pull_obj ) {
306
306
nativeio_digitalinout_obj_t * self = MP_OBJ_TO_PTR (self_in );
307
307
if (common_hal_nativeio_digitalinout_get_direction (self ) == DIRECTION_OUT ) {
308
308
nlr_raise (mp_obj_new_exception_msg (& mp_type_OSError ,
309
309
"Pull not used when direction is output." ));
310
310
return mp_const_none ;
311
311
}
312
- common_hal_nativeio_digitalinout_set_pull (self , (enum digitalinout_pull_t ) MP_OBJ_SMALL_INT_VALUE (pull ));
312
+ enum digitalinout_pull_t pull = PULL_NONE ;
313
+ if (pull_obj == & nativeio_digitalinout_pull_up_obj ) {
314
+ pull = PULL_UP ;
315
+ } else if (pull_obj == & nativeio_digitalinout_pull_down_obj ) {
316
+ pull = PULL_DOWN ;
317
+ }
318
+ common_hal_nativeio_digitalinout_set_pull (self , pull );
313
319
return mp_const_none ;
314
320
}
315
321
MP_DEFINE_CONST_FUN_OBJ_2 (nativeio_digitalinout_set_pull_obj , nativeio_digitalinout_obj_set_pull );
You can’t perform that action at this time.
0 commit comments