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

Compilation fix

Browse Source
This commit is contained in:
Bertrand Songis
2016-08-28 10:06:37 +02:00
parent 4377815c7b
commit 6071b1aa0d
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/opentx.h
+8 -5
View File
@@ -545,17 +545,20 @@ extern uint8_t rotencSpeed;
#define ROTENC_DELAY_HIGHSPEED 2 #define ROTENC_DELAY_HIGHSPEED 2
#endif #endif
#define HEART_TIMER_10MS 1 #define HEART_TIMER_10MS 1
#define HEART_TIMER_PULSES 2 // when multiple modules this is the first one #define HEART_TIMER_PULSES 2 // when multiple modules this is the first one
#if defined(PCBTARANIS) || defined(PCBFLAMENCO) || defined(PCBHORUS) #if defined(PCBTARANIS) || defined(PCBFLAMENCO) || defined(PCBHORUS)
#define HEART_WDT_CHECK (HEART_TIMER_10MS + (HEART_TIMER_PULSES << 0) + (HEART_TIMER_PULSES << 1)) #define HEART_WDT_CHECK (HEART_TIMER_10MS + (HEART_TIMER_PULSES << 0) + (HEART_TIMER_PULSES << 1))
#else #else
#define HEART_WDT_CHECK (HEART_TIMER_10MS + HEART_TIMER_PULSES) #define HEART_WDT_CHECK (HEART_TIMER_10MS + HEART_TIMER_PULSES)
#endif #endif
extern uint8_t heartbeat; extern uint8_t heartbeat;
#if defined(CPUARM) #if defined(CPUARM) && !defined(BOOT)
void watchdogSuspend(uint32_t timeout); void watchdogSuspend(uint32_t timeout);
#define WATCHDOG_SUSPEND(x) watchdogSuspend(x)
#else
#define WATCHDOG_SUSPEND(...)
#endif #endif
#define MAX_ALERT_TIME 60 #define MAX_ALERT_TIME 60
radio/src/targets/common/arm/stm32/usbd_storage_msd.cpp
+2 -2
View File
@@ -223,7 +223,7 @@ int8_t STORAGE_Read (uint8_t lun,
uint32_t blk_addr, uint32_t blk_addr,
uint16_t blk_len) uint16_t blk_len)
{ {
watchdogSuspend(100/*1s*/); WATCHDOG_SUSPEND(100/*1s*/);
#if defined(EEPROM) #if defined(EEPROM)
if (lun == STORAGE_EEPROM_LUN) { if (lun == STORAGE_EEPROM_LUN) {
@@ -248,7 +248,7 @@ int8_t STORAGE_Write (uint8_t lun,
uint32_t blk_addr, uint32_t blk_addr,
uint16_t blk_len) uint16_t blk_len)
{ {
watchdogSuspend(100/*1s*/); WATCHDOG_SUSPEND(100/*1s*/);
#if defined(EEPROM) #if defined(EEPROM)
if (lun == STORAGE_EEPROM_LUN) { if (lun == STORAGE_EEPROM_LUN) {