piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Merged remove useless powerup reason.

Browse Source
This commit is contained in:
Richard Li
2021-07-27 14:38:54 +08:00
parent 67bf2a4e2b
commit aede763f4c
2 changed files with 11 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/targets/nv14/board.h
+10 -21
View File
@@ -238,13 +238,6 @@ enum EnumSwitchesPositions
}; };
#define STORAGE_NUM_SWITCHES_POSITIONS (STORAGE_NUM_SWITCHES * 3) #define STORAGE_NUM_SWITCHES_POSITIONS (STORAGE_NUM_SWITCHES * 3)
enum EnumPowerupState
{
BOARD_POWER_OFF = 0xCAFEDEAD,
BOARD_POWER_ON = 0xDEADBEEF,
BOARD_STARTED = 0xBAADF00D,
BOARD_REBOOT = 0xC00010FF,
};
void monitorInit(); void monitorInit();
void keysInit(); void keysInit();
@@ -261,15 +254,6 @@ uint32_t readTrims();
#define DBLKEYS_PRESSED_RGT_UP(in) (false) #define DBLKEYS_PRESSED_RGT_UP(in) (false)
#define DBLKEYS_PRESSED_LFT_DWN(in) (false) #define DBLKEYS_PRESSED_LFT_DWN(in) (false)
// WDT driver
extern uint32_t powerupReason;
extern uint32_t boardState;
/*#define SHUTDOWN_REQUEST 0xDEADBEEF
#define NO_SHUTDOWN_REQUEST ~SHUTDOWN_REQUEST
#define DIRTY_SHUTDOWN 0xCAFEDEAD
#define NORMAL_POWER_OFF ~DIRTY_SHUTDOWN*/
#define WDG_DURATION 500 /*ms*/ #define WDG_DURATION 500 /*ms*/
void watchdogInit(unsigned int duration); void watchdogInit(unsigned int duration);
#if defined(SIMU) #if defined(SIMU)
@@ -361,6 +345,16 @@ uint16_t getBatteryVoltage(); // returns current battery voltage in 10mV steps
#define BATTERY_MIN 35 // 3.5V #define BATTERY_MIN 35 // 3.5V
#define BATTERY_MAX 42 // 4.2V #define BATTERY_MAX 42 // 4.2V
enum EnumPowerupState
{
BOARD_POWER_OFF = 0xCAFEDEAD,
BOARD_POWER_ON = 0xDEADBEEF,
BOARD_STARTED = 0xBAADF00D,
BOARD_REBOOT = 0xC00010FF,
};
extern uint32_t boardState;
#if defined(__cplusplus) #if defined(__cplusplus)
enum PowerReason { enum PowerReason {
SHUTDOWN_REQUEST = 0xDEADBEEF, SHUTDOWN_REQUEST = 0xDEADBEEF,
@@ -413,11 +407,6 @@ bool pwrPressed();
#define pwrForcePressed() false #define pwrForcePressed() false
#endif #endif
uint32_t pwrPressedDuration();; uint32_t pwrPressedDuration();;
/*#if defined(SIMU) || defined(NO_UNEXPECTED_SHUTDOWN)
#define UNEXPECTED_SHUTDOWN() (false)
#else
#define UNEXPECTED_SHUTDOWN() (powerupReason == DIRTY_SHUTDOWN)
#endif*/
#define AUX_SERIAL_POWER_ON() #define AUX_SERIAL_POWER_ON()
#define AUX_SERIAL_POWER_OFF() #define AUX_SERIAL_POWER_OFF()
radio/src/targets/nv14/pwr_driver.cpp
-5
View File
@@ -21,7 +21,6 @@
#include "pwr.h" #include "pwr.h"
#include "board.h" #include "board.h"
uint32_t powerupReason __NOINIT; // Stores power up reason beyond initialization for emergency mode activation
uint32_t boardState __NOINIT; uint32_t boardState __NOINIT;
void pwrInit() void pwrInit()
@@ -89,10 +88,6 @@ bool pwrPressed()
void pwrResetHandler() void pwrResetHandler()
{ {
if (boardState != BOARD_POWER_OFF) { if (boardState != BOARD_POWER_OFF) {
powerupReason = boardState != BOARD_REBOOT && WAS_RESET_BY_WATCHDOG_OR_SOFTWARE() ? SOFTRESET_REQUEST : SHUTDOWN_REQUEST;
RCC->CSR |= RCC_CSR_RMVF; //clear all flags RCC->CSR |= RCC_CSR_RMVF; //clear all flags
} }
else {
powerupReason = SHUTDOWN_REQUEST;
}
} }