Skip to content

Commit dbd3ab4

Browse files
committed
Format code
1 parent 7800000 commit dbd3ab4

2 files changed

Lines changed: 23 additions & 24 deletions

File tree

src/base_components/encoder.c

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -85,15 +85,14 @@ static void sw_callback(hal_gpio_pin_t pin, encoder_t *encoder) {
8585
encoder->rotate_since_pressed = false;
8686

8787
if (now - encoder->released_at_ms < encoder->multi_press_duration_ms) {
88-
encoder->multi_press_cnt += 1;
89-
printf("Multi press detected: %d\r\n", encoder->multi_press_cnt);
90-
if (encoder->on_multi_press != NULL) {
91-
encoder->on_multi_press(encoder->callback_param, encoder->multi_press_cnt);
92-
}
88+
encoder->multi_press_cnt += 1;
89+
printf("Multi press detected: %d\r\n", encoder->multi_press_cnt);
90+
if (encoder->on_multi_press != NULL) {
91+
encoder->on_multi_press(encoder->callback_param, encoder->multi_press_cnt);
92+
}
9393
} else {
94-
encoder->multi_press_cnt = 1;
94+
encoder->multi_press_cnt = 1;
9595
}
96-
9796
} else {
9897
printf("Encoder Released\r\n");
9998
encoder->released_at_ms = now;

src/base_components/encoder.h

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -10,28 +10,28 @@ typedef void (*ev_encoder_callback_t)(void *);
1010
typedef void (*ev_encoder_multi_press_callback_t)(void *, uint8_t);
1111

1212
typedef struct {
13-
hal_gpio_pin_t pin_a; // Also known as CLK
14-
hal_gpio_pin_t pin_b; // Also known as DT
15-
uint8_t old_AB;
16-
int8_t encval;
13+
hal_gpio_pin_t pin_a; // Also known as CLK
14+
hal_gpio_pin_t pin_b; // Also known as DT
15+
uint8_t old_AB;
16+
int8_t encval;
1717

18-
hal_gpio_pin_t pin_sw;
19-
uint8_t pin_sw_state;
20-
uint32_t pin_sw_last_change;
18+
hal_gpio_pin_t pin_sw;
19+
uint8_t pin_sw_state;
20+
uint32_t pin_sw_last_change;
2121

22-
bool rotate_since_pressed;
22+
bool rotate_since_pressed;
2323

24-
ev_encoder_callback_t on_press;
25-
ev_encoder_callback_t on_rotate_ccw;
26-
ev_encoder_callback_t on_rotate_cw;
27-
ev_encoder_callback_t on_rotate_ccw_while_pressed;
28-
ev_encoder_callback_t on_rotate_cw_while_pressed;
29-
void * callback_param;
24+
ev_encoder_callback_t on_press;
25+
ev_encoder_callback_t on_rotate_ccw;
26+
ev_encoder_callback_t on_rotate_cw;
27+
ev_encoder_callback_t on_rotate_ccw_while_pressed;
28+
ev_encoder_callback_t on_rotate_cw_while_pressed;
29+
void * callback_param;
3030

3131
// Needed to detect Multi presses for reset logic
32-
uint32_t released_at_ms;
33-
uint32_t multi_press_duration_ms;
34-
uint8_t multi_press_cnt;
32+
uint32_t released_at_ms;
33+
uint32_t multi_press_duration_ms;
34+
uint8_t multi_press_cnt;
3535
ev_encoder_multi_press_callback_t on_multi_press;
3636
} encoder_t;
3737

0 commit comments

Comments
 (0)