[Horus] Fixes. ADC + Switches + Trims + RTC OK

radio/src/tasks_arm.cpp

@@ -1,23 +1,23 @@
-/*
- * 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.
- */
-
+/*
+ * 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"
 
 OS_TID menusTaskId;
@@ -129,7 +129,7 @@ void menusTask(void * pdata)
 {
   opentxInit();
 
-#if defined(PCBTARANIS) && defined(REV9E)
+#if defined(PWR_BUTTON_DELAY)
   while (1) {
     uint32_t pwr_check = pwrCheck();
     if (pwr_check == e_power_off) {
@@ -158,9 +158,8 @@ void menusTask(void * pdata)
 
   BACKLIGHT_OFF();
 
-#if defined(COLORLCD)
-#elif defined(PCBTARANIS)
-  displaySleepBitmap();
+#if defined(COLORLCD) || defined(PCBTARANIS)
+  drawSleepBitmap();
 #else
   lcdClear();
   displayPopup(STR_SHUTDOWN);