watchdogSetTimeout renamed to watchdogSuspend

This commit is contained in:
Bertrand Songis
2016-08-28 09:26:18 +02:00
parent db79e2c53e
commit 4377815c7b
5 changed files with 9 additions and 9 deletions
+3 -3
View File
@@ -92,7 +92,7 @@ void flashBootloader(const char * filename)
}
for (int i=0; i<BOOTLOADER_SIZE; i+=1024) {
watchdogSetTimeout(100/*1s*/);
watchdogSuspend(100/*1s*/);
if (f_read(&file, buffer, 1024, &count) != FR_OK || count != 1024) {
POPUP_WARNING(STR_SDCARD_ERROR);
break;
@@ -119,14 +119,14 @@ void flashBootloader(const char * filename)
void flashSportDevice(ModuleIndex module, const char *filename)
{
pausePulses();
watchdogSetTimeout(60*60*100/*1h*/);
watchdogSuspend(60*60*100/*1h*/);
lcdClear();
drawProgressBar(STR_WRITING);
sportFirmwareUpdate(module, filename);
watchdogSetTimeout(100/*1s*/);
watchdogSuspend(100/*1s*/);
resumePulses();
}
+2 -2
View File
@@ -80,7 +80,7 @@ volatile tmr10ms_t g_tmr10ms;
volatile uint8_t rtc_count = 0;
uint32_t watchdogTimeout = 0;
void watchdogSetTimeout(uint32_t timeout)
void watchdogSuspend(uint32_t timeout)
{
watchdogTimeout = timeout;
}
@@ -1972,7 +1972,7 @@ void opentxClose(uint8_t shutdown)
if (shutdown) {
#if defined(CPUARM)
watchdogSetTimeout(2000/*20s*/);
watchdogSuspend(2000/*20s*/);
#endif
pausePulses(); // stop mixer task to disable trims processing while in shutdown
AUDIO_BYE();
+1 -1
View File
@@ -555,7 +555,7 @@ extern uint8_t rotencSpeed;
extern uint8_t heartbeat;
#if defined(CPUARM)
void watchdogSetTimeout(uint32_t timeout);
void watchdogSuspend(uint32_t timeout);
#endif
#define MAX_ALERT_TIME 60
+1 -1
View File
@@ -42,7 +42,7 @@ void storageDirty(uint8_t msk)
void preModelLoad()
{
#if defined(CPUARM)
watchdogSetTimeout(500/*5s*/);
watchdogSuspend(500/*5s*/);
#endif
#if defined(SDCARD)
@@ -223,7 +223,7 @@ int8_t STORAGE_Read (uint8_t lun,
uint32_t blk_addr,
uint16_t blk_len)
{
watchdogSetTimeout(100/*1s*/);
watchdogSuspend(100/*1s*/);
#if defined(EEPROM)
if (lun == STORAGE_EEPROM_LUN) {
@@ -248,7 +248,7 @@ int8_t STORAGE_Write (uint8_t lun,
uint32_t blk_addr,
uint16_t blk_len)
{
watchdogSetTimeout(100/*1s*/);
watchdogSuspend(100/*1s*/);
#if defined(EEPROM)
if (lun == STORAGE_EEPROM_LUN) {