@@ -65,7 +65,7 @@ struct button_dev{
65
65
#define BUTTON_GLITCH_FILTER_TIME_MS CONFIG_IO_GLITCH_FILTER_TIME_MS
66
66
static const char * TAG = "button" ;
67
67
68
- static void button_press_cb (xTimerHandle tmr )
68
+ static void button_press_cb (TimerHandle_t tmr )
69
69
{
70
70
button_cb_t * btn_cb = (button_cb_t * ) pvTimerGetTimerID (tmr );
71
71
button_dev_t * btn = btn_cb -> pbtn ;
@@ -82,7 +82,7 @@ static void button_press_cb(xTimerHandle tmr)
82
82
}
83
83
}
84
84
85
- static void button_tap_psh_cb (xTimerHandle tmr )
85
+ static void button_tap_psh_cb (TimerHandle_t tmr )
86
86
{
87
87
button_cb_t * btn_cb = (button_cb_t * ) pvTimerGetTimerID (tmr );
88
88
button_dev_t * btn = btn_cb -> pbtn ;
@@ -108,7 +108,7 @@ static void button_tap_psh_cb(xTimerHandle tmr)
108
108
}
109
109
}
110
110
111
- static void button_tap_rls_cb (xTimerHandle tmr )
111
+ static void button_tap_rls_cb (TimerHandle_t tmr )
112
112
{
113
113
button_cb_t * btn_cb = (button_cb_t * ) pvTimerGetTimerID (tmr );
114
114
button_dev_t * btn = btn_cb -> pbtn ;
@@ -144,7 +144,7 @@ static void button_tap_rls_cb(xTimerHandle tmr)
144
144
}
145
145
}
146
146
147
- static void button_press_serial_cb (xTimerHandle tmr )
147
+ static void button_press_serial_cb (TimerHandle_t tmr )
148
148
{
149
149
button_dev_t * btn = (button_dev_t * ) pvTimerGetTimerID (tmr );
150
150
if (btn -> press_serial_cb .cb ) {
@@ -185,7 +185,7 @@ static void button_gpio_isr_handler(void* arg)
185
185
}
186
186
}
187
187
188
- static void button_free_tmr (xTimerHandle * tmr )
188
+ static void button_free_tmr (TimerHandle_t * tmr )
189
189
{
190
190
if (tmr && * tmr ) {
191
191
xTimerStop (* tmr , portMAX_DELAY );
@@ -295,22 +295,22 @@ esp_err_t iot_button_set_evt_cb(button_handle_t btn_handle, button_cb_type_t typ
295
295
if (type == BUTTON_CB_PUSH ) {
296
296
btn -> tap_psh_cb .arg = arg ;
297
297
btn -> tap_psh_cb .cb = cb ;
298
- btn -> tap_psh_cb .interval = BUTTON_GLITCH_FILTER_TIME_MS / portTICK_RATE_MS ;
298
+ btn -> tap_psh_cb .interval = BUTTON_GLITCH_FILTER_TIME_MS / portTICK_PERIOD_MS ;
299
299
btn -> tap_psh_cb .pbtn = btn ;
300
300
xTimerChangePeriod (btn -> tap_psh_cb .tmr , btn -> tap_psh_cb .interval , portMAX_DELAY );
301
301
} else if (type == BUTTON_CB_RELEASE ) {
302
302
btn -> tap_rls_cb .arg = arg ;
303
303
btn -> tap_rls_cb .cb = cb ;
304
- btn -> tap_rls_cb .interval = BUTTON_GLITCH_FILTER_TIME_MS / portTICK_RATE_MS ;
304
+ btn -> tap_rls_cb .interval = BUTTON_GLITCH_FILTER_TIME_MS / portTICK_PERIOD_MS ;
305
305
btn -> tap_rls_cb .pbtn = btn ;
306
306
xTimerChangePeriod (btn -> tap_rls_cb .tmr , btn -> tap_psh_cb .interval , portMAX_DELAY );
307
307
} else if (type == BUTTON_CB_TAP ) {
308
308
btn -> tap_short_cb .arg = arg ;
309
309
btn -> tap_short_cb .cb = cb ;
310
- btn -> tap_short_cb .interval = BUTTON_GLITCH_FILTER_TIME_MS / portTICK_RATE_MS ;
310
+ btn -> tap_short_cb .interval = BUTTON_GLITCH_FILTER_TIME_MS / portTICK_PERIOD_MS ;
311
311
btn -> tap_short_cb .pbtn = btn ;
312
312
} else if (type == BUTTON_CB_SERIAL ) {
313
- iot_button_set_serial_cb (btn_handle , 1 , 1000 / portTICK_RATE_MS , cb , arg );
313
+ iot_button_set_serial_cb (btn_handle , 1 , 1000 / portTICK_PERIOD_MS , cb , arg );
314
314
}
315
315
return ESP_OK ;
316
316
}
0 commit comments