Skip to content

Commit 410b533

Browse files
author
Greg Smith
committed
Tweaks and minor fixes for issues introduced in EEZ port.
1 parent 94a4061 commit 410b533

File tree

11 files changed

+136
-1
lines changed

11 files changed

+136
-1
lines changed

source/main/display.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -307,6 +307,9 @@ void __attribute__((unused)) action_gesture(lv_event_t * e)
307307
{
308308
lv_dir_t dir = lv_indev_get_gesture_dir(lv_indev_get_act());
309309

310+
// let platform adjust it
311+
dir = platform_adjust_gesture(dir);
312+
310313
// called from LVGL
311314
if (dir == LV_DIR_LEFT)
312315
{
@@ -1785,6 +1788,7 @@ static uint8_t update_ui_element(tUIUpdate* update)
17851788
{
17861789
element_1 = objects.ui_usb_status_fail;
17871790

1791+
#if CONFIG_TONEX_CONTROLLER_DISPLAY_FULL_UI
17881792
if (update->Value == 1)
17891793
{
17901794
// if enabled, adjust UI to suit modeller
@@ -1809,6 +1813,7 @@ static uint8_t update_ui_element(tUIUpdate* update)
18091813
} break;
18101814
}
18111815
}
1816+
#endif
18121817
} break;
18131818

18141819
case UI_ELEMENT_BT_STATUS:

source/main/platform_common.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,5 @@ void platform_adjust_touch_coords(lv_coord_t* x, lv_coord_t* y);
2222
void platform_adjust_display_flush_area(lv_area_t *area);
2323
void platform_get_icon_coords(int16_t* dest, uint8_t max_entries);
2424
const lv_font_t* platform_get_toast_font(void);
25-
uint16_t platform_get_toast_padding(void);
25+
uint16_t platform_get_toast_padding(void);
26+
lv_dir_t platform_adjust_gesture(lv_dir_t gesture);

source/main/platform_devkitc.c

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,19 @@ __attribute__((unused)) uint16_t platform_get_toast_padding(void)
137137
return 15;
138138
}
139139

140+
/****************************************************************************
141+
* NAME:
142+
* DESCRIPTION:
143+
* PARAMETERS:
144+
* RETURN:
145+
* NOTES:
146+
*****************************************************************************/
147+
__attribute__((unused)) lv_dir_t platform_adjust_gesture(lv_dir_t gesture)
148+
{
149+
// nothing special needed
150+
return gesture;
151+
}
152+
140153
/****************************************************************************
141154
* NAME:
142155
* DESCRIPTION:

source/main/platform_jc3248w.c

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -265,6 +265,19 @@ __attribute__((unused)) uint16_t platform_get_toast_padding(void)
265265
return 25;
266266
}
267267

268+
/****************************************************************************
269+
* NAME:
270+
* DESCRIPTION:
271+
* PARAMETERS:
272+
* RETURN:
273+
* NOTES:
274+
*****************************************************************************/
275+
__attribute__((unused)) lv_dir_t platform_adjust_gesture(lv_dir_t gesture)
276+
{
277+
// nothing special needed
278+
return gesture;
279+
}
280+
268281
/****************************************************************************
269282
* NAME:
270283
* DESCRIPTION:

source/main/platform_lgtdisps3.c

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,19 @@ __attribute__((unused)) uint16_t platform_get_toast_padding(void)
191191
return 15;
192192
}
193193

194+
/****************************************************************************
195+
* NAME:
196+
* DESCRIPTION:
197+
* PARAMETERS:
198+
* RETURN:
199+
* NOTES:
200+
*****************************************************************************/
201+
__attribute__((unused)) lv_dir_t platform_adjust_gesture(lv_dir_t gesture)
202+
{
203+
// nothing special needed
204+
return gesture;
205+
}
206+
194207
/****************************************************************************
195208
* NAME:
196209
* DESCRIPTION:

source/main/platform_m5atoms3r.c

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,19 @@ __attribute__((unused)) uint16_t platform_get_toast_padding(void)
146146
return 5;
147147
}
148148

149+
/****************************************************************************
150+
* NAME:
151+
* DESCRIPTION:
152+
* PARAMETERS:
153+
* RETURN:
154+
* NOTES:
155+
*****************************************************************************/
156+
__attribute__((unused)) lv_dir_t platform_adjust_gesture(lv_dir_t gesture)
157+
{
158+
// nothing special needed
159+
return gesture;
160+
}
161+
149162
/****************************************************************************
150163
* NAME:
151164
* DESCRIPTION:

source/main/platform_ws169.c

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,31 @@ __attribute__((unused)) uint16_t platform_get_toast_padding(void)
159159
return 10;
160160
}
161161

162+
/****************************************************************************
163+
* NAME:
164+
* DESCRIPTION:
165+
* PARAMETERS:
166+
* RETURN:
167+
* NOTES:
168+
*****************************************************************************/
169+
__attribute__((unused)) lv_dir_t platform_adjust_gesture(lv_dir_t gesture)
170+
{
171+
#if CONFIG_TONEX_CONTROLLER_WAVESHARE_169_LANDSCAPE
172+
// landscape mode
173+
if (gesture == LV_DIR_TOP)
174+
{
175+
return LV_DIR_LEFT;
176+
}
177+
else if (gesture == LV_DIR_BOTTOM)
178+
{
179+
return LV_DIR_RIGHT;
180+
}
181+
#endif
182+
183+
// portrait, nothing special needed
184+
return gesture;
185+
}
186+
162187
/****************************************************************************
163188
* NAME:
164189
* DESCRIPTION:

source/main/platform_ws19t.c

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,19 @@ __attribute__((unused)) uint16_t platform_get_toast_padding(void)
177177
return 15;
178178
}
179179

180+
/****************************************************************************
181+
* NAME:
182+
* DESCRIPTION:
183+
* PARAMETERS:
184+
* RETURN:
185+
* NOTES:
186+
*****************************************************************************/
187+
__attribute__((unused)) lv_dir_t platform_adjust_gesture(lv_dir_t gesture)
188+
{
189+
// nothing special needed
190+
return gesture;
191+
}
192+
180193
/****************************************************************************
181194
* NAME:
182195
* DESCRIPTION:

source/main/platform_ws35.c

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -251,6 +251,19 @@ __attribute__((unused)) uint16_t platform_get_toast_padding(void)
251251
return 25;
252252
}
253253

254+
/****************************************************************************
255+
* NAME:
256+
* DESCRIPTION:
257+
* PARAMETERS:
258+
* RETURN:
259+
* NOTES:
260+
*****************************************************************************/
261+
__attribute__((unused)) lv_dir_t platform_adjust_gesture(lv_dir_t gesture)
262+
{
263+
// nothing special needed
264+
return gesture;
265+
}
266+
254267
/****************************************************************************
255268
* NAME:
256269
* DESCRIPTION:

source/main/platform_ws35b.c

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -312,6 +312,19 @@ __attribute__((unused)) uint16_t platform_get_toast_padding(void)
312312
return 25;
313313
}
314314

315+
/****************************************************************************
316+
* NAME:
317+
* DESCRIPTION:
318+
* PARAMETERS:
319+
* RETURN:
320+
* NOTES:
321+
*****************************************************************************/
322+
__attribute__((unused)) lv_dir_t platform_adjust_gesture(lv_dir_t gesture)
323+
{
324+
// nothing special needed
325+
return gesture;
326+
}
327+
315328
/****************************************************************************
316329
* NAME:
317330
* DESCRIPTION:

0 commit comments

Comments
 (0)