diff --git a/ChangeLog b/ChangeLog index 9e022de1..28b07c33 100644 --- a/ChangeLog +++ b/ChangeLog @@ -283,6 +283,6 @@ https://github.com/olikraus/u8g2 ChangeLog * Added support for UC1609 (issue 1565) * Added support for GU800 series of Vacuum Fluorescent Displays (VFD, issue 1604) * Changed SPI Mode for Sharp displays (ls013..., issue 1771) - * Added many more fonts + * Added many more fonts (issues 1794, 1775, 1706, 1769) * Fixed several bugs and compiler errors \ No newline at end of file diff --git a/csrc/mui_u8g2.c b/csrc/mui_u8g2.c index 01821a1c..44a7bebd 100644 --- a/csrc/mui_u8g2.c +++ b/csrc/mui_u8g2.c @@ -83,7 +83,7 @@ mui _input_uint8_invers_select_u8g2 --> mui_u8g2_u8_value_0_9_wm_mse_pi mui _single_line_option_invers_select_u8g2 --> mui_u8g2_u8_opt_line_wa_mse_pi mui _select_options_parent_invers_select_u8g2 --> mui_u8g2_u8_opt_parent_wa_mse_pi - mui _select_options_child_invers_select_u8g2 --> mui_u8g2_u8_opt_child_wm_mse_pi + mui _select_options_child_invers_select_u8g2 --> mui_u8g2_u8_opt_child_wm_pi mui _checkbox_invers_select_u8g2 --> mui_u8g2_u8_chkbox_wm_pi mui _radio_invers_select_u8g2 --> mui_u8g2_u8_radio_wm_pi @@ -1612,7 +1612,7 @@ uint8_t mui_u8g2_u8_radio_wm_pi(mui_t *ui, uint8_t msg) } -uint8_t mui_u8g2_u8_opt_parent_wm_mse_pi(mui_t *ui, uint8_t msg) +uint8_t mui_u8g2_u8_opt_parent_wm_pi(mui_t *ui, uint8_t msg) { uint8_t *value = (uint8_t *)muif_get_data(ui->uif); switch(msg) @@ -1695,7 +1695,7 @@ uint8_t mui_u8g2_u8_opt_child_mse_common(mui_t *ui, uint8_t msg) } -uint8_t mui_u8g2_u8_opt_radio_child_wm_mse_pi(mui_t *ui, uint8_t msg) +uint8_t mui_u8g2_u8_opt_radio_child_wm_pi(mui_t *ui, uint8_t msg) { u8g2_t *u8g2 = mui_get_U8g2(ui); uint8_t *value = (uint8_t *)muif_get_data(ui->uif); @@ -1740,7 +1740,7 @@ uint8_t mui_u8g2_u8_opt_radio_child_wm_mse_pi(mui_t *ui, uint8_t msg) } -uint8_t mui_u8g2_u8_opt_radio_child_w1_mse_pi(mui_t *ui, uint8_t msg) +uint8_t mui_u8g2_u8_opt_radio_child_w1_pi(mui_t *ui, uint8_t msg) { u8g2_t *u8g2 = mui_get_U8g2(ui); uint8_t *value = (uint8_t *)muif_get_data(ui->uif); @@ -1786,7 +1786,7 @@ uint8_t mui_u8g2_u8_opt_radio_child_w1_mse_pi(mui_t *ui, uint8_t msg) } -uint8_t mui_u8g2_u8_opt_child_wm_mse_pi(mui_t *ui, uint8_t msg) +uint8_t mui_u8g2_u8_opt_child_wm_pi(mui_t *ui, uint8_t msg) { u8g2_t *u8g2 = mui_get_U8g2(ui); //uint8_t *value = (uint8_t *)muif_get_data(ui->uif); @@ -1833,7 +1833,7 @@ uint8_t mui_u8g2_u8_opt_child_wm_mse_pi(mui_t *ui, uint8_t msg) mui_u8g2_goto_parent --> mui_u8g2_goto_data - Used together with mui_u8g2_goto_form_w1_mse_pi + Used together with mui_u8g2_goto_form_w1_pi */ uint8_t mui_u8g2_goto_data(mui_t *ui, uint8_t msg) @@ -1865,9 +1865,9 @@ uint8_t mui_u8g2_goto_data(mui_t *ui, uint8_t msg) /* -mui_u8g2_goto_child_w1_mse_pi --> mui_u8g2_goto_form_w1_mse_pi +mui_u8g2_goto_child_w1_mse_pi --> mui_u8g2_goto_form_w1_pi */ -uint8_t mui_u8g2_goto_form_w1_mse_pi(mui_t *ui, uint8_t msg) +uint8_t mui_u8g2_goto_form_w1_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 @@ -1890,7 +1890,7 @@ uint8_t mui_u8g2_goto_form_w1_mse_pi(mui_t *ui, uint8_t msg) return 0; } -uint8_t mui_u8g2_goto_form_w1_mse_pf(mui_t *ui, uint8_t msg) +uint8_t mui_u8g2_goto_form_w1_pf(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 @@ -2020,7 +2020,7 @@ uint8_t mui_u8g2_u16_list_line_wa_mud_pi(mui_t *ui, uint8_t msg) FDS: MUI_XYA, arg=form id data: mui_u8g2_list_t * */ -uint8_t mui_u8g2_u16_list_parent_wm_mse_pi(mui_t *ui, uint8_t msg) +uint8_t mui_u8g2_u16_list_parent_wm_pi(mui_t *ui, uint8_t msg) { //u8g2_t *u8g2 = mui_get_U8g2(ui); mui_u8g2_list_t *list = (mui_u8g2_list_t *)muif_get_data(ui->uif); @@ -2104,7 +2104,7 @@ static uint8_t mui_u8g2_u16_list_child_mse_common(mui_t *ui, uint8_t msg) return 0; } -uint8_t mui_u8g2_u16_list_child_w1_mse_pi(mui_t *ui, uint8_t msg) +uint8_t mui_u8g2_u16_list_child_w1_pi(mui_t *ui, uint8_t msg) { u8g2_t *u8g2 = mui_get_U8g2(ui); mui_u8g2_list_t *list = (mui_u8g2_list_t *)muif_get_data(ui->uif); @@ -2144,7 +2144,7 @@ uint8_t mui_u8g2_u16_list_child_w1_mse_pi(mui_t *ui, uint8_t msg) return 0; } -uint8_t mui_u8g2_u16_list_goto_w1_mse_pi(mui_t *ui, uint8_t msg) +uint8_t mui_u8g2_u16_list_goto_w1_pi(mui_t *ui, uint8_t msg) { u8g2_t *u8g2 = mui_get_U8g2(ui); mui_u8g2_list_t *list = (mui_u8g2_list_t *)muif_get_data(ui->uif); diff --git a/csrc/mui_u8g2.h b/csrc/mui_u8g2.h index e70faf3e..9cee209d 100644 --- a/csrc/mui_u8g2.h +++ b/csrc/mui_u8g2.h @@ -161,20 +161,18 @@ uint8_t mui_u8g2_u8_opt_line_wa_mud_pf(mui_t *ui, uint8_t msg); /* GIF, MUIF_VAR /* 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 */ -/* TODO: remove "mse" from the fn name */ -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 */ -/* Note: there is no opt_child_goto muif, because this can be done with mui_u8g2_goto_form_w1_mse_pi */ +uint8_t mui_u8g2_u8_opt_parent_wm_pi(mui_t *ui, uint8_t msg); /* GIF, MUIF_VARIABLE, MUI_XYAT */ +uint8_t mui_u8g2_u8_opt_radio_child_wm_pi(mui_t *ui, uint8_t msg); /* GIF, MUIF_VARIABLE, MUI_XYA */ +uint8_t mui_u8g2_u8_opt_radio_child_w1_pi(mui_t *ui, uint8_t msg); /* GIF, MUIF_VARIABLE, MUI_XYA */ +uint8_t mui_u8g2_u8_opt_child_wm_pi(mui_t *ui, uint8_t msg); /* MUIF_VARIABLE, MUI_XYA */ +/* Note: there is no opt_child_goto muif, because this can be done with mui_u8g2_goto_form_w1_pi */ /* (scrollable) jump menu */ /* The text part of the parent defines a '|' separted list of elements, which can be selected goto_form functions. */ /* Each '|' separted element must be prefixed with the form number (MUI_x) */ -/* TODO: remove "mse" from the fn name */ uint8_t mui_u8g2_goto_data(mui_t *ui, uint8_t msg); /* REF, MUIF_RO, MUI_DATA (WARNING: Must appear only once per form!!! */ -uint8_t mui_u8g2_goto_form_w1_mse_pi(mui_t *ui, uint8_t msg); /* REF, MUIF_BUTTON, MUI_XYA */ -uint8_t mui_u8g2_goto_form_w1_mse_pf(mui_t *ui, uint8_t msg); /* REF, MUIF_BUTTON, MUI_XYA */ +uint8_t mui_u8g2_goto_form_w1_pi(mui_t *ui, uint8_t msg); /* REF, MUIF_BUTTON, MUI_XYA */ +uint8_t mui_u8g2_goto_form_w1_pf(mui_t *ui, uint8_t msg); /* REF, MUIF_BUTTON, MUI_XYA */ /* character input */ @@ -240,10 +238,9 @@ uint8_t mui_u8g2_u16_list_line_wa_mud_pi(mui_t *ui, uint8_t msg); /* GIF, /* dropdown list / combo box with 16 size and callback functions for MUIF_U8G2_U16_LIST */ -/* TODO: remove "mse" from the fn name */ -uint8_t mui_u8g2_u16_list_parent_wm_mse_pi(mui_t *ui, uint8_t msg); /* GIF, MUIF_U8G2_U16_LIST, MUI_XYA, arg=subform */ -uint8_t mui_u8g2_u16_list_child_w1_mse_pi(mui_t *ui, uint8_t msg); /* GIF, MUIF_U8G2_U16_LIST, MUI_XYA, arg=sub element number */ -uint8_t mui_u8g2_u16_list_goto_w1_mse_pi(mui_t *ui, uint8_t msg); /* REF, MUIF_U8G2_U16_LIST first char of the string denotes the target form */ +uint8_t mui_u8g2_u16_list_parent_wm_pi(mui_t *ui, uint8_t msg); /* GIF, MUIF_U8G2_U16_LIST, MUI_XYA, arg=subform */ +uint8_t mui_u8g2_u16_list_child_w1_pi(mui_t *ui, uint8_t msg); /* GIF, MUIF_U8G2_U16_LIST, MUI_XYA, arg=sub element number */ +uint8_t mui_u8g2_u16_list_goto_w1_pi(mui_t *ui, uint8_t msg); /* REF, MUIF_U8G2_U16_LIST first char of the string denotes the target form */ #ifdef __cplusplus diff --git a/sys/arduino/u8g2_page_buffer/MUIBlink/MUIBlink.ino b/sys/arduino/u8g2_page_buffer/MUIBlink/MUIBlink.ino index 130d71ff..62db7213 100644 --- a/sys/arduino/u8g2_page_buffer/MUIBlink/MUIBlink.ino +++ b/sys/arduino/u8g2_page_buffer/MUIBlink/MUIBlink.ino @@ -391,7 +391,7 @@ muif_t muif_list[] = { MUIF_RO("HR", mui_hrule), MUIF_U8G2_LABEL(), MUIF_RO("GP",mui_u8g2_goto_data), - MUIF_BUTTON("GC", mui_u8g2_goto_form_w1_mse_pi), + MUIF_BUTTON("GC", mui_u8g2_goto_form_w1_pi), MUIF_U8G2_U8_MIN_MAX("NB", &blink_light, 0, 4, mui_u8g2_u8_min_max_wm_mse_pi), MUIF_U8G2_U8_MIN_MAX("NT", &blink_time, 0, 4, mui_u8g2_u8_min_max_wm_mse_pi), diff --git a/sys/arduino/u8g2_page_buffer/MUIDemo/MUIDemo.ino b/sys/arduino/u8g2_page_buffer/MUIDemo/MUIDemo.ino index 7349e5b7..724c39f7 100644 --- a/sys/arduino/u8g2_page_buffer/MUIDemo/MUIDemo.ino +++ b/sys/arduino/u8g2_page_buffer/MUIDemo/MUIDemo.ino @@ -459,7 +459,7 @@ muif_t muif_list[] = { /* main menu */ MUIF_RO("GP",mui_u8g2_goto_data), - MUIF_BUTTON("GC", mui_u8g2_goto_form_w1_mse_pi), + MUIF_BUTTON("GC", mui_u8g2_goto_form_w1_pi), /* Goto Form Button where the width is equal to the size of the text, spaces can be used to extend the size */ @@ -485,11 +485,11 @@ muif_t muif_list[] = { MUIF_VARIABLE("CB",&checkbox_input,mui_u8g2_u8_chkbox_wm_pi), /* the following two fields belong together and implement a single selection combo box to select a color */ - MUIF_VARIABLE("IC",&color_input,mui_u8g2_u8_opt_parent_wm_mse_pi), - MUIF_VARIABLE("OC",&color_input,mui_u8g2_u8_opt_radio_child_w1_mse_pi), + MUIF_VARIABLE("IC",&color_input,mui_u8g2_u8_opt_parent_wm_pi), + MUIF_VARIABLE("OC",&color_input,mui_u8g2_u8_opt_radio_child_w1_pi), - MUIF_VARIABLE("ID",&food_input,mui_u8g2_u8_opt_parent_wm_mse_pi), - MUIF_VARIABLE("OD",&food_input,mui_u8g2_u8_opt_child_wm_mse_pi), + MUIF_VARIABLE("ID",&food_input,mui_u8g2_u8_opt_parent_wm_pi), + MUIF_VARIABLE("OD",&food_input,mui_u8g2_u8_opt_child_wm_pi), /* radio button style */ MUIF_VARIABLE("RS",&direction_input,mui_u8g2_u8_radio_wm_pi), @@ -497,10 +497,10 @@ muif_t muif_list[] = { MUIF_U8G2_U16_LIST("L1", &list_selection, NULL, list_get_str, list_get_cnt, mui_u8g2_u16_list_line_wa_mse_pi), MUIF_U8G2_U16_LIST("L2", &list_selection2, NULL, list_get_str, list_get_cnt, mui_u8g2_u16_list_line_wa_mud_pi), - MUIF_U8G2_U16_LIST("LP", &list_selection3, NULL, list_get_str, list_get_cnt, mui_u8g2_u16_list_parent_wm_mse_pi), - MUIF_U8G2_U16_LIST("LC", &list_selection3, NULL, list_get_str, list_get_cnt, mui_u8g2_u16_list_child_w1_mse_pi), + MUIF_U8G2_U16_LIST("LP", &list_selection3, NULL, list_get_str, list_get_cnt, mui_u8g2_u16_list_parent_wm_pi), + MUIF_U8G2_U16_LIST("LC", &list_selection3, NULL, list_get_str, list_get_cnt, mui_u8g2_u16_list_child_w1_pi), - MUIF_U8G2_U16_LIST("LG", &list_selection4, NULL, menu_get_str, menu_get_cnt, mui_u8g2_u16_list_goto_w1_mse_pi), + MUIF_U8G2_U16_LIST("LG", &list_selection4, NULL, menu_get_str, menu_get_cnt, mui_u8g2_u16_list_goto_w1_pi), /* MUI_GOTO uses the fixed ".G" id and is intended for goto buttons. This is a full display width style button */ MUIF_GOTO(mui_u8g2_btn_goto_w1_pi), diff --git a/sys/arduino/u8g2_page_buffer/MUIInput2BtnBounce2/MUIInput2BtnBounce2.ino b/sys/arduino/u8g2_page_buffer/MUIInput2BtnBounce2/MUIInput2BtnBounce2.ino index 3fc02f83..52dbc5f2 100644 --- a/sys/arduino/u8g2_page_buffer/MUIInput2BtnBounce2/MUIInput2BtnBounce2.ino +++ b/sys/arduino/u8g2_page_buffer/MUIInput2BtnBounce2/MUIInput2BtnBounce2.ino @@ -380,7 +380,7 @@ muif_t muif_list[] = { MUIF_RO("HR", mui_hrule), MUIF_U8G2_LABEL(), MUIF_RO("GP",mui_u8g2_goto_data), - MUIF_BUTTON("GC", mui_u8g2_goto_form_w1_mse_pi), + MUIF_BUTTON("GC", mui_u8g2_goto_form_w1_pi), /* this example will use three buttons, so use "mse" functions here */ MUIF_U8G2_U8_MIN_MAX("NV", &num_value, 0, 99, mui_u8g2_u8_min_max_wm_mse_pi), diff --git a/sys/arduino/u8g2_page_buffer/MUIInput3BtnBounce2/MUIInput3BtnBounce2.ino b/sys/arduino/u8g2_page_buffer/MUIInput3BtnBounce2/MUIInput3BtnBounce2.ino index ec82c9a8..b24f15bd 100644 --- a/sys/arduino/u8g2_page_buffer/MUIInput3BtnBounce2/MUIInput3BtnBounce2.ino +++ b/sys/arduino/u8g2_page_buffer/MUIInput3BtnBounce2/MUIInput3BtnBounce2.ino @@ -382,7 +382,7 @@ muif_t muif_list[] = { MUIF_RO("HR", mui_hrule), MUIF_U8G2_LABEL(), MUIF_RO("GP",mui_u8g2_goto_data), - MUIF_BUTTON("GC", mui_u8g2_goto_form_w1_mse_pi), + MUIF_BUTTON("GC", mui_u8g2_goto_form_w1_pi), /* this example will use three buttons, so use "mud" functions here */ MUIF_U8G2_U8_MIN_MAX("NV", &num_value, 0, 99, mui_u8g2_u8_min_max_wm_mud_pi), diff --git a/sys/arduino/u8g2_page_buffer/MUIInput3BtnWithU8g2/MUIInput3BtnWithU8g2.ino b/sys/arduino/u8g2_page_buffer/MUIInput3BtnWithU8g2/MUIInput3BtnWithU8g2.ino index 7895c091..211b6bd3 100644 --- a/sys/arduino/u8g2_page_buffer/MUIInput3BtnWithU8g2/MUIInput3BtnWithU8g2.ino +++ b/sys/arduino/u8g2_page_buffer/MUIInput3BtnWithU8g2/MUIInput3BtnWithU8g2.ino @@ -376,7 +376,7 @@ muif_t muif_list[] = { MUIF_RO("HR", mui_hrule), MUIF_U8G2_LABEL(), MUIF_RO("GP",mui_u8g2_goto_data), - MUIF_BUTTON("GC", mui_u8g2_goto_form_w1_mse_pi), + MUIF_BUTTON("GC", mui_u8g2_goto_form_w1_pi), MUIF_U8G2_U8_MIN_MAX("NV", &num_value, 0, 99, mui_u8g2_u8_min_max_wm_mse_pi), MUIF_U8G2_U8_MIN_MAX_STEP("NB", &bar_value, 0, 16, 1, MUI_MMS_2X_BAR, mui_u8g2_u8_bar_wm_mse_pf), diff --git a/sys/arduino/u8g2_page_buffer/MUIInputSimpleRotary/MUIInputSimpleRotary.ino b/sys/arduino/u8g2_page_buffer/MUIInputSimpleRotary/MUIInputSimpleRotary.ino index 6463b002..e853c039 100644 --- a/sys/arduino/u8g2_page_buffer/MUIInputSimpleRotary/MUIInputSimpleRotary.ino +++ b/sys/arduino/u8g2_page_buffer/MUIInputSimpleRotary/MUIInputSimpleRotary.ino @@ -71,7 +71,7 @@ SimpleRotary rotary(2,3,4); //U8G2_SSD1312_128X64_NONAME_1_SW_I2C u8g2(U8G2_R0, /* clock=*/ SCL, /* data=*/ SDA, /* reset=*/ 8); //U8G2_SSD1312_128X64_NONAME_1_HW_I2C u8g2(U8G2_R0, /* reset=*/ 8); //U8G2_SH1106_128X64_NONAME_1_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); -//U8G2_SH1106_128X64_NONAME_1_HW_I2C u8g2(U8G2_R0, /* reset=*/ U8X8_PIN_NONE); +U8G2_SH1106_128X64_NONAME_1_HW_I2C u8g2(U8G2_R0, /* reset=*/ U8X8_PIN_NONE); //U8G2_SH1106_128X64_VCOMH0_1_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); // same as the NONAME variant, but maximizes setContrast() range //U8G2_SH1106_128X64_WINSTAR_1_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); // same as the NONAME variant, but uses updated SH1106 init sequence //U8G2_SH1106_128X32_VISIONOX_1_HW_I2C u8g2(U8G2_R0, /* reset=*/ U8X8_PIN_NONE); @@ -376,7 +376,7 @@ muif_t muif_list[] = { MUIF_RO("HR", mui_hrule), MUIF_U8G2_LABEL(), MUIF_RO("GP",mui_u8g2_goto_data), - MUIF_BUTTON("GC", mui_u8g2_goto_form_w1_mse_pi), + MUIF_BUTTON("GC", mui_u8g2_goto_form_w1_pi), MUIF_U8G2_U8_MIN_MAX("NV", &num_value, 0, 99, mui_u8g2_u8_min_max_wm_mud_pi), MUIF_U8G2_U8_MIN_MAX_STEP("NB", &bar_value, 0, 16, 1, MUI_MMS_2X_BAR, mui_u8g2_u8_bar_wm_mud_pf), diff --git a/sys/arduino/u8g2_page_buffer/MUIInputVersatileRotaryEncoder/MUIInputVersatileRotaryEncoder.ino b/sys/arduino/u8g2_page_buffer/MUIInputVersatileRotaryEncoder/MUIInputVersatileRotaryEncoder.ino index a3fe33c1..d4d31906 100644 --- a/sys/arduino/u8g2_page_buffer/MUIInputVersatileRotaryEncoder/MUIInputVersatileRotaryEncoder.ino +++ b/sys/arduino/u8g2_page_buffer/MUIInputVersatileRotaryEncoder/MUIInputVersatileRotaryEncoder.ino @@ -381,7 +381,7 @@ muif_t muif_list[] = { MUIF_RO("HR", mui_hrule), MUIF_U8G2_LABEL(), MUIF_RO("GP",mui_u8g2_goto_data), - MUIF_BUTTON("GC", mui_u8g2_goto_form_w1_mse_pi), + MUIF_BUTTON("GC", mui_u8g2_goto_form_w1_pi), MUIF_U8G2_U8_MIN_MAX("NV", &num_value, 0, 99, mui_u8g2_u8_min_max_wm_mud_pi), MUIF_U8G2_U8_MIN_MAX_STEP("NB", &bar_value, 0, 16, 1, MUI_MMS_2X_BAR, mui_u8g2_u8_bar_wm_mud_pf), diff --git a/sys/sdl/mui/main.c b/sys/sdl/mui/main.c index 2c45d26f..0daff9f5 100644 --- a/sys/sdl/mui/main.c +++ b/sys/sdl/mui/main.c @@ -241,15 +241,15 @@ muif_t muif_list[] MUI_PROGMEM = { /* the following two fields belong together and implement a single selection combo box to select a color */ //MUIF("IC",MUIF_CFLAG_IS_CURSOR_SELECTABLE,&color_input,mui_u8g2_u8_opt_parent_wa_mse_pi), - MUIF_VARIABLE("IC",&color_input,mui_u8g2_u8_opt_parent_wm_mse_pi), + MUIF_VARIABLE("IC",&color_input,mui_u8g2_u8_opt_parent_wm_pi), //MUIF("OC",MUIF_CFLAG_IS_CURSOR_SELECTABLE,&color_input,mui_u8g2_u8_opt_child_w1_mse_pi), //MUIF("OC",MUIF_CFLAG_IS_CURSOR_SELECTABLE,&color_input,mui_u8g2_u8_opt_child_w1_mse_pi), //MUIF("OC",MUIF_CFLAG_IS_CURSOR_SELECTABLE,&color_input,mui_u8g2_u8_opt_child_w1_mse_pi), //MUIF("OC",MUIF_CFLAG_IS_CURSOR_SELECTABLE,&color_input,mui_u8g2_u8_opt_child_w1_mse_pi), - MUIF_VARIABLE("OC",&color_input,mui_u8g2_u8_opt_radio_child_w1_mse_pi), + MUIF_VARIABLE("OC",&color_input,mui_u8g2_u8_opt_radio_child_w1_pi), - MUIF_VARIABLE("ID",&food_input,mui_u8g2_u8_opt_parent_wm_mse_pi), - MUIF_VARIABLE("OD",&food_input,mui_u8g2_u8_opt_child_wm_mse_pi), + MUIF_VARIABLE("ID",&food_input,mui_u8g2_u8_opt_parent_wm_pi), + MUIF_VARIABLE("OD",&food_input,mui_u8g2_u8_opt_child_wm_pi), /* radio button style */ //MUIF("RS",MUIF_CFLAG_IS_CURSOR_SELECTABLE,&direction_input,mui_u8g2_u8_radio_wm_pi), @@ -258,10 +258,10 @@ muif_t muif_list[] MUI_PROGMEM = { MUIF_U8G2_U16_LIST("L1", &list_selection, NULL, list_get_str, list_get_cnt, mui_u8g2_u16_list_line_wa_mse_pi), MUIF_U8G2_U16_LIST("L2", &list_selection2, NULL, list_get_str, list_get_cnt, mui_u8g2_u16_list_line_wa_mud_pi), - MUIF_U8G2_U16_LIST("LP", &list_selection3, NULL, list_get_str, list_get_cnt, mui_u8g2_u16_list_parent_wm_mse_pi), - MUIF_U8G2_U16_LIST("LC", &list_selection3, NULL, list_get_str, list_get_cnt, mui_u8g2_u16_list_child_w1_mse_pi), + MUIF_U8G2_U16_LIST("LP", &list_selection3, NULL, list_get_str, list_get_cnt, mui_u8g2_u16_list_parent_wm_pi), + MUIF_U8G2_U16_LIST("LC", &list_selection3, NULL, list_get_str, list_get_cnt, mui_u8g2_u16_list_child_w1_pi), - MUIF_U8G2_U16_LIST("LG", &list_selection4, NULL, menu_get_str, menu_get_cnt, mui_u8g2_u16_list_goto_w1_mse_pi), + MUIF_U8G2_U16_LIST("LG", &list_selection4, NULL, menu_get_str, menu_get_cnt, mui_u8g2_u16_list_goto_w1_pi), /* MUI_GOTO uses the fixed ".G" id and is intended for goto buttons. This is a full display width style button */ MUIF_GOTO(mui_u8g2_btn_goto_w1_pi), diff --git a/sys/sdl/mui_all/main.c b/sys/sdl/mui_all/main.c index a48431a5..f5583021 100644 --- a/sys/sdl/mui_all/main.c +++ b/sys/sdl/mui_all/main.c @@ -283,7 +283,7 @@ muif_t muif_list[] MUI_PROGMEM = { MUIF_LABEL(mui_u8g2_draw_text), MUIF_RO("GP",mui_u8g2_goto_data), - MUIF_BUTTON("GC", mui_u8g2_goto_form_w1_mse_pi), + MUIF_BUTTON("GC", mui_u8g2_goto_form_w1_pi), /* Form 10 */ MUIF_GOTO(mui_u8g2_btn_goto_wm_fi), @@ -308,11 +308,11 @@ muif_t muif_list[] MUI_PROGMEM = { /* Form 50: Parent/Child Option */ - MUIF_VARIABLE("P1",&color_input,mui_u8g2_u8_opt_parent_wm_mse_pi), - MUIF_VARIABLE("ca",&color_input,mui_u8g2_u8_opt_radio_child_w1_mse_pi), + MUIF_VARIABLE("P1",&color_input,mui_u8g2_u8_opt_parent_wm_pi), + MUIF_VARIABLE("ca",&color_input,mui_u8g2_u8_opt_radio_child_w1_pi), - 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), + MUIF_VARIABLE("P2",&food_input,mui_u8g2_u8_opt_parent_wm_pi), + MUIF_VARIABLE("cf",&food_input,mui_u8g2_u8_opt_child_wm_pi), /* Form 60: Char Input */ MUIF_VARIABLE("T0", text_input+0, mui_u8g2_u8_char_wm_mud_pi), @@ -324,8 +324,8 @@ muif_t muif_list[] MUI_PROGMEM = { MUIF_U8G2_U16_LIST("A1", &list_selection_1, NULL, animals_get_str, animals_get_cnt, mui_u8g2_u16_list_line_wa_mse_pi), MUIF_U8G2_U16_LIST("A2", &list_selection_2, NULL, animals_get_str, animals_get_cnt, mui_u8g2_u16_list_line_wa_mud_pi), - MUIF_U8G2_U16_LIST("AP", &list_selection_3, NULL, animals_get_str, animals_get_cnt, mui_u8g2_u16_list_parent_wm_mse_pi), - MUIF_U8G2_U16_LIST("AC", &list_selection_3, NULL, animals_get_str, animals_get_cnt, mui_u8g2_u16_list_child_w1_mse_pi), + MUIF_U8G2_U16_LIST("AP", &list_selection_3, NULL, animals_get_str, animals_get_cnt, mui_u8g2_u16_list_parent_wm_pi), + MUIF_U8G2_U16_LIST("AC", &list_selection_3, NULL, animals_get_str, animals_get_cnt, mui_u8g2_u16_list_child_w1_pi), }; @@ -708,8 +708,8 @@ MUI_GOTO(64, 59, 70, " Ok ") -//uint8_t mui_u8g2_u16_list_parent_wm_mse_pi(mui_t *ui, uint8_t msg); /* MUIF_U8G2_U16_LIST, MUI_XYA, arg=subform */ -//uint8_t mui_u8g2_u16_list_child_w1_mse_pi(mui_t *ui, uint8_t msg); /* MUIF_U8G2_U16_LIST, MUI_XYA, arg=sub element number */ +//uint8_t mui_u8g2_u16_list_parent_wm_pi(mui_t *ui, uint8_t msg); /* MUIF_U8G2_U16_LIST, MUI_XYA, arg=subform */ +//uint8_t mui_u8g2_u16_list_child_w1_pi(mui_t *ui, uint8_t msg); /* MUIF_U8G2_U16_LIST, MUI_XYA, arg=sub element number */ MUI_FORM(80) @@ -751,11 +751,11 @@ MUI_XYA("AC", 5, 60, 2) /* - 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), + MUIF_VARIABLE("P1",&color_input,mui_u8g2_u8_opt_parent_wm_pi), + MUIF_VARIABLE("c1",&color_input,mui_u8g2_u8_opt_radio_child_w1_pi), - MUIF_VARIABLE("P2",&food_input,mui_u8g2_u8_opt_parent_wm_mse_pi), - MUIF_VARIABLE("ca",&food_input,mui_u8g2_u8_opt_child_wm_mse_pi), + MUIF_VARIABLE("P2",&food_input,mui_u8g2_u8_opt_parent_wm_pi), + MUIF_VARIABLE("ca",&food_input,mui_u8g2_u8_opt_child_wm_pi), MUI_LABEL(5,24, "Color:") @@ -819,11 +819,11 @@ muif_t muif_list_old[] MUI_PROGMEM = { /* the following two fields belong together and implement a single selection combo box to select a color */ //MUIF("IC",MUIF_CFLAG_IS_CURSOR_SELECTABLE,&color_input,mui_u8g2_u8_opt_parent_wa_mse_pi), - MUIF_VARIABLE("IC",&color_input,mui_u8g2_u8_opt_parent_wm_mse_pi), - MUIF_VARIABLE("OC",&color_input,mui_u8g2_u8_opt_radio_child_w1_mse_pi), + MUIF_VARIABLE("IC",&color_input,mui_u8g2_u8_opt_parent_wm_pi), + MUIF_VARIABLE("OC",&color_input,mui_u8g2_u8_opt_radio_child_w1_pi), - MUIF_VARIABLE("ID",&food_input,mui_u8g2_u8_opt_parent_wm_mse_pi), - MUIF_VARIABLE("OD",&food_input,mui_u8g2_u8_opt_child_wm_mse_pi), + MUIF_VARIABLE("ID",&food_input,mui_u8g2_u8_opt_parent_wm_pi), + MUIF_VARIABLE("OD",&food_input,mui_u8g2_u8_opt_child_wm_pi), /* radio button style */ //MUIF("RS",MUIF_CFLAG_IS_CURSOR_SELECTABLE,&direction_input,mui_u8g2_u8_radio_wm_pi), @@ -832,10 +832,10 @@ muif_t muif_list_old[] MUI_PROGMEM = { MUIF_U8G2_U16_LIST("L1", &list_selection, NULL, list_get_str, list_get_cnt, mui_u8g2_u16_list_line_wa_mse_pi), MUIF_U8G2_U16_LIST("L2", &list_selection2, NULL, list_get_str, list_get_cnt, mui_u8g2_u16_list_line_wa_mud_pi), - MUIF_U8G2_U16_LIST("LP", &list_selection3, NULL, list_get_str, list_get_cnt, mui_u8g2_u16_list_parent_wm_mse_pi), - MUIF_U8G2_U16_LIST("LC", &list_selection3, NULL, list_get_str, list_get_cnt, mui_u8g2_u16_list_child_w1_mse_pi), + MUIF_U8G2_U16_LIST("LP", &list_selection3, NULL, list_get_str, list_get_cnt, mui_u8g2_u16_list_parent_wm_pi), + MUIF_U8G2_U16_LIST("LC", &list_selection3, NULL, list_get_str, list_get_cnt, mui_u8g2_u16_list_child_w1_pi), - MUIF_U8G2_U16_LIST("LG", &list_selection4, NULL, menu_get_str, menu_get_cnt, mui_u8g2_u16_list_goto_w1_mse_pi), + MUIF_U8G2_U16_LIST("LG", &list_selection4, NULL, menu_get_str, menu_get_cnt, mui_u8g2_u16_list_goto_w1_pi), /* MUI_GOTO uses the fixed ".G" id and is intended for goto buttons. This is a full display width style button */ MUIF_GOTO(mui_u8g2_btn_goto_w1_pi), diff --git a/sys/sdl/mui_blink/main.c b/sys/sdl/mui_blink/main.c index 68c9eebd..54e07344 100644 --- a/sys/sdl/mui_blink/main.c +++ b/sys/sdl/mui_blink/main.c @@ -79,7 +79,7 @@ muif_t muif_list[] = { MUIF_RO("HR", mui_hrule), MUIF_U8G2_LABEL(), MUIF_RO("GP",mui_u8g2_goto_data), - MUIF_BUTTON("GC", mui_u8g2_goto_form_w1_mse_pi), + MUIF_BUTTON("GC", mui_u8g2_goto_form_w1_pi), MUIF_U8G2_U8_MIN_MAX("NB", &blink_light, 0, 4, mui_u8g2_u8_min_max_wm_mse_pi), MUIF_U8G2_U8_MIN_MAX("NT", &blink_time, 0, 4, mui_u8g2_u8_min_max_wm_mse_pi), diff --git a/sys/sdl/mui_ref/main.c b/sys/sdl/mui_ref/main.c index 0b1ca490..99651c51 100644 --- a/sys/sdl/mui_ref/main.c +++ b/sys/sdl/mui_ref/main.c @@ -271,7 +271,7 @@ muif_t muif_list[] MUI_PROGMEM = { MUIF_U8G2_LABEL(), MUIF_RO("GP",mui_u8g2_goto_data), - MUIF_BUTTON("GC", mui_u8g2_goto_form_w1_mse_pi), + MUIF_BUTTON("GC", mui_u8g2_goto_form_w1_pi), /* Form 10 */ MUIF_GOTO(mui_u8g2_btn_goto_wm_fi), @@ -302,11 +302,11 @@ muif_t muif_list[] MUI_PROGMEM = { /* Form 50: Parent/Child Option */ - MUIF_VARIABLE("P1",&color_input,mui_u8g2_u8_opt_parent_wm_mse_pi), - MUIF_VARIABLE("ca",&color_input,mui_u8g2_u8_opt_radio_child_w1_mse_pi), + MUIF_VARIABLE("P1",&color_input,mui_u8g2_u8_opt_parent_wm_pi), + MUIF_VARIABLE("ca",&color_input,mui_u8g2_u8_opt_radio_child_w1_pi), - 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), + MUIF_VARIABLE("P2",&food_input,mui_u8g2_u8_opt_parent_wm_pi), + MUIF_VARIABLE("cf",&food_input,mui_u8g2_u8_opt_child_wm_pi), /* Form 60: Char Input */ MUIF_VARIABLE("T0", text_input+0, mui_u8g2_u8_char_wm_mud_pi), @@ -318,8 +318,8 @@ muif_t muif_list[] MUI_PROGMEM = { MUIF_U8G2_U16_LIST("A1", &list_selection_1, NULL, animals_get_str, animals_get_cnt, mui_u8g2_u16_list_line_wa_mse_pi), MUIF_U8G2_U16_LIST("A2", &list_selection_2, NULL, animals_get_str, animals_get_cnt, mui_u8g2_u16_list_line_wa_mud_pi), - MUIF_U8G2_U16_LIST("AP", &list_selection_3, NULL, animals_get_str, animals_get_cnt, mui_u8g2_u16_list_parent_wm_mse_pi), - MUIF_U8G2_U16_LIST("AC", &list_selection_3, NULL, animals_get_str, animals_get_cnt, mui_u8g2_u16_list_child_w1_mse_pi), + MUIF_U8G2_U16_LIST("AP", &list_selection_3, NULL, animals_get_str, animals_get_cnt, mui_u8g2_u16_list_parent_wm_pi), + MUIF_U8G2_U16_LIST("AC", &list_selection_3, NULL, animals_get_str, animals_get_cnt, mui_u8g2_u16_list_child_w1_pi), /* Form 90: bar */ MUIF_U8G2_U8_MIN_MAX_STEP("B0", &number_input9, 0, 20, 2, MUI_MMS_2X_BAR|MUI_MMS_SHOW_VALUE, mui_u8g2_u8_bar_wm_mse_pi), @@ -615,8 +615,8 @@ MUI_LABEL(5,10, "uint8 ParentChild Select") MUI_XY("HR", 0,13) MUI_STYLE(7) MUI_DATA("GP", - MUI_51 "u8_opt_radio_child_w1_mse_pi|" - MUI_53 "u8_opt_child_wm_mse_pi|" + MUI_51 "u8_opt_radio_child_w1_pi|" + MUI_53 "u8_opt_child_wm_pi|" MUI_1 "Back to Main Menu" ) MUI_XYA("GC", 5, 25, 0) MUI_XYA("GC", 5, 37, 1) @@ -625,7 +625,7 @@ MUI_XYA("GC", 5, 49, 2) MUI_FORM(51) MUI_STYLE(2) -MUI_LABEL(1,5, "..._u8_opt_parent_wm_mse_pi") +MUI_LABEL(1,5, "..._u8_opt_parent_wm_pi") MUI_LABEL(1,12, "MUIF_VARIABLE") MUI_LABEL(1,19, "MUI_XYAT") MUI_LABEL(1,25, "Parent: Show selected option") @@ -638,7 +638,7 @@ MUI_GOTO(64, 59, 50, " Ok ") MUI_FORM(52) MUI_STYLE(2) -MUI_LABEL(1,5, "..._u8_opt_radio_child_w1_mse_pi") +MUI_LABEL(1,5, "..._u8_opt_radio_child_w1_pi") MUI_LABEL(1,12, "MUIF_VARIABLE") MUI_LABEL(1,19, "MUI_XYA") MUI_LABEL(1,25, "Child: Show selectable options") @@ -650,7 +650,7 @@ MUI_XYA("ca", 5, 60, 2) MUI_FORM(53) MUI_STYLE(2) -MUI_LABEL(1,5, "..._u8_opt_parent_wm_mse_pi") +MUI_LABEL(1,5, "..._u8_opt_parent_wm_pi") MUI_LABEL(1,12, "MUIF_VARIABLE") MUI_LABEL(1,19, "MUI_XYAT") MUI_LABEL(1,25, "Parent: Show selected option") @@ -664,7 +664,7 @@ MUI_GOTO(64, 59, 50, " Ok ") MUI_FORM(54) MUI_STYLE(2) -MUI_LABEL(1,5, "..._u8_opt_child_wm_mse_pi") +MUI_LABEL(1,5, "..._u8_opt_child_wm_pi") MUI_LABEL(1,12, "MUIF_VARIABLE") MUI_LABEL(1,19, "MUI_XYA") MUI_LABEL(1,25, "Child: Show selectable options") @@ -757,8 +757,8 @@ MUI_GOTO(64, 59, 70, " Ok ") -//uint8_t mui_u8g2_u16_list_parent_wm_mse_pi(mui_t *ui, uint8_t msg); /* MUIF_U8G2_U16_LIST, MUI_XYA, arg=subform */ -//uint8_t mui_u8g2_u16_list_child_w1_mse_pi(mui_t *ui, uint8_t msg); /* MUIF_U8G2_U16_LIST, MUI_XYA, arg=sub element number */ +//uint8_t mui_u8g2_u16_list_parent_wm_pi(mui_t *ui, uint8_t msg); /* MUIF_U8G2_U16_LIST, MUI_XYA, arg=subform */ +//uint8_t mui_u8g2_u16_list_child_w1_pi(mui_t *ui, uint8_t msg); /* MUIF_U8G2_U16_LIST, MUI_XYA, arg=sub element number */ MUI_FORM(80) @@ -767,7 +767,7 @@ MUI_LABEL(5,10, "uint16 ParentChild Select") MUI_XY("HR", 0,13) MUI_STYLE(7) MUI_DATA("GP", - MUI_81 "u16_list_parent_wm_mse_pi|" + MUI_81 "u16_list_parent_wm_pi|" MUI_1 "Back to Main Menu" ) MUI_XYA("GC", 5, 25, 0) MUI_XYA("GC", 5, 37, 1) @@ -776,7 +776,7 @@ MUI_XYA("GC", 5, 49, 2) MUI_FORM(81) MUI_STYLE(2) -MUI_LABEL(1,5, "..._u16_list_parent_wm_mse_pi") +MUI_LABEL(1,5, "..._u16_list_parent_wm_pi") MUI_LABEL(1,12, "MUIF_U8G2_U16_LIST") MUI_LABEL(1,19, "MUI_XYA") MUI_LABEL(1,25, "Parent: Show selected option") @@ -788,7 +788,7 @@ MUI_GOTO(64, 59, 80, " Ok ") MUI_FORM(82) MUI_STYLE(2) -MUI_LABEL(1,5, "...u16_list_child_w1_mse_pi") +MUI_LABEL(1,5, "...u16_list_child_w1_pi") MUI_LABEL(1,12, "MUIF_U8G2_U16_LIST") MUI_LABEL(1,19, "MUI_XYA") MUI_LABEL(1,25, "Child: Show selectable options") diff --git a/tools/png2bin/png2bin b/tools/png2bin/png2bin deleted file mode 100755 index 851d6d60..00000000 Binary files a/tools/png2bin/png2bin and /dev/null differ diff --git a/tools/release/print_release.sh b/tools/release/print_release.sh index 87a6c71d..fa638cee 100755 --- a/tools/release/print_release.sh +++ b/tools/release/print_release.sh @@ -1,2 +1,2 @@ # without 'v' prefix -echo -n "2.32.13" +echo -n "2.32.14"