From 92ceaa948c1f6ead565e7f1e3edd72fa13a1c8c2 Mon Sep 17 00:00:00 2001
From: JivaroFAD <jivarofad@gmail.com>
Date: Fri, 27 Feb 2015 18:35:39 +0100
Subject: [PATCH] MEGA2560 update

Build option for Companion
Default LCD = ST7565P and not ST7565R
---
 .../src/firmwares/opentx/opentxinterface.cpp  |  23 ++++++++++++++++++
 doc/Mega2560/MEGA2560_Listing.xls             | Bin 51200 -> 51200 bytes
 radio/src/Makefile                            |   9 +++----
 3 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/companion/src/firmwares/opentx/opentxinterface.cpp b/companion/src/firmwares/opentx/opentxinterface.cpp
index 0b880b2db..61c45f856 100644
--- a/companion/src/firmwares/opentx/opentxinterface.cpp
+++ b/companion/src/firmwares/opentx/opentxinterface.cpp
@@ -1243,6 +1243,29 @@ void registerOpenTxFirmwares()
 
   /* MEGA2560 board */
   openTx = new OpenTxFirmware("opentx-mega2560", QObject::tr("OpenTX for MEGA2560 board"), BOARD_MEGA2560);
+  Option LCD_options[] = { { "ST7565P LCD", QObject::tr("ST7565P LCD or compatible"), 0 }, { "ST7565R LCD", QObject::tr("ST7565R LCD or compatible"), 0 }, { NULL } };
+  openTx->addOptions(LCD_options);
+  openTx->addOption("heli", QObject::tr("Enable heli menu and cyclic mix support"));
+  openTx->addOption("templates", QObject::tr("Enable TEMPLATES menu"));
+  openTx->addOption("nofp", QObject::tr("No flight modes"));
+  openTx->addOption("nocurves", QObject::tr("Disable curves menus"));
+  openTx->addOption("sdcard", QObject::tr("Support for SD memory card"));
+  openTx->addOption("voice", QObject::tr("Used if you have voice module"));
+  openTx->addOption("PXX", QObject::tr("Support of FrSky PXX protocol"));
+  Option dsm2_options[] = { { "DSM2", QObject::tr("Support for DSM2 modules"), 0 }, { "DSM2PPM", QObject::tr("Support for DSM2 modules using ppm instead of true serial"), 0 }, { NULL } };
+  openTx->addOptions(dsm2_options);
+  openTx->addOption("ppmca", QObject::tr("PPM center adjustment in limits"));
+  openTx->addOption("gvars", QObject::tr("Global variables"), GVARS_VARIANT);
+  openTx->addOption("symlimits", QObject::tr("Symetrical Limits"));
+  openTx->addOption("mixersmon", QObject::tr("Adds mixers output view to the CHANNELS MONITOR screen, pressing [ENT] switches between the views"));
+  openTx->addOption("autosource", QObject::tr("In model setup menus automatically set source by moving the control"));
+  openTx->addOption("autoswitch", QObject::tr("In model setup menus automatically set switch by moving the control"));
+  openTx->addOption("dblkeys", QObject::tr("Enable resetting values by pressing up and down at the same time"));
+  openTx->addOption("nographics", QObject::tr("No graphical check boxes and sliders"));
+  openTx->addOption("battgraph", QObject::tr("Battery graph"));
+  openTx->addOption("nobold", QObject::tr("Don't use bold font for highlighting active items"));
+  openTx->addOption("pgbar", QObject::tr("EEprom write Progress bar"));
+  openTx->addOption("imperial", QObject::tr("Imperial units"));
   addOpenTxCommonOptions(openTx);
   firmwares.push_back(openTx);
 
