Massive clean thanks to Schwabe : unifdef -m -DCPUARM -UCPUM64 -UCPUM2560 -UPCBSTD -UPCBMEGA2560 -UPCBGRUVIN9X -UPCB9X $(find . -name "*.cpp" -or -name "*.h")

2018-07-05 08:04:55 +02:00
parent c032b30247
commit dd632969f3
106 changed files with 27 additions and 6626 deletions
@@ -83,13 +83,11 @@ void menuModelCurvesAll(event_t event)
 #endif
    {
      drawStringWithIndex(0, y, STR_CV, k+1, attr);
-#if defined(CPUARM)
      CurveData & crv = g_model.curves[k];
      editName(4*FW, y, crv.name, sizeof(crv.name), 0, 0);
 #if LCD_W >= 212
      lcdDrawNumber(11*FW, y, 5+crv.points, LEFT);
      lcdDrawText(lcdLastRightPos, y, STR_PTS, 0);
-#endif
 #endif
    }
  }
@@ -104,7 +102,6 @@ void menuModelCurvesAll(event_t event)
  }
 }

-#if defined(CPUARM)
 void editCurveRef(coord_t x, coord_t y, CurveRef & curve, event_t event, LcdFlags flags)
 {
  coord_t x1 = x;
@@ -155,4 +152,3 @@ void editCurveRef(coord_t x, coord_t y, CurveRef & curve, event_t event, LcdFlag
      break;
  }
 }
-#endif
@@ -20,10 +20,8 @@

 #include "opentx.h"

-#if defined(CPUARM)
 uint8_t popupMenuOffsetType = MENU_OFFSET_INTERNAL;
 void (*popupFunc)(event_t event) = NULL;
-#endif

 #if defined(NAVIGATION_MENUS)
 const char * popupMenuItems[POPUP_MENU_MAX_LINES];
@@ -43,11 +41,7 @@ const char * runPopupMenu(event_t event)
  lcdDrawRect(MENU_X, y, MENU_W, display_count * (FH+1) + 2);

  for (uint8_t i=0; i<display_count; i++) {
-#if defined(CPUARM)
    lcdDrawText(MENU_X+6, i*(FH+1) + y + 2, popupMenuItems[i+(popupMenuOffsetType == MENU_OFFSET_INTERNAL ? popupMenuOffset : 0)], 0);
-#else
-    lcdDrawText(MENU_X+6, i*(FH+1) + y + 2, popupMenuItems[i], popupMenuFlags);
-#endif
    if (i == s_menu_item) lcdDrawSolidFilledRect(MENU_X+1, i*(FH+1) + y + 1, MENU_W-2, 9);
  }

