fix(cpn): Add back failsafe settings for protocols that support (#4220)

Neil Horne · web-flow · commit 23bc14566cc8 · 2023-10-19T11:20:52.000+10:00
diff --git a/companion/src/modeledit/setup.cpp b/companion/src/modeledit/setup.cpp
@@ -565,6 +565,9 @@ void ModulePanel::update()
       default:
         break;
     }
+
+    if (protocol != PULSES_MULTIMODULE && module.hasFailsafes(firmware))
+      mask |= MASK_FAILSAFES;
   }
   else if (IS_HORUS_OR_TARANIS(board)) {
     if (model->trainerMode == TRAINER_MODE_SLAVE_JACK) {
@@ -574,9 +577,6 @@ void ModulePanel::update()
   else if (model->trainerMode != TRAINER_MODE_MASTER_JACK) {
     mask |= MASK_PPM_FIELDS | MASK_CHANNELS_RANGE | MASK_CHANNELS_COUNT;
   }
-  else if (module.hasFailsafes(firmware)) {
-    mask |= MASK_FAILSAFES;
-  }
 
   if (isExternalModule(moduleIdx))
     ui->telemetryBaudrate->setVisible(mask & MASK_BAUDRATE);

Original file line number	Diff line number	Diff line change
`@@ -565,6 +565,9 @@ void ModulePanel::update()`
`565`	`565`	`default:`
`566`	`566`	`break;`
`567`	`567`	`}`
	`568`	`+`
	`569`	`+ if (protocol != PULSES_MULTIMODULE && module.hasFailsafes(firmware))`
	`570`	`+ mask \|= MASK_FAILSAFES;`
`568`	`571`	`}`
`569`	`572`	`else if (IS_HORUS_OR_TARANIS(board)) {`
`570`	`573`	`if (model->trainerMode == TRAINER_MODE_SLAVE_JACK) {`
`@@ -574,9 +577,6 @@ void ModulePanel::update()`
`574`	`577`	`else if (model->trainerMode != TRAINER_MODE_MASTER_JACK) {`
`575`	`578`	`mask \|= MASK_PPM_FIELDS \| MASK_CHANNELS_RANGE \| MASK_CHANNELS_COUNT;`
`576`	`579`	`}`
`577`		`- else if (module.hasFailsafes(firmware)) {`
`578`		`- mask \|= MASK_FAILSAFES;`
`579`		`- }`
`580`	`580`
`581`	`581`	`if (isExternalModule(moduleIdx))`
`582`	`582`	`ui->telemetryBaudrate->setVisible(mask & MASK_BAUDRATE);`