diff --git a/doc/Mega2560/MEGA2560_Listing.xls b/doc/Mega2560/MEGA2560_Listing.xls
index 8dc0f044dd660268e969e33e725d30d52603919d..a16da90ed4dfcdade41e2436d19fb565b9bc8e56 100644
GIT binary patch
delta 444
zcmY+<JxH5D9LMqR`8+Xs67jW)gHaQ$@vYzsE>c8LgrEpYA&4(oq^N`7<lxXyMGUPP
zyg^W;tuJ&cC<h|N#X(V|NWs=cLFnS@P*AYYf1-<b-0yQQ+@HHx!ipuV?H;$Qo@$P@
z$F4Fx?&WM9EAVP>VYBO+7nJIqf;`h+IO|e(=G0%4`EIWWG61h1hQvkjkJwoZpA;O3
z`DxHm0xRNQF>FDs6wbvvvCD?30Gx^4L0ET5fiifL4s+tASXK^`ZfJQ4OCESDe)kY$
zO(wUp5wCzN2lhjd?SqL*I22!-<=RLvv$_|C$H1A9T5<ExJ?qICk{3VgT1VQ{fVqh5
zC^cx}eH%(e&8z-ZTR4d}Ix4FFjeM2d8ojsVruj0~5K!&<{KGfN_aBp4H~*Mn9a<Pp
zt;70PYSz4%Jh@3_-F#DhOIj|w@-=8p##8%@jU~fR7M2hB5elDl$1x9y-?>YhKkR@#
Qeq?@bhJtF^+#k8sf6KmXi~s-t

delta 447
zcmZ9I-7CXU7{|Y7zu#VIW;J%<$2Ku-Qi$Y2YF8^_A}^bba$&nsyWwstwWPh-xgahq
zR<0DCqTIO{r6e!8!Ik_0inMa!+2qD~I^WN8&htG_=bU&}if5%GpH{@Qn<j%6fL&z<
zK6t*)%5Bzu5w#}N>`Igrw=uTf092FZnHVI_E5IvJX#{o|z=;+WU~K}niI+sL1dQ2$
z2jUfRNCt-Ozzxyn0QS_t9dTR(%rsMP;wN#L?qX^Iayp=oc&38`OO(9RhQAef(F18G
znW_L!8&D(~MX`O-Vf^+1y%FGPm3plS*GNKF8^XWf=aU{bE7ViRj0MH%^gd$&;rH*z
zgs)Jyo&~r&d_a01E=hD&+(f$UEXt3P7G9s+s$_?x!PKvM`9yl5vi5Q*Q_dDM<x1J_
z&X)bbR8Qvs{q6}pQH4SJxWAEy42h<K8b}&Y9gLJhBU~GgW<EOFkt<xwZ*waKaa(XY
K*n}uuXxR^K=x+T0

diff --git a/radio/src/Makefile b/radio/src/Makefile
index 41b158a65..e866f4a11 100644
--- a/radio/src/Makefile
+++ b/radio/src/Makefile
@@ -657,7 +657,7 @@ ifeq ($(PCB), MEGA2560)
   MCU = atmega2560
   OPT = s
   CPPDEFS = -DF_CPU=$(F_CPU)UL -DPCBMEGA2560 -DCPUM2560 -DEEPROM_VARIANT=0 -DAUDIO
-  SDCARD = YES
+  SDCARD = NO
   BUZZER = YES
   THR_TRACE = YES
   INCDIRS += targets/mega2560 targets/stock FatFs FatFs/option
@@ -668,10 +668,10 @@ ifeq ($(PCB), MEGA2560)
   BITMAPS += bitmaps/9X/splash.lbm bitmaps/9X/asterisk.lbm bitmaps/9X/about.lbm
   GUIGENERALSRC += gui/$(GUIDIRECTORY)/menu_general_diagkeys.cpp gui/$(GUIDIRECTORY)/menu_general_diaganas.cpp
 
-  ifeq ($(PCBREV), ST7565P)
-    EXTRABOARDSRC = targets/stock/lcd_driver.cpp targets/common_avr/telemetry_driver.cpp
+  ifeq ($(PCBREV), ST7565R)
+    EXTRABOARDSRC = targets/mega2560/lcd_driver_ST7565R.cpp targets/common_avr/telemetry_driver.cpp 
   else
-    EXTRABOARDSRC = targets/mega2560/lcd_driver_ST7565R.cpp targets/common_avr/telemetry_driver.cpp
+    EXTRABOARDSRC = targets/stock/lcd_driver.cpp targets/common_avr/telemetry_driver.cpp
   endif
 
   ifeq ($(SDCARD), YES)
@@ -692,7 +692,6 @@ ifeq ($(PCB), MEGA2560)
   endif
 
   # Enable extra rotary encoders
-  # Values = YES, NO
   ROTARY_ENCODERS = 2
   CPPDEFS += -DROTARY_ENCODERS=${ROTARY_ENCODERS}
 endif