Re #3827: added mutex to getADC(), because adcRead() is not reentrant (#3889)

* Re #3827: added mutex to getADC(), because adcRead() is not reentrant

* Re #3827: alternative solution to prevent calling getADC() from different threads, because adcRead() is not reentrant

* Cosmetics
This commit is contained in:
Damjan Adamic
2016-10-08 22:09:25 +02:00
committed by Bertrand Songis
parent 1e4470a007
commit 2dd8b8702f
4 changed files with 25 additions and 12 deletions
+13 -8
View File
@@ -1119,7 +1119,7 @@ void checkTHR()
return; return;
} }
getADC(); GET_ADC_IF_MIXER_NOT_RUNNING();
evalInputs(e_perout_mode_notrainer); // let do evalInputs do the job evalInputs(e_perout_mode_notrainer); // let do evalInputs do the job
@@ -1138,9 +1138,7 @@ void checkTHR()
while (1) { while (1) {
SIMU_SLEEP(1); GET_ADC_IF_MIXER_NOT_RUNNING();
getADC();
evalInputs(e_perout_mode_notrainer); // let do evalInputs do the job evalInputs(e_perout_mode_notrainer); // let do evalInputs do the job
@@ -1171,6 +1169,12 @@ void checkTHR()
doLoopCommonActions(); doLoopCommonActions();
wdt_reset(); wdt_reset();
SIMU_SLEEP(1);
#if defined(CPUARM)
CoTickDelay(10);
#endif
} }
#endif #endif
@@ -1200,6 +1204,9 @@ void alert(const pm_char * t, const pm_char * s ALERT_SOUND_ARG)
while(1) { while(1) {
SIMU_SLEEP(1); SIMU_SLEEP(1);
#if defined(CPUARM)
CoTickDelay(10);
#endif
if (keyDown()) break; // wait for key release if (keyDown()) break; // wait for key release
@@ -1474,7 +1481,7 @@ void getADC()
s_anaFilt[x] = (s_anaFilt[x] - previous) + v; s_anaFilt[x] = (s_anaFilt[x] - previous) + v;
} }
else else
#endif #endif // #if defined(VIRTUAL_INPUTS)
{ {
//use unfiltered value //use unfiltered value
s_anaFilt[x] = v * JITTER_ALPHA; s_anaFilt[x] = v * JITTER_ALPHA;
@@ -1486,7 +1493,6 @@ void getADC()
} }
#endif #endif
#if defined(CPUARM)
#define ANAFILT_MAX (2 * RESX * JITTER_ALPHA * ANALOG_MULTIPLIER - 1) #define ANAFILT_MAX (2 * RESX * JITTER_ALPHA * ANALOG_MULTIPLIER - 1)
StepsCalibData * calib = (StepsCalibData *) &g_eeGeneral.calib[x]; StepsCalibData * calib = (StepsCalibData *) &g_eeGeneral.calib[x];
if (IS_POT_MULTIPOS(x) && IS_MULTIPOS_CALIBRATED(calib)) { if (IS_POT_MULTIPOS(x) && IS_MULTIPOS_CALIBRATED(calib)) {
@@ -1500,10 +1506,9 @@ void getADC()
} }
} }
} }
#endif // defined(CPUARM)
} }
} }
#endif #endif // #if defined(CPUARM)
#endif // SIMU #endif // SIMU
+5
View File
@@ -847,6 +847,11 @@ void checkAll();
#if !defined(SIMU) #if !defined(SIMU)
void getADC(); void getADC();
#if defined(CPUARM)
#define GET_ADC_IF_MIXER_NOT_RUNNING() do { if (s_pulses_paused) getADC(); } while(0)
#else
#define GET_ADC_IF_MIXER_NOT_RUNNING() getADC()
#endif
#endif #endif
#if defined(SBUS) #if defined(SBUS)
+6 -4
View File
@@ -737,14 +737,13 @@ void checkSwitches()
while (1) { while (1) {
#if defined(TELEMETRY_MOD_14051) || defined(TELEMETRY_MOD_14051_SWAPPED) #if defined(TELEMETRY_MOD_14051) || defined(TELEMETRY_MOD_14051_SWAPPED)
// FIXME: One getADC() call only reads one 14051 MUX input. To have all switch states updated, we need to call it MUX_MAX+1 times. #define GETADC_COUNT (MUX_MAX+1)
#define GETADC_COUNT (MUX_MAX+1)
#elif defined(PCBTARANIS) || defined(PCBFLAMENCO) || defined(PCBHORUS) #elif defined(PCBTARANIS) || defined(PCBFLAMENCO) || defined(PCBHORUS)
#define GETADC_COUNT 1 #define GETADC_COUNT 1
#endif #endif
#ifdef GETADC_COUNT #ifdef GETADC_COUNT
for (uint8_t i=0; i<GETADC_COUNT; i++) { for (uint8_t i=0; i<GETADC_COUNT; i++) {
getADC(); GET_ADC_IF_MIXER_NOT_RUNNING();
} }
#undef GETADC_COUNT #undef GETADC_COUNT
#endif #endif
@@ -942,6 +941,9 @@ void checkSwitches()
wdt_reset(); wdt_reset();
SIMU_SLEEP(1); SIMU_SLEEP(1);
#if defined(CPUARM)
CoTickDelay(10);
#endif
} }
#endif #endif
+1
View File
@@ -360,6 +360,7 @@ extern uint8_t main_thread_running;
extern char * main_thread_error; extern char * main_thread_error;
#define getADC() #define getADC()
#define GET_ADC_IF_MIXER_NOT_RUNNING()
#define getADC_bandgap() #define getADC_bandgap()
#define SIMU_SLEEP(x) do { if (!main_thread_running) return; sleep(x/*ms*/); } while (0) #define SIMU_SLEEP(x) do { if (!main_thread_running) return; sleep(x/*ms*/); } while (0)