Bsongis/move everything (#3669)

* Directories moved * Directories moved * Directories moved * Directories moved * Directories moved * rename horus directories in gui to 480x272 * Directories moved * Rename taranis to 212x64 * Directories moved - TARANIS target removed, it's now X9E / X9D+ / X9D * Directories moved - TARANIS target removed, it's now X9E / X9D+ / X9D * Directories moved - TARANIS target removed, it's now X9E / X9D+ / X9D * Directories moved - TARANIS target removed, it's now X9E / X9D+ / X9D * Directories moved - TARANIS target removed, it's now X9E / X9D+ / X9D * Directories moved - TARANIS target removed, it's now X9E / X9D+ / X9D * Directories moved - TARANIS target removed, it's now X9E / X9D+ / X9D * Fix x9e compile * Directories moved - TARANIS target removed, it's now X9E / X9D+ / X9D * Directories moved - TARANIS target removed, it's now X9E / X9D+ / X9D * Directories moved - TARANIS target removed, it's now X9E / X9D+ / X9D * Directories moved - TARANIS target removed, it's now X9E / X9D+ / X9D * Directories moved - TARANIS target removed, it's now X9E / X9D+ / X9D * Minor improvement of path handling * Another bunch of files renamed :) * Another bunch of files renamed :) * Another bunch of files renamed :) * Another bunch of files renamed :) * Another bunch of files renamed :) * Rename 9x to 128x64 * Compilation fixes * Compilation fixes * Compilation fixes * Compilation fixes * Compilation fixes * Compilation fixes
2016-07-29 12:47:20 +02:00
parent e3e0d970a5
commit 83cdd67e6a
340 changed files with 3035 additions and 5126 deletions
@@ -0,0 +1,467 @@
+/*
+ * Copyright (C) OpenTX
+ *
+ * Based on code named
+ *   th9x - http://code.google.com/p/th9x
+ *   er9x - http://code.google.com/p/er9x
+ *   gruvin9x - http://code.google.com/p/gruvin9x
+ *
+ * License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#include "opentx.h"
+
+#define REFRESH_FILES()        do { reusableBuffer.sdmanager.offset = 65535; menuVerticalPosition = 0; } while(0)
+#define NODE_TYPE(fname)       fname[SD_SCREEN_FILE_LENGTH+1]
+#define IS_DIRECTORY(fname)    ((bool)(!NODE_TYPE(fname)))
+#define IS_FILE(fname)         ((bool)(NODE_TYPE(fname)))
+
+void menuGeneralSdManagerInfo(evt_t event)
+{
+  SIMPLE_SUBMENU(STR_SD_INFO_TITLE, 1);
+
+  lcd_putsLeft(2*FH, STR_SD_TYPE);
+  lcdDrawText(10*FW, 2*FH, SD_IS_HC() ? STR_SDHC_CARD : STR_SD_CARD);
+
+  lcd_putsLeft(3*FH, STR_SD_SIZE);
+  lcdDrawNumber(10*FW, 3*FH, sdGetSize(), LEFT);
+  lcdDrawChar(lcdLastPos, 3*FH, 'M');
+
+  lcd_putsLeft(4*FH, STR_SD_SECTORS);
+#if defined(SD_GET_FREE_BLOCKNR)
+  lcdDrawNumber(10*FW, 4*FH,  SD_GET_FREE_BLOCKNR()/1000, LEFT);
+  lcdDrawChar(lcdLastPos, 4*FH, '/');
+  lcdDrawNumber(lcdLastPos+FW, 4*FH, sdGetNoSectors()/1000, LEFT);
+#else
+  lcdDrawNumber(10*FW, 4*FH, sdGetNoSectors()/1000, LEFT);
+#endif
+  lcdDrawChar(lcdLastPos, 4*FH, 'k');
+
+  lcd_putsLeft(5*FH, STR_SD_SPEED);
+  lcdDrawNumber(10*FW, 5*FH, SD_GET_SPEED()/1000, LEFT);
+  lcdDrawText(lcdLastPos, 5*FH, "kb/s");
+}
+
+inline bool isFilenameGreater(bool isfile, const char * fn, const char * line)
+{
+  return (isfile && IS_DIRECTORY(line)) || (isfile==IS_FILE(line) && strcasecmp(fn, line) > 0);
+}
+
+inline bool isFilenameLower(bool isfile, const char * fn, const char * line)
+{
+  return (!isfile && IS_FILE(line)) || (isfile==IS_FILE(line) && strcasecmp(fn, line) < 0);
+}
+
+bool isBootloader(const char * filename)
+{
+  FIL file;
+  f_open(&file, filename, FA_READ);
+  uint8_t buffer[1024];
+  UINT count;
+
+  if (f_read(&file, buffer, 1024, &count) != FR_OK || count != 1024) {
+    return false;
+  }
+
+  return isBootloaderStart((uint32_t *)buffer);
+}
+
+void flashBootloader(const char * filename)
+{
+  FIL file;
+  f_open(&file, filename, FA_READ);
+  uint8_t buffer[1024];
+  UINT count;
+
+  lcdClear();
+  drawProgressBar(STR_WRITING);
+
+  static uint8_t unlocked = 0;
+  if (!unlocked) {
+    unlocked = 1;
+    unlockFlash();
+  }
+
+  for (int i=0; i<BOOTLOADER_SIZE; i+=1024) {
+    watchdogSetTimeout(100/*1s*/);
+    if (f_read(&file, buffer, 1024, &count) != FR_OK || count != 1024) {
+      POPUP_WARNING(STR_SDCARD_ERROR);
+      break;
+    }
+    if (i==0 && !isBootloaderStart((uint32_t *)buffer)) {
+      POPUP_WARNING(STR_INCOMPATIBLE);
+      break;
+    }
+    for (int j=0; j<1024; j+=FLASH_PAGESIZE) {
+      writeFlash(CONVERT_UINT_PTR(FIRMWARE_ADDRESS+i+j), (uint32_t *)(buffer+j));
+    }
+    updateProgressBar(i, BOOTLOADER_SIZE);
+    SIMU_SLEEP(30/*ms*/);
+  }
+
+  if (unlocked) {
+    lockFlash();
+    unlocked = 0;
+  }
+
+  f_close(&file);
+}
+
+void flashSportDevice(ModuleIndex module, const char *filename)
+{
+  pausePulses();
+  watchdogSetTimeout(60*60*100/*1h*/);
+
+  lcdClear();
+  drawProgressBar(STR_WRITING);
+
+  sportFirmwareUpdate(module, filename);
+
+  watchdogSetTimeout(100/*1s*/);
+  resumePulses();
+}
+
+void getSelectionFullPath(char *lfn)
+{
+  f_getcwd(lfn, _MAX_LFN);
+  strcat(lfn, PSTR("/"));
+  strcat(lfn, reusableBuffer.sdmanager.lines[menuVerticalPosition - menuVerticalOffset]);
+}
+
+void onSdManagerMenu(const char *result)
+{
+  TCHAR lfn[_MAX_LFN+1];
+
+  // TODO possible buffer overflows here!
+
+  uint8_t index = menuVerticalPosition-menuVerticalOffset;
+  char *line = reusableBuffer.sdmanager.lines[index];
+
+  if (result == STR_SD_INFO) {
+    pushMenu(menuGeneralSdManagerInfo);
+  }
+  else if (result == STR_SD_FORMAT) {
+    POPUP_CONFIRMATION(STR_CONFIRM_FORMAT);
+  }
+  else if (result == STR_COPY_FILE) {
+    clipboard.type = CLIPBOARD_TYPE_SD_FILE;
+    f_getcwd(clipboard.data.sd.directory, CLIPBOARD_PATH_LEN);
+    strncpy(clipboard.data.sd.filename, line, CLIPBOARD_PATH_LEN-1);
+  }
+  else if (result == STR_PASTE) {
+    f_getcwd(lfn, _MAX_LFN);
+    // if destination is dir, copy into that dir
+    if (IS_DIRECTORY(line)) {
+      strcat(lfn, PSTR("/"));
+      strcat(lfn, line);
+    }
+    if (strcmp(clipboard.data.sd.directory, lfn)) {  // prevent copying to the same directory
+      POPUP_WARNING(sdCopyFile(clipboard.data.sd.filename, clipboard.data.sd.directory, clipboard.data.sd.filename, lfn));
+      REFRESH_FILES();
+    }
+  }
+  else if (result == STR_RENAME_FILE) {
+    memcpy(reusableBuffer.sdmanager.originalName, line, sizeof(reusableBuffer.sdmanager.originalName));
+    char * ext = getFileExtension(line, SD_SCREEN_FILE_LENGTH+1);
+    if (ext) {
+      // write spaces to allow a longer filename
+      memset(ext, ' ', SD_SCREEN_FILE_LENGTH-LEN_FILE_EXTENSION-(ext-line));
+      line[SD_SCREEN_FILE_LENGTH-LEN_FILE_EXTENSION] = '\0';
+    }
+    else {
+      int len = strlen(line);
+      memset(line + strlen(line), ' ', SD_SCREEN_FILE_LENGTH - len);
+      line[SD_SCREEN_FILE_LENGTH] = '\0';
+    }
+    s_editMode = EDIT_MODIFY_STRING;
+    editNameCursorPos = 0;
+  }
+  else if (result == STR_DELETE_FILE) {
+    getSelectionFullPath(lfn);
+    f_unlink(lfn);
+    strncpy(statusLineMsg, line, 13);
+    strcpy_P(statusLineMsg+min((uint8_t)strlen(statusLineMsg), (uint8_t)13), STR_REMOVED);
+    showStatusLine();
+    REFRESH_FILES();
+  }
+  else if (result == STR_PLAY_FILE) {
+    getSelectionFullPath(lfn);
+    audioQueue.stopAll();
+    audioQueue.playFile(lfn, 0, ID_PLAY_FROM_SD_MANAGER);
+  }
+  else if (result == STR_ASSIGN_BITMAP) {
+    strAppendFilename(g_model.header.bitmap, line, sizeof(g_model.header.bitmap));
+    memcpy(modelHeaders[g_eeGeneral.currModel].bitmap, g_model.header.bitmap, sizeof(g_model.header.bitmap));
+    storageDirty(EE_MODEL);
+  }
+  else if (result == STR_VIEW_TEXT) {
+    getSelectionFullPath(lfn);
+    pushMenuTextView(lfn);
+  }
+  else if (result == STR_FLASH_BOOTLOADER) {
+    getSelectionFullPath(lfn);
+    flashBootloader(lfn);
+  }
+  else if (result == STR_FLASH_INTERNAL_MODULE) {
+    getSelectionFullPath(lfn);
+    flashSportDevice(INTERNAL_MODULE, lfn);
+  }
+  else if (result == STR_FLASH_EXTERNAL_DEVICE) {
+    getSelectionFullPath(lfn);
+    flashSportDevice(EXTERNAL_MODULE, lfn);
+  }
+#if defined(LUA)
+  else if (result == STR_EXECUTE_FILE) {
+    getSelectionFullPath(lfn);
+    luaExec(lfn);
+  }
+#endif
+}
+
+void menuGeneralSdManager(evt_t _event)
+{
+  if (warningResult) {
+    warningResult = 0;
+    displayPopup(STR_FORMATTING);
+    closeLogs();
+    audioQueue.stopSD();
+    if (f_mkfs(0, 1, 0) == FR_OK) {
+      f_chdir("/");
+      REFRESH_FILES();
+    }
+    else {
+      POPUP_WARNING(STR_SDCARD_ERROR);
+    }
+  }
+
+  int lastPos = menuVerticalPosition;
+
+  evt_t event = (EVT_KEY_MASK(_event) == KEY_ENTER ? 0 : _event);
+  SIMPLE_MENU(SD_IS_HC() ? STR_SDHC_CARD : STR_SD_CARD, menuTabGeneral, e_Sd, reusableBuffer.sdmanager.count);
+
+  int index = menuVerticalPosition-menuVerticalOffset;
+
+  switch(_event) {
+    case EVT_ENTRY:
+      f_chdir(ROOT_PATH);
+      REFRESH_FILES();
+      lastPos = -1;
+      break;
+
+    case EVT_KEY_LONG(KEY_MENU):
+      if (!READ_ONLY() && s_editMode == 0) {
+        killEvents(_event);
+        POPUP_MENU_ADD_ITEM(STR_SD_INFO);
+        POPUP_MENU_ADD_ITEM(STR_SD_FORMAT);
+        POPUP_MENU_START(onSdManagerMenu);
+      }
+      break;
+
+    case EVT_KEY_BREAK(KEY_EXIT):
+      REFRESH_FILES();
+      break;
+
+    case EVT_KEY_BREAK(KEY_ENTER):
+      if (s_editMode > 0) {
+        break;
+      }
+      else {
+        if (IS_DIRECTORY(reusableBuffer.sdmanager.lines[index])) {
+          f_chdir(reusableBuffer.sdmanager.lines[index]);
+          menuVerticalOffset = 0;
+          menuVerticalPosition = 1;
+          index = 1;
+          REFRESH_FILES();
+          killEvents(_event);
+          return;
+        }
+      }
+      // no break
+
+    case EVT_KEY_LONG(KEY_ENTER):
+      if (s_editMode == 0) {
+        killEvents(_event);
+        char * line = reusableBuffer.sdmanager.lines[index];
+        char * ext = getFileExtension(line, SD_SCREEN_FILE_LENGTH+1);
+        if (!strcmp(line, "..")) {
+          break;      // no menu for parent dir
+        }
+        if (ext) {
+          if (!strcasecmp(ext, SOUNDS_EXT)) {
+            POPUP_MENU_ADD_ITEM(STR_PLAY_FILE);
+          }
+          else if (!strcasecmp(ext, BITMAPS_EXT)) {
+            if (!READ_ONLY() && (ext-line) <= (int)sizeof(g_model.header.bitmap)) {
+              POPUP_MENU_ADD_ITEM(STR_ASSIGN_BITMAP);
+            }
+          }
+          else if (!strcasecmp(ext, TEXT_EXT)) {
+            POPUP_MENU_ADD_ITEM(STR_VIEW_TEXT);
+          }
+#if defined(LUA)
+          else if (!strcasecmp(ext, SCRIPTS_EXT)) {
+            POPUP_MENU_ADD_ITEM(STR_EXECUTE_FILE);
+          }
+#endif
+          else if (!READ_ONLY() && !strcasecmp(ext, FIRMWARE_EXT)) {
+            TCHAR lfn[_MAX_LFN + 1];
+            getSelectionFullPath(lfn);
+            if (isBootloader(lfn)) {
+              POPUP_MENU_ADD_ITEM(STR_FLASH_BOOTLOADER);
+            }
+          }
+          else if (!READ_ONLY() && !strcasecmp(ext, SPORT_FIRMWARE_EXT)) {
+            POPUP_MENU_ADD_ITEM(STR_FLASH_EXTERNAL_DEVICE);
+            POPUP_MENU_ADD_ITEM(STR_FLASH_INTERNAL_MODULE);
+          }
+        }
+        if (!READ_ONLY()) {
+          if (IS_FILE(line))
+            POPUP_MENU_ADD_ITEM(STR_COPY_FILE);
+          if (clipboard.type == CLIPBOARD_TYPE_SD_FILE)
+            POPUP_MENU_ADD_ITEM(STR_PASTE);
+          POPUP_MENU_ADD_ITEM(STR_RENAME_FILE);
+          if (IS_FILE(line))
+            POPUP_MENU_ADD_ITEM(STR_DELETE_FILE);
+        }
+        POPUP_MENU_START(onSdManagerMenu);
+      }
+      break;
+  }
+
+  if (reusableBuffer.sdmanager.offset != menuVerticalOffset) {
+    FILINFO fno;
+    DIR dir;
+    char *fn;   /* This function is assuming non-Unicode cfg. */
+    TCHAR lfn[_MAX_LFN + 1];
+    fno.lfname = lfn;
+    fno.lfsize = sizeof(lfn);
+
+    if (menuVerticalOffset == 0) {
+      reusableBuffer.sdmanager.offset = 0;
+      memset(reusableBuffer.sdmanager.lines, 0, sizeof(reusableBuffer.sdmanager.lines));
+    }
+    else if (menuVerticalOffset == reusableBuffer.sdmanager.count-NUM_BODY_LINES) {
+      reusableBuffer.sdmanager.offset = menuVerticalOffset;
+      memset(reusableBuffer.sdmanager.lines, 0, sizeof(reusableBuffer.sdmanager.lines));
+    }
+    else if (menuVerticalOffset > reusableBuffer.sdmanager.offset) {
+      memmove(reusableBuffer.sdmanager.lines[0], reusableBuffer.sdmanager.lines[1], (NUM_BODY_LINES-1)*sizeof(reusableBuffer.sdmanager.lines[0]));
+      memset(reusableBuffer.sdmanager.lines[NUM_BODY_LINES-1], 0xff, SD_SCREEN_FILE_LENGTH);
+      NODE_TYPE(reusableBuffer.sdmanager.lines[NUM_BODY_LINES-1]) = 1;
+    }
+    else {
+      memmove(reusableBuffer.sdmanager.lines[1], reusableBuffer.sdmanager.lines[0], (NUM_BODY_LINES-1)*sizeof(reusableBuffer.sdmanager.lines[0]));
+      memset(reusableBuffer.sdmanager.lines[0], 0, sizeof(reusableBuffer.sdmanager.lines[0]));
+    }
+
+    reusableBuffer.sdmanager.count = 0;
+
+    FRESULT res = f_opendir(&dir, ".");        /* Open the directory */
+    if (res == FR_OK) {
+      for (;;) {
+        res = f_readdir(&dir, &fno);                   /* Read a directory item */
+        if (res != FR_OK || fno.fname[0] == 0) break;  /* Break on error or end of dir */
+        if (fno.fname[0] == '.' && fno.fname[1] == '\0') continue;             /* Ignore dot entry */
+#if _USE_LFN
+        fn = *fno.lfname ? fno.lfname : fno.fname;
+#else
+        fn = fno.fname;
+#endif
+        if (strlen(fn) > SD_SCREEN_FILE_LENGTH) continue;
+
+        reusableBuffer.sdmanager.count++;
+
+        bool isfile = !(fno.fattrib & AM_DIR);
+
+        if (menuVerticalOffset == 0) {
+          for (int i=0; i<NUM_BODY_LINES; i++) {
+            char *line = reusableBuffer.sdmanager.lines[i];
+            if (line[0] == '\0' || isFilenameLower(isfile, fn, line)) {
+              if (i < NUM_BODY_LINES-1) memmove(reusableBuffer.sdmanager.lines[i+1], line, sizeof(reusableBuffer.sdmanager.lines[i]) * (NUM_BODY_LINES-1-i));
+              memset(line, 0, sizeof(reusableBuffer.sdmanager.lines[0]));
+              strcpy(line, fn);
+              NODE_TYPE(line) = isfile;
+              break;
+            }
+          }
+        }
+        else if (reusableBuffer.sdmanager.offset == menuVerticalOffset) {
+          for (int8_t i=NUM_BODY_LINES-1; i>=0; i--) {
+            char *line = reusableBuffer.sdmanager.lines[i];
+            if (line[0] == '\0' || isFilenameGreater(isfile, fn, line)) {
+              if (i > 0) memmove(reusableBuffer.sdmanager.lines[0], reusableBuffer.sdmanager.lines[1], sizeof(reusableBuffer.sdmanager.lines[0]) * i);
+              memset(line, 0, sizeof(reusableBuffer.sdmanager.lines[0]));
+              strcpy(line, fn);
+              NODE_TYPE(line) = isfile;
+              break;
+            }
+          }
+        }
+        else if (menuVerticalOffset > reusableBuffer.sdmanager.offset) {
+          if (isFilenameGreater(isfile, fn, reusableBuffer.sdmanager.lines[NUM_BODY_LINES-2]) && isFilenameLower(isfile, fn, reusableBuffer.sdmanager.lines[NUM_BODY_LINES-1])) {
+            memset(reusableBuffer.sdmanager.lines[NUM_BODY_LINES-1], 0, sizeof(reusableBuffer.sdmanager.lines[0]));
+            strcpy(reusableBuffer.sdmanager.lines[NUM_BODY_LINES-1], fn);
+            NODE_TYPE(reusableBuffer.sdmanager.lines[NUM_BODY_LINES-1]) = isfile;
+          }
+        }
+        else {
+          if (isFilenameLower(isfile, fn, reusableBuffer.sdmanager.lines[1]) && isFilenameGreater(isfile, fn, reusableBuffer.sdmanager.lines[0])) {
+            memset(reusableBuffer.sdmanager.lines[0], 0, sizeof(reusableBuffer.sdmanager.lines[0]));
+            strcpy(reusableBuffer.sdmanager.lines[0], fn);
+            NODE_TYPE(reusableBuffer.sdmanager.lines[0]) = isfile;
+          }
+        }
+      }
+    }
+  }
+
+  reusableBuffer.sdmanager.offset = menuVerticalOffset;
+
+  for (int i=0; i<NUM_BODY_LINES; i++) {
+    coord_t y = MENU_HEADER_HEIGHT + 1 + i*FH;
+    lcdNextPos = 0;
+    LcdFlags attr = (index == i ? INVERS : 0);
+    if (reusableBuffer.sdmanager.lines[i][0]) {
+      if (IS_DIRECTORY(reusableBuffer.sdmanager.lines[i])) { lcdDrawChar(0, y, '[', s_editMode == EDIT_MODIFY_STRING ? 0 : attr); }
+      if (s_editMode == EDIT_MODIFY_STRING && attr) {
+        editName(lcdNextPos, y, reusableBuffer.sdmanager.lines[i], SD_SCREEN_FILE_LENGTH-4, _event, attr, 0);
+        if (s_editMode == 0) {
+          unsigned int len = effectiveLen(reusableBuffer.sdmanager.lines[i], SD_SCREEN_FILE_LENGTH-LEN_FILE_EXTENSION);
+          char * ext = getFileExtension(reusableBuffer.sdmanager.originalName, sizeof(reusableBuffer.sdmanager.originalName));
+          if (ext) {
+            strAppend(&reusableBuffer.sdmanager.lines[i][len], ext);
+          }
+          else {
+            reusableBuffer.sdmanager.lines[i][len] = 0;
+          }
+          f_rename(reusableBuffer.sdmanager.originalName, reusableBuffer.sdmanager.lines[i]);
+          REFRESH_FILES();
+        }
+      }
+      else {
+        lcdDrawText(lcdNextPos, y, reusableBuffer.sdmanager.lines[i], attr);
+      }
+      if (IS_DIRECTORY(reusableBuffer.sdmanager.lines[i])) { lcdDrawChar(lcdNextPos, y, ']', s_editMode == EDIT_MODIFY_STRING ? 0 : attr); }
+    }
+  }
+
+  char * ext = getFileExtension(reusableBuffer.sdmanager.lines[index], SD_SCREEN_FILE_LENGTH+1);
+  if (ext && !strcasecmp(ext, BITMAPS_EXT)) {
+    if (lastPos != menuVerticalPosition) {
+      if (!lcdLoadBitmap(modelBitmap, reusableBuffer.sdmanager.lines[index], MODEL_BITMAP_WIDTH, MODEL_BITMAP_HEIGHT)) {
+        memcpy(modelBitmap, logo_taranis, MODEL_BITMAP_SIZE);
+      }
+    }
+    lcdDrawBitmap(22*FW+2, 2*FH+FH/2, modelBitmap);
+  }
+}