Bsongis/horus flash external device (#4446)

* CMake options changed to UNEXPECTED_SHUTDOWN=YES/NO and  PWR_BUTTON=PRESS/SWITCH

* [X12S / X10] Flash an external device is now OK
This commit is contained in:
Bertrand Songis
2017-02-12 21:04:46 +01:00
committed by Andre Bernet
parent 808d7749c7
commit b9bb831b7f
25 changed files with 107 additions and 158 deletions
+7 -10
View File
@@ -1,7 +1,7 @@
option(DISK_CACHE "Enable SD card disk cache" YES)
option(BLUETOOTH_CLI_PASSTHROUGH "Enable direct communicaton with Bluetooth module from CLI" NO)
option(PWR_BUTTON_DISABLED "Disable the Power Button (for debugging with JTAG)" NO)
option(NO_UNEXPECTED_SHUTDOWN "Disable the Unexpected Shutdown screen (for debugging with JTAG)" NO)
option(UNEXPECTED_SHUTDOWN "Enable the Unexpected Shutdown screen" YES)
set(PWR_BUTTON "PRESS" CACHE STRING "Pwr button type (PRESS/SWITCH)")
set(CPU_TYPE STM32F4)
set(HSE_VALUE 12000000)
@@ -22,14 +22,6 @@ if(SPLASH STREQUAL OFF)
message(FATAL_ERROR "Option SPLASH=OFF not supported on Horus")
endif()
if(PWR_BUTTON_DISABLED)
add_definitions(-DPWR_BUTTON_DISABLED)
endif()
if(NO_UNEXPECTED_SHUTDOWN)
add_definitions(-DNO_UNEXPECTED_SHUTDOWN)
endif()
if (PCB STREQUAL X10)
set(FLAVOUR x10)
add_definitions(-DPCBX10)
@@ -68,6 +60,11 @@ endif()
add_definitions(-DPCBHORUS -DSTM32F429_439xx -DSDRAM -DCOLORLCD -DPPM_PIN_UART -DPPM_PIN_TIMER)
add_definitions(-DEEPROM_VARIANT=0 -DAUDIO -DVOICE -DRTCLOCK)
add_definitions(-DGPS_USART_BAUDRATE=${INTERNAL_GPS_BAUDRATE})
add_definitions(-DPWR_BUTTON_${PWR_BUTTON})
if(NOT UNEXPECTED_SHUTDOWN)
add_definitions(-DNO_UNEXPECTED_SHUTDOWN)
endif()
include_directories(${RADIO_SRC_DIRECTORY}/fonts/480x272 gui/${GUI_DIR} gui/${GUI_DIR}/layouts)
+1 -1
View File
@@ -391,6 +391,7 @@ extern "C" {
#endif
// Power driver
#define SOFT_PWR_CTRL
void pwrInit(void);
uint32_t pwrCheck(void);
void pwrOn(void);
@@ -398,7 +399,6 @@ void pwrOff(void);
void pwrResetHandler(void);
uint32_t pwrPressed(void);
uint32_t pwrPressedDuration(void);
#define pwroffPressed() pwrPressed()
#if defined(SIMU) || defined(NO_UNEXPECTED_SHUTDOWN)
#define UNEXPECTED_SHUTDOWN() (false)
#else
-6
View File
@@ -46,11 +46,9 @@ void pwrInit()
GPIO_InitStructure.GPIO_Mode = GPIO_Mode_IN;
#if !defined(PWR_BUTTON_DISABLED)
// Init PWR SWITCH PIN
GPIO_InitStructure.GPIO_Pin = PWR_SWITCH_GPIO_PIN;
GPIO_Init(PWR_GPIO, &GPIO_InitStructure);
#endif
// Init PCBREV PIN
// TODO to be removed on X10?
@@ -101,11 +99,7 @@ void pwrOff()
uint32_t pwrPressed()
{
#if defined(PWR_BUTTON_DISABLED)
return false;
#else
return GPIO_ReadInputDataBit(PWR_GPIO, PWR_SWITCH_GPIO_PIN) == Bit_RESET;
#endif
}
void pwrResetHandler()
+7 -7
View File
@@ -576,14 +576,14 @@ int lcdRestoreBackupBuffer()
}
#endif
uint32_t pwroffPressed() { return false; }
#if defined(CPUARM) && !defined(PWR_BUTTON_DELAY)
uint32_t pwrCheck() { return true; }
#endif
#if defined(CPUARM)
void pwrOff() { }
void pwrOff()
{
}
uint32_t pwrPressed()
{
return false;
}
#endif
#if defined(STM32)
+6 -1
View File
@@ -234,6 +234,7 @@ void calcConsumption();
// Trainer driver
#define SLAVE_MODE() (pwrCheck() == e_power_trainer)
#define TRAINER_CONNECTED() (PIOA->PIO_PDSR & PIO_PA8)
void checkTrainerSettings();
void init_trainer_capture();
@@ -368,10 +369,14 @@ void btPushByte(uint8_t data);
#endif
// Power driver
#define TRAINER_PWR
#if !defined(REVA)
#define SOFT_PWR_CTRL
#endif
void pwrInit();
void pwrOff();
uint32_t pwrCheck();
uint32_t pwroffPressed();
uint32_t pwrPressed();
#define UNEXPECTED_SHUTDOWN() (g_eeGeneral.unexpectedShutdown)
// EEPROM driver
+3 -33
View File
@@ -20,42 +20,12 @@
#include "opentx.h"
uint32_t pwroffPressed()
uint32_t pwrPressed()
{
#if defined(SIMU) || defined(REVA)
return false;
return true;
#else
return !(PIOC->PIO_PDSR & PIO_PC17);
#endif
}
uint32_t pwrCheck()
{
#if defined(SIMU)
return e_power_on;
#elif defined(REVA)
if (PIOC->PIO_PDSR & PIO_PC25)
return e_power_usb;
else if (PIOA->PIO_PDSR & PIO_PA8)
return e_power_trainer;
else
return e_power_on;
#elif defined(REVB)
if (!pwroffPressed())
return e_power_on;
else if (usbPlugged())
return e_power_usb;
else if ( PIOA->PIO_PDSR & PIO_PA8 )
return e_power_trainer;
else
return e_power_off;
#else
if (!pwroffPressed())
return e_power_on;
else if (PIOA->PIO_PDSR & PIO_PA8)
return e_power_trainer;
else
return e_power_off;
return PIOC->PIO_PDSR & PIO_PC17;
#endif
}
+4
View File
@@ -4,6 +4,7 @@ option(TARANIS_INTERNAL_PPM "Taranis internal module hack to output PPM" OFF)
option(MIXERS_MONITOR "Enable Mixers Monitor screen (not available on X7 yet)" OFF)
if(PCB STREQUAL X9E)
set(PWR_BUTTON "PRESS" CACHE STRING "Pwr button type (PRESS/SWITCH)")
set(STICKS "STANDARD" CACHE STRING "Sticks type (STANDARD/HORUS)")
set(CPU_TYPE STM32F4)
set(CPU_TYPE_FULL STM32F407xE) # for size report
@@ -14,6 +15,7 @@ if(PCB STREQUAL X9E)
add_definitions(-DSTM32F40_41xxx -DPCBX9E)
add_definitions(-DEEPROM_VARIANT=0x8000)
add_definitions(-DBLUETOOTH)
add_definitions(-DPWR_BUTTON_${PWR_BUTTON})
set(FIRMWARE_TARGET_SRC
${FIRMWARE_TARGET_SRC}
top_lcd_driver.cpp
@@ -60,6 +62,7 @@ elseif(PCB STREQUAL X9D)
set(SERIAL2_DRIVER ../common/arm/stm32/serial2_driver.cpp)
set(GVAR_SCREEN model_gvars.cpp)
elseif(PCB STREQUAL X7)
set(PWR_BUTTON "PRESS" CACHE STRING "Pwr button type (PRESS/SWITCH)")
set(CPU_TYPE STM32F2)
set(CPU_TYPE_FULL STM32F205xE) # for size report
set(LINKER_SCRIPT targets/taranis/stm32f2_flash.ld)
@@ -68,6 +71,7 @@ elseif(PCB STREQUAL X7)
set(FLAVOUR x7)
add_definitions(-DPCBX7 -DSOFTWARE_VOLUME)
add_definitions(-DEEPROM_VARIANT=0x4000)
add_definitions(-DPWR_BUTTON_${PWR_BUTTON})
set(FIRMWARE_TARGET_SRC
${FIRMWARE_TARGET_SRC}
bluetooth_driver.cpp
+2 -4
View File
@@ -417,16 +417,14 @@ extern "C" {
#endif
// Power driver
#define SOFT_PWR_CTRL
void pwrInit(void);
uint32_t pwrCheck(void);
void pwrOn(void);
void pwrOff(void);
#if defined(PWR_PRESS_BUTTON)
uint32_t pwrPressed(void);
#if defined(PWR_PRESS_BUTTON)
uint32_t pwrPressedDuration(void);
#define pwroffPressed() pwrPressed()
#else
uint32_t pwroffPressed(void);
#endif
#if defined(SIMU)
@@ -619,11 +619,7 @@ int main()
}
if (state != ST_FLASHING && state != ST_USB) {
#if defined(PCBX9E) || defined(PCBX7)
if (pwrPressed()) {
#else
if (pwrCheck() == e_power_off) {
#endif
if (pwrOffPressed()) {
lcdOff(); // this drains LCD caps
pwrOff();
for (;;) {
-16
View File
@@ -85,23 +85,7 @@ void pwrOff()
// this function must not return!
}
#if defined(PWR_PRESS_BUTTON)
uint32_t pwrPressed()
{
return GPIO_ReadInputDataBit(PWR_GPIO, PWR_SWITCH_GPIO_PIN) == Bit_RESET;
}
#else
uint32_t pwroffPressed()
{
return GPIO_ReadInputDataBit(PWR_GPIO, PWR_SWITCH_GPIO_PIN) != Bit_RESET;
}
uint32_t pwrCheck()
{
if (!pwroffPressed())
return e_power_on;
else if (usbPlugged())
return e_power_usb;
else
return e_power_off;
}
#endif