Bsongis/x7d fixes (#4019)

* [X7D] Various fixes [Others] - Fixes the Mixer / Inputs MOVE / COPY problem on X9E - Adds the copy/paste/rename feature in SDCARD menu on X7D/SKY9X - Merges some duplicated code using the new directory structure - Cosmetics
2016-11-13 19:06:21 +01:00
parent fd33cc9d2b
commit bfb5e9b8a6
42 changed files with 1285 additions and 2188 deletions
@@ -0,0 +1,479 @@
+/*
+ * 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 _STR_MAX(x)                     PSTR("/" #x)
+#define STR_MAX(x)                     _STR_MAX(x)
+
+uint8_t getMixesCount()
+{
+  uint8_t count = 0;
+  uint8_t ch ;
+  
+  for (int i=MAX_MIXERS-1; i>=0; i--) {
+    ch = mixAddress(i)->srcRaw;
+    if (ch != 0) {
+      count++;
+    }
+  }
+  return count;
+}
+
+bool reachMixesLimit()
+{
+  if (getMixesCount() >= MAX_MIXERS) {
+    POPUP_WARNING(STR_NOFREEMIXER);
+    return true;
+  }
+  return false;
+}
+
+void deleteMix(uint8_t idx)
+{
+  pauseMixerCalculations();
+  MixData * mix = mixAddress(idx);
+  memmove(mix, mix+1, (MAX_MIXERS-(idx+1))*sizeof(MixData));
+  memclear(&g_model.mixData[MAX_MIXERS-1], sizeof(MixData));
+  resumeMixerCalculations();
+  storageDirty(EE_MODEL);
+}
+
+void insertMix(uint8_t idx)
+{
+  pauseMixerCalculations();
+  MixData * mix = mixAddress(idx);
+  memmove(mix+1, mix, (MAX_MIXERS-(idx+1))*sizeof(MixData));
+  memclear(mix, sizeof(MixData));
+  mix->destCh = s_currCh-1;
+  mix->srcRaw = s_currCh;
+  if (!isSourceAvailable(mix->srcRaw)) {
+    mix->srcRaw = (s_currCh > 4 ? MIXSRC_Rud - 1 + s_currCh : MIXSRC_Rud - 1 + channel_order(s_currCh));
+    while (!isSourceAvailable(mix->srcRaw)) {
+      mix->srcRaw += 1;
+    }
+  }
+  mix->weight = 100;
+  resumeMixerCalculations();
+  storageDirty(EE_MODEL);
+}
+
+void copyMix(uint8_t idx)
+{
+  pauseMixerCalculations();
+  MixData * mix = mixAddress(idx);
+  memmove(mix+1, mix, (MAX_MIXERS-(idx+1))*sizeof(MixData));
+  resumeMixerCalculations();
+  storageDirty(EE_MODEL);
+}
+
+bool swapMixes(uint8_t & idx, uint8_t up)
+{
+  MixData * x, * y;
+  int8_t tgt_idx = (up ? idx-1 : idx+1);
+  
+  x = mixAddress(idx);
+  
+  if (tgt_idx < 0) {
+    if (x->destCh == 0)
+      return false;
+    x->destCh--;
+    return true;
+  }
+  
+  if (tgt_idx == MAX_MIXERS) {
+    if (x->destCh == MAX_OUTPUT_CHANNELS-1)
+      return false;
+    x->destCh++;
+    return true;
+  }
+  
+  y = mixAddress(tgt_idx);
+  uint8_t destCh = x->destCh;
+  if(!y->srcRaw || destCh != y->destCh) {
+    if (up) {
+      if (destCh>0) x->destCh--;
+      else return false;
+    }
+    else {
+      if (destCh<MAX_OUTPUT_CHANNELS-1) x->destCh++;
+      else return false;
+    }
+    return true;
+  }
+  
+  pauseMixerCalculations();
+  memswap(x, y, sizeof(MixData));
+  resumeMixerCalculations();
+  
+  idx = tgt_idx;
+  return true;
+}
+
+void onMixesMenu(const char * result)
+{
+  uint8_t chn = mixAddress(s_currIdx)->destCh + 1;
+  
+  if (result == STR_EDIT) {
+    pushMenu(menuModelMixOne);
+  }
+  else if (result == STR_INSERT_BEFORE || result == STR_INSERT_AFTER) {
+    if (!reachMixesLimit()) {
+      s_currCh = chn;
+      if (result == STR_INSERT_AFTER) { s_currIdx++; menuVerticalPosition++; }
+      insertMix(s_currIdx);
+      pushMenu(menuModelMixOne);
+    }
+  }
+  else if (result == STR_COPY || result == STR_MOVE) {
+    s_copyMode = (result == STR_COPY ? COPY_MODE : MOVE_MODE);
+    s_copySrcIdx = s_currIdx;
+    s_copySrcCh = chn;
+    s_copySrcRow = menuVerticalPosition;
+  }
+  else if (result == STR_DELETE) {
+    deleteMix(s_currIdx);
+  }
+}
+
+#if LCD_W >= 212
+#define MIX_LINE_WEIGHT_POS            2*FW+12
+#define MIX_LINE_SRC_POS               7*FW+5
+#define MIX_LINE_CURVE_POS             13*FW+3
+#define MIX_LINE_SWITCH_POS            19*FW+1
+#define MIX_LINE_FM_POS                13*FW+3
+#define MIX_LINE_DELAY_POS             24*FW+3
+#define MIX_LINE_NAME_POS              LCD_W-LEN_EXPOMIX_NAME*FW-MENUS_SCROLLBAR_WIDTH
+
+void displayHeaderChannelName(uint8_t ch)
+{
+  uint8_t len = zlen(g_model.limitData[ch].name, sizeof(g_model.limitData[ch].name));
+  if (len) {
+    lcdDrawSizedText(80, 1, g_model.limitData[ch].name, len, ZCHAR|SMLSIZE);
+  }
+}
+
+void displayMixInfos(coord_t y, MixData * md)
+{
+  drawCurveRef(MIX_LINE_CURVE_POS, y, md->curve, 0);
+
+  if (md->swtch) {
+    drawSwitch(MIX_LINE_SWITCH_POS, y, md->swtch);
+  }
+}
+
+void displayMixLine(coord_t y, MixData * md)
+{
+  if (md->name[0])
+    lcdDrawSizedText(MIX_LINE_NAME_POS, y, md->name, sizeof(md->name), ZCHAR);
+  if (!md->flightModes || ((md->curve.value || md->swtch) && ((get_tmr10ms() / 200) & 1)))
+    displayMixInfos(y, md);
+  else
+    displayFlightModes(MIX_LINE_FM_POS, y, md->flightModes);
+
+  char cs = ' ';
+  if (md->speedDown || md->speedUp)
+    cs = 'S';
+  if (md->delayUp || md->delayDown)
+    cs = (cs == 'S' ? '*' : 'D');
+  lcdDrawChar(MIX_LINE_DELAY_POS, y, cs);
+}
+#else
+#define MIX_LINE_WEIGHT_POS            6*FW+8
+#define MIX_LINE_SRC_POS               7*FW+3
+#define MIX_LINE_CURVE_POS             12*FW
+#define MIX_LINE_SWITCH_POS            16*FW+4
+#define MIX_LINE_FM_POS                13*FW+3
+#define MIX_LINE_DELAY_POS             20*FW+2
+#define MIX_LINE_NAME_POS              LCD_W-LEN_EXPOMIX_NAME*FW
+
+void displayHeaderChannelName(uint8_t ch)
+{
+  uint8_t len = zlen(g_model.limitData[ch].name, sizeof(g_model.limitData[ch].name));
+  if (len) {
+    lcdDrawSizedText(80, 1, g_model.limitData[ch].name, len, ZCHAR|SMLSIZE);
+  }
+}
+
+void displayMixInfos(coord_t y, MixData * md)
+{
+  drawCurveRef(MIX_LINE_CURVE_POS, y, md->curve, 0);
+  
+  if (md->swtch) {
+    drawSwitch(MIX_LINE_SWITCH_POS, y, md->swtch);
+  }
+  
+  char cs = ' ';
+  if (md->speedDown || md->speedUp)
+    cs = 'S';
+  if (md->delayUp || md->delayDown)
+    cs = (cs == 'S' ? '*' : 'D');
+  lcdDrawChar(MIX_LINE_DELAY_POS, y, cs);
+}
+
+void displayMixLine(coord_t y, MixData * md)
+{
+  if (md->name[0])
+    lcdDrawSizedText(MIX_LINE_NAME_POS, y, md->name, sizeof(md->name), ZCHAR);
+  else if (!md->flightModes || ((md->curve.value || md->swtch) && ((get_tmr10ms() / 200) & 1)))
+    displayMixInfos(y, md);
+  else
+    displayFlightModes(MIX_LINE_FM_POS, y, md->flightModes);
+}
+#endif
+
+void menuModelMixAll(event_t event)
+{
+  int8_t sub = menuVerticalPosition - HEADER_LINE;
+  
+  if (s_editMode > 0) {
+    s_editMode = 0;
+  }
+  
+  uint8_t chn = mixAddress(s_currIdx)->destCh + 1;
+  
+  switch (event) {
+    case EVT_ENTRY:
+    case EVT_ENTRY_UP:
+      s_copyMode = 0;
+      s_copyTgtOfs = 0;
+      break;
+    case EVT_KEY_LONG(KEY_EXIT):
+      if (s_copyMode && s_copyTgtOfs == 0) {
+        deleteMix(s_currIdx);
+        killEvents(event);
+        event = 0;
+      }
+      // no break
+    case EVT_KEY_BREAK(KEY_EXIT):
+      if (s_copyMode) {
+        if (s_copyTgtOfs) {
+          // cancel the current copy / move operation
+          if (s_copyMode == COPY_MODE) {
+            deleteMix(s_currIdx);
+          }
+          else {
+            do {
+              swapMixes(s_currIdx, s_copyTgtOfs > 0);
+              s_copyTgtOfs += (s_copyTgtOfs < 0 ? +1 : -1);
+            } while (s_copyTgtOfs != 0);
+            storageDirty(EE_MODEL);
+          }
+          menuVerticalPosition = s_copySrcRow + HEADER_LINE;
+          s_copyTgtOfs = 0;
+        }
+        s_copyMode = 0;
+        event = 0;
+      }
+      break;
+    case EVT_KEY_BREAK(KEY_ENTER):
+      if ((!s_currCh || (s_copyMode && !s_copyTgtOfs)) && !READ_ONLY()) {
+        s_copyMode = (s_copyMode == COPY_MODE ? MOVE_MODE : COPY_MODE);
+        s_copySrcIdx = s_currIdx;
+        s_copySrcCh = chn;
+        s_copySrcRow = sub;
+        break;
+      }
+      // no break
+    
+    case EVT_KEY_LONG(KEY_ENTER):
+      killEvents(event);
+      if (s_copyTgtOfs) {
+        s_copyMode = 0;
+        s_copyTgtOfs = 0;
+      }
+      else {
+        if (READ_ONLY()) {
+          if (!s_currCh) {
+            pushMenu(menuModelMixOne);
+          }
+        }
+        else {
+          if (s_copyMode) s_currCh = 0;
+          if (s_currCh) {
+            if (reachMixesLimit()) break;
+            insertMix(s_currIdx);
+            pushMenu(menuModelMixOne);
+            s_copyMode = 0;
+          }
+          else {
+            event = 0;
+            s_copyMode = 0;
+            POPUP_MENU_ADD_ITEM(STR_EDIT);
+            POPUP_MENU_ADD_ITEM(STR_INSERT_BEFORE);
+            POPUP_MENU_ADD_ITEM(STR_INSERT_AFTER);
+            POPUP_MENU_ADD_ITEM(STR_COPY);
+            POPUP_MENU_ADD_ITEM(STR_MOVE);
+            POPUP_MENU_ADD_ITEM(STR_DELETE);
+            POPUP_MENU_START(onMixesMenu);
+          }
+        }
+      }
+      break;
+    case EVT_KEY_LONG(KEY_LEFT):
+    case EVT_KEY_LONG(KEY_RIGHT):
+      if (s_copyMode && !s_copyTgtOfs) {
+        if (reachMixesLimit()) break;
+        s_currCh = chn;
+        if (event == EVT_KEY_LONG(KEY_RIGHT)) { s_currIdx++; menuVerticalPosition++; }
+        insertMix(s_currIdx);
+        pushMenu(menuModelMixOne);
+        s_copyMode = 0;
+        killEvents(event);
+      }
+      break;
+    case EVT_KEY_FIRST(KEY_UP):
+    case EVT_KEY_REPT(KEY_UP):
+    case EVT_KEY_FIRST(KEY_DOWN):
+    case EVT_KEY_REPT(KEY_DOWN):
+#if defined(ROTARY_ENCODER_NAVIGATION)
+    case EVT_ROTARY_RIGHT:
+    case EVT_ROTARY_LEFT:
+#endif
+      if (s_copyMode) {
+        uint8_t next_ofs = (IS_PREVIOUS_EVENT(event) ? s_copyTgtOfs - 1 : s_copyTgtOfs + 1);
+        
+        if (s_copyTgtOfs==0 && s_copyMode==COPY_MODE) {
+          // insert a mix on the same channel (just above / just below)
+          if (reachMixesLimit()) break;
+          copyMix(s_currIdx);
+          if (IS_NEXT_EVENT(event))
+            s_currIdx++;
+          else if (sub - menuVerticalOffset >= 6)
+            menuVerticalOffset++;
+        }
+        else if (next_ofs==0 && s_copyMode==COPY_MODE) {
+          // delete the mix
+          deleteMix(s_currIdx);
+          if (IS_PREVIOUS_EVENT(event))
+            s_currIdx--;
+        }
+        else {
+          // only swap the mix with its neighbor
+          if (!swapMixes(s_currIdx, IS_PREVIOUS_EVENT(event))) break;
+          storageDirty(EE_MODEL);
+        }
+        
+        s_copyTgtOfs = next_ofs;
+      }
+      break;
+  }
+  
+  lcdDrawNumber(FW*sizeof(TR_MIXER)+FW+FW/2, 0, getMixesCount(), RIGHT);
+  lcdDrawText(FW*sizeof(TR_MIXER)+FW+FW/2, 0, STR_MAX(MAX_MIXERS));
+  
+  // Value
+  uint8_t index = mixAddress(s_currIdx)->destCh;
+  if (!s_currCh) {
+    displayHeaderChannelName(index);
+#if LCD_W >= 212
+    lcdDrawNumber(127, 2, calcRESXto1000(ex_chans[index]), PREC1|TINSIZE|RIGHT);
+#endif
+  }
+  
+  SIMPLE_MENU(STR_MIXER, menuTabModel, MENU_MODEL_MIXES, HEADER_LINE + s_maxLines);
+
+#if LCD_W >= 212
+  // Gauge
+  if (!s_currCh) {
+    drawGauge(127, 1, 58, 6, ex_chans[index], 1024);
+  }
+#endif
+  
+  sub = menuVerticalPosition - HEADER_LINE;
+  s_currCh = 0;
+  int cur = 0;
+  int i = 0;
+  
+  for (int ch=1; ch<=MAX_OUTPUT_CHANNELS; ch++) {
+    MixData * md;
+    coord_t y = MENU_HEADER_HEIGHT+1+(cur-menuVerticalOffset)*FH;
+    if (i<MAX_MIXERS && (md=mixAddress(i))->srcRaw && md->destCh+1 == ch) {
+      if (cur-menuVerticalOffset >= 0 && cur-menuVerticalOffset < NUM_BODY_LINES) {
+        putsChn(0, y, ch, 0); // show CHx
+      }
+      uint8_t mixCnt = 0;
+      do {
+        if (s_copyMode) {
+          if (s_copyMode == MOVE_MODE && cur-menuVerticalOffset >= 0 && cur-menuVerticalOffset < NUM_BODY_LINES && s_copySrcCh == ch && s_copyTgtOfs != 0 && i == (s_copySrcIdx + (s_copyTgtOfs<0))) {
+            lcdDrawRect(22, y-1, LCD_W-22, 9, DOTTED);
+            cur++; y+=FH;
+          }
+          if (s_currIdx == i) {
+            sub = cur;
+            menuVerticalPosition = cur + HEADER_LINE;
+            s_currCh = ch;
+          }
+        }
+        else if (sub == cur) {
+          s_currIdx = i;
+        }
+        if (cur-menuVerticalOffset >= 0 && cur-menuVerticalOffset < NUM_BODY_LINES) {
+          uint8_t attr = ((s_copyMode || sub != cur) ? 0 : INVERS);
+          
+          if (mixCnt > 0) lcdDrawTextAtIndex(FW, y, STR_VMLTPX2, md->mltpx, 0);
+          
+          drawSource(MIX_LINE_SRC_POS, y, md->srcRaw, 0);
+          
+          gvarWeightItem(MIX_LINE_WEIGHT_POS, y, md, RIGHT | attr | (isMixActive(i) ? BOLD : 0), 0);
+          
+          displayMixLine(y, md);
+          
+          if (s_copyMode) {
+            if ((s_copyMode==COPY_MODE || s_copyTgtOfs == 0) && s_copySrcCh == ch && i == (s_copySrcIdx + (s_copyTgtOfs<0))) {
+              /* draw a border around the raw on selection mode (copy/move) */
+              lcdDrawRect(22, y-1, LCD_W-22, 9, s_copyMode == COPY_MODE ? SOLID : DOTTED);
+            }
+            if (cur == sub) {
+              /* invert the raw when it's the current one */
+              lcdDrawSolidFilledRect(23, y, LCD_W-24, 7);
+            }
+          }
+        }
+        cur++; y+=FH; mixCnt++; i++; md++;
+      } while (i<MAX_MIXERS && md->srcRaw && md->destCh+1 == ch);
+      if (s_copyMode == MOVE_MODE && cur-menuVerticalOffset >= 0 && cur-menuVerticalOffset < NUM_BODY_LINES && s_copySrcCh == ch && i == (s_copySrcIdx + (s_copyTgtOfs<0))) {
+        lcdDrawRect(22, y-1, LCD_W-22, 9, DOTTED);
+        cur++;
+      }
+    }
+    else {
+      uint8_t attr = 0;
+      if (sub == cur) {
+        s_currIdx = i;
+        s_currCh = ch;
+        if (!s_copyMode) {
+          attr = INVERS;
+        }
+      }
+      if (cur-menuVerticalOffset >= 0 && cur-menuVerticalOffset < NUM_BODY_LINES) {
+        putsChn(0, y, ch, attr); // show CHx
+        if (s_copyMode == MOVE_MODE && s_copySrcCh == ch) {
+          lcdDrawRect(22, y-1, LCD_W-22, 9, DOTTED);
+        }
+      }
+      cur++;
+    }
+  }
+  s_maxLines = cur;
+  if (sub >= s_maxLines-1) {
+    menuVerticalPosition = s_maxLines - 1 + HEADER_LINE;
+  }
+}