@@ -36,11 +36,11 @@ typedef struct _microbit_accelerometer_obj_t {
36
36
} microbit_accelerometer_obj_t ;
37
37
38
38
volatile bool accelerometer_up_to_date = false;
39
- STATIC volatile uint16_t gesture_state = 0 ; // 1 bit per gesture
40
- STATIC volatile uint8_t gesture_list_cur = 0 ; // index into gesture_list
41
- STATIC volatile uint8_t gesture_list [GESTURE_LIST_SIZE ] = {0 }; // list of pending gestures, 4-bits per element
39
+ static volatile uint16_t gesture_state = 0 ; // 1 bit per gesture
40
+ static volatile uint8_t gesture_list_cur = 0 ; // index into gesture_list
41
+ static volatile uint8_t gesture_list [GESTURE_LIST_SIZE ] = {0 }; // list of pending gestures, 4-bits per element
42
42
43
- STATIC const qstr gesture_name_map [] = {
43
+ static const qstr gesture_name_map [] = {
44
44
[MICROBIT_HAL_ACCELEROMETER_EVT_NONE ] = MP_QSTR_ ,
45
45
[MICROBIT_HAL_ACCELEROMETER_EVT_TILT_UP ] = MP_QSTR_up ,
46
46
[MICROBIT_HAL_ACCELEROMETER_EVT_TILT_DOWN ] = MP_QSTR_down ,
@@ -56,7 +56,7 @@ STATIC const qstr gesture_name_map[] = {
56
56
[MICROBIT_HAL_ACCELEROMETER_EVT_SHAKE ] = MP_QSTR_shake ,
57
57
};
58
58
59
- STATIC uint32_t gesture_from_obj (mp_obj_t gesture_in ) {
59
+ static uint32_t gesture_from_obj (mp_obj_t gesture_in ) {
60
60
qstr gesture = mp_obj_str_get_qstr (gesture_in );
61
61
for (uint i = 0 ; i < MP_ARRAY_SIZE (gesture_name_map ); ++ i ) {
62
62
if (gesture == gesture_name_map [i ]) {
@@ -66,7 +66,7 @@ STATIC uint32_t gesture_from_obj(mp_obj_t gesture_in) {
66
66
mp_raise_ValueError (MP_ERROR_TEXT ("invalid gesture" ));
67
67
}
68
68
69
- STATIC void update_for_gesture (void ) {
69
+ static void update_for_gesture (void ) {
70
70
if (!accelerometer_up_to_date ) {
71
71
accelerometer_up_to_date = true;
72
72
int axis [3 ];
@@ -90,31 +90,31 @@ void microbit_hal_gesture_callback(int value) {
90
90
}
91
91
}
92
92
93
- STATIC mp_obj_t microbit_accelerometer_get_x (mp_obj_t self_in ) {
93
+ static mp_obj_t microbit_accelerometer_get_x (mp_obj_t self_in ) {
94
94
(void )self_in ;
95
95
int axis [3 ];
96
96
microbit_hal_accelerometer_get_sample (axis );
97
97
return mp_obj_new_int (axis [0 ]);
98
98
}
99
- STATIC MP_DEFINE_CONST_FUN_OBJ_1 (microbit_accelerometer_get_x_obj , microbit_accelerometer_get_x );
99
+ static MP_DEFINE_CONST_FUN_OBJ_1 (microbit_accelerometer_get_x_obj , microbit_accelerometer_get_x ) ;
100
100
101
- STATIC mp_obj_t microbit_accelerometer_get_y (mp_obj_t self_in ) {
101
+ static mp_obj_t microbit_accelerometer_get_y (mp_obj_t self_in ) {
102
102
(void )self_in ;
103
103
int axis [3 ];
104
104
microbit_hal_accelerometer_get_sample (axis );
105
105
return mp_obj_new_int (axis [1 ]);
106
106
}
107
- STATIC MP_DEFINE_CONST_FUN_OBJ_1 (microbit_accelerometer_get_y_obj , microbit_accelerometer_get_y );
107
+ static MP_DEFINE_CONST_FUN_OBJ_1 (microbit_accelerometer_get_y_obj , microbit_accelerometer_get_y ) ;
108
108
109
- STATIC mp_obj_t microbit_accelerometer_get_z (mp_obj_t self_in ) {
109
+ static mp_obj_t microbit_accelerometer_get_z (mp_obj_t self_in ) {
110
110
(void )self_in ;
111
111
int axis [3 ];
112
112
microbit_hal_accelerometer_get_sample (axis );
113
113
return mp_obj_new_int (axis [2 ]);
114
114
}
115
- STATIC MP_DEFINE_CONST_FUN_OBJ_1 (microbit_accelerometer_get_z_obj , microbit_accelerometer_get_z );
115
+ static MP_DEFINE_CONST_FUN_OBJ_1 (microbit_accelerometer_get_z_obj , microbit_accelerometer_get_z ) ;
116
116
117
- STATIC mp_obj_t microbit_accelerometer_get_values (mp_obj_t self_in ) {
117
+ static mp_obj_t microbit_accelerometer_get_values (mp_obj_t self_in ) {
118
118
(void )self_in ;
119
119
int axis [3 ];
120
120
microbit_hal_accelerometer_get_sample (axis );
@@ -125,33 +125,33 @@ STATIC mp_obj_t microbit_accelerometer_get_values(mp_obj_t self_in) {
125
125
};
126
126
return mp_obj_new_tuple (3 , tuple );
127
127
}
128
- STATIC MP_DEFINE_CONST_FUN_OBJ_1 (microbit_accelerometer_get_values_obj , microbit_accelerometer_get_values );
128
+ static MP_DEFINE_CONST_FUN_OBJ_1 (microbit_accelerometer_get_values_obj , microbit_accelerometer_get_values ) ;
129
129
130
- STATIC mp_obj_t microbit_accelerometer_get_strength (mp_obj_t self_in ) {
130
+ static mp_obj_t microbit_accelerometer_get_strength (mp_obj_t self_in ) {
131
131
(void )self_in ;
132
132
int axis [3 ];
133
133
microbit_hal_accelerometer_get_sample (axis );
134
134
int strength = sqrtf (axis [0 ] * axis [0 ] + axis [1 ] * axis [1 ] + axis [2 ] * axis [2 ]);
135
135
return mp_obj_new_int (strength );
136
136
}
137
- STATIC MP_DEFINE_CONST_FUN_OBJ_1 (microbit_accelerometer_get_strength_obj , microbit_accelerometer_get_strength );
137
+ static MP_DEFINE_CONST_FUN_OBJ_1 (microbit_accelerometer_get_strength_obj , microbit_accelerometer_get_strength ) ;
138
138
139
- STATIC mp_obj_t microbit_accelerometer_current_gesture (mp_obj_t self_in ) {
139
+ static mp_obj_t microbit_accelerometer_current_gesture (mp_obj_t self_in ) {
140
140
(void )self_in ;
141
141
update_for_gesture ();
142
142
return MP_OBJ_NEW_QSTR (gesture_name_map [microbit_hal_accelerometer_get_gesture ()]);
143
143
}
144
- STATIC MP_DEFINE_CONST_FUN_OBJ_1 (microbit_accelerometer_current_gesture_obj , microbit_accelerometer_current_gesture );
144
+ static MP_DEFINE_CONST_FUN_OBJ_1 (microbit_accelerometer_current_gesture_obj , microbit_accelerometer_current_gesture ) ;
145
145
146
- STATIC mp_obj_t microbit_accelerometer_is_gesture (mp_obj_t self_in , mp_obj_t gesture_in ) {
146
+ static mp_obj_t microbit_accelerometer_is_gesture (mp_obj_t self_in , mp_obj_t gesture_in ) {
147
147
(void )self_in ;
148
148
uint32_t gesture = gesture_from_obj (gesture_in );
149
149
update_for_gesture ();
150
150
return mp_obj_new_bool (microbit_hal_accelerometer_get_gesture () == gesture );
151
151
}
152
- STATIC MP_DEFINE_CONST_FUN_OBJ_2 (microbit_accelerometer_is_gesture_obj , microbit_accelerometer_is_gesture );
152
+ static MP_DEFINE_CONST_FUN_OBJ_2 (microbit_accelerometer_is_gesture_obj , microbit_accelerometer_is_gesture ) ;
153
153
154
- STATIC mp_obj_t microbit_accelerometer_was_gesture (mp_obj_t self_in , mp_obj_t gesture_in ) {
154
+ static mp_obj_t microbit_accelerometer_was_gesture (mp_obj_t self_in , mp_obj_t gesture_in ) {
155
155
(void )self_in ;
156
156
uint32_t gesture = gesture_from_obj (gesture_in );
157
157
update_for_gesture ();
@@ -160,9 +160,9 @@ STATIC mp_obj_t microbit_accelerometer_was_gesture(mp_obj_t self_in, mp_obj_t ge
160
160
gesture_list_cur = 0 ;
161
161
return result ;
162
162
}
163
- STATIC MP_DEFINE_CONST_FUN_OBJ_2 (microbit_accelerometer_was_gesture_obj , microbit_accelerometer_was_gesture );
163
+ static MP_DEFINE_CONST_FUN_OBJ_2 (microbit_accelerometer_was_gesture_obj , microbit_accelerometer_was_gesture ) ;
164
164
165
- STATIC mp_obj_t microbit_accelerometer_get_gestures (mp_obj_t self_in ) {
165
+ static mp_obj_t microbit_accelerometer_get_gestures (mp_obj_t self_in ) {
166
166
(void )self_in ;
167
167
update_for_gesture ();
168
168
if (gesture_list_cur == 0 ) {
@@ -176,16 +176,16 @@ STATIC mp_obj_t microbit_accelerometer_get_gestures(mp_obj_t self_in) {
176
176
gesture_list_cur = 0 ;
177
177
return o ;
178
178
}
179
- STATIC MP_DEFINE_CONST_FUN_OBJ_1 (microbit_accelerometer_get_gestures_obj , microbit_accelerometer_get_gestures );
179
+ static MP_DEFINE_CONST_FUN_OBJ_1 (microbit_accelerometer_get_gestures_obj , microbit_accelerometer_get_gestures ) ;
180
180
181
- STATIC mp_obj_t microbit_accelerometer_set_range (mp_obj_t self_in , mp_obj_t g ) {
181
+ static mp_obj_t microbit_accelerometer_set_range (mp_obj_t self_in , mp_obj_t g ) {
182
182
(void )self_in ;
183
183
microbit_hal_accelerometer_set_range (mp_obj_get_int (g ));
184
184
return mp_const_none ;
185
185
}
186
- STATIC MP_DEFINE_CONST_FUN_OBJ_2 (microbit_accelerometer_set_range_obj , microbit_accelerometer_set_range );
186
+ static MP_DEFINE_CONST_FUN_OBJ_2 (microbit_accelerometer_set_range_obj , microbit_accelerometer_set_range ) ;
187
187
188
- STATIC const mp_rom_map_elem_t microbit_accelerometer_locals_dict_table [] = {
188
+ static const mp_rom_map_elem_t microbit_accelerometer_locals_dict_table [] = {
189
189
{ MP_ROM_QSTR (MP_QSTR_get_x ), MP_ROM_PTR (& microbit_accelerometer_get_x_obj ) },
190
190
{ MP_ROM_QSTR (MP_QSTR_get_y ), MP_ROM_PTR (& microbit_accelerometer_get_y_obj ) },
191
191
{ MP_ROM_QSTR (MP_QSTR_get_z ), MP_ROM_PTR (& microbit_accelerometer_get_z_obj ) },
@@ -197,9 +197,9 @@ STATIC const mp_rom_map_elem_t microbit_accelerometer_locals_dict_table[] = {
197
197
{ MP_ROM_QSTR (MP_QSTR_get_gestures ), MP_ROM_PTR (& microbit_accelerometer_get_gestures_obj ) },
198
198
{ MP_ROM_QSTR (MP_QSTR_set_range ), MP_ROM_PTR (& microbit_accelerometer_set_range_obj ) },
199
199
};
200
- STATIC MP_DEFINE_CONST_DICT (microbit_accelerometer_locals_dict , microbit_accelerometer_locals_dict_table );
200
+ static MP_DEFINE_CONST_DICT (microbit_accelerometer_locals_dict , microbit_accelerometer_locals_dict_table ) ;
201
201
202
- STATIC MP_DEFINE_CONST_OBJ_TYPE (
202
+ static MP_DEFINE_CONST_OBJ_TYPE (
203
203
microbit_accelerometer_type ,
204
204
MP_QSTR_MicroBitAccelerometer ,
205
205
MP_TYPE_FLAG_NONE ,
0 commit comments