wuqiyang312
/
u8g2-copy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update

This commit is contained in:
kraus 2022-01-06 00:05:50 +01:00
parent 47e570c263
commit 76c8b1e0e4
4 changed files with 43 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
csrc/mui_u8g2.c
View File

@ -1453,8 +1453,10 @@ uint8_t mui_u8g2_u8_opt_child_wm_mse_pi(mui_t *ui, uint8_t msg)
MUIF: MUIF_RO()
FDS: MUI_DATA()
mui_u8g2_goto_parent --> mui_u8g2_goto_data
*/
uint8_t mui_u8g2_goto_parent(mui_t *ui, uint8_t msg)
uint8_t mui_u8g2_goto_data(mui_t *ui, uint8_t msg)
{
switch(msg)
{
@ -1482,8 +1484,10 @@ uint8_t mui_u8g2_goto_parent(mui_t *ui, uint8_t msg)
}
uint8_t mui_u8g2_goto_child_w1_mse_pi(mui_t *ui, uint8_t msg)
/*
mui_u8g2_goto_child_w1_mse_pi --> mui_u8g2_goto_form_w1_mse_pi
*/
uint8_t mui_u8g2_goto_form_w1_mse_pi(mui_t *ui, uint8_t msg)
{
u8g2_t *u8g2 = mui_get_U8g2(ui);
uint8_t arg = ui->arg; // remember the arg value, because it might be overwritten

17
csrc/mui_u8g2.h
View File

@ -131,14 +131,21 @@ uint8_t mui_u8g2_u8_opt_line_wa_mse_pf(mui_t *ui, uint8_t msg); /* GIF, MUIF_VAR
uint8_t mui_u8g2_u8_opt_line_wa_mud_pi(mui_t *ui, uint8_t msg); /* GIF, MUIF_VARIABLE,MUI_XYAT */
uint8_t mui_u8g2_u8_opt_line_wa_mud_pf(mui_t *ui, uint8_t msg); /* GIF, MUIF_VARIABLE,MUI_XYAT */
uint8_t mui_u8g2_u8_opt_parent_wm_mse_pi(mui_t *ui, uint8_t msg); /* MUIF_VARIABLE, MUI_XYAT */
uint8_t mui_u8g2_u8_opt_radio_child_wm_mse_pi(mui_t *ui, uint8_t msg); /* MUIF_VARIABLE, MUI_XYA */
uint8_t mui_u8g2_u8_opt_radio_child_w1_mse_pi(mui_t *ui, uint8_t msg); /* MUIF_VARIABLE, MUI_XYA */
/* The text part of the parent defines a '|' separted list of elements, which can be selected by the child. */
/* Argument is a form number where the child element is placed multiple times */
/* The child form does not require the ok button, because the child function will return to the parent with the select element */
uint8_t mui_u8g2_u8_opt_parent_wm_mse_pi(mui_t *ui, uint8_t msg); /* GIF, MUIF_VARIABLE, MUI_XYAT */
uint8_t mui_u8g2_u8_opt_radio_child_wm_mse_pi(mui_t *ui, uint8_t msg); /* GIF, MUIF_VARIABLE, MUI_XYA */
uint8_t mui_u8g2_u8_opt_radio_child_w1_mse_pi(mui_t *ui, uint8_t msg); /* GIF, MUIF_VARIABLE, MUI_XYA */
uint8_t mui_u8g2_u8_opt_child_wm_mse_pi(mui_t *ui, uint8_t msg); /* MUIF_VARIABLE, MUI_XYA */
uint8_t mui_u8g2_goto_parent(mui_t *ui, uint8_t msg); /* MUIF_RO, MUI_DATA (WARNING: Must appear only once per form!!! */
uint8_t mui_u8g2_goto_child_w1_mse_pi(mui_t *ui, uint8_t msg); /* MUIF_BUTTON, MUI_XYA */
//uint8_t mui_u8g2_goto_parent(mui_t *ui, uint8_t msg); /* MUIF_RO, MUI_DATA (WARNING: Must appear only once per form!!! */
// renamed to
uint8_t mui_u8g2_goto_data(mui_t *ui, uint8_t msg); /* MUIF_RO, MUI_DATA (WARNING: Must appear only once per form!!! */
//uint8_t mui_u8g2_goto_child_w1_mse_pi(mui_t *ui, uint8_t msg); /* MUIF_BUTTON, MUI_XYA */
// renamed to
uint8_t mui_u8g2_goto_form_w1_mse_pi(mui_t *ui, uint8_t msg); /* MUIF_BUTTON, MUI_XYA */
uint8_t mui_u8g2_u8_char_wm_mud_pi(mui_t *ui, uint8_t msg); /* MUIF_VARIABLE,MUI_XY, usually requires a monospaced font line profont12 */

4
sys/sdl/mui_all/main.c
View File

@ -282,8 +282,8 @@ muif_t muif_list[] MUI_PROGMEM = {
MUIF_LABEL(mui_u8g2_draw_text),
MUIF_RO("GP",mui_u8g2_goto_parent),
MUIF_BUTTON("GC", mui_u8g2_goto_child_w1_mse_pi),
MUIF_RO("GP",mui_u8g2_goto_data),
MUIF_BUTTON("GC", mui_u8g2_goto_form_w1_mse_pi),
/* Form 10 */
MUIF_GOTO(mui_u8g2_btn_goto_wm_fi),

26
sys/sdl/mui_ref/main.c
View File

@ -1,5 +1,23 @@
/*
mui_ref
Documentatio
mui-style
monochrome user interface concepts
selected element: inverted vs frame
selection criteria: size vs. number of element types
only buttons --> inverted cursor
buttons and user elements --> frame cuser
what means style:
selected element concept (inverted vs frame)
MUI_STYLE command for fonts
callback postfix
Edit modes
unselected, selected, selected & update
*/
#include "u8g2.h"
#include <stdlib.h>
@ -251,8 +269,8 @@ muif_t muif_list[] MUI_PROGMEM = {
MUIF_LABEL(mui_u8g2_draw_text),
MUIF_RO("GP",mui_u8g2_goto_parent),
MUIF_BUTTON("GC", mui_u8g2_goto_child_w1_mse_pi),
MUIF_RO("GP",mui_u8g2_goto_data),
MUIF_BUTTON("GC", mui_u8g2_goto_form_w1_mse_pi),
/* Form 10 */
MUIF_GOTO(mui_u8g2_btn_goto_wm_fi),
@ -919,10 +937,10 @@ int main(void)
draw(10, "asnnnsnsnnnsnnsnnnsnnnsnnnnns.q", "mui_btn_goto.gif");
draw(20, "assssnsnssnnnnnnsnsnnssppssssssnsnnnssnpppppppsns.q", "mui_uint8_number.gif");
draw(30, "assnsnsnssnsnsssnsns.q", "mui_uint8_checkbox_radio.gif");
*/
draw(40, "asnnssnsnssppsnsnnsnnsssnsnnnssnnsns.q", "mui_u8g2_u8_opt_line_wa.gif");
*/
draw(50, "assnnnnsnnspppsnsnssnnnsnnsnnnnnnnsns.q", "mui_u8g2_u8_opt_parent.gif");
return 0;
}