- fixed issues where the preset user text length was not handled properly.

  - If the text length was set to maximum (31 characters + null terminator) then load from NVS failed
  - text box had the wrong max length, allow extra characters to be entered that got truncated
- slight tweaks to 4.3B UI; larger font for preset user text, moved green tick in settings to corner away from sliders (matches 3.5")

Author: Greg Smith

source/main/control.c

@@ -2313,7 +2313,7 @@ static uint8_t __attribute__((unused)) LoadPresetUserText(uint16_t preset_index,
     if (err == ESP_OK) 
     {
         // read
-        required_size = MAX_PRESET_USER_TEXT_LENGTH - 1;
+        required_size = MAX_PRESET_USER_TEXT_LENGTH;
         err = nvs_get_str(my_handle, key, text, &required_size);
 
         // clamp text at max length and ensure its null terminated

source/main/ui_generated_480x320land/screens.c

@@ -243,7 +243,7 @@ void create_screen_screen1() {
                     objects.ui_preset_details_text_area = obj;
                     lv_obj_set_pos(obj, 8, 185);
                     lv_obj_set_size(obj, 464, 67);
-                    lv_textarea_set_max_length(obj, 128);
+                    lv_textarea_set_max_length(obj, 31);
                     lv_textarea_set_text(obj, "Preset Description...");
                     lv_textarea_set_one_line(obj, false);
                     lv_textarea_set_password_mode(obj, false);

source/main/ui_generated_800x480land/screens.c

@@ -169,15 +169,15 @@ void create_screen_screen1() {
                     objects.ui_preset_details_text_area = obj;
                     lv_obj_set_pos(obj, 14, 278);
                     lv_obj_set_size(obj, 773, 104);
-                    lv_textarea_set_max_length(obj, 128);
+                    lv_textarea_set_max_length(obj, 31);
                     lv_textarea_set_text(obj, "Preset Description...");
                     lv_textarea_set_one_line(obj, false);
                     lv_textarea_set_password_mode(obj, false);
                     lv_obj_add_event_cb(obj, action_preset_description_pressed, LV_EVENT_PRESSED, (void *)0);
                     lv_obj_clear_flag(obj, LV_OBJ_FLAG_SCROLLABLE|LV_OBJ_FLAG_SCROLL_CHAIN_HOR|LV_OBJ_FLAG_SCROLL_CHAIN_VER|LV_OBJ_FLAG_SCROLL_ELASTIC|LV_OBJ_FLAG_SCROLL_MOMENTUM|LV_OBJ_FLAG_SCROLL_ON_FOCUS|LV_OBJ_FLAG_SCROLL_WITH_ARROW);
                     lv_obj_add_state(obj, LV_STATE_DISABLED);
                     lv_obj_set_style_text_color(obj, lv_color_hex(0xff808080), LV_PART_MAIN | LV_STATE_DEFAULT);
-                    lv_obj_set_style_text_font(obj, &lv_font_montserrat_30, LV_PART_MAIN | LV_STATE_DEFAULT);
+                    lv_obj_set_style_text_font(obj, &lv_font_montserrat_36, LV_PART_MAIN | LV_STATE_DEFAULT);
                     lv_obj_set_style_border_color(obj, lv_color_hex(0xff563f2a), LV_PART_MAIN | LV_STATE_DEFAULT);
                     lv_obj_set_style_bg_color(obj, lv_color_hex(0xffffffff), LV_PART_MAIN | LV_STATE_DEFAULT);
                     lv_obj_set_style_bg_opa(obj, 0, LV_PART_MAIN | LV_STATE_DEFAULT);
@@ -2443,7 +2443,7 @@ void create_screen_settings() {
             // ui_Closeimage
             lv_obj_t *obj = lv_img_create(parent_obj);
             objects.ui_closeimage = obj;
-            lv_obj_set_pos(obj, 354, 410);
+            lv_obj_set_pos(obj, 704, 405);
             lv_obj_set_size(obj, LV_SIZE_CONTENT, LV_SIZE_CONTENT);
             lv_img_set_src(obj, &img_tick);
             lv_obj_add_event_cb(obj, action_close_settings_page, LV_EVENT_PRESSED, (void *)0);
@@ -5232,7 +5232,7 @@ void create_screen_val_settings() {
             // ui_ValCloseimage
             lv_obj_t *obj = lv_img_create(parent_obj);
             objects.ui_val_closeimage = obj;
-            lv_obj_set_pos(obj, 354, 406);
+            lv_obj_set_pos(obj, 704, 405);
             lv_obj_set_size(obj, LV_SIZE_CONTENT, LV_SIZE_CONTENT);
             lv_img_set_src(obj, &img_tick);
             lv_obj_add_event_cb(obj, action_close_settings_page, LV_EVENT_PRESSED, (void *)0);

ui_design_480x320land/Tonex_Controller_480_320.eez-project

@@ -1201,7 +1201,7 @@
                   "oneLineMode": false,
                   "passwordMode": false,
                   "acceptedCharacters": "",
-                  "maxTextLength": 128
+                  "maxTextLength": 31
                 },
                 {
                   "objID": "c5acbd04-2a91-4da0-a470-cec66a14bdc7",

ui_design_800x480land/Tonex_Controller_800_480land.eez-project

@@ -910,7 +910,7 @@
                       "MAIN": {
                         "DEFAULT": {
                           "text_color": "808080",
-                          "text_font": "MONTSERRAT_30",
+                          "text_font": "MONTSERRAT_36",
                           "border_color": "563F2A",
                           "bg_color": "#FFFFFF",
                           "bg_opa": 0
@@ -926,7 +926,7 @@
                   "oneLineMode": false,
                   "passwordMode": false,
                   "acceptedCharacters": "",
-                  "maxTextLength": 128
+                  "maxTextLength": 31
                 },
                 {
                   "objID": "12223d2e-5652-421b-bad3-faff2cb5fc6b",
@@ -11776,8 +11776,8 @@
             {
               "objID": "bae65739-be8c-4cf5-f502-b9b105d36067",
               "type": "LVGLImageWidget",
-              "left": 354,
-              "top": 410,
+              "left": 704,
+              "top": 405,
               "width": 87,
               "height": 70,
               "customInputs": [],
@@ -25016,8 +25016,8 @@
             {
               "objID": "d2793565-3886-41e7-f9ca-9582d42a2fea",
               "type": "LVGLImageWidget",
-              "left": 354,
-              "top": 406,
+              "left": 704,
+              "top": 405,
               "width": 87,
               "height": 70,
               "customInputs": [],