Remove accel.reset_gestures(), merge functionality into get_gestures().

dpgeorge · dpgeorge · commit 616b4dab4633 · 2016-04-17T12:36:23.000+01:00
The get and reset functionality must be atomic, otherwise it's possible
to miss gestures in between calls to these functions.
diff --git a/docs/accelerometer.rst b/docs/accelerometer.rst
@@ -57,10 +57,7 @@ Functions
 .. py:function:: get_gestures()
 
     Return a tuple of the gesture history. The most recent is listed last.
-
-.. py:function:: reset_gestures()
-
-    Clears the gesture history.
+    Also clears the gesture history before returning.
 
 Examples
 --------
diff --git a/docs/microbit_micropython_api.rst b/docs/microbit_micropython_api.rst
@@ -234,8 +234,6 @@ The accelerometer is accessed via the ``accelerometer`` object::
     accelerometer.was_gesture(name)
     # return a tuple of the gesture history. The most recent is listed last.
     accelerometer.get_gestures()
-    # clears the gesture history.
-    accelerometer.reset_gestures()
 
 The recognised gestures are: ``up``, ``down``, ``left``, ``right``, ``face up``, ``face down``, ``freefall``, ``3g``, ``6g``, ``8g``, ``shake``.
 
diff --git a/inc/genhdr/qstrdefs.generated.h b/inc/genhdr/qstrdefs.generated.h
@@ -449,7 +449,6 @@ QDEF(MP_QSTR_current_gesture, (const byte*)"\xd4\x0f" "current_gesture")
 QDEF(MP_QSTR_is_gesture, (const byte*)"\x07\x0a" "is_gesture")
 QDEF(MP_QSTR_was_gesture, (const byte*)"\xd8\x0b" "was_gesture")
 QDEF(MP_QSTR_get_gestures, (const byte*)"\x18\x0c" "get_gestures")
-QDEF(MP_QSTR_reset_gestures, (const byte*)"\x1b\x0e" "reset_gestures")
 QDEF(MP_QSTR_up, (const byte*)"\xa0\x02" "up")
 QDEF(MP_QSTR_down, (const byte*)"\x37\x04" "down")
 QDEF(MP_QSTR_left, (const byte*)"\xde\x04" "left")
diff --git a/inc/microbit/qstrdefsport.h b/inc/microbit/qstrdefsport.h
@@ -166,7 +166,6 @@ Q(current_gesture)
 Q(is_gesture)
 Q(was_gesture)
 Q(get_gestures)
-Q(reset_gestures)
 Q(up)
 Q(down)
 Q(left)
diff --git a/source/microbit/microbitaccelerometer.cpp b/source/microbit/microbitaccelerometer.cpp
@@ -169,18 +169,11 @@ mp_obj_t microbit_accelerometer_get_gestures(mp_obj_t self_in) {
         uint gesture = (gesture_list[i >> 1] >> (4 * (i & 1))) & 0x0f;
         o->items[i] = MP_OBJ_NEW_QSTR(gesture_name_map[gesture]);
     }
+    gesture_list_cur = 0;
     return o;
 }
 MP_DEFINE_CONST_FUN_OBJ_1(microbit_accelerometer_get_gestures_obj, microbit_accelerometer_get_gestures);
 
-mp_obj_t microbit_accelerometer_reset_gestures(mp_obj_t self_in) {
-    microbit_accelerometer_obj_t *self = (microbit_accelerometer_obj_t*)self_in;
-    update(self);
-    gesture_list_cur = 0;
-    return mp_const_none;
-}
-MP_DEFINE_CONST_FUN_OBJ_1(microbit_accelerometer_reset_gestures_obj, microbit_accelerometer_reset_gestures);
-
 STATIC const mp_map_elem_t microbit_accelerometer_locals_dict_table[] = {
     { MP_OBJ_NEW_QSTR(MP_QSTR_get_x), (mp_obj_t)&microbit_accelerometer_get_x_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_get_y), (mp_obj_t)&microbit_accelerometer_get_y_obj },
@@ -190,7 +183,6 @@ STATIC const mp_map_elem_t microbit_accelerometer_locals_dict_table[] = {
     { MP_OBJ_NEW_QSTR(MP_QSTR_is_gesture), (mp_obj_t)&microbit_accelerometer_is_gesture_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_was_gesture), (mp_obj_t)&microbit_accelerometer_was_gesture_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_get_gestures), (mp_obj_t)&microbit_accelerometer_get_gestures_obj },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_reset_gestures), (mp_obj_t)&microbit_accelerometer_reset_gestures_obj },
 };
 
 STATIC MP_DEFINE_CONST_DICT(microbit_accelerometer_locals_dict, microbit_accelerometer_locals_dict_table);
