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

update

This commit is contained in:
kraus 2021-10-10 20:56:52 +02:00
parent 5d7eb07272
commit cd911cc831
3 changed files with 47 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
csrc/mui_u8g2.h
View File

@ -137,7 +137,7 @@ uint8_t mui_u8g2_goto_child_w1_mse_pi(mui_t *ui, uint8_t msg); /* MUIF_
uint8_t mui_u8g2_u8_char_wm_mud_pi(mui_t *ui, uint8_t msg);
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 */
/*===== data = mui_u8g2_u8_min_max_t* =====*/

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

@ -24,6 +24,7 @@ uint8_t radio_input = 0;
uint8_t fruit_input = 2;
uint8_t color_input = 0;
uint8_t food_input = 0;
uint8_t text_input[4] = { ' ',' ',' ',' '} ;
uint8_t number_input = 2; // variable where the user can input a number between 0 and 9
@ -32,7 +33,6 @@ uint8_t fruit_input2 = 2;
uint8_t my_value3 = 0;
uint8_t checkbox_input = 0;
uint8_t direction_input = 0;
uint8_t text_input[4] = { ' ',' ',' ',' '} ;
uint8_t exit_code = 0;
uint16_t list_selection = 0;
uint16_t list_selection2 = 0;
@ -237,8 +237,8 @@ muif_t muif_list[] MUI_PROGMEM = {
/* food and drink */
MUIF_STYLE(4, mui_style_streamline_food_drink),
/* monospaced font */
//MUIF_STYLE(3, mui_style_monospaced),
/* monospaced font, good for mui_u8g2_u8_char_wm_mud_pi */
MUIF_STYLE(5, mui_style_monospaced),
/* horizontal line (hrule) */
MUIF_RO("HR", mui_hrule),
@ -277,6 +277,12 @@ muif_t muif_list[] MUI_PROGMEM = {
MUIF_VARIABLE("P2",&food_input,mui_u8g2_u8_opt_parent_wm_mse_pi),
MUIF_VARIABLE("cf",&food_input,mui_u8g2_u8_opt_child_wm_mse_pi),
/* Form 60: Char Input */
MUIF_VARIABLE("T0", text_input+0, mui_u8g2_u8_char_wm_mud_pi),
MUIF_VARIABLE("T1", text_input+1, mui_u8g2_u8_char_wm_mud_pi),
MUIF_VARIABLE("T2", text_input+2, mui_u8g2_u8_char_wm_mud_pi),
MUIF_VARIABLE("T3", text_input+3, mui_u8g2_u8_char_wm_mud_pi),
};
@ -294,7 +300,7 @@ MUI_DATA("GP",
MUI_30 "uint8 Checkbox|"
MUI_40 "uint8 Cycle Options|"
MUI_50 "uint8 ParentChild Select|"
MUI_15 "Text Input|"
MUI_60 "uint8 Char/Text Input|"
MUI_16 "Single Line Selection|"
MUI_17 "List Line Selection|"
MUI_18 "Parent/Child List|"
@ -523,7 +529,7 @@ MUI_DATA("GP",
MUI_XYA("GC", 5, 25, 0)
MUI_XYA("GC", 5, 37, 1)
MUI_XYA("GC", 5, 49, 2)
MUI_XYA("GC", 5, 61, 3)
//MUI_XYA("GC", 5, 61, 3)
MUI_FORM(51)
MUI_STYLE(2)
@ -578,6 +584,37 @@ MUI_XYA("cf", 53, 53, 2)
MUI_XYA("cf", 78, 53, 3)
MUI_XYA("cf", 103, 53, 4)
MUI_FORM(60)
MUI_STYLE(1)
MUI_LABEL(5,10, "uint8 Char/Text Input")
MUI_XY("HR", 0,13)
MUI_STYLE(0)
MUI_DATA("GP",
MUI_61 "u8_char_wm_mud_pi|"
MUI_1 "Back to Main Menu" )
MUI_XYA("GC", 5, 25, 0)
MUI_XYA("GC", 5, 37, 1)
MUI_XYA("GC", 5, 49, 2)
MUI_XYA("GC", 5, 61, 3)
MUI_FORM(61)
MUI_STYLE(2)
MUI_LABEL(1,5, "mui_u8g2_u8_char_wm_mud_pi")
MUI_LABEL(1,12, "MUIF_VARIABLE")
MUI_LABEL(1,19, "MUI_XYAT")
MUI_LABEL(1,25, "4x Char Input")
MUI_XY("HR", 0,26)
MUI_STYLE(0)
MUI_LABEL(5,40, "Text:")
MUI_STYLE(5)
MUI_XY("T0",40, 40)
MUI_XY("T1",48, 40)
MUI_XY("T2",56, 40)
MUI_XY("T3",64, 40)
MUI_STYLE(0)
MUI_GOTO(64, 59, 60, " Ok ")
/*
MUIF_VARIABLE("P1",&color_input,mui_u8g2_u8_opt_parent_wm_mse_pi),
MUIF_VARIABLE("c1",&color_input,mui_u8g2_u8_opt_radio_child_w1_mse_pi),

4
tools/font/bdfconv/Makefile
View File

@ -38,6 +38,10 @@ battery24: bdfconv
./bdfconv -f 1 -v -m '32-127s' ../bdf/battery24.bdf -n battery24 -o battery24.c -d ../bdf/7x13.bdf
convert -trim bdf.tga battery24.png
hornet: bdfconv
./bdfconv -a -f 1 -v -m '32-127s' ./tmp/hornet.bdf -n hornet -o hornet.c -d ../bdf/7x13.bdf
convert -trim bdf.tga hornet.png
10x20greek: bdfconv
./bdfconv -f 1 -v -m '32-127,$$370-$$3ff' ../bdf/10x20.bdf -n 10x20_greek -o 10x20_greek.c -d ../bdf/7x13.bdf