diff --git a/esp32_marauder/MenuFunctions.cpp b/esp32_marauder/MenuFunctions.cpp index 6462547..2fa9076 100644 --- a/esp32_marauder/MenuFunctions.cpp +++ b/esp32_marauder/MenuFunctions.cpp @@ -128,25 +128,27 @@ void MenuFunctions::writeBadUSB(){ lv_textarea_set_text(ta1, ""); lv_textarea_set_placeholder_text(ta1, "Ducky script"); - // Create load button - lv_obj_t * label; - lv_obj_t * load_btn = lv_btn_create(lv_scr_act(), NULL); - lv_obj_set_event_cb(load_btn, load_btn_cb); - lv_obj_set_height(load_btn, 35); - lv_obj_set_width(load_btn, LV_HOR_RES / 3); - lv_obj_align(load_btn, ta1, LV_ALIGN_IN_TOP_RIGHT, NULL, (LV_VER_RES / 2) - 35); // align to text area - label = lv_label_create(load_btn, NULL); - lv_label_set_text(label, "Load"); - - // Create Save As button - lv_obj_t * label2; - lv_obj_t * save_as_btn = lv_btn_create(lv_scr_act(), NULL); - lv_obj_set_event_cb(save_as_btn, load_btn_cb); - lv_obj_set_height(save_as_btn, 35); - lv_obj_set_width(save_as_btn, LV_HOR_RES / 3); - lv_obj_align(save_as_btn, ta1, LV_ALIGN_IN_TOP_MID, NULL, (LV_VER_RES / 2) - 35); // align to text area - label2 = lv_label_create(save_as_btn, NULL); - lv_label_set_text(label2, "Save As"); + if (sd_obj.supported) { + // Create load button + lv_obj_t * label; + lv_obj_t * load_btn = lv_btn_create(lv_scr_act(), NULL); + lv_obj_set_event_cb(load_btn, load_btn_cb); + lv_obj_set_height(load_btn, 35); + lv_obj_set_width(load_btn, LV_HOR_RES / 3); + lv_obj_align(load_btn, ta1, LV_ALIGN_IN_TOP_RIGHT, NULL, (LV_VER_RES / 2) - 35); // align to text area + label = lv_label_create(load_btn, NULL); + lv_label_set_text(label, "Load"); + + // Create Save As button + lv_obj_t * label2; + lv_obj_t * save_as_btn = lv_btn_create(lv_scr_act(), NULL); + lv_obj_set_event_cb(save_as_btn, load_btn_cb); + lv_obj_set_height(save_as_btn, 35); + lv_obj_set_width(save_as_btn, LV_HOR_RES / 3); + lv_obj_align(save_as_btn, ta1, LV_ALIGN_IN_TOP_MID, NULL, (LV_VER_RES / 2) - 35); // align to text area + label2 = lv_label_create(save_as_btn, NULL); + lv_label_set_text(label2, "Save As"); + } // Focus it on one of the text areas to start lv_keyboard_set_textarea(kb, ta1); @@ -313,22 +315,22 @@ void test_btn_cb(lv_obj_t * btn, lv_event_t event) { display_string.toCharArray(buf, display_string.length() + 1); lv_textarea_set_text(ta1, buf); + + // Create Save button + lv_obj_t * save_label; + lv_obj_t * save_btn = lv_btn_create(lv_scr_act(), NULL); + lv_obj_set_event_cb(save_btn, load_btn_cb); + lv_obj_set_height(save_btn, 35); + lv_obj_set_width(save_btn, LV_HOR_RES / 3); + lv_obj_align(save_btn, ta1, LV_ALIGN_IN_TOP_LEFT, NULL, (LV_VER_RES / 2) - 35); // align to text area + save_label = lv_label_create(save_btn, NULL); + lv_label_set_text(save_label, "Save"); } } // Delete the file list obj lv_obj_del_async(lv_obj_get_parent(lv_obj_get_parent(btn))); menu_function_obj.loaded_file = btn_text; - - // Create Save button - lv_obj_t * save_label; - lv_obj_t * save_btn = lv_btn_create(lv_scr_act(), NULL); - lv_obj_set_event_cb(save_btn, load_btn_cb); - lv_obj_set_height(save_btn, 35); - lv_obj_set_width(save_btn, LV_HOR_RES / 3); - lv_obj_align(save_btn, ta1, LV_ALIGN_IN_TOP_LEFT, NULL, (LV_VER_RES / 2) - 35); // align to text area - save_label = lv_label_create(save_btn, NULL); - lv_label_set_text(save_label, "Save"); } }