Bsongis/issue 3600 emergency shutdown (#3602)

* [ARM] Fixes #3600 - Emergency shutdown

* Compilation fix

* Function renamed

* Compilation fix

* Compilation fix

* Compilation fix

* Suggestion from projectkk2glider
This commit is contained in:
Bertrand Songis
2016-06-17 07:32:33 +02:00
committed by GitHub
parent 238943f4a2
commit 4445f7cdec
7 changed files with 89 additions and 41 deletions
+32 -23
View File
@@ -1,24 +1,33 @@
/*
* 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"
/*
* 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"
uint32_t pwroffPressed()
{
#if defined(SIMU) || defined(REVA)
return false;
#else
return !(PIOC->PIO_PDSR & PIO_PC17);
#endif
}
uint32_t pwrCheck()
{
@@ -32,7 +41,7 @@ uint32_t pwrCheck()
else
return e_power_on;
#elif defined(REVB)
if (PIOC->PIO_PDSR & PIO_PC17)
if (!pwroffPressed())
return e_power_on;
else if (usbPlugged())
return e_power_usb;
@@ -41,7 +50,7 @@ uint32_t pwrCheck()
else
return e_power_off;
#else
if (PIOC->PIO_PDSR & PIO_PC17)
if (!pwroffPressed())
return e_power_on;
else if (PIOA->PIO_PDSR & PIO_PA8)
return e_power_trainer;