Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-23 16:25:16 +03:00
Code Issues Wiki Activity

perMainArm() renamed to perMain()

Browse source
This commit is contained in:
Damjan Adamic 2014-12-07 10:12:26 +01:00
parent afedd86fae
commit f8203b72f7
4 changed files with 13 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

2
radio/src/main_arm.cpp
View file

@ -97,7 +97,7 @@ void checkEeprom()
} }
} }
void perMainArm() void perMain()
{ {
#if defined(PCBSKY9X) && !defined(REVA) #if defined(PCBSKY9X) && !defined(REVA)
calcConsumption(); calcConsumption();

22
radio/src/opentx.h
View file

@ -727,11 +727,9 @@ void evalMixes(uint8_t tick10ms);
void doMixerCalculations(); void doMixerCalculations();
#if defined(CPUARM) #if defined(CPUARM)
void perMainArm(); void checkTrims();
void checkTrims();
#else
void perMain();
#endif #endif
void perMain();
NOINLINE void per10ms(); NOINLINE void per10ms();
getvalue_t getValue(mixsrc_t i); getvalue_t getValue(mixsrc_t i);
@ -747,15 +745,15 @@ void logicalSwitchesTimerTick();
void logicalSwitchesReset(); void logicalSwitchesReset();
#if defined(CPUARM) #if defined(CPUARM)
void evalLogicalSwitches(bool isCurrentPhase=true); void evalLogicalSwitches(bool isCurrentPhase=true);
void logicalSwitchesCopyState(uint8_t src, uint8_t dst); void logicalSwitchesCopyState(uint8_t src, uint8_t dst);
#define LS_RECURSIVE_EVALUATION_RESET() #define LS_RECURSIVE_EVALUATION_RESET()
#else #else
#define evalLogicalSwitches(xxx) #define evalLogicalSwitches(xxx)
#define GETSWITCH_RECURSIVE_TYPE uint16_t #define GETSWITCH_RECURSIVE_TYPE uint16_t
extern volatile GETSWITCH_RECURSIVE_TYPE s_last_switch_used; extern volatile GETSWITCH_RECURSIVE_TYPE s_last_switch_used;
extern volatile GETSWITCH_RECURSIVE_TYPE s_last_switch_value; extern volatile GETSWITCH_RECURSIVE_TYPE s_last_switch_value;
#define LS_RECURSIVE_EVALUATION_RESET() s_last_switch_used = 0 #define LS_RECURSIVE_EVALUATION_RESET() s_last_switch_used = 0
#endif #endif
#if defined(PCBTARANIS) #if defined(PCBTARANIS)

4
radio/src/targets/simu/simpgmspace.cpp
View file

@ -342,10 +342,8 @@ void *main_thread(void *)
#if defined(CPUARM) #if defined(CPUARM)
doMixerCalculations(); doMixerCalculations();
checkTrims(); checkTrims();
perMainArm();
#else
perMain();
#endif #endif
perMain();
sleep(10/*ms*/); sleep(10/*ms*/);
} }

2
radio/src/tasks_arm.cpp
View file

@ -160,7 +160,7 @@ void menusTask(void * pdata)
while (pwrCheck() != e_power_off) { while (pwrCheck() != e_power_off) {
U64 start = CoGetOSTime(); U64 start = CoGetOSTime();
perMainArm(); perMain();
// TODO remove completely massstorage from sky9x firmware // TODO remove completely massstorage from sky9x firmware
U32 runtime = (U32)(CoGetOSTime() - start); U32 runtime = (U32)(CoGetOSTime() - start);
// deduct the thread run-time from the wait, if run-time was more than // deduct the thread run-time from the wait, if run-time was more than