Skip to content

Commit 59f83d7

Browse files
committed
remove eventHandlerMenu callback & optimizations
1 parent bab02c2 commit 59f83d7

File tree

1 file changed

+4
-15
lines changed

1 file changed

+4
-15
lines changed

examples/Controlling_Manually_Braccio/Controlling_Manually_Braccio.ino

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -80,15 +80,6 @@ void moveJoints(uint32_t btnID) {
8080
}
8181

8282
// Event Handlers
83-
static void eventHandlerMenu(lv_event_t * e) {
84-
lv_obj_t * obj = lv_event_get_target(e);
85-
uint32_t id = lv_btnmatrix_get_selected_btn(obj);
86-
87-
selectedJoints = jointsPair[id];
88-
89-
directionScreen();
90-
lv_obj_del(btnm);
91-
}
9283

9384
static void eventHandlerDirectional(lv_event_t * e) {
9485
lv_event_code_t code = lv_event_get_code(e);
@@ -141,8 +132,6 @@ void mainMenu() {
141132
lv_btnmatrix_set_one_checked(btnm, true);
142133
lv_btnmatrix_set_selected_btn(btnm, 0);
143134

144-
lv_obj_add_event_cb(btnm, eventHandlerMenu, LV_EVENT_PRESSED, NULL);
145-
146135
Braccio.connectJoystickTo(btnm);
147136
}
148137

@@ -175,7 +164,7 @@ void directionScreen(void)
175164
lv_btnmatrix_set_btn_ctrl(directional, 7, LV_BTNMATRIX_CTRL_CHECKABLE);
176165
lv_btnmatrix_set_btn_ctrl(directional, 8, LV_BTNMATRIX_CTRL_HIDDEN);
177166

178-
if (selectedJoints == "Elbow") {
167+
if (state == ELBOW) {
179168
lv_btnmatrix_set_btn_ctrl(directional, 3, LV_BTNMATRIX_CTRL_HIDDEN);
180169
lv_btnmatrix_set_btn_ctrl(directional, 5, LV_BTNMATRIX_CTRL_HIDDEN);
181170
}
@@ -185,12 +174,12 @@ void directionScreen(void)
185174

186175
lv_obj_add_event_cb(directional, eventHandlerDirectional, LV_EVENT_ALL, NULL);
187176

188-
delay(50);
189-
Braccio.connectJoystickTo(btnm);
177+
// delay(50);
178+
Braccio.connectJoystickTo(directional);
190179
}
191180

192181
void setup() {
193-
Braccio.begin(mainMenu);
182+
Braccio.begin(directionScreen);
194183
delay(500); // Waits for the Braccio initialization
195184

196185
Braccio.speed(SLOW);

0 commit comments

Comments
 (0)