Merge branch '2.3' into 2.4

# Conflicts:
#	radio/src/datastructs.h
This commit is contained in:
Raphael Coeffic
2021-06-10 17:31:39 +02:00
17 changed files with 94 additions and 14 deletions
+2
View File
@@ -580,6 +580,7 @@ bool setupPulsesInternalModule(uint8_t protocol)
void stopPulsesInternalModule()
{
if (moduleState[INTERNAL_MODULE].protocol != PROTOCOL_CHANNELS_UNINITIALIZED) {
mixerSchedulerSetPeriod(INTERNAL_MODULE, 0);
intmoduleStop();
moduleState[INTERNAL_MODULE].protocol = PROTOCOL_CHANNELS_NONE;
}
@@ -607,6 +608,7 @@ bool setupPulsesInternalModule()
void stopPulsesExternalModule()
{
if (moduleState[EXTERNAL_MODULE].protocol != PROTOCOL_CHANNELS_UNINITIALIZED) {
mixerSchedulerSetPeriod(EXTERNAL_MODULE, 0);
extmoduleStop();
moduleState[EXTERNAL_MODULE].protocol = PROTOCOL_CHANNELS_NONE;
}