@@ -71,11 +65,7 @@ const char * runPopupMenu(event_t event)
      }
 #endif
      else {
-#if defined(CPUARM)
        s_menu_item = min<uint8_t>(display_count, MENU_MAX_DISPLAY_LINES) - 1;
-#else
-        s_menu_item = display_count - 1;
-#endif
 #if defined(SDCARD)
        if (popupMenuNoItems > MENU_MAX_DISPLAY_LINES) {
          popupMenuOffset = popupMenuNoItems - display_count;
@@ -114,11 +104,7 @@ const char * runPopupMenu(event_t event)
    CASE_EVT_ROTARY_BREAK
 #endif
    case EVT_KEY_BREAK(KEY_ENTER):
-#if defined(CPUARM)
      result = popupMenuItems[s_menu_item + (popupMenuOffsetType == MENU_OFFSET_INTERNAL ? popupMenuOffset : 0)];
-#else
-      result = popupMenuItems[s_menu_item];
-#endif
      // no break

 #if defined(CASE_EVT_ROTARY_LONG)
@@ -83,7 +83,6 @@ void onSdManagerMenu(const char * result)
  else if (result == STR_SD_FORMAT) {
    POPUP_CONFIRMATION(STR_CONFIRM_FORMAT);
  }
-#if defined(CPUARM)
  else if (result == STR_COPY_FILE) {
    clipboard.type = CLIPBOARD_TYPE_SD_FILE;
    f_getcwd(clipboard.data.sd.directory, CLIPBOARD_PATH_LEN);
@@ -111,7 +110,6 @@ void onSdManagerMenu(const char * result)
    s_editMode = EDIT_MODIFY_STRING;
    editNameCursorPos = 0;
  }
-#endif
  else if (result == STR_DELETE_FILE) {
    getSelectionFullPath(lfn);
    f_unlink(lfn);
@@ -120,13 +118,11 @@ void onSdManagerMenu(const char * result)
    showStatusLine();
    REFRESH_FILES();
  }
-#if defined(CPUARM)
  else if (result == STR_PLAY_FILE) {
    getSelectionFullPath(lfn);
    audioQueue.stopAll();
    audioQueue.playFile(lfn, 0, ID_PLAY_FROM_SD_MANAGER);
  }
-#endif
 #if LCD_DEPTH > 1
  else if (result == STR_ASSIGN_BITMAP) {
    strAppendFilename(g_model.header.bitmap, line, sizeof(g_model.header.bitmap));
@@ -134,12 +130,10 @@ void onSdManagerMenu(const char * result)
    storageDirty(EE_MODEL);
  }
 #endif
-#if defined(CPUARM)
  else if (result == STR_VIEW_TEXT) {
    getSelectionFullPath(lfn);
    pushMenuTextView(lfn);
  }
-#endif
 #if defined(PCBTARANIS)
  else if (result == STR_FLASH_BOOTLOADER) {
    getSelectionFullPath(lfn);
@@ -176,9 +170,7 @@ void menuRadioSdManager(event_t _event)
 #if defined(PCBSKY9X)
    Card_state = SD_ST_DATA;
 #endif
-#if defined(CPUARM)
    audioQueue.stopSD();
-#endif
    if(sdCardFormat()) {
      f_chdir("/");
      REFRESH_FILES();
@@ -258,7 +250,6 @@ void menuRadioSdManager(event_t _event)
        if (!strcmp(line, "..")) {
          break; // no menu for parent dir
        }
-#if defined(CPUARM)
        const char * ext = getFileExtension(line);
        if (ext) {
          if (!strcasecmp(ext, SOUNDS_EXT)) {
@@ -295,15 +286,12 @@ void menuRadioSdManager(event_t _event)
          }
 #endif
        }
-#endif
        if (!READ_ONLY()) {
-#if defined(CPUARM)
          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);
-#endif
          if (IS_FILE(line))
            POPUP_MENU_ADD_ITEM(STR_DELETE_FILE);
        }
@@ -404,7 +392,6 @@ void menuRadioSdManager(event_t _event)
      if (IS_DIRECTORY(reusableBuffer.sdmanager.lines[i])) {
        lcdDrawChar(0, y, '[', s_editMode == EDIT_MODIFY_STRING ? 0 : attr);
      }
-#if defined(CPUARM)
      if (s_editMode == EDIT_MODIFY_STRING && attr) {
        uint8_t extlen, efflen;
        const char * ext = getFileExtension(reusableBuffer.sdmanager.originalName, 0, 0, NULL, &extlen);
@@ -424,9 +411,6 @@ void menuRadioSdManager(event_t _event)
      else {
        lcdDrawText(lcdNextPos, y, reusableBuffer.sdmanager.lines[i], attr);
      }
-#else
-      lcdDrawText(lcdNextPos, y, reusableBuffer.sdmanager.lines[i], attr);
-#endif
      if (IS_DIRECTORY(reusableBuffer.sdmanager.lines[i])) {
        lcdDrawChar(lcdNextPos, y, ']', s_editMode == EDIT_MODIFY_STRING ? 0 : attr);
      }
@@ -32,7 +32,6 @@ void drawStringWithIndex(coord_t x, coord_t y, const pm_char * str, uint8_t idx,
  }
 }

-#if defined(CPUARM)
 FlightModesType editFlightModes(coord_t x, coord_t y, event_t event, FlightModesType value, uint8_t attr)
 {
  int posHorz = menuHorizontalPosition;
@@ -60,9 +59,7 @@ FlightModesType editFlightModes(coord_t x, coord_t y, event_t event, FlightModes
  
  return value;
 }
-#endif

-#if defined(CPUARM)
 void editName(coord_t x, coord_t y, char * name, uint8_t size, event_t event, uint8_t active, LcdFlags attr)
 {
  uint8_t mode = 0;
@@ -176,7 +173,6 @@ void editName(coord_t x, coord_t y, char * name, uint8_t size, event_t event, ui
    lcdNextPos = backupNextPos;
  }
 }
-#endif

 void gvarWeightItem(coord_t x, coord_t y, MixData * md, LcdFlags attr, event_t event)
 {
@@ -186,11 +182,9 @@ void gvarWeightItem(coord_t x, coord_t y, MixData * md, LcdFlags attr, event_t e
  MD_UNION_TO_WEIGHT(weight, md);
 }

-#if defined(CPUARM)
 void drawGVarName(coord_t x, coord_t y, int8_t idx, LcdFlags flags)
 {
  char s[8];
  getGVarString(s, idx);
  lcdDrawText(x, y, s, flags);
 }
-#endif