summaryrefslogtreecommitdiffstatshomepage
path: root/cc3200
diff options
context:
space:
mode:
authorDaniel Campora <daniel@wipy.io>2015-06-10 22:11:33 +0200
committerDaniel Campora <daniel@wipy.io>2015-06-10 23:35:43 +0200
commit1811c6bccf97a8d9d461c6bface90bac58a3ebad (patch)
tree1b75da6e8267440af71ce794b0d575027579fe3f /cc3200
parente2dc7ac2a9f4d8e07e7c5d11172adba3287e1278 (diff)
downloadmicropython-1811c6bccf97a8d9d461c6bface90bac58a3ebad.tar.gz
micropython-1811c6bccf97a8d9d461c6bface90bac58a3ebad.zip
cc3200: Remove Timer.AB constant.
Timer.A and Timer.B can be ORed for this purpose.
Diffstat (limited to 'cc3200')
-rw-r--r--cc3200/mods/pybtimer.c1
-rw-r--r--cc3200/qstrdefsport.h1
2 files changed, 0 insertions, 2 deletions
diff --git a/cc3200/mods/pybtimer.c b/cc3200/mods/pybtimer.c
index 23299d5f9a..3bab50b620 100644
--- a/cc3200/mods/pybtimer.c
+++ b/cc3200/mods/pybtimer.c
@@ -510,7 +510,6 @@ STATIC const mp_map_elem_t pyb_timer_locals_dict_table[] = {
// class constants
{ MP_OBJ_NEW_QSTR(MP_QSTR_A), MP_OBJ_NEW_SMALL_INT(TIMER_A) },
{ MP_OBJ_NEW_QSTR(MP_QSTR_B), MP_OBJ_NEW_SMALL_INT(TIMER_B) },
- { MP_OBJ_NEW_QSTR(MP_QSTR_AB), MP_OBJ_NEW_SMALL_INT(TIMER_A | TIMER_B) },
{ MP_OBJ_NEW_QSTR(MP_QSTR_ONE_SHOT), MP_OBJ_NEW_SMALL_INT(TIMER_CFG_A_ONE_SHOT) },
{ MP_OBJ_NEW_QSTR(MP_QSTR_PERIODIC), MP_OBJ_NEW_SMALL_INT(TIMER_CFG_A_PERIODIC) },
{ MP_OBJ_NEW_QSTR(MP_QSTR_EDGE_COUNT), MP_OBJ_NEW_SMALL_INT(TIMER_CFG_A_CAP_COUNT) },
diff --git a/cc3200/qstrdefsport.h b/cc3200/qstrdefsport.h
index c9e1314cbf..9e91d28ec4 100644
--- a/cc3200/qstrdefsport.h
+++ b/cc3200/qstrdefsport.h
@@ -348,7 +348,6 @@ Q(event_count)
Q(event_time)
Q(A)
Q(B)
-Q(AB)
Q(ONE_SHOT)
Q(PERIODIC)
Q(EDGE_COUNT)