fix signed/unsigned compilation problem

dhalbert · dhalbert · commit 01a8a95b2c99 · 2021-06-10T01:14:16.000-04:00
diff --git a/shared-bindings/keypad/Keys.c b/shared-bindings/keypad/Keys.c
@@ -117,7 +117,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(keypad_keys_scan_obj, keypad_keys_scan);
 STATIC mp_obj_t keypad_keys_state(mp_obj_t self_in, mp_obj_t key_num_obj) {
     keypad_keys_obj_t *self = MP_OBJ_TO_PTR(self_in);
     mp_int_t key_num = mp_obj_int_get_checked(key_num_obj);
-    if (key_num < 0 || key_num >= common_hal_keypad_keys_length(self)) {
+    if (key_num < 0 || (mp_uint_t)key_num >= common_hal_keypad_keys_length(self)) {
         mp_raise_ValueError_varg(translate("%q out of range"), MP_QSTR_key_num);
     }
 
diff --git a/shared-module/keypad/Keys.c b/shared-module/keypad/Keys.c
@@ -106,13 +106,13 @@ size_t common_hal_keypad_keys_length(keypad_keys_obj_t *self) {
 
 bool common_hal_keypad_keys_scan(keypad_keys_obj_t *self) {
     uint64_t now = port_get_raw_ticks(NULL);
-    uint64_t last_scan_ticks = self->last_scan_ticks;
-    self->last_scan_ticks = now;
-    if (now - last_scan_ticks < DEBOUNCE_TICKS) {
+    if (now - self->last_scan_ticks < DEBOUNCE_TICKS) {
         // Too soon.
         return false;
     }
 
+    self->last_scan_ticks = now;
+
     for (mp_uint_t key_num = 0; key_num < common_hal_keypad_keys_length(self); key_num++) {
         self->previously_pressed[key_num] = self->currently_pressed[key_num];
         self->currently_pressed[key_num] =

Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(keypad_keys_scan_obj, keypad_keys_scan);`
`117`	`117`	`STATIC mp_obj_t keypad_keys_state(mp_obj_t self_in, mp_obj_t key_num_obj) {`
`118`	`118`	`keypad_keys_obj_t *self = MP_OBJ_TO_PTR(self_in);`
`119`	`119`	`mp_int_t key_num = mp_obj_int_get_checked(key_num_obj);`
`120`		`- if (key_num < 0 \|\| key_num >= common_hal_keypad_keys_length(self)) {`
	`120`	`+ if (key_num < 0 \|\| (mp_uint_t)key_num >= common_hal_keypad_keys_length(self)) {`
`121`	`121`	`mp_raise_ValueError_varg(translate("%q out of range"), MP_QSTR_key_num);`
`122`	`122`	`}`
`123`	`123`