Skip to content

Commit 8620f17

Browse files
committed
Rename read_keypad to braccio_read_keypad.
1 parent a27245a commit 8620f17

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

src/Braccio++.cpp

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,11 @@ void my_print( const char * dsc )
1111
Serial.println(dsc);
1212
}
1313

14+
extern "C" {
15+
void braccio_disp_flush(lv_disp_drv_t *disp, const lv_area_t *area, lv_color_t *color_p);
16+
void braccio_read_keypad(lv_indev_drv_t * indev, lv_indev_data_t * data);
17+
};
18+
1419
using namespace std::chrono_literals;
1520

1621
BraccioClass::BraccioClass()
@@ -121,7 +126,7 @@ bool BraccioClass::begin(voidFuncPtr custom_menu)
121126

122127
lv_indev_drv_init(&_lvgl_indev_drv);
123128
_lvgl_indev_drv.type = LV_INDEV_TYPE_KEYPAD;
124-
_lvgl_indev_drv.read_cb = read_keypad;
129+
_lvgl_indev_drv.read_cb = braccio_read_keypad;
125130
_lvgl_kb_indev = lv_indev_drv_register(&_lvgl_indev_drv);
126131

127132
lv_style_init(&_lv_style);
@@ -397,7 +402,7 @@ extern "C" void braccio_disp_flush(lv_disp_drv_t *disp, const lv_area_t *area, l
397402
}
398403

399404
/* Reading input device (simulated encoder here) */
400-
extern "C" void read_keypad(lv_indev_drv_t * drv, lv_indev_data_t* data)
405+
extern "C" void braccio_read_keypad(lv_indev_drv_t * drv, lv_indev_data_t* data)
401406
{
402407
static uint32_t last_key = 0;
403408

src/Braccio++.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,6 @@
1313

1414
extern const lv_img_dsc_t img_bulb_gif;
1515

16-
extern "C" {
17-
void braccio_disp_flush(lv_disp_drv_t *disp, const lv_area_t *area, lv_color_t *color_p);
18-
void read_keypad(lv_indev_drv_t * indev, lv_indev_data_t * data);
19-
};
20-
2116
enum speed_grade_t {
2217
FAST = 10,
2318
MEDIUM = 100,

0 commit comments

Comments
 (0)